Working on PPC.

24 files changed, 240 insertions, 100 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs
index 2a68344fb..ff46f9c9f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Panel PC Jobs Module")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.3.1536")]
 
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index 7cc76bdcc..f3e7711f9 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -42,6 +42,16 @@ namespace Tango.PPC.Jobs.ViewModels
 
         #region Properties
 
+        private BL.Enumerations.JobStatuses _jobStatus;
+        /// <summary>
+        /// Gets or sets the temporary job status.
+        /// </summary>
+        public BL.Enumerations.JobStatuses JobStatus
+        {
+            get { return _jobStatus; }
+            set { _jobStatus = value; RaisePropertyChangedAuto(); }
+        }
+
         private Job _job;
         /// <summary>
         /// Gets or sets the selected job.
@@ -190,6 +200,20 @@ namespace Tango.PPC.Jobs.ViewModels
         /// </summary>
         public RelayCommand DyeCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the approve sample command.
+        /// </summary>
+        public RelayCommand ApproveSampleCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the repeat sample dye command.
+        /// </summary>
+        public RelayCommand RepeatSampleDyeCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets another sample command.
+        /// </summary>
+        public RelayCommand AnotherSampleCommand { get; set; }
         #endregion
 
         #region Constructors
@@ -220,7 +244,7 @@ namespace Tango.PPC.Jobs.ViewModels
             RemoveSegmentCommand = new RelayCommand<Segment>(RemoveSegment);
             RemoveBrushStopCommand = new RelayCommand<BrushStop>(RemoveBrushStop);
             RemoveJobCommand = new RelayCommand(RemoveJob);
-            SaveJobCommand = new RelayCommand(SaveJob);
+            SaveJobCommand = new RelayCommand(() => SaveJob());
             ReplaceBrushStopCommand = new RelayCommand<BrushStop>(InvokeColorAdjustmentForBrushStop);
             TwineCatalogFieldTapCommand = new RelayCommand<BrushStop>(InvokeTwineCatalogForBrushStop);
             IncreaseDecreaseSamplesToDyeCommand = new RelayCommand<string>((x) =>
@@ -240,6 +264,10 @@ namespace Tango.PPC.Jobs.ViewModels
 
             StartSampleDyeCommand = new RelayCommand(StartSampleDye);
             DyeCommand = new RelayCommand(StartJob, CanStartJob);
+
+            ApproveSampleCommand = new RelayCommand(ApproveSampleDye);
+            RepeatSampleDyeCommand = new RelayCommand(RepeatSampleDye);
+            AnotherSampleCommand = new RelayCommand(DyeAnotherSample);
         }
 
         #endregion
@@ -249,13 +277,22 @@ namespace Tango.PPC.Jobs.ViewModels
         /// <summary>
         /// Saves the job.
         /// </summary>
-        private async void SaveJob()
+        private async void SaveJob(bool displayNotification = true)
         {
+            if (JobStatus != BL.Enumerations.JobStatuses.Draft)
+            {
+                Job.JobStatus = JobStatus;
+            }
+
             if (Job.Validate(_db))
             {
                 await _db.SaveChangesAsync();
                 RaiseMessage(new JobSavedMessage() { Job = Job });
-                await NotificationProvider.ShowInfo(String.Format("Job '{0}' saved successfully.", Job.Name));
+
+                if (displayNotification)
+                {
+                    await NotificationProvider.ShowInfo(String.Format("Job '{0}' saved successfully.", Job.Name));
+                }
             }
         }
 
@@ -468,11 +505,48 @@ namespace Tango.PPC.Jobs.ViewModels
                 }
             }
 
-            MachineProvider.MachineOperator.Print(sampleDyeJob);
+            SaveJob(false);
+
+            var thisJob = Job;
+
+            MachineProvider.MachineOperator.Print(sampleDyeJob).Completed += (x, e) =>
+            {
+                thisJob.JobStatus = BL.Enumerations.JobStatuses.PendingApproval;
+
+                if (Job != null && Job.Guid == thisJob.Guid)
+                {
+                    JobStatus = BL.Enumerations.JobStatuses.PendingApproval;
+                }
+            };
 
             NavigationManager.NavigateTo<JobsModule>(nameof(JobProgressView));
         }
 
