PPC Eureka. Power button, new dialog.

2 files changed, 73 insertions, 32 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml
index 10750bba3..092088ca6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml
@@ -48,6 +48,13 @@
                                         </Border>
                                         <StackPanel>
                                             <DockPanel>
+                                                <touch:TouchIconButton Icon="ChevronLeft" IsHitTestVisible="{Binding NavigationManager.IsNavigating,Converter={StaticResource BooleanInverseConverter}}" IsEnabled="{Binding NavigationManager.CanNavigateBack}" Width="40" Height="40" Padding="10" Margin="10 0 0 0" Command="{Binding MenuOrBackCommand}" EnableDropShadow="False">
+                                                    <touch:TouchIconButton.Style>
+                                                        <Style TargetType="touch:TouchIconButton" BasedOn="{StaticResource {x:Type touch:TouchIconButton}}">
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+                                                        </Style>
+                                                    </touch:TouchIconButton.Style>
+                                                </touch:TouchIconButton>
                                                 <Image Source="/Images/logo.png" Stretch="Uniform" HorizontalAlignment="Center" Margin="0 10 10 10" Width="157"></Image>
                                             </DockPanel>
                                         </StackPanel>
@@ -81,11 +88,21 @@
                                         </touch:TouchButton>
                                     </Border>
                                 </StackPanel>
+                                <StackPanel Margin="0 5 0 0">
+                                    <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 1">
+                                        <touch:TouchButton Style="{StaticResource TangoFlatButton}" Padding="10 15" Foreground="{StaticResource TangoDarkForegroundBrush}" Command="{Binding PowerCommand}">
+                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                                <Image Source="/Images/menu/power.png" VerticalAlignment="Center" Width="20" Height="20"></Image>
+                                                <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Foreground="{StaticResource TangoLightForegroundBrush}" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="Light">Power</TextBlock>
+                                            </StackPanel>
+                                        </touch:TouchButton>
+                                    </Border>
+                                </StackPanel>
                             </StackPanel>
 
                             <Grid VerticalAlignment="Bottom">
                                 <Border Background="{StaticResource TangoPrimaryBackgroundBrush}" Height="350" Padding="20" RenderTransformOrigin="0.5,1" VerticalAlignment="Bottom">
-                                    <Border.Resources>
+                                    <!--<Border.Resources>
                                         <Style x:Key="PowerButton" TargetType="touch:TouchButton" BasedOn="{StaticResource TangoLinkButton}">
                                             <Setter Property="Foreground" Value="{StaticResource TangoPrimaryBackgroundBrush}"></Setter>
                                             <Setter Property="FontSize" Value="{StaticResource TangoTitleFontSize}"></Setter>
@@ -99,7 +116,7 @@
                                                 </Trigger>
                                             </Style.Triggers>
                                         </Style>
-                                    </Border.Resources>
+                                    </Border.Resources>-->
                                     <Border.Style>
                                         <Style TargetType="Border">
                                             <Setter Property="RenderTransform">
@@ -107,7 +124,7 @@
                                                     <ScaleTransform ScaleX="1" ScaleY="0" />
                                                 </Setter.Value>
                                             </Setter>
-                                            <Style.Triggers>
+                                            <!--<Style.Triggers>
                                                 <DataTrigger Binding="{Binding IsPowerOpened}" Value="True">
                                                     <DataTrigger.EnterActions>
                                                         <BeginStoryboard>
@@ -124,7 +141,7 @@
                                                         </BeginStoryboard>
                                                     </DataTrigger.ExitActions>
                                                 </DataTrigger>
-                                            </Style.Triggers>
+                                            </Style.Triggers>-->
                                         </Style>
                                     </Border.Style>
                                     <Grid>
@@ -133,7 +150,7 @@
                                             <RowDefinition Height="1*"/>
                                         </Grid.RowDefinitions>
 
-                                        <Grid>
+                                        <!--<Grid>
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="188*"/>
                                                 <ColumnDefinition Width="261*"/>
@@ -146,9 +163,9 @@
                                                 <touch:TouchButton Style="{StaticResource PowerButton}" Command="{Binding StandByCommand}">Stand By</touch:TouchButton>
                                                 <touch:TouchButton Style="{StaticResource PowerButton}" Command="{Binding ResetCommand}">Reset</touch:TouchButton>
                                             </UniformGrid>
-                                        </Grid>
+                                        </Grid>-->
 
-                                        <Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="25 0" Opacity="0.3" StrokeThickness="1" Stroke="{StaticResource TangoDividerBrush}" />
+                                        <!--<Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="25 0" Opacity="0.3" StrokeThickness="1" Stroke="{StaticResource TangoDividerBrush}" />
 
                                         <Grid Grid.Row="1">
                                             <Grid.ColumnDefinitions>
