From d045a47ad7363e62b763013fa6afcdb1762a7ce3 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 11 Aug 2019 16:48:35 +0300
Subject: Machine Studio : added configuration for  dark /light theme

---
 .../Views/EventsView.xaml                          | 27 +++++++---------------
 1 file changed, 8 insertions(+), 19 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
index 5e16461a6..5be54a721 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventsView.xaml
@@ -62,24 +62,19 @@
                                 <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
                             </StackPanel>
                         </Button>
-                        
-                        <Border Margin="10" Padding="5" BorderBrush="DimGray" BorderThickness="1">
-                            <Border.Background>
-                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                    <GradientStop Color="White"/>
-                                    <GradientStop Color="#FFEAEAEA" Offset="1"/>
-                                </LinearGradientBrush>
-                            </Border.Background>
+
+                        <Border Margin="10" Padding="5" BorderBrush="DimGray" BorderThickness="1" Background="{StaticResource Logging.Background}">
                             <StackPanel Orientation="Horizontal">
                                 <Image Source="../Images/machine-trans.png" RenderOptions.BitmapScalingMode="Fant"></Image>
                                 <StackPanel Orientation="Horizontal" Width="300" Margin="20 0 0 5" VerticalAlignment="Bottom">
                                     <materialDesign:PackIcon Kind="BarcodeScan" VerticalAlignment="Center" Width="24" Height="24" />
-                                    <autoComplete:AutoCompleteTextBox HorizontalContentAlignment="Stretch" Width="300" Margin="10 0 0 0" FontSize="16" Provider="{StaticResource MachinesProvider}" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}" materialDesign:HintAssist.Hint="Serial Number / Name" DisplayMember="SerialNumber">
+                                    <autoComplete:AutoCompleteTextBox HorizontalContentAlignment="Stretch" Width="300" Margin="10 0 0 0" FontSize="16" Provider="{StaticResource MachinesProvider}" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}" materialDesign:HintAssist.Hint="Serial Number / Name" DisplayMember="SerialNumber"
+                                                                      Foreground="{StaticResource MainWindow.Foreground}">
                                         <autoComplete:AutoCompleteTextBox.ItemTemplate>
                                             <DataTemplate>
-                                                <Border Padding="5">
+                                                <Border Padding="5" >
                                                     <DockPanel LastChildFill="False" Width="250">
-                                                        <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
+                                                        <StackPanel Orientation="Horizontal" DockPanel.Dock="Left"  >
                                                             <Image Source="/Images/machine-trans.png" Width="24" RenderOptions.BitmapScalingMode="Fant" />
                                                             <TextBlock Margin="10 0 0 0" FontWeight="SemiBold" Text="{Binding SerialNumber}" VerticalAlignment="Center"></TextBlock>
                                                         </StackPanel>
@@ -92,13 +87,7 @@
                                 </StackPanel>
                             </StackPanel>
                         </Border>
-                        <Border Margin="10" Padding="5" BorderBrush="DimGray" BorderThickness="1">
-                            <Border.Background>
-                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                    <GradientStop Color="White"/>
-                                    <GradientStop Color="#FFEAEAEA" Offset="1"/>
-                                </LinearGradientBrush>
-                            </Border.Background>
+                        <Border Margin="10" Padding="5" BorderBrush="DimGray" BorderThickness="1" Background="{StaticResource Logging.Background}">
                             <StackPanel Orientation="Horizontal">
                                 <materialDesign:PackIcon Kind="Calendar" Width="24" Height="24" VerticalAlignment="Bottom" Margin="0 0 0 5" />
                                 <DatePicker x:Name="datePicker" DisplayDateStart="{Binding MinDate}" DisplayDateEnd="{Binding MaxDate}" CalendarStyle="{StaticResource HighlightDatePickerStyle}" SelectedDate="{Binding SelectedDate}" materialDesign:HintAssist.Hint="Pick Date" Margin="10 0 0 5" Width="200" VerticalAlignment="Bottom" FontSize="16">
@@ -111,7 +100,7 @@
                 </Grid>
             </Border>
 
-            <Grid Grid.Row="1" Background="#B3FFFFFF">
+            <Grid Grid.Row="1" Background="{StaticResource TransparentBackgroundBrush400}">
                 <Grid Margin="10">
                     <Grid.ColumnDefinitions>
 
-- 
cgit v1.3.1