Machine Studio : added configuration for dark /light theme

1 files changed, 16 insertions, 16 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
index 71ce6f173..9308fce5a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/MainView.xaml
@@ -60,7 +60,7 @@
                                     <ComboBox IsEnabled="{Binding IsFree}" ItemsSource="{Binding HardwareVersions}" SelectedItem="{Binding SelectedVersion}" Width="300" FontSize="16" FontWeight="Bold" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Hardware Version">
                                         <ComboBox.ItemTemplate>
                                             <DataTemplate>
-                                                <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="Gray" FontSize="14">v</Run><Run Foreground="Gray" FontSize="14" Text="{Binding Version}"></Run></TextBlock>
+                                                <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14">v</Run><Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14" Text="{Binding Version}"></Run></TextBlock>
                                             </DataTemplate>
                                         </ComboBox.ItemTemplate>
                                     </ComboBox>
@@ -356,28 +356,28 @@
                     <ScrollViewer IsEnabled="{Binding IsFree}" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Margin="0 90 0 10">
                         <Grid>
                             <StackPanel>
-                                <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}" Padding="20 10">
-                                    <StackPanel>
-                                        <TextBlock Text="HARDWARE VERSION" Foreground="Gray" FontWeight="Bold" FontStyle="Italic" FontSize="16"></TextBlock>
+                                <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource WhiteBackgroundBrush}" Padding="20 10">
+                                    <StackPanel >
+                                        <TextBlock Text="HARDWARE VERSION" Foreground="{StaticResource GrayBrush}" FontWeight="Bold" FontStyle="Italic" FontSize="16"></TextBlock>
 
-                                        <TextBlock Margin="0 10 0 0" FontSize="10" Foreground="Gray">Name</TextBlock>
+                                        <TextBlock Margin="0 10 0 0" FontSize="10" Foreground="{StaticResource GrayBrush}">Name</TextBlock>
                                         <TextBox Text="{Binding CurrentVersion.Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
 
-                                        <TextBlock Margin="0 20 0 0" FontSize="10" Foreground="Gray">Version</TextBlock>
-                                        <mahApps:NumericUpDown Minimum="0" BorderThickness="0 0 0 1" HorizontalContentAlignment="Left" Maximum="1000" HasDecimals="True" Value="{Binding CurrentVersion.Version}" />
+                                        <TextBlock Margin="0 20 0 0" FontSize="10" Foreground="{StaticResource GrayBrush}">Version</TextBlock>
+                                        <mahApps:NumericUpDown Minimum="0" BorderThickness="0 0 0 1" HorizontalContentAlignment="Left" Maximum="1000" HasDecimals="True" Value="{Binding CurrentVersion.Version}" Foreground="{StaticResource GrayBrush}"/>
                                     </StackPanel>
                                 </materialDesign:Card>
 
-                                <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}">
-                                    <StackPanel>
+                                <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource WhiteBackgroundBrush}">
+                                    <StackPanel >
                                         <Grid>
-                                            <Expander HorizontalAlignment="Stretch" IsExpanded="True">
+                                            <Expander HorizontalAlignment="Stretch" IsExpanded="True" Background="{DynamicResource Card.Background}">
                                                 <Expander.Header>
-                                                    <TextBlock FontSize="18" Foreground="#595959" FontWeight="Bold" FontStyle="Italic">
+                                                    <TextBlock FontSize="18" Foreground="{StaticResource MainWindow.Foreground}" FontWeight="Bold" FontStyle="Italic">
                                                         <Run Text="{Binding SelectedHardwareObjectTypeName,Mode=OneWay}"></Run>
                                                     </TextBlock>
                                                 </Expander.Header>
-                                                <StackPanel>
+                                                <StackPanel >
                                                     <editors:ParameterizedEditor ParameterizedObject="{Binding SelectedHardwareObject}" Padding="10">
                                                         <editors:ParameterizedEditor.ItemsPanel>
                                                             <ItemsPanelTemplate>
@@ -388,7 +388,7 @@
                                                             <DataTemplate>
                                                                 <DockPanel>
                                                                     <mahApps:NumericUpDown  DockPanel.Dock="Right" Background="Transparent" BorderThickness="0 0 0 0" Value="{Binding Value,UpdateSourceTrigger=PropertyChanged}" HasDecimals="True" HorizontalContentAlignment="Center" Width="100" />
-                                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
+                                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
                                                                 </DockPanel>
                                                             </DataTemplate>
                                                         </editors:ParameterizedEditor.DoubleTemplate>
@@ -396,15 +396,15 @@
                                                             <DataTemplate>
                                                                 <DockPanel>
                                                                     <mahApps:NumericUpDown  DockPanel.Dock="Right" Background="Transparent" BorderThickness="0 0 0 0" Value="{Binding Value,Converter={StaticResource DoubleToIntConverter},UpdateSourceTrigger=PropertyChanged}" HasDecimals="False" HorizontalContentAlignment="Center" Width="100" />
-                                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
+                                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
                                                                 </DockPanel>
                                                             </DataTemplate>
                                                         </editors:ParameterizedEditor.Int32Template>
                                                         <editors:ParameterizedEditor.BooleanTemplate>
                                                             <DataTemplate>
                                                                 <DockPanel Margin="0 5 0 0">
-                                                                    <ToggleButton DockPanel.Dock="Right"  Width="100" IsChecked="{Binding Value}" HorizontalAlignment="Right" />
-                                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
+                                                                    <ToggleButton DockPanel.Dock="Right"  Width="100" IsChecked="{Binding Value}" HorizontalAlignment="Right"  Foreground="{StaticResource MainWindow.Foreground}"/>
+                                                                    <TextBlock Text="{Binding Name}" VerticalAlignment="Center" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
                                                                 </DockPanel>
                                                             </DataTemplate>
                                                         </editors:ParameterizedEditor.BooleanTemplate>