Tidied up shutdown display. Fixed counter offset to accommodate for l…

…oad time
IridiumIO · Oct 24, 2017 · c0b2b10 · c0b2b10
1 parent 71cb9ab
commit c0b2b10
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/WindowsApp1/Compact.vb b/WindowsApp1/Compact.vb
@@ -7,7 +7,7 @@ Imports System.Management
 
 
 Public Class Compact
-    Dim version = "1.6.0"
+    Dim version = "1.7.0"
     Private WithEvents MyProcess As Process
     Private Delegate Sub AppendOutputTextDelegate(ByVal text As String)
 

diff --git a/WindowsApp1/My Project/AssemblyInfo.vb b/WindowsApp1/My Project/AssemblyInfo.vb
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.6.0.0")>
-<Assembly: AssemblyFileVersion("1.6.0.0")>
+<Assembly: AssemblyVersion("1.7.0.0")>
+<Assembly: AssemblyFileVersion("1.7.0.0")>
 <Assembly: NeutralResourcesLanguage("en")>
diff --git a/WindowsApp1/ShutdownDialog.Designer.vb b/WindowsApp1/ShutdownDialog.Designer.vb
diff --git a/WindowsApp1/ShutdownDialog.vb b/WindowsApp1/ShutdownDialog.vb
@@ -12,10 +12,17 @@ Public Class ShutdownDialog
 
     Private Sub Dialog1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         shutdownTimer.Start()
-
+        Select Case SDProcIntent.Text
+            Case "Shutdown"
+                SDProgText.Text = "Shutting down in 10 seconds"
+            Case "Restart"
+                SDProgText.Text = "Restarting in 10 seconds"
+            Case "Sleep"
+                SDProgText.Text = "Sleeping in 10 seconds"
+        End Select
     End Sub
 
-    Dim secCount As Integer = 10
+    Dim secCount As Integer = 9
     Private Sub shutdownTimer_Tick(sender As Object, e As EventArgs) Handles shutdownTimer.Tick
 
         Select Case SDProcIntent.Text