From 16cc209e80498a0b39c1ad57d4f36be906cbb313 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 28 Jul 2019 13:22:50 +0300
Subject: Refactored machine studio for using colors static resources.

---
 .../Views/ConnectedMachineView.xaml                   |  4 ++--
 .../Views/FirmwareUpgradeView.xaml                    |  6 +++---
 .../Tango.MachineStudio.UI/Views/MainView.xaml        | 19 ++++++++++---------
 .../Tango.MachineStudio.UI/Views/ReportIssueView.xaml |  4 ++--
 .../Views/ResolvedIssuesView.xaml                     |  2 +-
 .../Tango.MachineStudio.UI/Views/UpdateView.xaml      | 10 +++++-----
 6 files changed, 23 insertions(+), 22 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
index 338cb2d22..6c0a42ed1 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ConnectedMachineView.xaml
@@ -225,8 +225,8 @@
                 <Grid Grid.Column="1">
                     <DockPanel>
                         <StackPanel>
-                            <Button FontSize="11" Height="40" Width="140" Command="{Binding ResetCommand}" Background="Transparent" BorderBrush="#202020" Foreground="#202020" Margin="0 2" ToolTip="Reset the embedded device">RESET</Button>
-                            <Button FontSize="11" Height="40" Width="140" Command="{Binding TurnOffHeatersCommand}" Background="Transparent" BorderBrush="#202020" Foreground="#202020" Margin="0 2" ToolTip="Resets the current process parameters in the embedded device">
+                            <Button FontSize="11" Height="40" Width="140" Command="{Binding ResetCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush}" Foreground="{StaticResource DarkGrayBrush}" Margin="0 2" ToolTip="Reset the embedded device">RESET</Button>
+                            <Button FontSize="11" Height="40" Width="140" Command="{Binding TurnOffHeatersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush}" Foreground="{StaticResource DarkGrayBrush}" Margin="0 2" ToolTip="Resets the current process parameters in the embedded device">
                                 <TextBlock TextWrapping="Wrap" TextAlignment="Center">
                                 TURN OFF HEATERS
                                 </TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
index 976c3866a..9af5c6b06 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/FirmwareUpgradeView.xaml
@@ -88,7 +88,7 @@
                             <TextBlock HorizontalAlignment="Center" FontSize="18" FontWeight="SemiBold">Upgrading Machine Firmware</TextBlock>
                             <TextBlock Margin="0 40 0 0" HorizontalAlignment="Center" Foreground="Gray" Text="{Binding Handler.Message,Converter={StaticResource EnumToDescriptionConverter},Mode=OneWay}"></TextBlock>
                             <ProgressBar Height="15" Width="600" Margin="0 5 0 0" Maximum="{Binding Handler.Total,Mode=OneWay}" Value="{Binding Handler.Current,Mode=OneWay}" ></ProgressBar>
-                            <Button Width="150" Background="#FF5151" BorderBrush="#FF5151" Margin="0 40 0 0" Height="35" Command="{Binding AbortCommand}">ABORT</Button>
+                            <Button Width="150" Background="{StaticResource RedBrush100}" BorderBrush="{StaticResource RedBrush100}" Margin="0 40 0 0" Height="35" Command="{Binding AbortCommand}">ABORT</Button>
                         </StackPanel>
                     </Grid>
 
@@ -103,8 +103,8 @@
                     <Grid>
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                             <TextBlock HorizontalAlignment="Center" FontSize="18" FontWeight="SemiBold">Firmware Upgrade Failed</TextBlock>
-                            <materialDesign:PackIcon HorizontalAlignment="Center" Width="100" Margin="0 10 0 0" Height="100" Kind="AlertOutline" Foreground="#FF5151" />
-                            <TextBlock HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" Text="{Binding UpgradeError}" Foreground="#FF5151" FontWeight="SemiBold"></TextBlock>
+                            <materialDesign:PackIcon HorizontalAlignment="Center" Width="100" Margin="0 10 0 0" Height="100" Kind="AlertOutline" Foreground="{StaticResource RedBrush100}" />
+                            <TextBlock HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap" Text="{Binding UpgradeError}" Foreground="{StaticResource RedBrush100}" FontWeight="SemiBold"></TextBlock>
                             <Button Width="150" Margin="0 15 0 0" Height="35" Command="{Binding CloseCommand}">CLOSE</Button>
                         </StackPanel>
                     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
