Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

2 files changed, 51 insertions, 1 deletions

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 c858e982e..b413fee0d 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
@@ -86,6 +86,27 @@ namespace Tango.PPC.MachineSettings.ViewModels
             set { _enableRemoteAssistance = value; RaisePropertyChangedAuto(); OnEnableRemoteAssistanceChanged(); }
         }
 
+        private bool _enableLockScreen;
+        public bool EnableLockScreen
+        {
+            get { return _enableLockScreen; }
+            set { _enableLockScreen = value; RaisePropertyChangedAuto(); }
+        }
+
+        private int _lockScreenTimeoutMinutes;
+        public int LockScreenTimeoutMinutes
+        {
+            get { return _lockScreenTimeoutMinutes; }
+            set { _lockScreenTimeoutMinutes = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _lockScreenPassword;
+        public String LockScreenPassword
+        {
+            get { return _lockScreenPassword; }
+            set { _lockScreenPassword = value; RaisePropertyChangedAuto(); }
+        }
+
         #endregion
 
         #region Commands
@@ -125,6 +146,9 @@ namespace Tango.PPC.MachineSettings.ViewModels
                 Settings.HotSpotPassword = HotSpotPassword;
                 Settings.EnableExternalBridge = EnableExternalBridge;
                 Settings.ExternalBridgePassword = ExternalBridgePassword;
+                Settings.EnableLockScreen = EnableLockScreen;
+                Settings.LockScreenTimeout = TimeSpan.FromMinutes(LockScreenTimeoutMinutes);
+                Settings.LockScreenPassword = LockScreenPassword;
                 Settings.Save();
 
                 await MachineProvider.SaveMachine();
@@ -166,6 +190,9 @@ namespace Tango.PPC.MachineSettings.ViewModels
             _enableRemoteAssistance = RemoteAssistanceProvider.IsEnabled;
             RaisePropertyChanged(nameof(EnableRemoteAssistance));
 
+            EnableLockScreen = Settings.EnableLockScreen;
+            LockScreenTimeoutMinutes = (int)Settings.LockScreenTimeout.TotalMinutes;
+            LockScreenPassword = Settings.LockScreenPassword;
 
             SelectedJobTypes = new SelectedObjectCollection<JobTypes>(Enum.GetValues(typeof(JobTypes)).Cast<JobTypes>().ToObservableCollection(), Machine.SupportedJobTypes.ToObservableCollection());
             SelectedColorSpaces = new SelectedObjectCollection<ColorSpaces>(Enum.GetValues(typeof(ColorSpaces)).Cast<ColorSpaces>().Where(x => x.IsUserSpace()).ToObservableCollection(), Machine.SupportedColorSpaces.ToObservableCollection());
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 4f846a46d..dd5f89bb2 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
@@ -11,7 +11,7 @@
              xmlns:global="clr-namespace:Tango.PPC.MachineSettings"
              xmlns:local="clr-namespace:Tango.PPC.MachineSettings.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="2000" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+             d:DesignHeight="2500" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
 
     <Grid Background="{StaticResource TangoMidBackgroundBrush}">
         <Grid.RowDefinitions>
@@ -172,6 +172,29 @@
                                         </DockPanel>
                                     </StackPanel>
                                 </touch:TouchExpander>
+
+                                <!--LOCK SCREEN-->
+                                <touch:TouchExpander Margin="0 20 0 0" Header="Lock Screen" IsExpanded="True" FontSize="{StaticResource TangoExpanderHeaderFontSize}">
+                                    <StackPanel>
+                                        <controls:TableGrid Margin="10" RowHeight="60" MakeFirstColumnVerticalAlignmentBottom="False" TextElement.FontSize="{StaticResource TangoDefaultFontSize}">
+                                            <TextBlock VerticalAlignment="Center">Enable Lock Screen</TextBlock>
+                                            <touch:TouchToggleSlider Style="{StaticResource TangoToggleButtonGrayAccent}" HorizontalAlignment="Right" Margin="0 0 110 0" Width="90" IsChecked="{Binding EnableLockScreen}"></touch:TouchToggleSlider>
+
+                                            <TextBlock VerticalAlignment="Bottom">Lock Screen Timeout (m)</TextBlock>
+                                            <touch:TouchNumericTextBox HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" Minimum="1" Maximum="60" Value="{Binding LockScreenTimeoutMinutes}" HasDecimalPoint="False" KeyboardContainer="{Binding ElementName=Container}"></touch:TouchNumericTextBox>
+
+                                            <TextBlock VerticalAlignment="Bottom">Lock Screen Password</TextBlock>
+                                            <touch:TouchTextBox IsPassword="True" Watermark="•••••••" HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" Text="{Binding LockScreenPassword}" KeyboardContainer="{Binding ElementName=Container}"></touch:TouchTextBox>
+                                        </controls:TableGrid>
+
+                                        <DockPanel Margin="10 -50 0 0">
+                                            <touch:TouchIcon VerticalAlignment="Top" Icon="InformationOutline" Foreground="{StaticResource TangoGrayTextBrush}"></touch:TouchIcon>
+                                            <TextBlock Margin="10 0 0 0" VerticalAlignment="Top" TextWrapping="Wrap" FontSize="{StaticResource TangoSmallFontSize}" Foreground="{StaticResource TangoGrayTextBrush}">
+                                                Enable the lock screen to protect the panel from unauthorized access.
+                                            </TextBlock>
+                                        </DockPanel>
+                                    </StackPanel>
+                                </touch:TouchExpander>
                             </StackPanel>
                         </touch:LightTouchScrollViewer>
                     </Grid>