@@ -158,11 +175,11 @@
                                             <Image Source="/Images/power-tablet.png" Margin="30" />
 
                                             <touch:TouchButton Command="{Binding RestartApplicationCommand}" Grid.Column="1" Style="{StaticResource PowerButton}">Restart</touch:TouchButton>
-                                        </Grid>
+                                        </Grid>-->
                                     </Grid>
                                 </Border>
 
-                                <Border Background="{StaticResource TangoMidBackgroundBrush}" RenderTransformOrigin="0.5,1" VerticalAlignment="Bottom">
+                                <!--<Border Background="{StaticResource TangoMidBackgroundBrush}" RenderTransformOrigin="0.5,1" VerticalAlignment="Bottom">
                                     <Border.Style>
                                         <Style TargetType="Border">
                                             <Setter Property="RenderTransform">
@@ -196,7 +213,7 @@
                                             <TextBlock VerticalAlignment="Center" Margin="20 0 0 0" Foreground="{StaticResource TangoLightForegroundBrush}" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="Light">Power</TextBlock>
                                         </StackPanel>
                                     </touch:TouchButton>
-                                </Border>
+                                </Border>-->
                             </Grid>
                         </Grid>
                     </Border>
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 370ac1de7..e69f33514 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -17,6 +17,7 @@
         <localConverters:LengthToWeightConverter x:Key="LengthToWeightConverter" />
         <localConverters:LengthWithSpoolsConverter x:Key="LengthWithSpoolsConverter"/>
         <localConverters:CollectionToCountConverter x:Key="CollectionToCountConverter"/>
+        <localConverters:ProgressLengthSpoolConverter x:Key="ProgressLengthSpoolConverter"/>
 
         <Style x:Key="LinkRoundButtonStyle" TargetType="{x:Type touch:TouchButton}">
             <Setter Property="Background" Value="{StaticResource TangoMidAccentBrush}"></Setter>
@@ -249,7 +250,18 @@
                             <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 Text="{Binding Job.NumberOfUnitsMultipliedBySpools, TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></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 Orientation="Horizontal" HorizontalAlignment="Left">
@@ -305,7 +317,7 @@
                                                             <Setter.Value>
                                                                 <LinearGradientBrush StartPoint="0, 0" EndPoint="1, 1">
                                                                     <GradientStop Offset="0.2" Color="Red"/>
-                                                                    <GradientStop Offset="0.6" Color="Yellow"/>
+                                                                    <GradientStop Offset="0.5" Color="Yellow"/>
                                                                     <GradientStop Offset="0.8" Color="Blue"/>
                                                                 </LinearGradientBrush>
                                                             </Setter.Value>
@@ -340,48 +352,56 @@
                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityConverter}}"> Weight</TextBlock>
                                                 </StackPanel>
                                             </StackPanel>
-                                            <StackPanel Orientation="Horizontal" Margin="0 15 0 0" HorizontalAlignment="Center" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                           
+                                            <StackPanel Orientation="Horizontal" Margin="0 15 0 0" HorizontalAlignment="Center" >
                                                 <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
                                                     <TextBlock.Text>
-                                                        <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
-                                                            <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
+                                                        <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="0.#" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
+                                                            <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
                                                             <Binding Path="Job.Spools" Mode="OneWay"/>
+                                                            <Binding Path="Job.NumberOfUnits" Mode="OneWay"/>
+                                                            <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 LengthWithSpoolsConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
-                                                            <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" Mode="OneWay"/>
+                                                        <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
+                                                            <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/>
                                                             <Binding Path="Job.Spools" Mode="OneWay"/>
+                                                            <Binding Path="Job.NumberOfUnits" Mode="OneWay"/>
+                                                            <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}}">
+                                           
+                                            <!--<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 LengthToWeightConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
-                                                            <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
-                                                            <Binding Path="Job.GramPerLength" Mode="OneWay"/>
-                                                            <Binding Path="Job.Spools" Mode="OneWay"/>
+                                                        <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0'>
+                                                            <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
+                                                            <Binding Path="Job.NumberOfUnits" Mode="OneWay"/>
+                                                            <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 LengthToWeightConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
-                                                            <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" Mode="OneWay"/>
-                                                            <Binding Path="Job.GramPerLength" Mode="OneWay"/>
-                                                            <Binding Path="Job.Spools" Mode="OneWay"/>
+                                                        <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' >
+                                                            <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/>
+                                                            <Binding Path="Job.NumberOfUnits" Mode="OneWay"/>
+                                                            <Binding Path="IsSpoolView"/>
                                                         </MultiBinding>
                                                     </TextBlock.Text>
                                                 </TextBlock>
                                                 <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center" Text=" g"></TextBlock>