+        /// <summary>
+        /// Sets the job status back to not approved.
+        /// </summary>
+        private void RepeatSampleDye()
+        {
+            JobStatus = BL.Enumerations.JobStatuses.Draft;
+        }
+
+        /// <summary>
+        /// Approves the sample dye.
+        /// </summary>
+        private void ApproveSampleDye()
+        {
+            JobStatus = BL.Enumerations.JobStatuses.Approved;
+            SaveJob(false);
+        }
+
+        /// <summary>
+        /// Dyes another sample.
+        /// </summary>
+        private void DyeAnotherSample()
+        {
+            JobStatus = BL.Enumerations.JobStatuses.Draft;
+        }
+
         #endregion
 
         #region Out Of Gamut Check Thread
@@ -521,51 +595,46 @@ namespace Tango.PPC.Jobs.ViewModels
         /// </summary>
         public async override void OnNavigatedTo()
         {
-            if (_job_to_load == null || (_job_to_load != null && Job != null && _job_to_load.Guid == Job.Guid))
+            if (!(_job_to_load == null || (_job_to_load != null && Job != null && _job_to_load.Guid == Job.Guid)))
             {
-                if (_job_to_load_intent == JobNavigationIntent.SampleDye)
+                NotificationProvider.SetGlobalBusyMessage("Loading job details...");
+
+                _can_navigate_back = false;
+                base.OnNavigatedTo();
+
+                if (_db != null)
                 {
-                    View.DisplaySampleDye();
+                    _db.Dispose();
                 }
-                return;
-            }
 
-            NotificationProvider.SetGlobalBusyMessage("Loading job details...");
+                _db = ObservablesContext.CreateDefault();
+                var a = _db.Jobs.ToList();
+                Job = await _db.Jobs.SingleOrDefaultAsync(x => x.Guid == _job_to_load.Guid);
+                Job.ValidateOnPropertyChanged = true;
+                Rmls = await _db.Rmls.ToListAsync();
+                ColorSpaces = await _db.ColorSpaces.ToListAsync();
+                SpoolTypes = await _db.SpoolTypes.ToListAsync();
+                Customers = await _db.Customers.Where(x => x.OrganizationGuid == MachineProvider.Machine.OrganizationGuid).ToListAsync();
 
-            _can_navigate_back = false;
-            base.OnNavigatedTo();
+                if (!_check_gamut_thread.IsAlive)
+                {
+                    _check_gamut_thread.Start();
+                }
 
-            if (_db != null)
-            {
-                _db.Dispose();
-            }
+                SegmentsCollectionView = CollectionViewSource.GetDefaultView(Job.Segments);
+                SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending));
 
-            _db = ObservablesContext.CreateDefault();
-            var a = _db.Jobs.ToList();
-            Job = await _db.Jobs.SingleOrDefaultAsync(x => x.Guid == _job_to_load.Guid);
-            Job.ValidateOnPropertyChanged = true;
-            Rmls = await _db.Rmls.ToListAsync();
-            ColorSpaces = await _db.ColorSpaces.ToListAsync();
-            SpoolTypes = await _db.SpoolTypes.ToListAsync();
-            Customers = await _db.Customers.Where(x => x.OrganizationGuid == MachineProvider.Machine.OrganizationGuid).ToListAsync();
+                InvokeUIOnIdle(() =>
+                {
+                    NotificationProvider.ReleaseGlobalBusyMessage();
+                });
 
-            if (!_check_gamut_thread.IsAlive)
-            {
-                _check_gamut_thread.Start();
+                _job_to_load = null;
             }
 
