Merge branch 'eureka' of https://twinetfs.visualstudio.com/Tango/_git/Tango into eureka

4 files changed, 314 insertions, 237 deletions

diff --git a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip
index 1a65cb667..1fa8a95a1 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip
@@ -15,10 +15,10 @@
     <ROW Property="CTRLS" Value="2"/>
     <ROW Property="ExtractFilesFirst" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine Solutions LTD"/>
-    <ROW Property="ProductCode" Value="1033:{C8DCE902-0287-4F01-ADC1-DE269FC5DFC8} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{6EB25A1D-2D1C-4CDD-9868-A37C42DC831D} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Twine X4"/>
-    <ROW Property="ProductVersion" Value="2.0.11.0" Type="32" TargetFile="Tango.PPC.UI.exe"/>
+    <ROW Property="ProductVersion" Value="2.0.12.0" Type="32" TargetFile="Tango.PPC.UI.exe"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{4D8FDA03-F63E-4002-9A96-4BDE65B04355}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -680,7 +680,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Eureka" PackageFileName="TwineX4 Installer_v2.0.11" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="TwineX4 Installer_v2.0.11"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Eureka" PackageFileName="TwineX4 Installer_v2.0.12" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="TwineX4 Installer_v2.0.12"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 2ebae755a..219146a4e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")] 
-[assembly: AssemblyVersion("2.0.11.0")]
+[assembly: AssemblyVersion("2.0.12.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
index 653c2368f..684b9bd8c 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineStatusViewVM.cs
@@ -316,6 +316,12 @@ namespace Tango.PPC.UI.ViewModels
 
         public RelayCommand AbortCommand { get; set; }
 
+        public RelayCommand ResumeCommand { get; set; }
+        public RelayCommand CaancelJobCommand{ get; set; }
+        public RelayCommand RestartJobCommand { get; set; }
+        public RelayCommand ClearJobCommand { get; set; }
+        
+
         public RelayCommand GoToJobCommand { get; set; }
 
         /// <summary>
@@ -342,7 +348,14 @@ namespace Tango.PPC.UI.ViewModels
 
             StopCommand = new RelayCommand(StopJob, () => CanStopped());
             AbortCommand = new RelayCommand(AbortJob, () => CanStopped());
-            GoToJobCommand = new RelayCommand(GoToJob, () => IsEnableGoToJob());
+
+            ResumeCommand = new RelayCommand(ResumeJob, () => CanStopped());
+            CaancelJobCommand = new RelayCommand(CaancelJob, () => CanStopped());
+            RestartJobCommand = new RelayCommand(RestartJob, () => CanStopped());
+            ClearJobCommand = new RelayCommand(ClearJob, () => CanStopped());
+           
+
+        GoToJobCommand = new RelayCommand(GoToJob, () => IsEnableGoToJob());
             JobStatusViewCommand = new RelayCommand(JobStatusView);
             OverviewViewCommand = new RelayCommand(OverviewView);
             ClearAllNotificationsCommand = new RelayCommand(ClearAllNotifications);
@@ -663,6 +676,26 @@ namespace Tango.PPC.UI.ViewModels
         private void AbortJob()
         {
             _handler?.Cancel();
+            //Job = null;
+        }
+
+        private void ResumeJob()
+        {
+            
+        }
+
+        private void CaancelJob()
+        {
+            Job = null;
+        }
+
+        private void RestartJob()
+        {
+           
+        }
+
+        private void ClearJob()
+        {
             Job = null;
         }
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
index 5f5612fb6..686638870 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -352,6 +352,32 @@
             <Setter Property="VerticalTicks" Value="5"></Setter>
         </Style>
 
+
+        <Style x:Key="BlueFlatButton"  TargetType="touch:TouchButton" >
+            <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderBrush" Value="{StaticResource TangoPrimaryAccentBrush}"/>
+            <Style.Triggers>
+                <Trigger Property="IsEnabled" Value="False">
+                    <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
+                    <Setter Property="BorderBrush" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+
+
+        <Style x:Key="SelectedBlueFlatButton" TargetType="touch:TouchButton" >
+            <Setter Property="Foreground" Value="{StaticResource TangoLightForegroundBrush}"></Setter>
+            <Setter Property="Background" Value="{StaticResource TangoPrimaryAccentBrush}"/>
+            <Style.Triggers>
+                <Trigger Property="IsEnabled" Value="False">
+                    <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
+                    <Setter Property="Background" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+
+
     </UserControl.Resources>
     <Grid Width="998" Height="1123">
         <Grid >
@@ -456,269 +482,287 @@
                             </DockPanel>
                             <Border Height="2" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
                         </Grid>
-
-                        <DockPanel Grid.Row="1" Margin="0 11 0 0">
-                            <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Top"  Width="200" MinHeight="30" HorizontalAlignment="Right" Margin="0 0 0 0">
-                                <StackPanel Orientation="Vertical">
-                                    <touch:TouchToggleSlider Style="{StaticResource TouchToggleButtonSlider}" Background="{StaticResource TangoMidBackgroundBrush}" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20 0 20 0"  CornerRadius="17" Height="38" Width="164" ThumbWidth="80" LeftText="1 Set" RightText="1 Spool" ThumbCornerRadius="13" IsChecked="{Binding IsSpoolView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider>
-                                    <touch:TouchToggleSlider  Style="{StaticResource TouchToggleButtonSlider}" Background="{StaticResource TangoMidBackgroundBrush}" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20 18 20 0"  CornerRadius="17" Height="38" Width="164" ThumbWidth="80" LeftText="Length" RightText="Weight" ThumbCornerRadius="13" IsChecked="{Binding IsWeghtView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider>
+                        <StackPanel Orientation="Vertical" Grid.Row="1" Margin="0 11 0 0">
+                            <DockPanel >
+                                <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Top"  Width="200" MinHeight="30" HorizontalAlignment="Right" Margin="0 0 0 0">
+                                    <StackPanel Orientation="Vertical">
+                                        <touch:TouchToggleSlider Style="{StaticResource TouchToggleButtonSlider}" Background="{StaticResource TangoMidBackgroundBrush}" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20 0 20 0"  CornerRadius="17" Height="38" Width="164" ThumbWidth="80" LeftText="1 Set" RightText="1 Spool" ThumbCornerRadius="13" IsChecked="{Binding IsSpoolView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider>
+                                        <touch:TouchToggleSlider  Style="{StaticResource TouchToggleButtonSlider}" Background="{StaticResource TangoMidBackgroundBrush}" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20 18 20 0"  CornerRadius="17" Height="38" Width="164" ThumbWidth="80" LeftText="Length" RightText="Weight" ThumbCornerRadius="13" IsChecked="{Binding IsWeghtView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider>
+                                    </StackPanel>
                                 </StackPanel>
-                            </StackPanel>
 
-                            <UniformGrid x:Name="JobProperties" DockPanel.Dock="Left" Columns="1" Rows="5" HorizontalAlignment="Left" Margin="0 0 0 0" Height="390" VerticalAlignment="Top" MaxWidth="260">
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                    <Image Source="../Images/Job Issues/thread_type.png" Stretch="None" VerticalAlignment="Top"/>
-                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Thread Type</TextBlock>
-                                        <TextBlock Text="{Binding Job.Rml.DisplayName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='38', TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}" TextWrapping="Wrap" MaxWidth="200" MaxHeight="52" ></TextBlock>
+                                <UniformGrid x:Name="JobProperties" DockPanel.Dock="Left" Columns="1" Rows="5" HorizontalAlignment="Left" Margin="0 0 0 0" Height="390" VerticalAlignment="Top" MaxWidth="260">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <Image Source="../Images/Job Issues/thread_type.png" Stretch="None" VerticalAlignment="Top"/>
+                                        <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Thread Type</TextBlock>
+                                            <TextBlock Text="{Binding Job.Rml.DisplayName,Converter={StaticResource StringEllipsisConverter},ConverterParameter='38', TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}" TextWrapping="Wrap" MaxWidth="200" MaxHeight="52" ></TextBlock>
+                                        </StackPanel>
                                     </StackPanel>
-                                </StackPanel>
 
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                    <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length (m)</TextBlock>
-                                        <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
-                                            <TextBlock.Style>
-                                                <Style TargetType="{x:Type TextBlock}">
-                                                    <Setter Property="Text" Value="{Binding Job.LengthIncludingNumberOfUnitsAndSpools, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
-                                                            <Setter Property="Text" Value="{Binding Job.LengthIncludingNumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </TextBlock.Style>
-                                        </TextBlock>
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                                        <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length (m)</TextBlock>
+                                            <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
+                                                <TextBlock.Style>
+                                                    <Style TargetType="{x:Type TextBlock}">
+                                                        <Setter Property="Text" Value="{Binding Job.LengthIncludingNumberOfUnitsAndSpools, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
+                                                        <Style.Triggers>
+                                                            <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
+                                                                <Setter Property="Text" Value="{Binding Job.LengthIncludingNumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
+                                                            </DataTrigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </TextBlock.Style>
+                                            </TextBlock>
+                                        </StackPanel>
                                     </StackPanel>
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                    <Image Source="../Images/Job Issues/job_weight.png" Stretch="None" VerticalAlignment="Top"/>
-                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight (g)</TextBlock>
-                                        <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
-                                            <TextBlock.Style>
-                                                <Style TargetType="{x:Type TextBlock}">
-                                                    <Setter Property="Text" Value="{Binding Job.WeightIncludingNumberOfUnitsAndSpools, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
-                                                            <Setter Property="Text" Value="{Binding Job.WeightIncludingNumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </TextBlock.Style>
-                                        </TextBlock>
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <Image Source="../Images/Job Issues/job_weight.png" Stretch="None" VerticalAlignment="Top"/>
+                                        <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight (g)</TextBlock>
+                                            <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
+                                                <TextBlock.Style>
+                                                    <Style TargetType="{x:Type TextBlock}">
+                                                        <Setter Property="Text" Value="{Binding Job.WeightIncludingNumberOfUnitsAndSpools, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
+                                                        <Style.Triggers>
+                                                            <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
+                                                                <Setter Property="Text" Value="{Binding Job.WeightIncludingNumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
+                                                            </DataTrigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </TextBlock.Style>
+                                            </TextBlock>
+                                        </StackPanel>
                                     </StackPanel>
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                    <Image Source="../Images/Job Issues/job_copies.png" Stretch="None" VerticalAlignment="Top"/>
-                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Copies</TextBlock>
-                                        <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
-                                            <TextBlock.Style>
-                                                <Style TargetType="{x:Type TextBlock}">
-                                                    <Setter Property="Text" Value="{Binding Job.NumberOfUnitsMultipliedBySpools, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
-                                                            <Setter Property="Text" Value="{Binding Job.NumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.#'}" />
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </TextBlock.Style>
-                                        </TextBlock>
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <Image Source="../Images/Job Issues/job_copies.png" Stretch="None" VerticalAlignment="Top"/>
+                                        <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Copies</TextBlock>
+                                            <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
+                                                <TextBlock.Style>
+                                                    <Style TargetType="{x:Type TextBlock}">
+                                                        <Setter Property="Text" Value="{Binding Job.NumberOfUnitsMultipliedBySpools, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.##'}" />
+                                                        <Style.Triggers>
+                                                            <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
+                                                                <Setter Property="Text" Value="{Binding Job.NumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat='#,0.#'}" />
+                                                            </DataTrigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </TextBlock.Style>
+                                            </TextBlock>
+                                        </StackPanel>
                                     </StackPanel>
-                                </StackPanel>
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                    <Image Source="../Images/Job Issues/spools.png" Stretch="None" VerticalAlignment="Top"/>
-                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Spools</TextBlock>
-                                        <TextBlock Text="{Binding Job.Spools, TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock>
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <Image Source="../Images/Job Issues/spools.png" Stretch="None" VerticalAlignment="Top"/>
+                                        <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Spools</TextBlock>
+                                            <TextBlock Text="{Binding Job.Spools, TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock>
+                                        </StackPanel>
                                     </StackPanel>
-                                </StackPanel>
-                            </UniformGrid>
-                            <Grid x:Name="StatusCicle" Background="{StaticResource TangoMidBackgroundBrush}" VerticalAlignment="Top">
-                                <StackPanel VerticalAlignment="Center">
-                                    <Grid>
-                                        <touch:TouchRingProgress Width="364" Height="364" RingThickness="10">
-                                            <touch:TouchRingProgress.Style>
-                                                <Style TargetType="touch:TouchRingProgress">
-                                                    <Setter Property="Visibility" Value="Visible"></Setter>
-                                                    <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
-                                                    <Setter Property="Maximum" Value="{Binding RunningJobStatus.TotalProgressMinusSettingUp}"></Setter>
-                                                    <Setter Property="Value" Value="{Binding RunningJobStatus.ProgressMinusSettingUp}"></Setter>
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="False">
-                                                            <Setter Property="Visibility" Value="Visible"></Setter>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
-                                                            <Setter Property="Maximum" Value="100"></Setter>
-                                                            <Setter Property="Value" Value="99.9999999"></Setter>
-                                                            <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
-                                                            <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsFailed}" Value="True">
-                                                            <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </touch:TouchRingProgress.Style>
-                                        </touch:TouchRingProgress>
+                                </UniformGrid>
+                                <Grid x:Name="StatusCicle" Background="{StaticResource TangoMidBackgroundBrush}" VerticalAlignment="Top">
+                                    <StackPanel VerticalAlignment="Center">
+                                        <Grid>
+                                            <touch:TouchRingProgress Width="364" Height="364" RingThickness="10">
+                                                <touch:TouchRingProgress.Style>
+                                                    <Style TargetType="touch:TouchRingProgress">
+                                                        <Setter Property="Visibility" Value="Visible"></Setter>
+                                                        <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+                                                        <Setter Property="Maximum" Value="{Binding RunningJobStatus.TotalProgressMinusSettingUp}"></Setter>
+                                                        <Setter Property="Value" Value="{Binding RunningJobStatus.ProgressMinusSettingUp}"></Setter>
+                                                        <Style.Triggers>
+                                                            <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="False">
+                                                                <Setter Property="Visibility" Value="Visible"></Setter>
+                                                            </DataTrigger>
+                                                            <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
+                                                                <Setter Property="Maximum" Value="100"></Setter>
+                                                                <Setter Property="Value" Value="99.9999999"></Setter>
+                                                                <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
+                                                            </DataTrigger>
+                                                            <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
+                                                                <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
+                                                            </DataTrigger>
+                                                            <DataTrigger Binding="{Binding RunningJobStatus.IsFailed}" Value="True">
+                                                                <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                                            </DataTrigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </touch:TouchRingProgress.Style>
+                                            </touch:TouchRingProgress>
 
-                                        <touch:TouchBusyIndicator Width="360" Height="360" StrokeThickness="10" Maximum="100" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                            <touch:TouchBusyIndicator.Style>
-                                                <Style TargetType="touch:TouchBusyIndicator">
-                                                    <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
-                                                    <Setter Property="Value" Value="0"></Setter>
-                                                    <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="True">
-                                                            <Setter Property="Visibility" Value="Visible"></Setter>
-                                                            <Setter Property="Value" Value="0"></Setter>
-                                                            <Setter Property="IsIndeterminate" Value="True"></Setter>
-                                                            <Setter Property="Foreground">
-                                                                <Setter.Value>
-                                                                    <LinearGradientBrush StartPoint="0, 0" EndPoint="1, 1">
-                                                                        <GradientStop Offset="0.2" Color="{StaticResource TangoValidationErrorColor}"/>
-                                                                        <GradientStop Offset="0.5" Color="Yellow"/>
-                                                                        <GradientStop Offset="0.8" Color="{StaticResource TangoPrimaryAccentColor}"/>
-                                                                    </LinearGradientBrush>
-                                                                </Setter.Value>
-                                                            </Setter>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
-                                                            <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
-                                                            <Setter Property="Value" Value="99.9999999"></Setter>
-                                                            <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                                            <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsFailed}" Value="True">
-                                                            <Setter Property="Value" Value="99.9999999"></Setter>
-                                                            <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                                            <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </touch:TouchBusyIndicator.Style>
-                                        </touch:TouchBusyIndicator>
+                                            <touch:TouchBusyIndicator Width="360" Height="360" StrokeThickness="10" Maximum="100" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                <touch:TouchBusyIndicator.Style>
+                                                    <Style TargetType="touch:TouchBusyIndicator">
+                                                        <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+                                                        <Setter Property="Value" Value="0"></Setter>
+                                                        <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                                        <Style.Triggers>
+                                                            <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="True">
+                                                                <Setter Property="Visibility" Value="Visible"></Setter>
+                                                                <Setter Property="Value" Value="0"></Setter>
+                                                                <Setter Property="IsIndeterminate" Value="True"></Setter>
+                                                                <Setter Property="Foreground">
+                                                                    <Setter.Value>
+                                                                        <LinearGradientBrush StartPoint="0, 0" EndPoint="1, 1">
+                                                                            <GradientStop Offset="0.2" Color="{StaticResource TangoValidationErrorColor}"/>
+                                                                            <GradientStop Offset="0.5" Color="Yellow"/>
+                                                                            <GradientStop Offset="0.8" Color="{StaticResource TangoPrimaryAccentColor}"/>
+                                                                        </LinearGradientBrush>
+                                                                    </Setter.Value>
+                                                                </Setter>
+                                                            </DataTrigger>
+                                                            <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
+                                                                <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                                            </DataTrigger>
+                                                            <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
+                                                                <Setter Property="Value" Value="99.9999999"></Setter>
+                                                                <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                                                <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
+                                                            </DataTrigger>
+                                                            <DataTrigger Binding="{Binding RunningJobStatus.IsFailed}" Value="True">
+                                                                <Setter Property="Value" Value="99.9999999"></Setter>
+                                                                <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                                                <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                                            </DataTrigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </touch:TouchBusyIndicator.Style>
+                                            </touch:TouchBusyIndicator>
 
-                                        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                                            <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
 
-                                            <StackPanel Visibility="{Binding RunningJobStatus.IsSettingUp, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                                    <Image Source="../Images/JobProgressView/drop.png" Stretch="None" VerticalAlignment="Center" />
+                                                <StackPanel Visibility="{Binding RunningJobStatus.IsSettingUp, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Completed /</TextBlock>
-                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}"> Length</TextBlock>
-                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityConverter}}"> Weight</TextBlock>
+                                                        <Image Source="../Images/JobProgressView/drop.png" Stretch="None" VerticalAlignment="Center" />
+                                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Completed /</TextBlock>
+                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}"> Length</TextBlock>
+                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityConverter}}"> Weight</TextBlock>
+                                                        </StackPanel>
                                                     </StackPanel>
