Merge pull request #2 from taylorflatt/dev

Release 2.0.0.0

Author: taylorflatt

VERSION

@@ -1 +1 @@
-1.4.0.0
+2.0.0.0

WindowsShutdownTimer.exe

@@ -44,35 +44,34 @@ public StartTimerException(string message, Exception inner, string code) : base(
         }
     }
 
+
     /// <summary>
-    /// Trouble checking for a timer.
+    /// Used to show that the timer has ended. This isn't a true exception. This seemed easier (to read/understand) than traditional logic to me.
     /// </summary>
     [Serializable]
-    class CheckTimerException : Exception
+    class TimerEnded : Exception
     {
-        public string ErrorCode = "";
-
-        public CheckTimerException() { }
-
-        public CheckTimerException(string message, string code) : base(message)
-        {
-            this.ErrorCode = code;
-        }
-
-        public CheckTimerException(string message, Exception inner, string code) : base(message, inner)
-        {
-            this.ErrorCode = code;
-        }
+        public TimerEnded() { }
+        public TimerEnded(string message) : base(message) { }
     }
 
     /// <summary>
-    /// Used to show that the timer has ended. This isn't a true exception. This seemed easier (to read/understand) than traditional logic to me.
+    /// Timer exists in the scheduler.
     /// </summary>
     [Serializable]
-    class TimerEnded : Exception
+    class TimerExists : Exception
     {
-        public TimerEnded() { }
+        public TimerExists() { }
+        public TimerExists(string message) : base(message) { }
+    }
 
-        public TimerEnded(string message) : base(message) { }
+    /// <summary>
+    /// Timer doesn't exist in the scheduler.
+    /// </summary>
+    [Serializable]
+    class NoTimerExists : Exception
+    {
+        public NoTimerExists() { }
+        public NoTimerExists(string message) : base(message) { }
     }
 }

WindowsShutdownTimer/CustomExceptions.cs

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers>
+  <Costura>
+    <IncludedAssemblies>
+      Microsoft.Win32.TaskScheduler
+    </IncludedAssemblies>
+  </Costura>
+</Weavers>

WindowsShutdownTimer/FodyWeavers.xml

@@ -24,19 +24,29 @@ public Options(TimerForm parent)
             // Setting this in the design menu doesn't work. Must be set here.
             this.CenterToParent();
 
-            last_shutdown_label_desc.Text = "Last Shutdown: ";
-
-            // Because the settings manager won't store a 0001 default DateTime year.
-            DateTime defaultDate = new DateTime(0002, 1, 1, 0, 0, 0, 0);
-                
-            // Check on the status of the previous shutdown. If it was ever set or cancelled. 
-            // Or if it is still in the future (pending). Or successful then display when.
-            if (Properties.Settings.Default.ShutdownTimer == defaultDate)
-                last_shutdown_label.Text = "N/A or Unsuccessful";
-            else if(Properties.Settings.Default.ShutdownTimer > DateTime.UtcNow.ToLocalTime())
-                last_shutdown_label.Text = "Pending " + "(" + Convert.ToString(Properties.Settings.Default.ShutdownTimer.ToLocalTime()) + ")";
+            last_shutdown_label_desc.Text = "Last Attempted Shutdown: ";
+
+            if(timerWindow.TimerExists(TimerForm.DEFAULT_TASK_NAME))
+            {
+                if(timerWindow.TimerRunning(TimerForm.DEFAULT_TASK_NAME, DateTime.Now))
+                    last_shutdown_label.Text = "Pending " + "(" + Convert.ToString(Properties.Settings.Default.ShutdownTimer) + ")";
+                else
+                {
+                    // If the timer was never run, display the time accordingly.
+                    if (timerWindow.GetLastRunTime(TimerForm.DEFAULT_TASK_NAME) == timerWindow.SetDefaultDateTime(new DateTime()))
+                        last_shutdown_label.Text = "N/A";
+                    else
+                    {
+                        // Windows 7 doesn't have the last run time so I need to do something else.
+                        if (timerWindow.GetLastRunTime(TimerForm.DEFAULT_TASK_NAME) == default(DateTime))
+                            last_shutdown_label.Text = Convert.ToString(Properties.Settings.Default.ShutdownTimer);
+                        else
+                            last_shutdown_label.Text = Convert.ToString(timerWindow.GetLastRunTime(TimerForm.DEFAULT_TASK_NAME));
+                    }
+                }
+            }
             else
-                last_shutdown_label.Text = Convert.ToString(Properties.Settings.Default.ShutdownTimer.ToLocalTime());
+                last_shutdown_label.Text = "N/A";
         }
 
         /// <summary>
@@ -77,7 +87,7 @@ public void save_options_button_Click(object sender, EventArgs e)
                 Properties.Settings.Default.LClickOpenSysTray = false;
 
             Properties.Settings.Default.Save();
-            timerWindow.ApplyUserSettings();
+            //timerWindow.ApplyUserSettings();
 
             // Close the options form and redisplay the parent.
             ActiveForm.Close();

WindowsShutdownTimer/Options.Designer.cs

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("WindowsShutdownTimer")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyCopyright("Copyright Taylor Flatt ©  2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.0.0")]