-            SegmentsCollectionView = CollectionViewSource.GetDefaultView(Job.Segments);
-            SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending));
-
-            InvokeUIOnIdle(() =>
-            {
-                NotificationProvider.ReleaseGlobalBusyMessage();
-            });
-
-            _job_to_load = null;
-
             if (_job_to_load_intent == JobNavigationIntent.SampleDye)
             {
+                JobStatus = Job.JobStatus;
                 View.DisplaySampleDye();
             }
         }
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 ec68377a7..bfd571db0 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
@@ -574,55 +574,129 @@
 
                                 <StackPanel Margin="60 20 0 0">
 
-                                    <ContentControl Content="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext}">
+                                    <ContentControl>
                                         <ContentControl.Style>
                                             <Style TargetType="ContentControl">
-                                                <Setter Property="ContentTemplate">
+                                                <Setter Property="Content">
                                                     <Setter.Value>
-                                                        <DataTemplate>
-                                                            <StackPanel>
-                                                                <TextBlock>
+                                                        <StackPanel>
+                                                            <ContentControl Content="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext}">
+                                                                <ContentControl.Style>
+                                                                    <Style TargetType="ContentControl">
+                                                                        <Setter Property="ContentTemplate">
+                                                                            <Setter.Value>
+                                                                                <DataTemplate>
+                                                                                    <StackPanel>
+                                                                                        <TextBlock>
                                                                     <Run>Dye 1 or more units in order to get approval.</Run>
                                                                     <LineBreak/>
                                                                     <Run>Once approved, you can dye the entire job.</Run>
-                                                                </TextBlock>
+                                                                                        </TextBlock>
 
-                                                                <DockPanel Margin="0 50 0 0" LastChildFill="True" Width="450" HorizontalAlignment="Left">
-                                                                    <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center">How many sample units?</TextBlock>
+                                                                                        <DockPanel Margin="0 50 0 0" LastChildFill="True" Width="450" HorizontalAlignment="Left">
+                                                                                            <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center">How many sample units?</TextBlock>
 
-                                                                    <DockPanel Margin="50 0 0 0">
-                                                                        <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="-" DockPanel.Dock="Left" Icon="Minus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
-                                                                        <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="+" DockPanel.Dock="Right" Icon="Plus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
-                                                                        <touch:TouchNumericTextBox Value="{Binding Job.SampleUnitsOrMeters}" Minimum="1" Maximum="100" HorizontalContentAlignment="Center" VerticalAlignment="Center" Margin="10 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoTitleFontSize}" DockPanel.Dock="Right" KeyboardContainer="{Binding ElementName=Container}" />
-                                                                    </DockPanel>
-                                                                </DockPanel>
-                                                            </StackPanel>
-                                                        </DataTemplate>
+                                                                                            <DockPanel Margin="50 0 0 0">
+                                                                                                <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="-" DockPanel.Dock="Left" Icon="Minus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
+                                                                                                <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="+" DockPanel.Dock="Right" Icon="Plus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
+                                                                                                <touch:TouchNumericTextBox Value="{Binding Job.SampleUnitsOrMeters}" Minimum="1" Maximum="100" HorizontalContentAlignment="Center" VerticalAlignment="Center" Margin="10 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoTitleFontSize}" DockPanel.Dock="Right" KeyboardContainer="{Binding ElementName=Container}" />
+                                                                                            </DockPanel>
+                                                                                        </DockPanel>
+                                                                                    </StackPanel>
+                                                                                </DataTemplate>
+                                                                            </Setter.Value>
+                                                                        </Setter>
+                                                                        <Style.Triggers>
+                                                                            <DataTrigger Binding="{Binding Job.JobType}" Value="{x:Static enumerations:JobTypes.Sewing}">
+                                                                                <Setter Property="ContentTemplate">
+                                                                                    <Setter.Value>
+                                                                                        <DataTemplate>
+                                                                                            <StackPanel>
+                                                                                                <TextBlock>
+                                                                    <Run>Dye several meters per segment in order to get approval.</Run>
+                                                                    <LineBreak/>
+                                                                    <Run>Once approved, you can dye the entire job.</Run>
+                                                                                                </TextBlock>
+
+                                                                                                <DockPanel Margin="0 50 0 0" LastChildFill="True" Width="450" HorizontalAlignment="Left">
+                                                                                                    <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center">Meters per segment</TextBlock>
+
+                                                                                                    <DockPanel Margin="50 0 0 0">
+                                                                                                        <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="-" DockPanel.Dock="Left" Icon="Minus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
+                                                                                                        <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="+" DockPanel.Dock="Right" Icon="Plus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
+                                                                                                        <touch:TouchNumericTextBox Value="{Binding Job.SampleUnitsOrMeters}" Minimum="1" Maximum="100" HorizontalContentAlignment="Center" VerticalAlignment="Center" Margin="10 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoTitleFontSize}" DockPanel.Dock="Right" KeyboardContainer="{Binding ElementName=Container}" />
+                                                                                                    </DockPanel>
+                                                                                                </DockPanel>
+                                                                                            </StackPanel>
+                                                                                        </DataTemplate>
+                                                                                    </Setter.Value>
+                                                                                </Setter>
+                                                                            </DataTrigger>
+                                                                        </Style.Triggers>
+                                                                    </Style>
+                                                                </ContentControl.Style>
+                                                            </ContentControl>
+
+                                                            <touch:TouchButton Margin="0 50 0 15" DockPanel.Dock="Right" Height="54" Padding="0" Width="184" CornerRadius="30" BlurRadius="20" HorizontalAlignment="Right" Command="{Binding StartSampleDyeCommand}">
+                                                                START
+                                                            </touch:TouchButton>
+                                                        </StackPanel>
                                                     </Setter.Value>
                                                 </Setter>
