From de2b8a223b4fa65e085fbc0995e521ddba4e9335 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 17 Sep 2018 11:23:05 +0300
Subject: Moved Lubricant to the right.

---
 .../Views/JobView.xaml                             | 60 ++++++++++++++++++----
 1 file changed, 49 insertions(+), 11 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index de6532511..06e8648e8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -72,6 +72,7 @@
         <converters:IsNotConverter x:Key="IsNotConverter" />
         <converters:ObjectToObjectTypeConverter x:Key="ObjectToObjectTypeConverter" />
         <converters:MathOperatorConverter x:Key="MathOperatorConverter" />
+        <localConverters:LiquidVolumesToLubricantLiquidVolume x:Key="LiquidVolumesToLubricantLiquidVolume" />
 
 
         <ObjectDataProvider x:Key="dispenserDivisions" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
@@ -730,16 +731,28 @@
                                                                                                                                 </ItemsControl.ItemsPanel>
                                                                                                                                 <ItemsControl.ItemTemplate>
                                                                                                                                     <DataTemplate>
-                                                                                                                                        <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
-                                                                                                                                            <ContentControl.Foreground>
-                                                                                                                                                <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                                                                                                                                            </ContentControl.Foreground>
-                                                                                                                                            <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                                    <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
-                                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                                        </ContentControl>
+                                                                                                                                        <Border Width="60" Height="60">
+                                                                                                                                            <Border.Style>
+                                                                                                                                                <Style TargetType="Border">
+                                                                                                                                                    <Setter Property="Visibility" Value="Visible"></Setter>
+                                                                                                                                                    <Style.Triggers>
+                                                                                                                                                        <DataTrigger Binding="{Binding IdsPack.IdsPackFormula.Name}" Value="Lubricant">
+                                                                                                                                                            <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                                                                                                                                        </DataTrigger>
+                                                                                                                                                    </Style.Triggers>
+                                                                                                                                                </Style>
+                                                                                                                                            </Border.Style>
+                                                                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0">
+                                                                                                                                                <ContentControl.Foreground>
+                                                                                                                                                    <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                                                                                                                                </ContentControl.Foreground>
+                                                                                                                                                <mahapps:NumericUpDown FontSize="{StaticResource NumbersFontSize}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                                    <mahapps:NumericUpDown.Resources>
+                                                                                                                                                        <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
+                                                                                                                                                    </mahapps:NumericUpDown.Resources>
+                                                                                                                                                </mahapps:NumericUpDown>
+                                                                                                                                            </ContentControl>
+                                                                                                                                        </Border>
                                                                                                                                     </DataTemplate>
                                                                                                                                 </ItemsControl.ItemTemplate>
                                                                                                                             </ItemsControl>
@@ -750,7 +763,9 @@
                                                                                                                             </StackPanel>
                                                                                                                         </StackPanel>
 
-                                                                                                                        <TextBlock VerticalAlignment="Center" Margin="40 0 0 0" FontSize="16" FontStyle="Italic" Foreground="Gray">
+                                                                                                                        <materialDesign:PackIcon Kind="ChevronDoubleLeft" Margin="40 2 0 0" VerticalAlignment="Center" Foreground="Gray" />
+
+                                                                                                                        <TextBlock VerticalAlignment="Center" FontSize="16" Margin="5 0 0 0" FontStyle="Italic" Foreground="Gray">
                                                                                                                             <Run>Total:</Run>
                                                                                                                             <Run Text="{Binding TotalLiquidVolume,Mode=OneWay,StringFormat=0}"></Run><Run>%</Run>
                                                                                                                             <Run>(</Run>
@@ -758,6 +773,29 @@
                                                                                                                             <Run FontSize="12">nl</Run>
                                                                                                                             <Run>)</Run>
                                                                                                                         </TextBlock>
+
+                                                                                                                        <Border Margin="60 0 0 0" DataContext="{Binding LiquidVolumes,Converter={StaticResource LiquidVolumesToLubricantLiquidVolume}}" Width="55" Height="55" BorderBrush="#E6E6E6" BorderThickness="1 0 0 0">
+                                                                                                                            <Border.Style>
+                                                                                                                                <Style TargetType="Border">
+                                                                                                                                    <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                                                                                                                    <Style.Triggers>
+                                                                                                                                        <DataTrigger Binding="{Binding Converter={StaticResource NullObjectToBooleanConverter}}" Value="True">
+                                                                                                                                            <Setter Property="Visibility" Value="Visible"></Setter>
+                                                                                                                                        </DataTrigger>
+                                                                                                                                    </Style.Triggers>
+                                                                                                                                </Style>
+                                                                                                                            </Border.Style>
+                                                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0">
+                                                                                                                                <ContentControl.Foreground>
+                                                                                                                                    <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                                                                                                                </ContentControl.Foreground>
+                                                                                                                                <mahapps:NumericUpDown Foreground="#515151"  FontSize="20" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                    <mahapps:NumericUpDown.Resources>
+                                                                                                                                        <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
+                                                                                                                                    </mahapps:NumericUpDown.Resources>
+                                                                                                                                </mahapps:NumericUpDown>
+                                                                                                                            </ContentControl>
+                                                                                                                        </Border>
                                                                                                                     </StackPanel>
                                                                                                                 </Setter.Value>
                                                                                                             </Setter>
-- 
cgit v1.3.1