Refactored machine studio for using colors static resources.

2 files changed, 160 insertions, 2 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml
index 79245745e..6f7cd0e32 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/Generic.xaml
@@ -63,7 +63,7 @@
 
     <Style TargetType="{x:Type local:WpfGraphControl}">
         <Setter Property="BorderThickness" Value="1"></Setter>
-        <Setter Property="BorderBrush" Value="#FF2E2E2E"></Setter>
+        <Setter Property="BorderBrush" Value="{DynamicResource GrayBrush300}"></Setter>
         <Setter Property="Padding" Value="20 20 30 20"></Setter>
         <Setter Property="FontSize" Value="11"></Setter>
         <Setter Property="Foreground" Value="DodgerBlue"></Setter>
@@ -94,7 +94,7 @@
                             </Grid.ColumnDefinitions>
 
                             <Grid Grid.Column="1">
-                                <realTimeGraphX:WpfGraphGridLines Controller="{TemplateBinding Controller}" Foreground="#FF2E2E2E" />
+                                <realTimeGraphX:WpfGraphGridLines Controller="{TemplateBinding Controller}" Foreground="{DynamicResource GrayBrush300}" />
                                 <realTimeGraphX:WpfGraphSurface x:Name="surface" Controller="{TemplateBinding Controller}" BorderThickness="1 0 0 1" BorderBrush="{TemplateBinding Foreground}" />
 
                                 <Grid IsHitTestVisible="False" Visibility="{TemplateBinding GraphLabelVisibility}">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
