From d30fc59275a2d1a8091c2a4c02111275f2a19c3c Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 26 Sep 2019 12:34:30 +0300
Subject: Changes in HardwareConfigurationView for support dark theme

---
 .../Views/HardwareConfigurationView.xaml           | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/HardwareConfigurationView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/HardwareConfigurationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/HardwareConfigurationView.xaml
index 78f5dad59..ca9ea99b4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/HardwareConfigurationView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/HardwareConfigurationView.xaml
@@ -11,7 +11,7 @@
              xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
               xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800" DataContext="{Binding HardwareConfigurationViewVM}">
+             d:DesignHeight="450" d:DesignWidth="800" DataContext="{Binding HardwareConfigurationViewVM}" Foreground="{StaticResource GrayBrush280}">
     <UserControl.Resources>
         <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -20,7 +20,7 @@
         <converters:DoubleToIntConverter x:Key="DoubleToIntConverter" />
 
     </UserControl.Resources>
-    <Grid Margin="0 40 0 0">
+    <Grid Margin="0 40 0 0" TextElement.Foreground="{StaticResource GrayBrush280}">
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="400"></ColumnDefinition>
@@ -30,7 +30,7 @@
             <StackPanel Orientation="Vertical" HorizontalAlignment="Right" Margin="0 30 0 0" MouseUp="Main_container_MouseUp">
 
                 <TextBlock FontSize="10">Find component</TextBlock>
-                <Border Margin="0 2 0 0" Background="#78FFFFFF" BorderThickness="1" BorderBrush="Gray" CornerRadius="3" Padding="5">
+                <Border Margin="0 2 0 0" Background="{ StaticResource TransparentBackgroundBrush450}" BorderThickness="1" BorderBrush="{StaticResource borderBrush}" CornerRadius="3" Padding="5">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                         <materialDesign:PackIcon VerticalAlignment="Center" Width="24" Height="24" Kind="Magnify" />
                         <TextBox Style="{x:Null}" Background="Transparent" BorderThickness="0" Text="{Binding ComponentFilter,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Delay=1000}" materialDesign:HintAssist.Hint="Search" Width="350" FontSize="16" />
@@ -38,7 +38,7 @@
                 </Border>
 
                 <TextBlock Margin="0 10 0 0" FontSize="10">Find parameter</TextBlock>
-                <Border Margin="0 2 0 0" Background="#78FFFFFF" BorderThickness="1" BorderBrush="Gray" CornerRadius="3" Padding="5">
+                <Border Margin="0 2 0 0" Background="{ StaticResource TransparentBackgroundBrush450}" BorderThickness="1" BorderBrush="{StaticResource borderBrush}" CornerRadius="3" Padding="5">
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                         <materialDesign:PackIcon VerticalAlignment="Center" Width="24" Height="24" Kind="Magnify" />
                         <TextBox Style="{x:Null}" Background="Transparent" BorderThickness="0" Text="{Binding PropertyFilter,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Delay=1000}" materialDesign:HintAssist.Hint="Search" Width="350" FontSize="16" />
@@ -58,24 +58,24 @@
                                 <DockPanel>
                                     <TextBlock Margin="0 40 20 0" DockPanel.Dock="Left" Text="{Binding CollectionName}" FontSize="22" FontWeight="SemiBold" HorizontalAlignment="Right" TextAlignment="Right" VerticalAlignment="Top" Width="200" />
                                     <Grid>
-                                        <Border Name="LeftB" Grid.Column="0" VerticalAlignment="Stretch" HorizontalAlignment="Center" MinWidth="800">
+                                        <Border Name="LeftB" Grid.Column="0" VerticalAlignment="Stretch" HorizontalAlignment="Center" MinWidth="800" >
                                             <Grid>
                                                 <StackPanel Orientation="Vertical">
-                                                    <ItemsControl Focusable="False"  Margin="10,0,0,0" Name="ComponentListLeft" ItemsSource="{Binding Components}"  HorizontalContentAlignment="Stretch">
+                                                    <ItemsControl Focusable="False"  Margin="10,0,0,0" Name="ComponentListLeft" ItemsSource="{Binding Components}"  HorizontalContentAlignment="Stretch" Foreground="{StaticResource GrayBrush280}">
                                                         <ItemsControl.ItemTemplate>
                                                             <DataTemplate>
-                                                                <StackPanel Orientation="Vertical" Margin="0 10">
+                                                                <StackPanel Orientation="Vertical" Margin="0 10" >
                                                                     <TextBlock Margin="0 5"  Text="{Binding Description}" FontWeight="SemiBold" FontSize="18"/>
-                                                                    <Border BorderThickness="1" BorderBrush="Gray" CornerRadius="3" Background="#6EFFFFFF">
+                                                                    <Border BorderThickness="1" BorderBrush="{StaticResource borderBrush}" CornerRadius="3" Background="{StaticResource TransparentBackgroundBrush600}">
                                                                         <ItemsControl Focusable="False" Grid.Row="1" Margin="10"  Name="PropertyListL" ItemsSource="{Binding Properties}" HorizontalContentAlignment="Stretch">
                                                                             <ItemsControl.ItemTemplate>
                                                                                 <DataTemplate>