-                                                </StackPanel>
 
-                                                <StackPanel Orientation="Horizontal" Margin="0 15 0 0" HorizontalAlignment="Center"  Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                                    <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
-                                                        <TextBlock.Text>
-                                                            <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="#,0." TargetNullValue='-' FallbackValue='0' Mode="OneWay">
-                                                                <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
-                                                                <Binding Path="IsSpoolView"/>
-                                                                <Binding Path="RunningJobStatus.ProgressMinusSettingUp" />
-                                                            </MultiBinding>
-                                                        </TextBlock.Text>
-                                                    </TextBlock>
-                                                    <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center" Text="/"></TextBlock>
-                                                    <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center">
-                                                        <TextBlock.Text>
-                                                            <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="#,0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
-                                                                <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/>
-                                                                <Binding Path="IsSpoolView"/>
-                                                            </MultiBinding>
-                                                        </TextBlock.Text>
-                                                    </TextBlock>
-                                                    <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center" Text=" m"></TextBlock>
-                                                </StackPanel>
+                                                    <StackPanel Orientation="Horizontal" Margin="0 15 0 0" HorizontalAlignment="Center"  Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                                        <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
+                                                            <TextBlock.Text>
+                                                                <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="#,0." TargetNullValue='-' FallbackValue='0' Mode="OneWay">
+                                                                    <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
+                                                                    <Binding Path="IsSpoolView"/>
+                                                                    <Binding Path="RunningJobStatus.ProgressMinusSettingUp" />
+                                                                </MultiBinding>
+                                                            </TextBlock.Text>
+                                                        </TextBlock>
+                                                        <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center" Text="/"></TextBlock>
+                                                        <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center">
+                                                            <TextBlock.Text>
+                                                                <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="#,0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
+                                                                    <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/>
+                                                                    <Binding Path="IsSpoolView"/>
+                                                                </MultiBinding>
+                                                            </TextBlock.Text>
+                                                        </TextBlock>
+                                                        <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center" Text=" m"></TextBlock>
+                                                    </StackPanel>
 