index f66e247a9..57b8335c5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -248,11 +248,11 @@
                                                     <materialDesign:PackIcon Margin="10 0 0 0" Width="24" Height="24">
                                                         <materialDesign:PackIcon.Style>
                                                             <Style TargetType="materialDesign:PackIcon">
-                                                                <Setter Property="Foreground" Value="#333333"></Setter>
+                                                                <Setter Property="Foreground" Value="{StaticResource GrayBrush300}"></Setter>
                                                                 <Setter Property="Kind" Value="LanDisconnect"></Setter>
                                                                 <Style.Triggers>
                                                                     <DataTrigger Binding="{Binding ApplicationManager.IsMachineConnected,Mode=OneWay}" Value="True">
-                                                                        <Setter Property="Foreground" Value="#03FF8E"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource GreenMConnectionBrush}"></Setter>
                                                                         <Setter Property="Kind" Value="LanConnect"></Setter>
                                                                     </DataTrigger>
                                                                 </Style.Triggers>
@@ -470,6 +470,7 @@
                     <Border HorizontalAlignment="Right" Margin="0 -1 10 0" VerticalAlignment="Top" Width="300" Height="Auto" CornerRadius="0 0 30 30" BorderThickness="1 0 1 1" BorderBrush="DimGray">
                         <Border.Style>
                             <Style TargetType="Border">
+                                <Setter Property="Background" Value="{StaticResource BlueGradientBrush}"/>
                                 <Setter Property="RenderTransform">
                                     <Setter.Value>
                                         <ScaleTransform ScaleX="1" ScaleY="0"></ScaleTransform>
@@ -495,12 +496,12 @@
                                 </Style.Triggers>
                             </Style>
                         </Border.Style>
-                        <Border.Background>
+                        <!--<Border.Background>
                             <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
                                 <GradientStop Color="#03A9F4"/>
                                 <GradientStop Color="#0081BB" Offset="1"/>
                             </LinearGradientBrush>
-                        </Border.Background>
+                        </Border.Background>-->
 
                         <ItemsControl ItemsSource="{Binding NotificationProvider.TaskItems}">
                             <ItemsControl.ItemTemplate>
@@ -517,7 +518,7 @@
                     </Border>
 
                     <Grid HorizontalAlignment="Right" VerticalAlignment="Top" Margin="10" Visibility="{Binding IsMachineErrorsOpened,Converter={StaticResource BooleanToVisibilityConverter}}">
-                        <Border Width="350" Background="#FFF1F1F1" BorderBrush="White" CornerRadius="5" Padding="5">
+                        <Border Width="350" Background="{StaticResource WhiteBrush50}" BorderBrush="White" CornerRadius="5" Padding="5">
                             <Border.Effect>
                                 <DropShadowEffect ShadowDepth="0" BlurRadius="10" />
                             </Border.Effect>
@@ -525,7 +526,7 @@
                             <ItemsControl ItemsSource="{Binding ApplicationManager.ConnectedMachine.MachineEventsStateProvider.Events}">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate DataType="{x:Type entities:MachinesEvent}">
-                                        <Border BorderThickness="0 0 0 1" BorderBrush="#E1E1E1" Padding="5">
+                                        <Border BorderThickness="0 0 0 1" BorderBrush="{StaticResource WhiteBrush100}" Padding="5">
                                             <DockPanel>
                                                 <Grid DockPanel.Dock="Right" HorizontalAlignment="Right" VerticalAlignment="Center">
                                                     <ContentControl>