-                                                                                    <Grid VerticalAlignment="Center" Height="25" Background="Transparent">
-                                                                                        <StackPanel Orientation="Horizontal">
-                                                                                            <ToggleButton FocusVisualStyle="{x:Null}" x:Name="editPropertyButton" IsChecked="{Binding IsSelected,Mode=TwoWay}"  BorderThickness="0"  VerticalAlignment="Center" Cursor="Hand"  Margin="10 0 0 0"  Background="Transparent" VerticalContentAlignment="Top" Checked="EditPropertyButton_Checked">
+                                                                                    <Grid VerticalAlignment="Center" Height="25" Background="Transparent" >
+                                                                                        <StackPanel Orientation="Horizontal" >
+                                                                                            <ToggleButton FocusVisualStyle="{x:Null}" x:Name="editPropertyButton" IsChecked="{Binding IsSelected,Mode=TwoWay}"  BorderThickness="0"  VerticalAlignment="Center" Cursor="Hand"  Margin="10 0 0 0"  Background="Transparent" VerticalContentAlignment="Top" Checked="EditPropertyButton_Checked" Foreground="{StaticResource GrayBrush280}">
                                                                                                 <ToggleButton.Content>
                                                                                                     <StackPanel Orientation="Horizontal">
-                                                                                                        <TextBlock VerticalAlignment="Center" FontWeight="Normal">
+                                                                                                        <TextBlock VerticalAlignment="Center" FontWeight="Normal" >
                                                                                                             <Run Text="{Binding PropertyName}"></Run>
                                                                                                             <Run>:</Run>
                                                                                                         </TextBlock>
@@ -98,13 +98,13 @@
                                                                                                                 </Style>
                                                                                                             </TextBlock.Style>
                                                                                                         </TextBlock>
-                                                                                                        <ContentControl Visibility="{Binding ElementName=editPropertyButton,Path=IsChecked,Converter={StaticResource BooleanToVisibilityConverter}}" Margin="5 0 0 0" Content="{Binding}">
+                                                                                                        <ContentControl Visibility="{Binding ElementName=editPropertyButton,Path=IsChecked,Converter={StaticResource BooleanToVisibilityConverter}}" Margin="5 0 0 0" Content="{Binding}" Foreground="{StaticResource GrayBrush280}">
                                                                                                             <ContentControl.Resources>
                                                                                                                 <DataTemplate x:Key="int" DataType="{x:Type sys:Int32}">
-                                                                                                                    <mahapps:NumericUpDown KeyDown="NumericUpDown_KeyDown" MinHeight="20" MaxWidth="400" VerticalContentAlignment="Center" ScrollViewer.HorizontalScrollBarVisibility="Disabled" HorizontalAlignment="Center" Value="{Binding EditableValue,Converter={StaticResource DoubleToIntConverter}, UpdateSourceTrigger=PropertyChanged}" Background="Transparent" HideUpDownButtons="True"  InterceptArrowKeys="True" BorderThickness="0 0 0 1" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center"/>
+                                                                                                                    <mahapps:NumericUpDown KeyDown="NumericUpDown_KeyDown" MinHeight="20" MaxWidth="400" VerticalContentAlignment="Center" ScrollViewer.HorizontalScrollBarVisibility="Disabled" HorizontalAlignment="Center" Value="{Binding EditableValue,Converter={StaticResource DoubleToIntConverter}, UpdateSourceTrigger=PropertyChanged}" Background="Transparent" HideUpDownButtons="True"  InterceptArrowKeys="True" BorderThickness="0 0 0 1" BorderBrush="{StaticResource GrayBrush280}" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center" Foreground="{StaticResource GrayBrush280}"/>
                                                                                                                 </DataTemplate>
                                                                                                                 <DataTemplate x:Key="double" DataType="{x:Type sys:Double}">
-                                                                                                                    <mahapps:NumericUpDown KeyDown="NumericUpDown_KeyDown" MinHeight="20"  MaxWidth="400" VerticalContentAlignment="Center" ScrollViewer.HorizontalScrollBarVisibility="Disabled" HorizontalAlignment="Center" Value="{Binding EditableValue, UpdateSourceTrigger=PropertyChanged}" Background="Transparent" HideUpDownButtons="True"  InterceptArrowKeys="True" BorderThickness="0 0 0 1" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center"/>
+                                                                                                                    <mahapps:NumericUpDown KeyDown="NumericUpDown_KeyDown" MinHeight="20"  MaxWidth="400" VerticalContentAlignment="Center" ScrollViewer.HorizontalScrollBarVisibility="Disabled" HorizontalAlignment="Center" Value="{Binding EditableValue, UpdateSourceTrigger=PropertyChanged}" Background="Transparent" HideUpDownButtons="True"  InterceptArrowKeys="True" BorderThickness="0 0 0 1" BorderBrush="{StaticResource GrayBrush280}" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center" Foreground="{StaticResource GrayBrush280}"/>
                                                                                                                 </DataTemplate>
                                                                                                                 <DataTemplate x:Key="bool" DataType="{x:Type sys:Boolean}">
                                                                                                                     <ToggleButton Margin="10 2 0 0" IsChecked="{Binding EditableValue,UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Right"></ToggleButton>
-- 
cgit v1.3.1