From 51c59649e78ea81d88c52ca7a0f61d53e9ac83fe Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 20 Feb 2018 12:13:55 +0200
Subject: Working on developer module...

---
 .../Views/JobView.xaml                             | 28 ++++++++++++++++++----
 1 file changed, 23 insertions(+), 5 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 4467b1f28..e9867d202 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
@@ -34,6 +34,13 @@
             <Setter Property="Margin" Value="2" />
         </Style>
 
+        <ResourceDictionary x:Key="SelectAllTextBoxResource">
+            <Style TargetType="TextBox">
+                <EventSetter Event="GotFocus" Handler="TextBox_GotFocus"></EventSetter>
+                <EventSetter Event="MouseDown" Handler="TextBox_PreviewMouseUp"></EventSetter>
+            </Style>
+        </ResourceDictionary>
+
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
         <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
@@ -59,6 +66,7 @@
         <localConverters:OneToPercentConverter x:Key="OneToPercentConverter"/>
         <converters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
         <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
+        <converters:IsNotConverter x:Key="IsNotConverter" />
 
 
         <ObjectDataProvider x:Key="dispenserDivisions" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
@@ -474,7 +482,7 @@
 
                                                             </Grid>
 
-                                                            
+
                                                         </StackPanel>
 
                                                         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal" Margin="0 40 40 0">
@@ -617,13 +625,13 @@
                                                                                                                             </ItemsControl.ItemsPanel>
                                                                                                                             <ItemsControl.ItemTemplate>
                                                                                                                                 <DataTemplate>
-                                                                                                                                    <ContentControl Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
+                                                                                                                                    <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="16" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown FontSize="16" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.00" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
                                                                                                                                             <mahapps:NumericUpDown.Resources>
-                                                                                                                                                <Style TargetType="TextBox"/>
+                                                                                                                                                <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
                                                                                                                                             </mahapps:NumericUpDown.Resources>
                                                                                                                                         </mahapps:NumericUpDown>
                                                                                                                                     </ContentControl>
@@ -969,6 +977,16 @@
                                                                                                                                                     <DataTrigger Binding="{Binding DispenserStepDivision}" Value="{x:Static dispensing:DispenserStepDivisions.Auto}">
                                                                                                                                                         <Setter Property="Content" Value="Auto"></Setter>
                                                                                                                                                     </DataTrigger>
+                                                                                                                                                    <DataTrigger Binding="{Binding DispenserStepDivision,Converter={StaticResource IsNotConverter},ConverterParameter={x:Static dispensing:DispenserStepDivisions.Auto}}" Value="True">
+                                                                                                                                                        <Setter Property="Content">
+                                                                                                                                                            <Setter.Value>
+                                                                                                                                                                <TextBlock>
+                                                                                                                                                 <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                                                                                </TextBlock>
+                                                                                                                                                            </Setter.Value>
+                                                                                                                                                        </Setter>
+                                                                                                                                                    </DataTrigger>
                                                                                                                                                 </Style.Triggers>
                                                                                                                                             </Style>
                                                                                                                                         </Label.Style>
@@ -1217,7 +1235,7 @@
                                                                     <TextBox materialDesign:HintAssist.Hint="Table Name" DockPanel.Dock="Top" Text="{Binding Name}"></TextBox>
                                                                     <WrapPanel Orientation="Vertical" Margin="0 5 0 0">
                                                                         <WrapPanel.Resources>
-                                                                            <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+                                                                            <Style TargetType="TextBlock">
                                                                                 <Setter Property="FontSize" Value="10"></Setter>
                                                                                 <Setter Property="Foreground" Value="#7A7A7A"></Setter>
                                                                                 <Setter Property="Margin" Value="0 5 0 5"></Setter>
-- 
cgit v1.3.1