-                                            </StackPanel>
+                                            </StackPanel>-->
                                         </StackPanel>
 
                                         <StackPanel Height="90" Visibility="{Binding RunningJobStatus.IsSettingUp, FallbackValue=collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
@@ -452,8 +472,10 @@
                             <Run Text="x"></Run><Run Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
                         </TextBlock>-->
                     </Grid>
-                        <touch:MultiRangeSlider x:Name="PART_LowerSlider" Height="30"  Margin="0 0 0 0" Minimum="0" Maximum="{Binding RunningJobStatus.CurrentUnitTotalProgress}" Value="{Binding RunningJobStatus.CurrentUnitProgress}" Foreground="{StaticResource TangoDarkForegroundBrush}"
-                                           IsSnapToTickEnabled="True"  TickFrequency="1" VerticalAlignment="Center" IsEnabled="False" />
+                        <touch:MultiRangeSlider x:Name="PART_LowerSlider" Height="30"  Margin="0 0 0 0" Minimum="0"  Foreground="{StaticResource TangoDarkForegroundBrush}"
+                                           IsSnapToTickEnabled="True"  TickFrequency="1" VerticalAlignment="Center" IsEnabled="False" Maximum="{Binding RunningJobStatus.TotalProgressMinusSettingUp}" 
+                            Value ="{Binding RunningJobStatus.ProgressMinusSettingUp}"/>
+
                         <UniformGrid DockPanel.Dock="Bottom" Columns="4" Rows="1" HorizontalAlignment="Left" Margin="0 35 0 0" Height="Auto" VerticalAlignment="Top" Width="1200">
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                             <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
@@ -696,8 +718,10 @@
                             </StackPanel>
                             <StackPanel Orientation="Vertical" Margin="30 8 30 0" >
                                 <locaControls:RunningJobViewerEureka Height="16"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}"  />
-                                <touch:MultiRangeSlider x:Name="PART_LowerSlider1" Height="26"  Margin="0 0 0 0" Minimum="0" Maximum="{Binding RunningJobStatus.CurrentUnitTotalProgress}" Value="{Binding RunningJobStatus.CurrentUnitProgress}" Foreground="{StaticResource TangoDarkForegroundBrush}"
-                                           IsSnapToTickEnabled="True"  TickFrequency="1" VerticalAlignment="Center" IsEnabled="False" />
+                                
+                                <touch:MultiRangeSlider x:Name="PART_LowerSlider1" Height="26"  Margin="0 0 0 0" Minimum="0"  Foreground="{StaticResource TangoDarkForegroundBrush}"
+                                           IsSnapToTickEnabled="True"  TickFrequency="1" VerticalAlignment="Center" IsEnabled="False" Maximum="{Binding RunningJobStatus.TotalProgressMinusSettingUp}"   Value ="{Binding RunningJobStatus.ProgressMinusSettingUp}"/>
+
                             </StackPanel>
                         </DockPanel>
                         <Border Height="2" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
@@ -737,7 +761,7 @@
             <touch:TouchExpander x:Name="Notifications" Style="{StaticResource TouchRoundedExpander}"  IsTabStop="False" KeyboardNavigation.TabNavigation ="None" BorderThickness="0" IsExpanded="false" CornerRadius="20 20 0 0" >
                 <touch:TouchExpander.Header>
                     <DockPanel >
-                        <touch:TouchButton Margin="0 0 20 0" Content="Clear All" DockPanel.Dock="Right" Width="120"  Height="38"  HorizontalAlignment="Right" VerticalAlignment="Center" EnableDropShadow="False"  Background="Transparent" BorderThickness="1" CornerRadius="19"  BorderBrush="{StaticResource TangoPrimaryAccentBrush}" Foreground="{StaticResource TangoPrimaryAccentBrush}" Command="{Binding ClearAllNotificationsCommand}" >
+                        <touch:TouchButton Margin="0 0 20 0" Content="Clear All" DockPanel.Dock="Right" Width="120"  Height="38"  HorizontalAlignment="Right" VerticalAlignment="Center" EnableDropShadow="False"  Background="Transparent" BorderThickness="1" CornerRadius="19"  BorderBrush="{StaticResource TangoPrimaryAccentBrush}" Foreground="{StaticResource TangoPrimaryAccentBrush}" Command="{Binding ClearAllNotificationsCommand}" Visibility="{Binding NotificationProvider.HasNotificationItems, Converter={StaticResource BooleanToVisibilityConverter}}" >
                            
                         </touch:TouchButton>
                         <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" VerticalAlignment="Center"  >