Color selection and Job sequence package. Redesign list control, move Color Selection View to dialogs, implement save.

3 files changed, 25 insertions, 14 deletions

diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
index 18fb0726f..ad185f1a3 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
@@ -117,7 +117,14 @@ namespace Tango.Touch.Controls
         public static readonly DependencyProperty UpdateBindingOnlyWhenFocusedProperty =
             DependencyProperty.Register("UpdateBindingOnlyWhenFocused", typeof(bool), typeof(TouchNumericTextBox), new PropertyMetadata(false));
 
-
+        public virtual bool HasError
+        {
+            get
+            {
+                return Validation.GetHasError(this);
+            }
+        }
+        
 
         public override void OnApplyTemplate()
         {
@@ -161,13 +168,16 @@ namespace Tango.Touch.Controls
                     value = Math.Round(value, 0);
                 }
 
-                if (value < Minimum)
-                {
-                    value = Minimum;
-                }
-                else if (value > Maximum)
+                if (Maximum > Minimum)
                 {
-                    value = Maximum;
+                    if (value < Minimum)
+                    {
+                        value = Minimum;
+                    }
+                    else if (value > Maximum)
+                    {
+                        value = Maximum;
+                    }
                 }
             }
 
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml
index d347480d6..f26e53e73 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.xaml
@@ -8,8 +8,8 @@
                     xmlns:local="clr-namespace:Tango.Touch.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <!--<ResourceDictionary Source="../Resources/Colors.xaml" />-->
-        <components:SharedResourceDictionary Source="../Resources/Colors.xaml" />
+        <ResourceDictionary Source="../Resources/Colors.xaml" />
+        <!--<components:SharedResourceDictionary Source="../Resources/Colors.xaml" />-->
         <components:SharedResourceDictionary Source="../Resources/Fonts.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
@@ -40,8 +40,8 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}" keyboard:KeyboardView.Container="{TemplateBinding KeyboardContainer}">
                         <DockPanel>
-                            <Canvas DockPanel.Dock="Bottom" Visibility="{Binding RelativeSource={RelativeSource AncestorType=local:TouchNumericTextBox},Path=(Validation.HasError),Converter={StaticResource BooleanToVisibilityConverter}}">
-                                <TextBlock FontSize="12" Foreground="{StaticResource TangoValidationErrorBrush}" Margin="0 5 0 0" Text="{Binding RelativeSource={RelativeSource AncestorType=local:TouchNumericTextBox},Path=(Validation.Errors).CurrentItem.ErrorContent}"></TextBlock>
+                            <Canvas DockPanel.Dock="Bottom" Visibility="{Binding RelativeSource={RelativeSource AncestorType=local:TouchNumericTextBox},Path=HasError,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <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">
@@ -72,7 +72,7 @@
                                                             </BeginStoryboard>
                                                         </DataTrigger.ExitActions>
                                                     </DataTrigger>
-                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=local:TouchNumericTextBox},Path=(Validation.HasError)}" Value="True">
+                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=local:TouchNumericTextBox},Path=HasError}" Value="True">
                                                         <Setter Property="Fill" Value="{StaticResource TangoValidationErrorBrush}"></Setter>
                                                         <Setter Property="RenderTransform">
                                                             <Setter.Value>
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml
index dcb52859e..c95c87782 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchTextBox.xaml
@@ -8,7 +8,8 @@
                     xmlns:local="clr-namespace:Tango.Touch.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <components:SharedResourceDictionary Source="../Resources/Colors.xaml" />
+        <!--<components:SharedResourceDictionary Source="../Resources/Colors.xaml" />-->
+        <ResourceDictionary Source="../Resources/Colors.xaml" />
 
         <ResourceDictionary>
             <converters:StringNullOrEmptyToBooleanConverter x:Key="StringNullOrEmptyToBooleanConverter" />
@@ -39,7 +40,7 @@
                         <DockPanel>
                             <Border DockPanel.Dock="Bottom" Visibility="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=(Validation.HasError),Converter={StaticResource BooleanToVisibilityConverter}}">
                                 <Canvas>
-                                    <TextBlock FontSize="12" Width="{Binding RelativeSource={RelativeSource AncestorType=Border},Path=ActualWidth}" Foreground="{StaticResource TangoValidationErrorBrush}" Margin="0 5 0 0" TextWrapping="Wrap" Text="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=(Validation.Errors).CurrentItem.ErrorContent}"></TextBlock>
+                                    <TextBlock FontSize="12" Width="{Binding RelativeSource={RelativeSource AncestorType=Border},Path=ActualWidth}" Foreground="{StaticResource TangoValidationErrorBrush}" Margin="0 5 0 0" TextWrapping="Wrap" Text="{Binding RelativeSource={RelativeSource AncestorType=local:TouchTextBox},Path=(Validation.Errors)/ErrorContent}"></TextBlock>
                                 </Canvas>
                             </Border>
                             <DockPanel>