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/ApplicationLogDetailsView.xaml                     |  4 ++--
 .../Views/ApplicationLogsView.xaml                           | 12 ++++++------
 .../Views/EmbeddedLogDetailsView.xaml                        |  4 ++--
 .../Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml  | 12 ++++++------
 .../Tango.MachineStudio.Logging/Views/EventDetailsView.xaml  |  4 ++--
 .../Tango.MachineStudio.Logging/Views/EventsView.xaml        |  8 ++++----
 .../Modules/Tango.MachineStudio.Logging/Views/HomeView.xaml  |  2 +-
 .../Tango.MachineStudio.Logging/Views/TimelineView.xaml      |  2 +-
 8 files changed, 24 insertions(+), 24 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogDetailsView.xaml
index c7ebcaf02..d124ac3a1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogDetailsView.xaml
@@ -38,11 +38,11 @@
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Log.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 Log.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 Log.Category}" Value="Critical">
                                     <Setter Property="Kind" Value="BellPlus"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
index e61dc99ba..28864e93a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/ApplicationLogsView.xaml
@@ -50,13 +50,13 @@
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <Border Background="#F1F1F1">
+            <Border Background="{StaticResource WhiteBrush100}">
                 <Border.Effect>
                     <DropShadowEffect />
                 </Border.Effect>
                 <Grid>
                     <StackPanel Orientation="Horizontal">
-                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="#202020" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
+                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="{StaticResource DarkGrayBrush}" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
                             <StackPanel Orientation="Horizontal" >
                                 <materialDesign:PackIcon Kind="ArrowLeftBold" Width="20" Height="20" />
                                 <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
@@ -78,7 +78,7 @@
                             </StackPanel>
                         </Border>
 
-                        <Button Style="{StaticResource MaterialDesignFlatButton}" IsEnabled="{Binding IsRealTime}" Command="{Binding ToggleRealTimePaused}" Padding="0" Height="50" Width="50" Foreground="#202020" ToolTip="Pause/Resume Real-Time">
+                        <Button Style="{StaticResource MaterialDesignFlatButton}" IsEnabled="{Binding IsRealTime}" Command="{Binding ToggleRealTimePaused}" Padding="0" Height="50" Width="50" Foreground="{StaticResource DarkGrayBrush}" ToolTip="Pause/Resume Real-Time">
                             <materialDesign:PackIcon Width="50" Height="50">
                                 <materialDesign:PackIcon.Style>
                                     <Style TargetType="materialDesign:PackIcon">
@@ -200,11 +200,11 @@
                                                                     </DataTrigger>
                                                                     <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>
@@ -212,7 +212,7 @@
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Debug">
                                                                         <Setter Property="Kind" Value="Bug"></Setter>
-                                                                        <Setter Property="Foreground" Value="#303030"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource GrayBrush300}"></Setter>
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding CallerMethodName}" Value="OnStartup">
                                                                         <Setter Property="Kind" Value="ClockFast"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogDetailsView.xaml
index 6511f035f..4864a55a7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogDetailsView.xaml
@@ -36,11 +36,11 @@
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Log.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 Log.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 Log.Category}" Value="Critical">
                                     <Setter Property="Kind" Value="BellPlus"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml
index 4573c8451..4e5ba43d3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EmbeddedLogsView.xaml
@@ -50,13 +50,13 @@
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <Border Background="#F1F1F1">
+            <Border Background="{StaticResource WhiteBrush100}">
                 <Border.Effect>
                     <DropShadowEffect />
                 </Border.Effect>
                 <Grid>
                     <StackPanel Orientation="Horizontal">
-                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="#202020" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
+                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="{StaticResource DarkGrayBrush}" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
                             <StackPanel Orientation="Horizontal" >
                                 <materialDesign:PackIcon Kind="ArrowLeftBold" Width="20" Height="20" />
                                 <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
