From afca405892ace809c498c010a2d4484bec5adf11 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 24 Apr 2019 14:01:40 +0300
Subject: Implemented USB adapter finalizer. Added exception logging for USB
 adapter disconnection error. Added Volume color space icon to PPC.
 Implemented KeepAlive suppression on StorageAPI. Suppressed KeepAlive when
 uploading job. Implemented keep alive skipping when arrived responses queue
 is busy.

---
 Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ScreenLockView.xaml   | 4 ++--
 .../PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs   | 1 +
 Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ScreenLockView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ScreenLockView.xaml
index 8a90b03a0..7e5ca7507 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ScreenLockView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ScreenLockView.xaml
@@ -18,8 +18,8 @@
                 <touch:TouchButton Command="{Binding OKCommand}" Style="{StaticResource TangoMessageBoxButton}" DockPanel.Dock="Right" Width="120" Height="50" VerticalAlignment="Bottom">OK</touch:TouchButton>
             </StackPanel>
             <DockPanel>
-                <touch:TouchIcon Foreground="{StaticResource TangoErrorBrush}" Icon="Lock" VerticalAlignment="Top" Height="70"></touch:TouchIcon>
-                <StackPanel Margin="10 0 0 0">
+                <touch:TouchIcon Foreground="{StaticResource TangoErrorBrush}" Icon="Lock" VerticalAlignment="Top" Height="65"></touch:TouchIcon>
+                <StackPanel Margin="20 0 0 0">
                     <TextBlock FontSize="{StaticResource TangoHeaderFontSize}">Screen Locked</TextBlock>
                     <TextBlock Margin="0 10 0 0" TextWrapping="Wrap">Please enter the password to unlock the screen.</TextBlock>
                     <touch:TouchTextBox x:Name="txtPassword" Margin="0 30 40 0" IsPassword="True" KeyboardAction="Go" Text="{Binding Password,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 1550e97e1..ef2b8aeee 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -367,6 +367,7 @@ namespace Tango.PPC.UI.PPCApplication
                     if (_screenLockTimer != null)
                     {
                         _screenLockTimer.Dispose();
+                        _screenLockTimer = null;
                     }
 
                     if (settings.EnableLockScreen)
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index a0db99ffb..1f4f36e0b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.0.9.0")]
+[assembly: AssemblyVersion("1.0.10.0")]
-- 
cgit v1.3.1