+
                                                 <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding Job.JobType}" Value="{x:Static enumerations:JobTypes.Sewing}">
-                                                        <Setter Property="ContentTemplate">
+                                                    <DataTrigger Binding="{Binding JobStatus}" Value="{x:Static enumerations:JobStatuses.PendingApproval}">
+                                                        <Setter Property="Content">
                                                             <Setter.Value>
-                                                                <DataTemplate>
-                                                                    <StackPanel>
-                                                                        <TextBlock>
-                                                                    <Run>Dye several meters per segment in order to get approval.</Run>
-                                                                    <LineBreak/>
-                                                                    <Run>Once approved, you can dye the entire job.</Run>
-                                                                        </TextBlock>
+                                                                <StackPanel>
+                                                                    <TextBlock>How to continue?</TextBlock>
 
-                                                                        <DockPanel Margin="0 50 0 0" LastChildFill="True" Width="450" HorizontalAlignment="Left">
-                                                                            <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center">Meters per segment</TextBlock>
+                                                                    <UniformGrid Columns="2" Width="420" HorizontalAlignment="Left" Margin="0 40 0 20">
+                                                                        <StackPanel HorizontalAlignment="Left">
+                                                                            <touch:TouchButton Style="{StaticResource TangoHollowButton}" Width="180" Height="50" Command="{Binding ApproveSampleCommand}">
+                                                                                <StackPanel Orientation="Horizontal">
+                                                                                    <touch:TouchIcon Icon="Check"></touch:TouchIcon>
+                                                                                    <TextBlock Margin="10 0 0 0">DONE</TextBlock>
+                                                                                </StackPanel>
+                                                                            </touch:TouchButton>
 
