From c6ca09b04ceb4024311b86aab409ca658fbee37e Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 22 Dec 2019 14:51:17 +0200
Subject: Improved CanPrint and IsPrinting detection on PPC. Added support for
 PowerUp and StandBy states. Made sync jobs false by default.

---
 .../Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml         | 2 --
 .../MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml           | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml
index 53db8c11d..b580bd237 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml
@@ -9,13 +9,11 @@
              xmlns:vm="clr-namespace:Tango.MachineStudio.ActionLogs.ViewModels"
              xmlns:global="clr-namespace:Tango.MachineStudio.ActionLogs"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:localConverters="clr-namespace:Tango.MachineStudio.ActionLogs.Converters"
              mc:Ignorable="d" 
              d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <UserControl.Resources>
 
         <sharedConverters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
-        <localConverters:ActionLogTypesToStringConverter x:Key="ActionLogTypesToStringConverter"/>
     </UserControl.Resources>
     <Grid IsEnabled="{Binding IsFree}">
         <Grid.RowDefinitions>
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 3f1164526..020343ba0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -368,6 +368,9 @@
                                                         <DataTrigger Binding="{Binding ApplicationManager.ConnectedMachine.Status}" Value="{x:Static operations:MachineStatuses.Disconnected}">
                                                             <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/machine_off_Anim.gif"></Setter>
                                                         </DataTrigger>
+                                                        <DataTrigger Binding="{Binding ApplicationManager.ConnectedMachine.Status}" Value="{x:Static operations:MachineStatuses.PowerUp}">
+                                                            <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/getting_ready_Anim.gif"></Setter>
+                                                        </DataTrigger>
                                                         <DataTrigger Binding="{Binding ApplicationManager.ConnectedMachine.Status}" Value="{x:Static operations:MachineStatuses.Standby}">
                                                             <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/standby_Anim.gif"></Setter>
                                                         </DataTrigger>
-- 
cgit v1.3.1