PPC Graphic changes

12 files changed, 87 insertions, 21 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 54a3b72a9..6b1156ece 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -621,7 +621,7 @@
                                                 <Image Source="../Images/wind.png" Width="32"></Image>
                                                 <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Winding Method</TextBlock>
                                             </StackPanel>
-                                            <ComboBox Width="90" HorizontalAlignment="Left" ItemsSource="{Binding WindingMethods}" SelectedItem="{Binding ActiveJob.WindingMethod}" DisplayMemberPath="Name" ></ComboBox>
+                                            <ComboBox Width="90" HorizontalAlignment="Left" ItemsSource="{Binding WindingMethods}" SelectedItem="{Binding ActiveJob.WindingMethod}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
                                         </StackPanel>
                                     </Border>
 
@@ -631,7 +631,7 @@
                                                 <Image Source="../Images/thread.png" Width="32"></Image>
                                                 <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Spool</TextBlock>
                                             </StackPanel>
-                                            <ComboBox Width="90" HorizontalAlignment="Left" ItemsSource="{Binding SpoolTypes}" SelectedItem="{Binding ActiveJob.SpoolType}" >
+                                            <ComboBox Width="90" HorizontalAlignment="Left" ItemsSource="{Binding SpoolTypes}" SelectedItem="{Binding ActiveJob.SpoolType}" Style="{StaticResource TransparentComboBoxStyle}" >
                                                 <ComboBox.ToolTip>
                                                     <TextBlock>
                                                             <Run Text="{Binding ActiveJob.SpoolType.Name}"></Run>
@@ -753,7 +753,7 @@
                                                                 <StackPanel>
                                                                     <TextBlock>MEDIA</TextBlock>
                                                                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}">
+                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}">
                                                                             <ComboBox.ItemTemplate>
                                                                                 <DataTemplate>
                                                                                     <StackPanel>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
index fd0a63456..830718cb6 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
@@ -89,7 +89,7 @@
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
 
-                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="10" RadiusY="10" />
+                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="0.8" StrokeDashArray="5 5 5 5" RadiusX="6" RadiusY="6" />
                 </Grid>
             </Border>
         </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
index ac2d5b3be..ad60c46ca 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
@@ -12,7 +12,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:JobSummeryViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.JobSummeryViewVM}">
 
-    <Grid Background="{StaticResource TangoMidBackgroundBrush}">
+    <Grid Background="White">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="1*"/>
@@ -22,7 +22,7 @@
             <Border.Effect>
                 <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" />
             </Border.Effect>
-            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold" Text="Ready to Dye"></TextBlock>
+            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold" Text="Dye Job"></TextBlock>
         </Border>
 
         <Grid Grid.Row="1">
@@ -40,7 +40,6 @@
                                 <touch:TouchButton IsEnabled="{Binding MachineProvider.MachineOperator.CanPrint}" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Margin="20 0 0 0" Height="80" Padding="0" Width="270" CornerRadius="40" BlurRadius="20" HorizontalAlignment="Right" DelayCommand="{Binding DyeCommand}" DelayCommandDuration="00:00:0.3">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock VerticalAlignment="Center">DYE</TextBlock>
-                                        <touch:TouchIcon Margin="20 0 0 0" Icon="ChevronRight" Width="14" />
                                     </StackPanel>
                                 </touch:TouchButton>
                             </Grid>
@@ -92,7 +91,7 @@
                             </UniformGrid>
                         </Grid>
 
-                        <controls:JobSummeryViewer Height="50" DataContext="{Binding Job}" VerticalAlignment="Center" Margin="20 0" Grid.Row="2" />
+                        <controls:JobSummeryViewer Height="34" DataContext="{Binding Job}" VerticalAlignment="Center" Margin="20 0" Grid.Row="2" />
                     </Grid>
                 </DockPanel>
             </Border>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index ec21ebade..1c7e48bfa 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -648,7 +648,7 @@
 
                                                 <StackPanel Style="{StaticResource Level2ContainerExtraMargin}">
                                                     <Grid>
