"Light Inks Installed" & "Use Light Inks When Possible"

3 files changed, 23 insertions, 1 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj
index 00cc18382..d6bacb50c 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj
@@ -112,6 +112,10 @@
       <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
       <Name>Tango.BL</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.ColorConversion\Tango.ColorConversion.csproj">
+      <Project>{b4fe6485-4161-4b36-bc08-67e0b53d01b7}</Project>
+      <Name>Tango.ColorConversion</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.Core\Tango.Core.csproj">
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
@@ -166,7 +170,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
index 523934985..1565cda5a 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
@@ -12,6 +12,7 @@ using Tango.BL;
 using Tango.BL.Builders;
 using Tango.BL.Entities;
 using Tango.BL.Enumerations;
+using Tango.ColorConversion;
 using Tango.Core.Commands;
 using Tango.Core.DI;
 using Tango.Core.ExtensionMethods;
@@ -22,6 +23,7 @@ using Tango.PPC.Common.Lubrication;
 using Tango.PPC.Common.Messages;
 using Tango.PPC.Common.OS;
 using Tango.PPC.Common.UWF;
+using Tango.Settings;
 using Tango.SharedUI.Components;
 using Tango.WiFi;
 
@@ -234,6 +236,14 @@ namespace Tango.PPC.MachineSettings.ViewModels
             set { _selectedLubricationLevel = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _useLightInks;
+        public bool UseLightInks
+        {
+            get { return _useLightInks; }
+            set { _useLightInks = value; RaisePropertyChangedAuto(); }
+        }
+
+
         #endregion
 
         #region Commands
@@ -292,6 +302,9 @@ namespace Tango.PPC.MachineSettings.ViewModels
 
                 MachineDataSynchronizer.IsEnabled = SynchronizeJobs || SynchronizeDiagnostics;
 
+                var colorConversionSettings = SettingsManager.Default.GetOrCreate<ColorConversionSettings>();
+                colorConversionSettings.UseLightInks = UseLightInks;
+
                 Settings.Save();
 
                 await MachineProvider.SaveMachine();
@@ -422,6 +435,9 @@ namespace Tango.PPC.MachineSettings.ViewModels
 
             AutoCheckForUpdates = Settings.AutoCheckForUpdates;
 
+            var colorConversionSettings = SettingsManager.Default.GetOrCreate<ColorConversionSettings>();
+            UseLightInks = colorConversionSettings.UseLightInks;
+
             SelectedTimeZone = TimeZones.SingleOrDefault(x => x.StandardName == TimeZone.CurrentTimeZone.StandardName);
             _previousTimeZone = SelectedTimeZone;
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
index e69c57753..b3056c36e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
@@ -160,6 +160,8 @@
                                             <TextBlock VerticalAlignment="Bottom">Default Segment Length</TextBlock>
                                             <touch:TouchNumericTextBox HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" Minimum="1" Maximum="1000" Value="{Binding Settings.DefaultSegmentLength}" HasDecimalPoint="True" KeyboardContainer="{Binding ElementName=Container}"></touch:TouchNumericTextBox>
 
+                                            <TextBlock VerticalAlignment="Bottom">Use Light Inks When Possible</TextBlock>
+                                            <touch:TouchToggleSlider Style="{StaticResource TangoToggleButtonGrayAccent}" VerticalAlignment="Bottom" HorizontalAlignment="Right" Width="90" IsChecked="{Binding UseLightInks}"></touch:TouchToggleSlider>
                                         </controls:TableGrid>
 
                                         <DockPanel Margin="10 -50 0 0">