@@ -78,7 +78,7 @@
                             </StackPanel>
                         </Border>
 
-                        <Button Style="{StaticResource MaterialDesignFlatButton}" Command="{Binding ToggleRealTimePaused}" Padding="0" Height="50" Width="50" Foreground="#202020" ToolTip="Pause/Resume Real-Time">
+                        <Button Style="{StaticResource MaterialDesignFlatButton}" Command="{Binding ToggleRealTimePaused}" Padding="0" Height="50" Width="50" Foreground="{StaticResource DarkGrayBrush}" ToolTip="Pause/Resume Real-Time">
                             <materialDesign:PackIcon Width="50" Height="50">
                                 <materialDesign:PackIcon.Style>
                                     <Style TargetType="materialDesign:PackIcon">
@@ -170,11 +170,11 @@
                                                                     </DataTrigger>
                                                                     <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>
@@ -182,7 +182,7 @@
                                                                     </DataTrigger>
                                                                     <DataTrigger Binding="{Binding Category}" Value="Debug">
                                                                         <Setter Property="Kind" Value="Bug"></Setter>
-                                                                        <Setter Property="Foreground" Value="#303030"></Setter>
+                                                                        <Setter Property="Foreground" Value="{StaticResource GrayBrush300}"></Setter>
                                                                     </DataTrigger>
                                                                     <!--<DataTrigger Binding="{Binding CallerMethodName}" Value="OnStartup">
                                                                         <Setter Property="Kind" Value="ClockFast"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml
index 389b18776..8e0dc5fd1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/EventDetailsView.xaml
@@ -36,11 +36,11 @@
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding Event.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 Event.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 Event.Category}" Value="Critical">
                                     <Setter Property="Kind" Value="BellPlus"></Setter>
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 632495103..5e16461a6 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
@@ -50,13 +50,13 @@
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <Border Background="#F1F1F1">
+            <Border Background="{StaticResource WhiteBrush100}">
                 <Border.Effect>
                     <DropShadowEffect />
                 </Border.Effect>
                 <Grid>
                     <StackPanel Orientation="Horizontal">
-                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="#202020" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
+                        <Button Margin="10 0 0 0" Height="50" Style="{StaticResource MaterialDesignFlatButton}" Foreground="{StaticResource DarkGrayBrush}" Command="{Binding NavigateToHomeCommand}" HorizontalContentAlignment="Left">
                             <StackPanel Orientation="Horizontal" >
                                 <materialDesign:PackIcon Kind="ArrowLeftBold" Width="20" Height="20" />
                                 <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
@@ -178,11 +178,11 @@
                                                                     </DataTrigger>
                                                                     <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>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/HomeView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/HomeView.xaml
index b41351064..041650d7f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/HomeView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/HomeView.xaml
@@ -25,7 +25,7 @@
             <Setter Property="CornerRadius" Value="20"></Setter>
             <Setter Property="Width" Value="450"></Setter>
             <Setter Property="Height" Value="400"></Setter>
-            <Setter Property="TextElement.Foreground" Value="#202020"></Setter>
+            <Setter Property="TextElement.Foreground" Value="{StaticResource DarkGrayBrush}"></Setter>
             <Setter Property="TextElement.FontSize" Value="25"></Setter>
             <Setter Property="BorderThickness" Value="1"></Setter>
             <Setter Property="BorderBrush" Value="#D6D6D6"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml
index 664f2489c..fceed1ce8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Views/TimelineView.xaml
@@ -33,7 +33,7 @@
         </LinearGradientBrush>
 
         <LinearGradientBrush x:Key="errorBrush" StartPoint="0.5,0" EndPoint="0.5,1">
-            <GradientStop Color="#FFFF6A6A"/>
+            <GradientStop Color="{StaticResource RedBrush100}"/>
             <GradientStop Color="#FFD9D9" Offset="1"/>
         </LinearGradientBrush>
 
-- 
cgit v1.3.1