-                                                <StackPanel Orientation="Horizontal" Margin="0 10 0 0" HorizontalAlignment="Center" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                    <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
-                                                        <TextBlock.Text>
-                                                            <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="#,0.00" TargetNullValue='-' FallbackValue='0'>
-                                                                <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
-                                                                <Binding Path="IsSpoolView"/>
-                                                                <Binding Path="RunningJobStatus.ProgressMinusSettingUp" />
-                                                                <Binding Path="Job.GramPerLength" Mode="OneWay"/>
-                                                            </MultiBinding>
-                                                        </TextBlock.Text>
-                                                    </TextBlock>
-                                                    <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center" Text="/"></TextBlock>
-                                                    <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center">
-                                                        <TextBlock.Text>
-                                                            <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="#,0.#" TargetNullValue='-' FallbackValue='0' >
-                                                                <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/>
-                                                                <Binding Path="IsSpoolView"/>
-                                                                <Binding Path="Job.GramPerLength" Mode="OneWay"/>
-                                                            </MultiBinding>
-                                                        </TextBlock.Text>
-                                                    </TextBlock>
-                                                    <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center" Text=" g"></TextBlock>
+                                                    <StackPanel Orientation="Horizontal" Margin="0 10 0 0" HorizontalAlignment="Center" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                        <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
+                                                            <TextBlock.Text>
+                                                                <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="#,0.00" TargetNullValue='-' FallbackValue='0'>
+                                                                    <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
+                                                                    <Binding Path="IsSpoolView"/>
+                                                                    <Binding Path="RunningJobStatus.ProgressMinusSettingUp" />
+                                                                    <Binding Path="Job.GramPerLength" Mode="OneWay"/>
+                                                                </MultiBinding>
+                                                            </TextBlock.Text>
+                                                        </TextBlock>
+                                                        <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center" Text="/"></TextBlock>
+                                                        <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center">
+                                                            <TextBlock.Text>
+                                                                <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="#,0.#" TargetNullValue='-' FallbackValue='0' >
+                                                                    <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/>
+                                                                    <Binding Path="IsSpoolView"/>
+                                                                    <Binding Path="Job.GramPerLength" Mode="OneWay"/>
+                                                                </MultiBinding>
+                                                            </TextBlock.Text>
+                                                        </TextBlock>
+                                                        <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center" Text=" g"></TextBlock>
+                                                    </StackPanel>
                                                 </StackPanel>