new file mode 100644
index 000000000..90b3b0829
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Themes/LightThemeColors.xaml
@@ -0,0 +1,158 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Tango.MachineStudio.Common.Themes">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary>
+        <SolidColorBrush x:Key="OrangeBrush" Color="#FFA300"/>
+        <SolidColorBrush x:Key="OrangeBrush200" Color="#FFA65F"/>
+        <SolidColorBrush x:Key="OrangeBrush250" Color="#E79F20"/>
+            <SolidColorBrush x:Key="OrangeCanceledBrush" Color="#EF832B"/>
+            <!--Background for all duplicate buttons-->
+            <SolidColorBrush x:Key="OrangeBrush300" Color="#FF9A6A"/>
+        <SolidColorBrush x:Key="OrangeBrush400" Color="#F38B76"/>
+
+        <SolidColorBrush x:Key="RedBrush100" Color="#FF5151"/>
+            <SolidColorBrush x:Key="RedBrush200" Color="#FF6F6F"/>
+            <!--Background for all remove/delete buttons-->
+            <SolidColorBrush x:Key="RedBrush300" Color="#FF7272"/>
+        <SolidColorBrush x:Key="RedBrush400" Color="#FF8585"/>
+        <SolidColorBrush x:Key="RedBrush500" Color="#E14141"/>
+         <SolidColorBrush x:Key="OrangeUploadBrush" Color="#E76311"/>
+
+
+            <SolidColorBrush x:Key="GreenBrush" Color="#04CB04"/>
+            <SolidColorBrush x:Key="GreenDownloadFileBrush" Color="#2DD42D"/>
+            <SolidColorBrush x:Key="GreenBrush100" Color="#68E46E"/>
+            <!--<SolidColorBrush x:Key="GreenBrush200" Color="#65C682"/>-->
+            <!--Background for all new buttons-->
+            <SolidColorBrush x:Key="GreenBrush300" Color="#68B367"/>
+            <SolidColorBrush x:Key="GreenBrush400" Color="#90E990"/>
+            <SolidColorBrush x:Key="GreenBrush450" Color="#20BB20"/>
+            <SolidColorBrush x:Key="GreenUploadBrush" Color="#2FD42F"/>
+            <SolidColorBrush x:Key="GreenOpenFileBrush" Color="#2CC62C"/>
+            <SolidColorBrush x:Key="GreenMConnectionBrush" Color="#03FF8E"/>
+            <SolidColorBrush x:Key="GreenMenuDebugBrush" Color="#8DD28A"/>
+
+
+            <SolidColorBrush x:Key="DarkBlueBrush" Color="#3C7EF4"/>
+        <SolidColorBrush x:Key="DodgerBlueBrush" Color="DodgerBlue"/>
+        <SolidColorBrush x:Key="BlueBrush100" Color="#03A9F4" />
+        <SolidColorBrush x:Key="BlueBrush" Color="#64B8EC"/>
+        <SolidColorBrush x:Key="BlueSelectionStrokBrush" Color="#1EA9FF"/>
+
+        <SolidColorBrush x:Key="LilacBrush" Color="#833CEC"/>
+        <SolidColorBrush x:Key="LilacBrush100" Color="#682EBE"/>
+        <SolidColorBrush x:Key="LilacBrush200" Color="#532990"/>
+
+
+
+            <SolidColorBrush x:Key="WhiteTextBrush" Color="White"/>
+        <SolidColorBrush x:Key="WhiteBackgroundBrush" Color="White"/>
+        <SolidColorBrush x:Key="WhiteBrush" Color="#E6FFFFFF"/>
+        <SolidColorBrush x:Key="WhiteBrush50" Color="#FFF1F1F1"/>
+            
+        <SolidColorBrush x:Key="WhiteBrush100" Color="#ECECEC"/>
+        <SolidColorBrush x:Key="LightGrayBrush" Color="#A5A4A4"/>
+        <SolidColorBrush x:Key="LightGrayBrush100" Color="#BBBBBB"/>
+        <SolidColorBrush x:Key="LightGrayBrush150" Color="#CBCBCB"/>
+        <SolidColorBrush x:Key="LightGrayBrush200" Color="#D9D9D9"/>
+
+            <!-- used for regular text color -->
+        <SolidColorBrush x:Key="BlackForegroundBrush" Color="black"/>
+        <SolidColorBrush x:Key="DarkGrayBrush" Color="#1B1B1B"/>
+        <SolidColorBrush x:Key="DarkGrayBrush100" Color="#101010"/>
+        <SolidColorBrush x:Key="DarkGrayBrush200" Color="#202020"/>
+        <SolidColorBrush x:Key="GrayBrush300" Color="#303030"/>
+            <!--used for Foreground Storage-->
+        <SolidColorBrush x:Key="GrayBrush310" Color="#363636"/>
+        <SolidColorBrush x:Key="GrayBrush280" Color="#3E3E3E"/>
+        <SolidColorBrush x:Key="GrayBrush290" Color="#404040"/>
+         <!-- used for text color-->
+        <SolidColorBrush x:Key="GrayBrush250" Color="#5E5E5E"/>
+        <SolidColorBrush x:Key="GrayBrush200" Color="#616161"/>
+        <SolidColorBrush x:Key="GrayBrush50" Color="#7A7A7A"/>
+        <SolidColorBrush x:Key="GrayBrush" Color="Gray"/>
+        <SolidColorBrush x:Key="DimGrayBrush" Color="DimGray"/>
+
+
+            <LinearGradientBrush x:Key="BlueGradientBrush" StartPoint="0.5,0" EndPoint="0.5,1">
+            <GradientStop Color="#03A9F4"/>
+            <GradientStop Color="#0081BB" Offset="1"/>
+        </LinearGradientBrush>
+
+        <SolidColorBrush x:Key="TransparentBackgroundBrush" Color="#96FFFFFF"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush100" Color="#B9FFFFFF"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush200" Color="#E6FFFFFF"/>
+        <SolidColorBrush x:Key="TransparentBackgroundBrush300" Color="#D4FFFFFF"/>
+        <SolidColorBrush x:Key="Transparent200" Color="#C9F6F6F6"/>
+         <!--MachineJobSelectionView Grid Background-->
+        <SolidColorBrush x:Key="TransparentBackgroundBrush400" Color="#B1FFFFFF"/>
+        <!--Storage.Views.MainView-->
+        <SolidColorBrush x:Key="TransparentBackgroundBrush500" Color="#8BFFFFFF"/>
+            
+        <!--MachineTechView-->
+        <SolidColorBrush x:Key="TransparentBackgroundBrush450" Color="#7EFFFFFF"/>
+            <SolidColorBrush x:Key="TransparentBackgroundBrush600" Color="#70FFFFFF"/>
+        <SolidColorBrush x:Key="SelectionFillBrush" Color="#338D8D8D"/>
+        
+            <!--base background and foreground-->
+        <SolidColorBrush x:Key="MainWindow.Background" Color="White"></SolidColorBrush>
+        <SolidColorBrush x:Key="MainWindow.Foreground" Color="#FF494949"></SolidColorBrush>
+            
+            <!--material design colors-->
+            <SolidColorBrush x:Key="HighlightBrush" Color="#FF0288d1" />
+            <SolidColorBrush x:Key="AccentColorBrush" Color="#2196f3" />
+            <SolidColorBrush x:Key="AccentColorBrush2" Color="#FF29b6f6" />
+            <SolidColorBrush x:Key="AccentColorBrush3" Color="#FF4fc3f7" />
+            <SolidColorBrush x:Key="AccentColorBrush4" Color="#FF81d4fa" />
+            <SolidColorBrush x:Key="WindowTitleColorBrush" Color="#FF0288d1" />
+            <SolidColorBrush x:Key="AccentSelectedColorBrush" Color="#FFFFFFFF" />
+            <LinearGradientBrush x:Key="ProgressBrush" EndPoint="0.001,0.5" StartPoint="1.002,0.5">
+                <GradientStop Color="#0288d1" Offset="0" />
+                <GradientStop Color="#4fc3f7" Offset="1" />
+            </LinearGradientBrush>
+            <SolidColorBrush x:Key="CheckmarkFill" Color="#FF03a9f4" />
+            <SolidColorBrush x:Key="RightArrowFill" Color="#FF03a9f4" />
+            <SolidColorBrush x:Key="IdealForegroundColorBrush" Color="#FFFFFFFF" />
+            <SolidColorBrush x:Key="IdealForegroundDisabledBrush" Color="#2196f3" Opacity="0.4" />
+            <!--Colors-->
+            <Color x:Key="borderColor">Silver</Color>
+            <Color x:Key="graphGridLinesColor">#FF464646</Color>
+            <Color x:Key="graphsMarkerColor">Gray</Color>
+            <Color x:Key="materialColor">#FF03A9F4</Color>
+            <!--Brushes-->
+            <SolidColorBrush x:Key="borderBrush" Color="{StaticResource borderColor}"></SolidColorBrush>
+            <SolidColorBrush x:Key="graphGridLinesBrush" Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
+            <SolidColorBrush x:Key="BlackBrush" Color="#545454"></SolidColorBrush>
+            <SolidColorBrush x:Key="graphGridLinesLightBrush" Color="{StaticResource graphGridLinesColor}"></SolidColorBrush>
+            <SolidColorBrush x:Key="graphGridLinesDarkBrush" Color="#FF2E2E2E"></SolidColorBrush>
+            <SolidColorBrush x:Key="MaterialDesignFlatButtonClick" Color="#FFDEDEDE"></SolidColorBrush>
+           
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackgroundLight">
+                <GradientStop Color="White"/>
+                <GradientStop Color="#FFE9E9E9" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackgroundDark">
+                <GradientStop Color="Black"/>
+                <GradientStop Color="#FF333333" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphBackground">
+                <GradientStop Color="#121212"/>
+                <GradientStop Color="#FF333333" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphLabelBackground" Opacity="0.7">
+                <GradientStop Color="White"/>
+                <GradientStop Color="#FFD9D9D9" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0"  x:Key="graphLegendBackground" Opacity="0.7">
+                <GradientStop Color="#FFE9E9E9"/>
+                <GradientStop Color="#FFBDBDBD" Offset="1"/>
+            </LinearGradientBrush>
+            <LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5" x:Key="borderBackground">
+                <GradientStop Color="#00E6E6E6"/>
+                <GradientStop Color="#DEDEDE" Offset="1"/>
+            </LinearGradientBrush>
+            <SolidColorBrush Color="#FFECECEC" x:Key="topBarBackgroundBrush"></SolidColorBrush>
+    </ResourceDictionary>
+</ResourceDictionary.MergedDictionaries>
+</ResourceDictionary>
\ No newline at end of file