@@ -576,11 +577,11 @@
                                                                     <Style.Triggers>
                                                                         <DataTrigger Binding="{Binding Category}" Value="Warning">
                                                                             <Setter Property="Kind" Value="Alert"></Setter>
-                                                                            <Setter Property="Foreground" Value="#FFA300"></Setter>
+                                                                            <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
                                                                         </DataTrigger>
                                                                         <DataTrigger Binding="{Binding Category}" Value="Error">
                                                                             <Setter Property="Kind" Value="AlertOctagon"></Setter>
-                                                                            <Setter Property="Foreground" Value="#FF5C5C"></Setter>
+                                                                            <Setter Property="Foreground" Value="{StaticResource RedBrush100}"></Setter>
                                                                         </DataTrigger>
                                                                         <DataTrigger Binding="{Binding Category}" Value="Critical">
                                                                             <Setter Property="Kind" Value="BellPlus"></Setter>
@@ -605,7 +606,7 @@
                         </Border>
 
                         <Canvas HorizontalAlignment="Center">
-                            <Polygon Points="12,0 0,31 24,31" Fill="#FFF1F1F1" Canvas.Top="-30" Canvas.Left="90"></Polygon>
+                            <Polygon Points="12,0 0,31 24,31" Fill="{StaticResource WhiteBrush50}" Canvas.Top="-30" Canvas.Left="90"></Polygon>
                         </Canvas>
                     </Grid>
                 </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
index 5f5e1042b..a209df34a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
@@ -140,12 +140,12 @@
             </Grid>
 
             <Grid Grid.Row="2">
-                <Button HorizontalAlignment="Right" Height="40" Width="140" Command="{Binding OKCommand}" Background="#FF6262" BorderBrush="#FF6262" IsDefault="True">SUBMIT</Button>
+                <Button HorizontalAlignment="Right" Height="40" Width="140" Command="{Binding OKCommand}" Background="{StaticResource RedBrush100}" BorderBrush="{StaticResource RedBrush100}" IsDefault="True">SUBMIT</Button>
 
                 <ItemsControl ItemsSource="{Binding ValidationErrors}" HorizontalAlignment="Left" Margin="5" VerticalAlignment="Center" Visibility="Visible">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <TextBlock Foreground="#FF4C4C" Margin="0 2 0 0"><Run>*</Run> <Run Text="{Binding Path=.,Mode=OneWay}"></Run></TextBlock>
+                            <TextBlock Foreground="{StaticResource RedBrush100}" Margin="0 2 0 0"><Run>*</Run> <Run Text="{Binding Path=.,Mode=OneWay}"></Run></TextBlock>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
index 97c42d58d..d1ff75fc7 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
@@ -42,7 +42,7 @@
                             <Border BorderBrush="#E6E6E6" BorderThickness="0 0 0 1" Padding="5">
                                 <DockPanel>
                                     <StackPanel DockPanel.Dock="Right" HorizontalAlignment="Right" Orientation="Horizontal">
-                                        <Button Background="#FF8282" BorderBrush="#FF8282" Padding="0" Width="90" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DeclineCommand}" CommandParameter="{Binding}">
+                                        <Button Background="{StaticResource RedBrush400}" BorderBrush="{StaticResource RedBrush400}" Padding="0" Width="90" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DeclineCommand}" CommandParameter="{Binding}">
                                             <StackPanel Orientation="Horizontal">
                                                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Close" />
                                                 <TextBlock Margin="10 0 0 0" FontSize="11" VerticalAlignment="Center">NOT FIXED</TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
index f5d1065b8..a35928e12 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/UpdateView.xaml
@@ -54,7 +54,7 @@
                                 </Style>
                             </StackPanel.Style>
                             <TextBlock Foreground="Gray" FontSize="16">Release Notes</TextBlock>
