PPC. GUI changes

Related Work Items: #6699

4 files changed, 11 insertions, 6 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobView.xaml
index 2b098838a..e8e5e6c30 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobView.xaml
@@ -191,7 +191,7 @@
 
         <DataTemplate x:Key="CATALOG_Template" DataType="{x:Type entities:BrushStop}">
             <UniformGrid Rows="1" Columns="2" Height="30" MinWidth="150">
-                <StackPanel Orientation="Horizontal" Margin="10 0 0 0">
+                <StackPanel Orientation="Horizontal" Margin="0 0 0 0">
                     <TextBlock  Text="Catalog:" FontSize="{StaticResource TangoSmallFontSize}"  VerticalAlignment="Center"/>
                     <Border Margin="10 0 0 0"  Background="Transparent" BorderBrush="{StaticResource TangoGrayBrush}"  BorderThickness="0.8" MinWidth="42" MaxWidth="130">
                         <TextBlock Padding="4 0 4 0" Style="{StaticResource SliderGreyTextStyle}" Text="{Binding ColorCatalog.Name}" ></TextBlock>
@@ -370,8 +370,7 @@
                         </ContentControl.Style>
                     </ContentControl>
                     <Border Grid.Column="1"></Border>
-                    <ContentControl  x:Name="rightColorSpaceValues" Grid.Column="2"  Focusable="False" Margin="0 0 0 0" 
-                                                 HorizontalAlignment="Right"  
+                    <ContentControl  x:Name="rightColorSpaceValues" Grid.Column="2"  Focusable="False" Margin="0 0 0 0"  HorizontalAlignment="Right" HorizontalContentAlignment="Right" 
                                                  Visibility="{Binding IsGradient, Converter={StaticResource BooleanToVisibilityConverter}}" Content="{Binding SecondBrushStop}">
                         <ContentControl.Style>
                             <Style TargetType="ContentControl">
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
index dbda2320e..15c516124 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
@@ -73,7 +73,13 @@ namespace Tango.Touch.Controls
         public static readonly DependencyProperty DisplayWatermarkHintProperty =
             DependencyProperty.Register("DisplayWatermarkHint", typeof(bool), typeof(TouchNumericTextBox), new PropertyMetadata(false));
 
-
+        public bool HideUnderline
+        {
+            get { return (bool)GetValue(HideUnderlineProperty); }
+            set { SetValue(HideUnderlineProperty, value); }
+        }
+        public static readonly DependencyProperty HideUnderlineProperty =
+            DependencyProperty.Register("HideUnderline", typeof(bool), typeof(TouchNumericTextBox), new PropertyMetadata(false));
 
         public String StringFormat
         {
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml
index ff4756160..3fd056ee2 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml
@@ -44,7 +44,7 @@
                                 <TextBlock FontSize="12" Foreground="{StaticResource TangoValidationErrorBrush}" Margin="0 5 0 0" Text="{Binding RelativeSource={RelativeSource AncestorType=local:TouchNumericTextBox},Path=(Validation.Errors)/ErrorContent}"></TextBlock>
                             </Canvas>
                             <DockPanel>
-                                <Grid DockPanel.Dock="Bottom" Height="2">
+                                <Grid DockPanel.Dock="Bottom" Height="2" Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent},Path=HideUnderline,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                     <Rectangle Height="1" Fill="{StaticResource TangoTextWatermarkBrush}" />
                                     <Rectangle Height="2" RenderTransformOrigin="0.5,0.5" >
                                         <Rectangle.Style>
diff --git a/Software/Visual_Studio/Tango.Touch/Styles/TouchNumericUpDownControl.xaml b/Software/Visual_Studio/Tango.Touch/Styles/TouchNumericUpDownControl.xaml
index 1fc25c0ec..961b22c0f 100644
--- a/Software/Visual_Studio/Tango.Touch/Styles/TouchNumericUpDownControl.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Styles/TouchNumericUpDownControl.xaml
@@ -82,7 +82,7 @@
                         </RepeatButton>
 
                         <controls:TouchNumericTextBox x:Name="Number_PART" Margin="50 4 0 0" FontSize="{StaticResource TangoMessageBoxMessageFontSize}"  HorizontalContentAlignment="Center" VerticalAlignment="Center" BorderBrush="{TemplateBinding BorderBrush}" VerticalContentAlignment="Center" UpdateBindingOnlyWhenFocused="True"
-                                                Value="{Binding Value,RelativeSource={RelativeSource AncestorType=controls:TouchNumericUpDownConrol}, Mode=TwoWay}"  Minimum="{Binding MinValue,RelativeSource={RelativeSource AncestorType=controls:TouchNumericUpDownConrol}}" Maximum="{Binding MaxValue,RelativeSource={RelativeSource AncestorType=controls:TouchNumericUpDownConrol}, Mode=TwoWay}"/>
+                                                Value="{Binding Value,RelativeSource={RelativeSource AncestorType=controls:TouchNumericUpDownConrol}, Mode=TwoWay}"  Minimum="{Binding MinValue,RelativeSource={RelativeSource AncestorType=controls:TouchNumericUpDownConrol}}" Maximum="{Binding MaxValue,RelativeSource={RelativeSource AncestorType=controls:TouchNumericUpDownConrol}, Mode=TwoWay}" HideUnderline="True"/>
 
 
                         <RepeatButton Background="Transparent"  Height="40" Margin="50 0 0 0" Padding="2" Style="{StaticResource emptyButton}"  Command="{Binding Path=IncrementCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=controls:TouchNumericUpDownConrol}, Mode=TwoWay}" VerticalAlignment="Center">