-                                            </StackPanel>
 
-                                            <DockPanel Height="106" Visibility="{Binding RunningJobStatus.IsSettingUp, FallbackValue=collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" DockPanel.Dock="Top">
-                                                    <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
-                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Getting Ready...</TextBlock>
-                                                </StackPanel>
-                                                <TextBlock Margin="40 30 40 0" FontSize="{StaticResource TangoSmallFontSize}" FontWeight="Light" Text="{Binding RunningJobStatus.Message, FallbackValue='', TargetNullValue='', Converter={StaticResource StringEllipsisConverter},ConverterParameter='76'}" TextWrapping="Wrap" MaxWidth="310" HorizontalAlignment="Center" TextAlignment="Center" Height="42"></TextBlock>
-                                            </DockPanel>
+                                                <DockPanel Height="106" Visibility="{Binding RunningJobStatus.IsSettingUp, FallbackValue=collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" DockPanel.Dock="Top">
+                                                        <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
+                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Getting Ready...</TextBlock>
+                                                    </StackPanel>
+                                                    <TextBlock Margin="40 30 40 0" FontSize="{StaticResource TangoSmallFontSize}" FontWeight="Light" Text="{Binding RunningJobStatus.Message, FallbackValue='', TargetNullValue='', Converter={StaticResource StringEllipsisConverter},ConverterParameter='76'}" TextWrapping="Wrap" MaxWidth="310" HorizontalAlignment="Center" TextAlignment="Center" Height="42"></TextBlock>
+                                                </DockPanel>
 