-                            <TextBlock FontSize="12" TextWrapping="Wrap" Foreground="#404040" Margin="0 5 0 0" Text="{Binding UpdateComments}"></TextBlock>
+                            <TextBlock FontSize="12" TextWrapping="Wrap" Foreground="{StaticResource GrayBrush290}" Margin="0 5 0 0" Text="{Binding UpdateComments}"></TextBlock>
                         </StackPanel>
                     </Canvas>
                 </Grid>
@@ -109,7 +109,7 @@
                                                                 </StackPanel>
                                                             </Button>
 
-                                                            <Button Visibility="{Binding IsRollbackAvailable,Converter={StaticResource BoolToVisConverter}}" MinWidth="140" Height="40" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Restore Machine Studio to the previous version." Margin="0 40 0 0" Command="{Binding RollbackCommand}" Foreground="#FF5F5F">
+                                                            <Button Visibility="{Binding IsRollbackAvailable,Converter={StaticResource BoolToVisConverter}}" MinWidth="140" Height="40" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Restore Machine Studio to the previous version." Margin="0 40 0 0" Command="{Binding RollbackCommand}" Foreground="{StaticResource RedBrush100}">
                                                                 <StackPanel Orientation="Horizontal">
                                                                     <materialDesign:PackIcon Kind="BackupRestore" Width="24" Height="24" />
                                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Restore previous version</TextBlock>
@@ -185,7 +185,7 @@
                                                                 <TextBlock VerticalAlignment="Center" Margin="0 20 0 0">Your version of Machine Studio is up to date!</TextBlock>
                                                             </StackPanel>
 
-                                                            <Button Visibility="{Binding IsRollbackAvailable,Converter={StaticResource BoolToVisConverter}}" MinWidth="140" Height="40" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Restore Machine Studio to the previous version." Margin="0 40 0 0" Command="{Binding RollbackCommand}" Foreground="#FF5F5F">
+                                                            <Button Visibility="{Binding IsRollbackAvailable,Converter={StaticResource BoolToVisConverter}}" MinWidth="140" Height="40" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Restore Machine Studio to the previous version." Margin="0 40 0 0" Command="{Binding RollbackCommand}" Foreground="{StaticResource RedBrush100}">
                                                                 <StackPanel Orientation="Horizontal">
                                                                     <materialDesign:PackIcon Kind="BackupRestore" Width="24" Height="24" />
                                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Restore previous version</TextBlock>
@@ -201,7 +201,7 @@
                                                 <Setter.Value>
                                                     <Grid>
                                                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                            <materialDesign:PackIcon Kind="Alert" Width="100" Height="100" Foreground="#FF5F5F" HorizontalAlignment="Center" />
+                                                            <materialDesign:PackIcon Kind="Alert" Width="100" Height="100" Foreground="{StaticResource RedBrush100}" HorizontalAlignment="Center" />
                                                             <TextBlock VerticalAlignment="Center" Margin="0 20 0 0" HorizontalAlignment="Center">Error updating machine studio</TextBlock>
                                                             <TextBlock HorizontalAlignment="Center" Margin="0 10 0 0" FontSize="12" TextAlignment="Center">
                                                         <Run>An error occurred while updating your software.</Run>
@@ -238,7 +238,7 @@
                                                 <Setter.Value>
                                                     <Grid>
                                                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                            <materialDesign:PackIcon Kind="Alert" Width="100" Height="100" Foreground="#FF5F5F" HorizontalAlignment="Center" />
+                                                            <materialDesign:PackIcon Kind="Alert" Width="100" Height="100" Foreground="{StaticResource RedBrush100}" HorizontalAlignment="Center" />
                                                             <TextBlock VerticalAlignment="Center" Margin="0 20 0 0" HorizontalAlignment="Center">Error restoring previous version</TextBlock>
                                                             <TextBlock HorizontalAlignment="Center" Margin="0 10 0 0" FontSize="12" TextAlignment="Center">
                                                         <Run>An error occurred while restore the last version.</Run>
-- 
cgit v1.3.1