-                                                                            <DockPanel Margin="50 0 0 0">
-                                                                                <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="-" DockPanel.Dock="Left" Icon="Minus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
-                                                                                <touch:TouchIconButton Command="{Binding IncreaseDecreaseSamplesToDyeCommand}" CommandParameter="+" DockPanel.Dock="Right" Icon="Plus" Padding="15" Style="{StaticResource TangoHollowButton}" BorderThickness="2" Width="51" Height="51" />
-                                                                                <touch:TouchNumericTextBox Value="{Binding Job.SampleUnitsOrMeters}" Minimum="1" Maximum="100" HorizontalContentAlignment="Center" VerticalAlignment="Center" Margin="10 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontSize="{StaticResource TangoTitleFontSize}" DockPanel.Dock="Right" KeyboardContainer="{Binding ElementName=Container}" />
-                                                                            </DockPanel>
-                                                                        </DockPanel>
-                                                                    </StackPanel>
-                                                                </DataTemplate>
+                                                                            <TextBlock Margin="0 15 0 0" TextAlignment="Center">The sample is approved</TextBlock>
+                                                                        </StackPanel>
+
+                                                                        <StackPanel HorizontalAlignment="Right">
+                                                                            <touch:TouchButton Style="{StaticResource TangoHollowButton}" Width="180" Height="50" Command="{Binding RepeatSampleDyeCommand}">
+                                                                                <StackPanel Orientation="Horizontal">
+                                                                                    <touch:TouchIcon Icon="Repeat"></touch:TouchIcon>
+                                                                                    <TextBlock Margin="10 0 0 0">REPEAT</TextBlock>
+                                                                                </StackPanel>
+                                                                            </touch:TouchButton>
+
+                                                                            <TextBlock Margin="0 15 0 0" TextAlignment="Center">Dye more samples</TextBlock>
+                                                                        </StackPanel>
+                                                                    </UniformGrid>
+
+                                                                </StackPanel>
+                                                            </Setter.Value>
+                                                        </Setter>
+                                                    </DataTrigger>
+
+                                                    <DataTrigger Binding="{Binding JobStatus}" Value="{x:Static enumerations:JobStatuses.Approved}">
+                                                        <Setter Property="Content">
+                                                            <Setter.Value>
+                                                                <StackPanel Margin="0 40 80 40">
+                                                                    <DockPanel LastChildFill="False">
+                                                                        <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center">
+                                                                            <Run>Sample Approved:</Run>
+                                                                            <Run Text="{Binding Job.LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}"></Run>
+                                                                        </TextBlock>
+                                                                        <touch:TouchButton DockPanel.Dock="Right" HorizontalAlignment="Right" Style="{StaticResource TangoHollowButton}" Width="220" Height="50" Command="{Binding AnotherSampleCommand}">
+                                                                            <StackPanel Orientation="Horizontal">
+                                                                                <touch:TouchIcon Icon="Plus"></touch:TouchIcon>
+                                                                                <TextBlock Margin="10 0 0 0">ANOTHER SAMPLE</TextBlock>
+                                                                            </StackPanel>
+                                                                        </touch:TouchButton>
+                                                                    </DockPanel>
+                                                                </StackPanel>
                                                             </Setter.Value>
                                                         </Setter>
                                                     </DataTrigger>
@@ -630,10 +704,6 @@
                                             </Style>
                                         </ContentControl.Style>
                                     </ContentControl>
-
-                                    <touch:TouchButton Margin="0 50 0 15" DockPanel.Dock="Right" Height="54" Padding="0" Width="184" CornerRadius="30" BlurRadius="20" HorizontalAlignment="Right" Command="{Binding StartSampleDyeCommand}">
-                                        START
-                                    </touch:TouchButton>
                                 </StackPanel>
                             </touch:TouchExpander>
                         </StackPanel>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs
index 0e632a2ee..254e25c85 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Panel PC Common Library")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.3.1536")]
 
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index 7f1c1a115..9900a5b27 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -99,8 +99,8 @@
             <DockPanel>
                 <Border BorderThickness="0 0 0 1" BorderBrush="{StaticResource TangoDividerBrush}" DockPanel.Dock="Top">
                     <DockPanel>
-                        <Border Padding="20" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDividerBrush}">
-                            <touch:TouchHamburgerButton Width="50" Command="{Binding MenuOrBackCommand}" EnableDropShadow="False" Height="50" Foreground="{StaticResource TangoPrimaryAccentBrush}" IsBack="{Binding NavigationManager.CanNavigateBack}">
+                        <Border BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDividerBrush}">
+                            <touch:TouchHamburgerButton Width="100" Height="100" Padding="15" Command="{Binding MenuOrBackCommand}" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" IsBack="{Binding NavigationManager.CanNavigateBack}">
                                 <touch:TouchHamburgerButton.Effect>
                                     <DropShadowEffect ShadowDepth="15" BlurRadius="20" Color="Silver" />
                                 </touch:TouchHamburgerButton.Effect>
