Resume buttons. Buttons have been added to Machine Status View.

1 files changed, 20 insertions, 18 deletions

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 8f2b49f9e..0436cdab6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -482,8 +482,8 @@
                             </DockPanel>
                             <Border Height="2" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
                         </Grid>
-                        <StackPanel Orientation="Vertical" Grid.Row="1" Margin="0 11 0 0">
-                            <DockPanel >
+                        <DockPanel  Grid.Row="1" Margin="0 11 0 0" HorizontalAlignment="Stretch">
+                            <DockPanel DockPanel.Dock="Top">
                                 <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>
@@ -491,7 +491,7 @@
                                     </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">
+                                <UniformGrid x:Name="JobProperties" DockPanel.Dock="Left" Columns="1" Rows="5" HorizontalAlignment="Left" Margin="0 0 0 0" Height="390" VerticalAlignment="Top" Width="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">
@@ -562,7 +562,7 @@
                                         </StackPanel>
                                     </StackPanel>
                                 </UniformGrid>
-                                <Grid x:Name="StatusCicle" Background="{StaticResource TangoMidBackgroundBrush}" VerticalAlignment="Top">
+                                <Grid x:Name="StatusCicle" Background="{StaticResource TangoMidBackgroundBrush}" VerticalAlignment="Top" HorizontalAlignment="Center">
                                     <StackPanel VerticalAlignment="Center">
                                         <Grid>
                                             <touch:TouchRingProgress Width="364" Height="364" RingThickness="10">
@@ -716,20 +716,22 @@
                                     </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}"/>
+                            <Grid DockPanel.Dock="Top" Margin="60 10 0 0"  HorizontalAlignment="Center" Visibility="{Binding ShowSetButtons, Converter={StaticResource EnumToVisibilityConverter}, ConverterParameter='ShowDefault'}">
+                                <!--<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}"/>
+                                <touch:TouchButton Content="Stop" Margin="0 0 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}"/>
+                            </Grid>
+                            <UniformGrid  DockPanel.Dock="Top" Columns="2" Margin="60 10 0 0" Width="400"  HorizontalAlignment="Center" 
+                                Visibility="{Binding ShowSetButtons, Converter={StaticResource EnumToVisibilityConverter}, ConverterParameter='ShowOnCompleteJob'}">
+                                <touch:TouchButton Content="Restart" Margin="0 0 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding RestartJobCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.CanPrint}" 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}"/>
+                                <touch:TouchButton Content="Clear" Margin="0 0 0 0" Height="50" Width="164" CornerRadius="30"  Command="{Binding ClearJobCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.CanPrint}" 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}">
+                            </UniformGrid>
+                            <UniformGrid  DockPanel.Dock="Top" Columns="3" x:Name="ResumeStack" Margin="60 10 0 0"  HorizontalAlignment="Center"  Width="570" VerticalAlignment="Bottom" 
+                                Visibility="{Binding ShowSetButtons, Converter={StaticResource EnumToVisibilityConverter}, ConverterParameter='ShowROnErrorsJob'}">
+                                <touch:TouchButton  Margin="0 0 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding CaancelJobCommand}"  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>
@@ -758,11 +760,11 @@
                                     </StackPanel>
                                 </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}"/>
+                                <touch:TouchButton Content="Resume" Margin="0 0 0 0" Height="50" Width="164" CornerRadius="30"  Command="{Binding ResumeCommand}"  EnableDropShadow="False" Style="{StaticResource SelectedBlueFlatButton}"/>
+                                <touch:TouchButton Content="Restart Set" Margin="0 0 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding RestartJobCommand}"  BorderThickness="1"  EnableDropShadow="False" Style="{StaticResource BlueFlatButton}"/>
 
-                            </StackPanel>
-                        </StackPanel>
+                            </UniformGrid>
+                        </DockPanel>
                         <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"/>