-                                            <Rectangle x:Name="Rrect" Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoLightBorderBrush}" StrokeThickness="1"  Fill="{StaticResource TangoLightBorderBrush}" Height="2" />
+                                                <Rectangle x:Name="Rrect" Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoLightBorderBrush}" StrokeThickness="1"  Fill="{StaticResource TangoLightBorderBrush}" Height="2" />
 
-                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 15 0 0">
-                                                <Image Source="../Images/JobProgressView/clock.png" Stretch="None" VerticalAlignment="Center" />
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Time Left</TextBlock>
-                                            </StackPanel>
+                                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 15 0 0">
+                                                    <Image Source="../Images/JobProgressView/clock.png" Stretch="None" VerticalAlignment="Center" />
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Time Left</TextBlock>
+                                                </StackPanel>
 
-                                            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoLargeInfoFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                                <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoLargeInfoFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                                                 <Run Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=-}"></Run>
                                                 <Run FontSize="{StaticResource TangoComboBoxItemFontSize}" Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
-                                            </TextBlock>
-                                        </StackPanel>
-                                    </Grid>
+                                                </TextBlock>
+                                            </StackPanel>
+                                        </Grid>
 
-                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                        <touch:TouchButton Visibility="Collapsed" Content="Abort" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding AbortCommand}" IsEnabled="true" BorderThickness="1" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" EnableDropShadow="False">
-                                            <touch:TouchButton.Style >
-                                                <Style TargetType="touch:TouchButton" >
+
+                                    </StackPanel>
+                                </Grid>
+                            </DockPanel>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Visibility="Visible">
+                                <touch:TouchButton Content="Abort" Visibility="Collapsed" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding AbortCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" BorderThickness="1" EnableDropShadow="False" Style="{StaticResource BlueFlatButton}"/>
+
+                                <touch:TouchButton Content="Stop" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30"  Command="{Binding StopCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" EnableDropShadow="False" Style="{StaticResource SelectedBlueFlatButton}"/>
+
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Visibility="Collapsed">
+                                <touch:TouchButton Content="Restart" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding RestartJobCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" BorderThickness="1" EnableDropShadow="False" Style="{StaticResource BlueFlatButton}"/>
+
+                                <touch:TouchButton Content="Clear" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30"  Command="{Binding ClearJobCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" EnableDropShadow="False" Style="{StaticResource SelectedBlueFlatButton}"/>
+
+                            </StackPanel>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Visibility="Collapsed" MinWidth="500" VerticalAlignment="Bottom">
+                                <touch:TouchButton  Margin="0 0 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding CaancelJobCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" BorderThickness="0"  EnableDropShadow="False" Style="{StaticResource TangoLinkButton}"  Foreground="{StaticResource TangoPrimaryAccentBrush}">
+                                    <StackPanel Orientation="Vertical">
+                                        <TextBlock Margin="5 0 0 0"  FontSize="{StaticResource TangoButtonFontSize}" VerticalAlignment="Bottom" Text="Cancel" HorizontalAlignment="Center" Width="80">
+                                            <TextBlock.Style>
+                                                <Style TargetType="{x:Type TextBlock}">
                                                     <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
-                                                    <Setter Property="Background" Value="Transparent"/>
                                                     <Style.Triggers>
-                                                        <Trigger Property="IsEnabled" Value="False">
-                                                            <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
-                                                            <Setter Property="BorderBrush" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
-                                                        </Trigger>
+                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsEnabled}" Value="False">
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
+                                                        </DataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
-                                            </touch:TouchButton.Style>
-                                        </touch:TouchButton>
-                                        <touch:TouchButton Content="Stop" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30"  Command="{Binding StopCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" EnableDropShadow="False">
-                                            <touch:TouchButton.Style >
-                                                <Style TargetType="touch:TouchButton" >
-                                                    <Setter Property="Foreground" Value="{StaticResource TangoLightForegroundBrush}"></Setter>
-                                                    <Setter Property="Background" Value="{StaticResource TangoPrimaryAccentBrush}"/>
+                                            </TextBlock.Style>
+                                        </TextBlock>
+                                        <Rectangle Height="3"  VerticalAlignment="Bottom"  Margin="0 2 0 0" Width="84">
+                                            <Rectangle.Style>
+                                                <Style TargetType="{x:Type Rectangle}">
+                                                    <Setter Property="Fill" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
                                                     <Style.Triggers>
-                                                        <Trigger Property="IsEnabled" Value="False">
-                                                            <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
-                                                            <Setter Property="Background" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
-                                                        </Trigger>
+                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path=IsEnabled}" Value="False">
+                                                            <Setter Property="Fill" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
+                                                        </DataTrigger>
                                                     </Style.Triggers>
                                                 </Style>
-                                            </touch:TouchButton.Style>
-                                        </touch:TouchButton>
+                                            </Rectangle.Style>
+                                        </Rectangle>
                                     </StackPanel>
-                                </StackPanel>
-                            </Grid>
-                        </DockPanel>
+                                </touch:TouchButton>
+
+                                <touch:TouchButton Content="Resume" Margin="30 0 0 0" Height="50" Width="164" CornerRadius="30"  Command="{Binding ResumeCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" EnableDropShadow="False" Style="{StaticResource SelectedBlueFlatButton}"/>
+                                <touch:TouchButton Content="Restart" Margin="30 0 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding RestartJobCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" BorderThickness="1"  EnableDropShadow="False" Style="{StaticResource BlueFlatButton}"/>
+
+                            </StackPanel>
+                        </StackPanel>
                         <StackPanel x:Name="Job_Progress" Grid.Row="2" Margin="0 12 0 0" Orientation="Vertical">
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                 <Image Source="../Images/Job Issues/Thread.png" Stretch="None" VerticalAlignment="Top"/>