diff --git a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs
index 8322212d9..2eb4047d6 100644
--- a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@ using System.Windows.Markup;
 [assembly: AssemblyCompany("ic#code")]
 [assembly: AssemblyProduct("SharpDevelop")]
 [assembly: AssemblyCopyright("2000-2013 AlphaSierraPapa for the SharpDevelop Team")]
-[assembly: AssemblyVersion("1.0.7.1321")]
+[assembly: AssemblyVersion("1.0.11.1536")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2243:AttributeStringLiteralsShouldParseCorrectly",
diff --git a/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs
index 87e64731d..e548e7917 100644
--- a/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs
@@ -6,6 +6,6 @@ using System.Windows.Markup;
 
 [assembly: AssemblyTitle("Tango - GIF Animation Library")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.4.1536")]
 
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
index e602c9b09..a44f2a3af 100644
--- a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
@@ -4,4 +4,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Business logic components")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.0.7.1321")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.0.12.1536")]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
index 89293f32d..a2d51cf05 100644
--- a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Core Components")]
-[assembly: AssemblyVersion("2.0.8.1341")]
+[assembly: AssemblyVersion("2.0.13.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
index 71fcb7189..08934c967 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Remote Data Access Layer")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.12.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs
index 65acf8597..8b7968bf4 100644
--- a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Drag & Drop Components")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.11.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs
index 702681d55..0a2d10a13 100644
--- a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Hive UI Components")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.8.1536")]
 
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
index 1a301baad..7ec6dd065 100644
--- a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Logging Library")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.10.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs
index 35ad3b6c7..7058d26a2 100644
--- a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Logging Library")]
-[assembly: AssemblyVersion("2.0.11.1321")]
+[assembly: AssemblyVersion("2.0.16.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs
index 4946d0146..774bcdb36 100644
--- a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Message Repository")]
-[assembly: AssemblyVersion("2.0.8.1321")]
+[assembly: AssemblyVersion("2.0.13.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs
index 71fe010f7..50f0b2612 100644
--- a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Components")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.12.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs
index 621428c91..c675c1cc5 100644
--- a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Roslyn Scripting Components")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.11.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs
index bfb3a6f10..ac3317beb 100644
--- a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Serialization Components")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.12.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs
index 045739629..c52479659 100644
--- a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Global Settings")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.12.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs
index 2647565d8..6d98d4c35 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Shared UI Components")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.11.1536")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchHamburgerButton.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchHamburgerButton.xaml
index de43234a3..b993776ca 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchHamburgerButton.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchHamburgerButton.xaml
@@ -9,9 +9,10 @@
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
         <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="RippleBrush" Value="Transparent"></Setter>
         <Setter Property="HorizontalContentAlignment" Value="Center"/>
         <Setter Property="VerticalContentAlignment" Value="Center"/>
-        <Setter Property="CornerRadius" Value="50"></Setter>
+        <Setter Property="CornerRadius" Value="0"></Setter>
         <Setter Property="Width" Value="37" />
         <Setter Property="Height" Value="37" />
         <Setter Property="Padding" Value="1"/>
@@ -139,7 +140,7 @@
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                         <components:Ripple CornerRadius="{TemplateBinding CornerRadius}">
-                            <Viewbox>
+                            <Viewbox Margin="{TemplateBinding Padding}">
                                 <Canvas x:Name="canvas" Width="24" Height="24" RenderTransformOrigin="0.5,0.5">
                                     <Canvas.RenderTransform>
                                         <TransformGroup>
diff --git a/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs
index 323667fbd..00cdb87dd 100644
--- a/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Touch Components")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.4.1536")]
 [assembly: ComVisible(false)]
 
 [assembly:ThemeInfo(
diff --git a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
index a7c0a8fd2..1347f62e4 100644
--- a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Transport Components")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.10.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs
index ff7092647..87212ed31 100644
--- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Compilation CLI")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.12.1536")]
 [assembly: ComVisible(false)]
\ No newline at end of file