-                                                        <localControls:JobSummeryViewer DataContext="{Binding Job,IsAsync=True}" />
+                                                        <localControls:JobSummeryViewer DataContext="{Binding Job,IsAsync=True}" Height="34"/>
                                                     </Grid>
 
                                                     <DockPanel Margin="0 30 0 0" LastChildFill="False">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
index 5b9c234f0..c615583bc 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
@@ -292,9 +292,9 @@
                                 <touch:LightTouchDataGridColumn.Header>
                                     <Image Source="../Images/warning.png" Width="24" />
                                 </touch:LightTouchDataGridColumn.Header>
-                                <touch:LightTouchDataGridColumn.CellTemplate>
+                                <touch:LightTouchDataGridColumn.CellTemplate >
                                     <DataTemplate>
-                                        <touch:TouchIcon Width="26">
+                                        <touch:TouchIcon Width="26" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" >
                                             <touch:TouchIcon.Style>
                                                 <Style TargetType="touch:TouchIcon">
                                                     <Setter Property="Icon" Value="Check"></Setter>
@@ -311,17 +311,17 @@
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
-                            <touch:LightTouchDataGridColumn Width="100" Header="Status" SortMember="JobStatus">
+                            <touch:LightTouchDataGridColumn Width="100" Header="Status" SortMember="JobStatus" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter},IsAsync=True}"></controls:FastTextBlock>
+                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter},IsAsync=True}" HorizontalAlignment="Left" VerticalAlignment="Center"></controls:FastTextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
                             <touch:LightTouchDataGridColumn Width="1*" Header="Name" SortMember="Name" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding Name,IsAsync=True}"></controls:FastTextBlock>
+                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding Name,IsAsync=True}" HorizontalAlignment="Left" VerticalAlignment="Center"></controls:FastTextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
index 5062df1d6..fd967e39a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
@@ -143,6 +143,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Error",
                 Brush = Application.Current.Resources["TangoMessageBoxErrorBrush"] as Brush,
+                MessageType = MessageBoxVM.MessageTypes.Error,
             });
         }
 
@@ -159,6 +160,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Information",
                 Brush = Application.Current.Resources["TangoMessageBoxInfoBrush"] as Brush,
+                MessageType = MessageBoxVM.MessageTypes.Info,
             });
         }
 
@@ -175,6 +177,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Warning",
                 Brush = Application.Current.Resources["TangoMessageBoxWarningBrush"] as Brush,
+                MessageType = MessageBoxVM.MessageTypes.Warning,
             });
         }
 
@@ -192,6 +195,7 @@ namespace Tango.PPC.UI.Notifications
                 Title = "Confirm",
                 HasCancel = true,
                 Brush = Application.Current.Resources["TangoMessageBoxQuestionBrush"] as Brush,
+                MessageType = MessageBoxVM.MessageTypes.Question,
             });
         }
 
@@ -208,6 +212,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.Check,
                 Title = "Success",
                 Brush = Application.Current.Resources["TangoMessageBoxSuccessBrush"] as Brush,
+                MessageType = MessageBoxVM.MessageTypes.Success,
             });
         }
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index 13d0e56d5..3d475d912 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -25,7 +25,7 @@
     <Grid>
         <touch:TouchSideMenu x:Name="menu" IsOpened="{Binding IsMenuOpened,Mode=TwoWay}" Grid.Row="1" >
             <touch:TouchSideMenu.MenuContent>
-                <Border TextElement.FontSize="{StaticResource TangoMenuItemFontSize}" TextElement.FontFamily="{StaticResource TangoFlexoFontFamily}" Width="450" x:Name="border" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDarkForegroundBrush}" TextElement.Foreground="{StaticResource TangoDarkForegroundBrush}">
+                <Border TextElement.FontSize="{StaticResource TangoMenuItemFontSize}" TextElement.FontFamily="{StaticResource TangoFlexoMediumFontFamily}" Width="450" x:Name="border" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDarkForegroundBrush}" TextElement.Foreground="{StaticResource TangoDarkForegroundBrush}">
                     <DockPanel LastChildFill="False" Background="{StaticResource TangoPrimaryBackgroundBrush}">
                         <StackPanel MinWidth="300" DockPanel.Dock="Top">
                             <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 1" Height="320">
