Clean up minor typos

dziemborowicz · Jul 18, 2018 · f877f7d · f877f7d
1 parent ca53d1d
commit f877f7d
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/Hourglass/CommandLineArguments.cs b/Hourglass/CommandLineArguments.cs
@@ -82,7 +82,7 @@ public static string Usage
         public bool PromptOnExit { get; private set; }
 
         /// <summary>
-        /// Gets a value indicating whether to show progress in taskbar
+        /// Gets a value indicating whether to show progress in the taskbar.
         /// </summary>
         public bool ShowProgressInTaskbar { get; private set; }
 

diff --git a/Hourglass/Properties/Resources.resx b/Hourglass/Properties/Resources.resx
@@ -1235,6 +1235,6 @@ $</value>
   </data>
   <data name="ContextMenuShowProgressInTaskbarMenuItem" xml:space="preserve">
     <value>Show progress in taskbar</value>
-    <comment>The text for show progress in taskbar menu item</comment>
+    <comment>The text for the show progress in taskbar menu item</comment>
   </data>
 </root>
diff --git a/Hourglass/Serialization/TimerOptionsInfo.cs b/Hourglass/Serialization/TimerOptionsInfo.cs
@@ -30,8 +30,7 @@ public class TimerOptionsInfo
         public bool PromptOnExit { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether to show progress in taskbar
-        /// running.
+        /// Gets or sets a value indicating whether to show progress in the taskbar.
         /// </summary>
         public bool ShowProgressInTaskbar { get; set; }
 

diff --git a/Hourglass/Timing/TimerOptions.cs b/Hourglass/Timing/TimerOptions.cs
@@ -82,7 +82,7 @@ public class TimerOptions : INotifyPropertyChanged
         private bool promptOnExit;
 
         /// <summary>
-        /// A value indicating whether to show progress in taskbar
+        /// A value indicating whether to show progress in the taskbar.
         /// </summary>
         private bool showProgressInTaskbar;
 
@@ -280,8 +280,7 @@ public bool PromptOnExit
         }
 
         /// <summary>
-        /// Gets or sets a value indicating whether to show progress in taskbar
-        /// running.
+        /// Gets or sets a value indicating whether to show progress in the taskbar.
         /// </summary>
         public bool ShowProgressInTaskbar
         {

diff --git a/Hourglass/Windows/ContextMenu.cs b/Hourglass/Windows/ContextMenu.cs
@@ -52,14 +52,14 @@ public class ContextMenu : System.Windows.Controls.ContextMenu
         private MenuItem fullScreenMenuItem;
 
         /// <summary>
-        /// The "Show progress in taskbar" <see cref="MenuItem"/>.
+        /// The "Prompt on exit" <see cref="MenuItem"/>.
         /// </summary>
-        private MenuItem showProgressInTaskbarMenuItem;
+        private MenuItem promptOnExitMenuItem;
 
         /// <summary>
-        /// The "Prompt on exit" <see cref="MenuItem"/>.
+        /// The "Show progress in taskbar" <see cref="MenuItem"/>.
         /// </summary>
-        private MenuItem promptOnExitMenuItem;
+        private MenuItem showProgressInTaskbarMenuItem;
 
         /// <summary>
         /// The "Show in notification area" <see cref="MenuItem"/>.
@@ -359,7 +359,7 @@ private void UpdateMenuFromOptions()
             // Prompt on exit
             this.promptOnExitMenuItem.IsChecked = this.timerWindow.Options.PromptOnExit;
 
-            // Show in taskbar
+            // Show progress in taskbar
             this.showProgressInTaskbarMenuItem.IsChecked = this.timerWindow.Options.ShowProgressInTaskbar;
 
             // Show in notification area
@@ -466,7 +466,7 @@ private void UpdateOptionsFromMenu()
             // Prompt on exit
             this.timerWindow.Options.PromptOnExit = this.promptOnExitMenuItem.IsChecked;
 
-            // Show in taskbar
+            // Show progress in taskbar
             this.timerWindow.Options.ShowProgressInTaskbar = this.showProgressInTaskbarMenuItem.IsChecked;
 
             // Show in notification area
@@ -567,6 +567,7 @@ private void BuildMenu()
             this.promptOnExitMenuItem.Click += this.CheckableMenuItemClick;
             this.Items.Add(this.promptOnExitMenuItem);
 
+            // Show progress in taskbar
             this.showProgressInTaskbarMenuItem = new MenuItem();
             this.showProgressInTaskbarMenuItem.Header = Properties.Resources.ContextMenuShowProgressInTaskbarMenuItem;
             this.showProgressInTaskbarMenuItem.IsCheckable = true;

diff --git a/Hourglass/Windows/TimerWindow.xaml.cs b/Hourglass/Windows/TimerWindow.xaml.cs
@@ -1138,10 +1138,10 @@ private void UpdateTaskbarProgress()
         {
             if (!this.Options.ShowProgressInTaskbar)
             {
-                if (this.TaskbarItemInfo.ProgressState != TaskbarItemProgressState.None)
-                    this.TaskbarItemInfo.ProgressState = TaskbarItemProgressState.None;
+                this.TaskbarItemInfo.ProgressState = TaskbarItemProgressState.None;
                 return;
             }
+
             switch (this.Timer.State)
             {
                 case TimerState.Stopped: