merge

6 files changed, 23 insertions, 10 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/AdvancedColorCorrectionView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/AdvancedColorCorrectionView.xaml
index 4317264ee..69eb1fd72 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/AdvancedColorCorrectionView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/AdvancedColorCorrectionView.xaml
@@ -37,7 +37,7 @@
             <DockPanel Grid.Row="2" Margin="0 0 0 0">
                 <TextBlock DockPanel.Dock="Top" Margin="40 0 0 0">Please select the best alternative</TextBlock>
 
-                <hive:HexList Width="340" Height="460" Margin="0 20 0 0" RowCount="6" ColumnCount="5" ItemsSource="{Binding Suggestions}" SelectedItem="{Binding SelectedSuggestion,Mode=TwoWay}">
+                <hive:HexList Width="330" Height="460" Margin="0 20 0 0" RowCount="6" ColumnCount="5" ItemsSource="{Binding Suggestions}" SelectedItem="{Binding SelectedSuggestion,Mode=TwoWay}">
                     <hive:HexList.ItemContainerStyle>
                         <Style TargetType="ListBoxItem">
                             <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/BasicColorCorrectionViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/BasicColorCorrectionViewVM.cs
index f772edb0a..3cfedd3f0 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/BasicColorCorrectionViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/BasicColorCorrectionViewVM.cs
@@ -43,10 +43,16 @@ namespace Tango.PPC.Jobs.Dialogs
         /// </summary>
         public List<ColorConversionSuggestion> Suggestions { get; set; }
 
+
+        private ColorConversionSuggestion _selectedSuggestion;
         /// <summary>
         /// Gets or sets the selected suggestion.
         /// </summary>
-        public ColorConversionSuggestion SelectedSuggestion { get; set; }
+        public ColorConversionSuggestion SelectedSuggestion
+        {
+            get { return _selectedSuggestion; }
+            set { _selectedSuggestion = value; RaisePropertyChangedAuto(); }
+        }
 
         /// <summary>
         /// Gets or sets the more options command.
@@ -82,5 +88,14 @@ namespace Tango.PPC.Jobs.Dialogs
             Result = ColorCorrectionDialogResult.None;
             base.Cancel();
         }
+
+        /// <summary>
+        /// Called when the dialog has been shown.
+        /// </summary>
+        public override void OnShow()
+        {
+            base.OnShow();
+            SelectedSuggestion = Suggestions.GetCenterSuggestion();
+        }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/FineTuningPaletteView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/FineTuningPaletteView.xaml
index cbec4afd8..0d6faa092 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/FineTuningPaletteView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Dialogs/FineTuningPaletteView.xaml
@@ -29,9 +29,7 @@
                                         <Setter Property="Content">
                                             <Setter.Value>
                                                 <Ellipse Width="70" Height="70" Fill="{Binding Brush}" HorizontalAlignment="Center">
-                                                    <Ellipse.Effect>
-                                                        <DropShadowEffect Color="{StaticResource TangoDropShadowColor}" ShadowDepth="10" Direction="10" BlurRadius="15" Opacity="1" />
-                                                    </Ellipse.Effect>
+
                                                 </Ellipse>
                                             </Setter.Value>
                                         </Setter>
@@ -88,7 +86,7 @@
                 </touch:TouchButton>
             </DockPanel>
 
-            <hive:HexList Width="340" Height="460" Margin="0 40 0 0" RowCount="6" ColumnCount="5" ItemsSource="{Binding HiveSuggestions}" SelectedItem="{Binding SelectedHiveSuggestion,Mode=TwoWay}">
+            <hive:HexList Width="330" Height="460" Margin="0 40 0 0" RowCount="6" ColumnCount="5" ItemsSource="{Binding HiveSuggestions}" SelectedItem="{Binding SelectedHiveSuggestion,Mode=TwoWay}">
                 <hive:HexList.ItemContainerStyle>
                     <Style TargetType="ListBoxItem">
                         <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
index 32e8a16be..a2927660f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
@@ -290,12 +290,12 @@ namespace Tango.PPC.Jobs.ViewModels
                     {
                         Jobs = jobs;
                         DraftJobsCollectionView = new ListCollectionView(Jobs);
-                        DraftJobsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Job.LastUpdated), ListSortDirection.Ascending));
+                        DraftJobsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Job.LastUpdated), ListSortDirection.Descending));
                         DraftJobsCollectionView.Filter = new Predicate<object>(x => (x as Job).JobStatus == JobStatuses.Draft);
 
 
                         HistoryJobsCollectionView = new ListCollectionView(Jobs);
-                        HistoryJobsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Job.LastUpdated), ListSortDirection.Ascending));
+                        HistoryJobsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Job.LastUpdated), ListSortDirection.Descending));
                         HistoryJobsCollectionView.Filter = new Predicate<object>(x => (x as Job).JobStatus != JobStatuses.Draft);
 
                         IsLoadingJobs = false;
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
index 3d2f7daa8..27c3cb93a 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
@@ -27,7 +27,7 @@
 
         <Grid Grid.Row="1">
             <DockPanel>
-                <Grid DockPanel.Dock="Bottom" Height="350" Background="{StaticResource TangoPrimaryBackgroundBrush}">
+                <Grid DockPanel.Dock="Bottom" Height="350">
                     <StackPanel Margin="50 0 50 0">
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 60 0 0">
                         <touch:TouchButton FontSize="{StaticResource TangoExpanderHeaderFontSize}" Command="{Binding EditCommand}" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" RippleBrush="{StaticResource TangoRippleDarkBrush}" Background="Transparent" EnableDropShadow="False" Height="80" Padding="0" Width="270" Foreground="{StaticResource TangoPrimaryAccentBrush}" CornerRadius="40" BlurRadius="20" HorizontalAlignment="Right">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index 22c42eed7..a7062d036 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -171,7 +171,7 @@
                                     </Style.Triggers>
                                 </Style>
                             </DockPanel.Style>
-                            <Border DockPanel.Dock="Left" Background="{Binding SegmentBrush}">
+                            <Border DockPanel.Dock="Left" Background="{Binding SegmentBrush}" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoLightBorderBrush}">
                                 <Border.Style>
                                     <Style TargetType="Border">
                                         <Setter Property="CornerRadius" Value="8 0 0 8"></Setter>