@@ -59,7 +59,7 @@
                                     <DataTemplate>
                                         <Border Visibility="{Binding DockToBottom,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                             <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 1" Visibility="{Binding IsVisibleInMenu,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                <touch:TouchButton Margin="0 0 0 0" Padding="40 25" Foreground="{StaticResource TangoDarkForegroundBrush}" Style="{StaticResource TangoFlatButton}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}">
+                                                <touch:TouchButton Margin="0 0 0 0" Padding="40 25" Foreground="{StaticResource TangoDarkForegroundBrush}" Style="{StaticResource TangoFlatButton}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}" >
                                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                                         <Image VerticalAlignment="Center" Source="{Binding Image}" Width="32" Height="32"></Image>
                                                         <TextBlock VerticalAlignment="Center" Margin="40 0 0 0" Text="{Binding Name}" Foreground="{StaticResource TangoPrimaryAccentBrush}"></TextBlock>
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineStatuses.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineStatuses.cs
index 059c1f859..8884b33a3 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineStatuses.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineStatuses.cs
@@ -13,7 +13,7 @@ namespace Tango.Integration.Operation
         Disconnected,
         [Description("Standby")]
         Standby,
-        [Description("Ready To Dye")]
+        [Description("Dye Job")]
         ReadyToDye,
         [Description("Getting Ready")]
         GettingReady,
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/MessageBoxVM.cs b/Software/Visual_Studio/Tango.Touch/Controls/MessageBoxVM.cs
index 0330c3cb1..55dc72bf9 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/MessageBoxVM.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/MessageBoxVM.cs
@@ -12,6 +12,19 @@ namespace Tango.Touch.Controls
 {
     public class MessageBoxVM : DialogViewVM
     {
+        /// <summary>
+        /// Represents the available message notification types.
+        /// </summary>
+        public enum MessageTypes
+        {
+            Info,
+            Success,
+            Warning,
+            Error,
+            Question,
+        }
+        public MessageTypes MessageType { get; set; } = MessageTypes.Info;
+
         public String Title { get; set; }
 
         public TouchIconKind Icon { get; set; }
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml
index e7f822bb5..0b72e8b85 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml
@@ -228,7 +228,54 @@
                                                 <Grid ClipToBounds="True">
                                                     <DockPanel>
                                                         <Grid DockPanel.Dock="Top">
-                                                            <Border CornerRadius="5 5 0 0" Background="{StaticResource TangoPopupTitleBackgroundBrush}" BorderBrush="{StaticResource TangoGrayBrush}" BorderThickness="0 0 0 1" Padding="30">
+                                                            <Border CornerRadius="5 5 0 0"  BorderBrush="{StaticResource TangoGrayBrush}" BorderThickness="0 0 0 1" Padding="30">
+                                                                <Border.Style>
+                                                                    <Style TargetType="Border">
+                                                                       <Setter Property="Background">
+                                                                            <Setter.Value>
+                                                                                <SolidColorBrush Color="{StaticResource TangoPrimaryAccentColor}" Opacity="0.2"></SolidColorBrush>
+                                                                            </Setter.Value>
+                                                                        </Setter>
+                                                                        <Style.Triggers>
+                                                                            <DataTrigger Binding="{Binding MessageType}" Value="Info">
+                                                                                <Setter Property="Background">
+                                                                                    <Setter.Value>
+                                                                                        <SolidColorBrush Color="{StaticResource TangoPrimaryAccentColor}" Opacity="0.2"></SolidColorBrush>
+                                                                                    </Setter.Value>
+                                                                                </Setter>
+                                                                            </DataTrigger>
+                                                                            <DataTrigger Binding="{Binding MessageType}" Value="Success">
+                                                                                <Setter Property="Background">
+                                                                                    <Setter.Value>
+                                                                                        <SolidColorBrush Color="{StaticResource TangoSuccessColor}" Opacity="0.2"></SolidColorBrush>
+                                                                                    </Setter.Value>
+                                                                                </Setter>
+                                                                                <Setter Property="BorderBrush" Value="{StaticResource TangoSuccessBrush}"></Setter>
+                                                                            </DataTrigger>
+                                                                            <DataTrigger Binding="{Binding MessageType}" Value="Warning">
+                                                                                <Setter Property="Background">
+                                                                                    <Setter.Value>
+                                                                                        <SolidColorBrush Color="{StaticResource TangoWarningColor}" Opacity="0.2"></SolidColorBrush>
+                                                                                    </Setter.Value>
+                                                                                </Setter>
+                                                                            </DataTrigger>
+                                                                            <DataTrigger Binding="{Binding MessageType}" Value="Error">
+                                                                                <Setter Property="Background">
+                                                                                    <Setter.Value>
+                                                                                        <SolidColorBrush Color="{StaticResource TangoErrorColor}" Opacity="0.2"></SolidColorBrush>
+                                                                                    </Setter.Value>
+                                                                                </Setter>
+                                                                            </DataTrigger>
+                                                                            <DataTrigger Binding="{Binding MessageType}" Value="Question">
+                                                                                <Setter Property="Background">
+                                                                                    <Setter.Value>
+                                                                                        <SolidColorBrush Color="{StaticResource TangoPrimaryAccentColor}" Opacity="0.2"></SolidColorBrush>
+                                                                                    </Setter.Value>
+                                                                                </Setter>
+                                                                            </DataTrigger>
+                                                                        </Style.Triggers>
+                                                                    </Style>
+                                                                </Border.Style>
                                                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                                                     <local:TouchIcon Width="24" Height="24" Icon="{Binding Icon}" Margin="0 0 20 0" Foreground="{Binding Brush}" />
                                                                     <TextBlock Text="{Binding Title}" FontSize="{StaticResource TangoMessageBoxTitleFontSize}" FontWeight="Normal"></TextBlock>
diff --git a/Software/Visual_Studio/Tango.Touch/Resources/Colors.xaml b/Software/Visual_Studio/Tango.Touch/Resources/Colors.xaml
index c8a6d0e8d..39a2fd502 100644
--- a/Software/Visual_Studio/Tango.Touch/Resources/Colors.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Resources/Colors.xaml
@@ -17,8 +17,8 @@
     <Color x:Key="TangoDividerColor">#E7E8E9</Color>
     <Color x:Key="TangoLightBorderColor">#dbe0e8</Color>
 
-    <Color x:Key="TangoDisabledBackgroundColor">#B8B8B8</Color>
-    <Color x:Key="TangoDisabledForegroundColor">#5E5E5E</Color>
+    <Color x:Key="TangoDisabledBackgroundColor">#d8d8d9</Color>
+    <Color x:Key="TangoDisabledForegroundColor">#7c7c7d</Color>
 
     <Color x:Key="RippleLightColor">#6EFFFFFF</Color>
     <Color x:Key="RippleDarkColor">#28BDBDBD</Color>
diff --git a/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml b/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
index a4732966e..0d01c6777 100644
--- a/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Resources/Fonts.xaml
@@ -4,6 +4,7 @@
                     xmlns:local="clr-namespace:Tango.Touch.Resources">
 
     <FontFamily x:Key="TangoFlexoFontFamily">Flexo</FontFamily>
+    
 
     <sys:Double x:Key="TangoSmallFontSize">14</sys:Double>
     <sys:Double x:Key="TangoDefaultFontSize">16</sys:Double>
@@ -22,5 +23,6 @@
     <sys:Double x:Key="TangoComboBoxTitleFontSize">26</sys:Double>
     <sys:Double x:Key="TangoComboBoxItemFontSize">18</sys:Double>
 
-    <sys:Double x:Key="TangoMenuItemFontSize">27</sys:Double>
+    <FontFamily x:Key="TangoFlexoMediumFontFamily">Flexo Medium</FontFamily>
+    <sys:Double x:Key="TangoMenuItemFontSize">22</sys:Double>
 </ResourceDictionary>
\ No newline at end of file