2.1.5.2 - Implemented "-hideSystemTrayIcon" command line argument.

igloo-gkendall · igloo-gkendall · commit 2073ad7c3267 · 2018-08-13T13:38:54.000-04:00
diff --git a/FormMain.cs b/FormMain.cs
@@ -74,6 +74,7 @@ public partial class FormMain : Form
         private const string REGEX_COMMAND_LINE_DELAY = @"^-delay=(?<Hours>\d{2}):(?<Minutes>\d{2}):(?<Seconds>\d{2})\.(?<Milliseconds>\d{3})$";
         private const string REGEX_COMMAND_LINE_LOCK = "^-lock$";
         private const string REGEX_COMMAND_LINE_JPEG_LEVEL = @"^-jpeglevel=(?<JpegLevel>\d{1,3})$";
+        private const string REGEX_COMMAND_LINE_HIDE_SYSTEM_TRAY_ICON = "^-hideSystemTrayIcon$";
 
         /// <summary>
         /// Constructor for the main form. Arguments from the command line can be passed to it.
@@ -102,6 +103,17 @@ public FormMain(string[] args)
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void FormMain_Load(object sender, EventArgs e)
+        {
+            InitializeThreads();
+
+            DeleteSlides();
+            SearchDates();
+
+            // Changing the value of this property will automatically call SearchSlides.
+            toolStripComboBoxImageFormatFilter.SelectedIndex = Properties.Settings.Default.ImageFormatIndex;
+        }
+
+        private void InitializeThreads()
         {
             runDeleteSlidesThread = new BackgroundWorker
             {
@@ -123,12 +135,6 @@ private void FormMain_Load(object sender, EventArgs e)
                 WorkerSupportsCancellation = true
             };
             runSlideSearchThread.DoWork += new DoWorkEventHandler(DoWork_runSlideSearchThread);
-
-            DeleteSlides();
-            SearchDates();
-
-            // Changing the value of this property will automatically call SearchSlides.
-            toolStripComboBoxImageFormatFilter.SelectedIndex = Properties.Settings.Default.ImageFormatIndex;
         }
 
         /// <summary>
@@ -420,17 +426,17 @@ private void FormViewer_FormClosing(object sender, FormClosingEventArgs e)
                 // Close this window.
                 CloseWindow();
 
-                if (runDateSearchThread.IsBusy)
+                if (runDateSearchThread != null && runDateSearchThread.IsBusy)
                 {
                     runDateSearchThread.CancelAsync();
                 }
 
-                if (runSlideSearchThread.IsBusy)
+                if (runSlideSearchThread != null && runSlideSearchThread.IsBusy)
                 {
                     runSlideSearchThread.CancelAsync();
                 }
 
-                if (runDeleteSlidesThread.IsBusy)
+                if (runDeleteSlidesThread != null && runDeleteSlidesThread.IsBusy)
                 {
                     runDeleteSlidesThread.CancelAsync();
                 }
@@ -520,7 +526,7 @@ private void SearchDates()
 
             monthCalendar.BoldedDates = null;
 
-            if (!runDateSearchThread.IsBusy)
+            if (runDateSearchThread != null && !runDateSearchThread.IsBusy)
             {
                 runDateSearchThread.RunWorkerAsync();
             }
@@ -531,7 +537,7 @@ private void SearchDates()
         /// </summary>
         private void DeleteSlides()
         {
-            if (!runDeleteSlidesThread.IsBusy)
+            if (runDeleteSlidesThread != null && !runDeleteSlidesThread.IsBusy)
             {
                 runDeleteSlidesThread.RunWorkerAsync();
             }
@@ -547,7 +553,7 @@ private void SearchSlides()
             ClearPreview();
             DisableToolStripButtons();
 
-            if (!runSlideSearchThread.IsBusy)
+            if (runSlideSearchThread != null && !runSlideSearchThread.IsBusy)
             {
                 runSlideSearchThread.RunWorkerAsync();
             }
@@ -1110,13 +1116,13 @@ private void StartScreenCapture(string folder, string macro, string format, int
                     }
 
                     // Stop the folder search thread if it's busy.
-                    if (runDateSearchThread.IsBusy)
+                    if (runDateSearchThread != null && runDateSearchThread.IsBusy)
                     {
                         runDateSearchThread.CancelAsync();
                     }
 
                     // Stop the file search thread if it's busy.
-                    if (runSlideSearchThread.IsBusy)
+                    if (runSlideSearchThread != null && runSlideSearchThread.IsBusy)
                     {
                         runSlideSearchThread.CancelAsync();
                     }
@@ -1515,17 +1521,17 @@ private void Exit()
                 // Close this window.
                 CloseWindow();
 
-                if (runDateSearchThread.IsBusy)
+                if (runDateSearchThread != null && runDateSearchThread.IsBusy)
                 {
                     runDateSearchThread.CancelAsync();
                 }
 
-                if (runSlideSearchThread.IsBusy)
+                if (runSlideSearchThread != null && runSlideSearchThread.IsBusy)
                 {
                     runSlideSearchThread.CancelAsync();
                 }
 
-                if (runDeleteSlidesThread.IsBusy)
+                if (runDeleteSlidesThread != null && runDeleteSlidesThread.IsBusy)
                 {
                     runDeleteSlidesThread.CancelAsync();
                 }
@@ -1864,6 +1870,7 @@ private void ParseCommandLineArguments(string[] args)
                 toolStripMenuItemCloseWindowOnStartCapture.Checked = true;
                 toolStripMenuItemScheduleAtApplicationStartup.Checked = false;
                 toolStripMenuItemShowSlideshowOnStopScreenCapture.Checked = false;
+                toolStripMenuItemShowSystemTrayIcon.Checked = true;
 
                 #endregion Default Values for Command Line Arguments/Options
 
@@ -1878,6 +1885,7 @@ private void ParseCommandLineArguments(string[] args)
                 Regex rgxCommandLineScheduleStopAt = new Regex(REGEX_COMMAND_LINE_STOPAT);
                 Regex rgxCommandLineScheduleStartAt = new Regex(REGEX_COMMAND_LINE_STARTAT);
                 Regex rgxCommandLineJpegLevel = new Regex(REGEX_COMMAND_LINE_JPEG_LEVEL);
+                Regex rgxCommandLineHideSystemTrayIcon = new Regex(REGEX_COMMAND_LINE_HIDE_SYSTEM_TRAY_ICON);
 
                 #region Command Line Argument Parsing
 
@@ -1985,6 +1993,11 @@ private void ParseCommandLineArguments(string[] args)
                             jpegLevel = cmdJpegLevel;
                         }
                     }
+
+                    if (rgxCommandLineHideSystemTrayIcon.IsMatch(args[i]))
+                    {
+                        toolStripMenuItemShowSystemTrayIcon.Checked = false;
+                    }
                 }
 
                 #endregion Command Line Argument Parsing
@@ -1998,6 +2011,8 @@ private void ParseCommandLineArguments(string[] args)
                 numericUpDownImageResolutionRatio.Value = ratio;
                 comboBoxScheduleImageFormat.SelectedItem = imageFormat;
 
+                InitializeThreads();
+
                 if (isScheduled)
                 {
                     toolStripMenuItemScheduleAtApplicationStartup.Checked = true;
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // 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("2.1.5.1")]
-[assembly: AssemblyFileVersion("2.1.5.1")]
+[assembly: AssemblyVersion("2.1.5.2")]
+[assembly: AssemblyFileVersion("2.1.5.2")]
 [assembly: NeutralResourcesLanguageAttribute("en-CA")]
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
@@ -6,7 +6,7 @@
       <Value Profile="(Default)">60000</Value>
     </Setting>
     <Setting Name="ApplicationVersion" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">2.1.5.1</Value>
+      <Value Profile="(Default)">2.1.5.2</Value>
     </Setting>
     <Setting Name="ImageFormatFilter" Type="System.String" Scope="User">
       <Value Profile="(Default)">*.*</Value>
diff --git a/app.config b/app.config
@@ -439,7 +439,7 @@
   <applicationSettings>
     <AutoScreenCapture.Properties.Settings>
       <setting name="ApplicationVersion" serializeAs="String">
-        <value>2.1.5.1</value>
+        <value>2.1.5.2</value>
       </setting>
       <setting name="ApplicationName" serializeAs="String">
         <value>Auto Screen Capture</value>
diff --git a/app.manifest b/app.manifest
@@ -3,7 +3,7 @@
   <assemblyIdentity
     type="win32"
     name="GavinKendall.AutoScreenCapture"
-    version="2.1.5.0"/>
+    version="2.1.5.2"/>
   <asmv3:application>
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
       <dpiAware>True/PM</dpiAware>

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ public partial class FormMain : Form`
`74`	`74`	`private const string REGEX_COMMAND_LINE_DELAY = @"^-delay=(?<Hours>\d{2}):(?<Minutes>\d{2}):(?<Seconds>\d{2})\.(?<Milliseconds>\d{3})$";`
`75`	`75`	`private const string REGEX_COMMAND_LINE_LOCK = "^-lock$";`
`76`	`76`	`private const string REGEX_COMMAND_LINE_JPEG_LEVEL = @"^-jpeglevel=(?<JpegLevel>\d{1,3})$";`
	`77`	`+ private const string REGEX_COMMAND_LINE_HIDE_SYSTEM_TRAY_ICON = "^-hideSystemTrayIcon$";`
`77`	`78`
`78`	`79`	`/// <summary>`
`79`	`80`	`/// Constructor for the main form. Arguments from the command line can be passed to it.`
`@@ -102,6 +103,17 @@ public FormMain(string[] args)`
`102`	`103`	`/// <param name="sender"></param>`
`103`	`104`	`/// <param name="e"></param>`
`104`	`105`	`private void FormMain_Load(object sender, EventArgs e)`
	`106`	`+ {`
	`107`	`+ InitializeThreads();`
	`108`	`+`
	`109`	`+ DeleteSlides();`
	`110`	`+ SearchDates();`
	`111`	`+`
	`112`	`+ // Changing the value of this property will automatically call SearchSlides.`
	`113`	`+ toolStripComboBoxImageFormatFilter.SelectedIndex = Properties.Settings.Default.ImageFormatIndex;`
	`114`	`+ }`
	`115`	`+`
	`116`	`+ private void InitializeThreads()`
`105`	`117`	`{`
`106`	`118`	`runDeleteSlidesThread = new BackgroundWorker`
`107`	`119`	`{`
`@@ -123,12 +135,6 @@ private void FormMain_Load(object sender, EventArgs e)`
`123`	`135`	`WorkerSupportsCancellation = true`
`124`	`136`	`};`
`125`	`137`	`runSlideSearchThread.DoWork += new DoWorkEventHandler(DoWork_runSlideSearchThread);`
`126`		`-`
`127`		`- DeleteSlides();`
`128`		`- SearchDates();`
`129`		`-`
`130`		`- // Changing the value of this property will automatically call SearchSlides.`
`131`		`- toolStripComboBoxImageFormatFilter.SelectedIndex = Properties.Settings.Default.ImageFormatIndex;`
`132`	`138`	`}`
`133`	`139`
`134`	`140`	`/// <summary>`
`@@ -420,17 +426,17 @@ private void FormViewer_FormClosing(object sender, FormClosingEventArgs e)`
`420`	`426`	`// Close this window.`
`421`	`427`	`CloseWindow();`
`422`	`428`
`423`		`- if (runDateSearchThread.IsBusy)`
	`429`	`+ if (runDateSearchThread != null && runDateSearchThread.IsBusy)`
`424`	`430`	`{`
`425`	`431`	`runDateSearchThread.CancelAsync();`
`426`	`432`	`}`
`427`	`433`
`428`		`- if (runSlideSearchThread.IsBusy)`
	`434`	`+ if (runSlideSearchThread != null && runSlideSearchThread.IsBusy)`
`429`	`435`	`{`
`430`	`436`	`runSlideSearchThread.CancelAsync();`
`431`	`437`	`}`
`432`	`438`
`433`		`- if (runDeleteSlidesThread.IsBusy)`
	`439`	`+ if (runDeleteSlidesThread != null && runDeleteSlidesThread.IsBusy)`
`434`	`440`	`{`
`435`	`441`	`runDeleteSlidesThread.CancelAsync();`
`436`	`442`	`}`
`@@ -520,7 +526,7 @@ private void SearchDates()`
`520`	`526`
`521`	`527`	`monthCalendar.BoldedDates = null;`
`522`	`528`
`523`		`- if (!runDateSearchThread.IsBusy)`
	`529`	`+ if (runDateSearchThread != null && !runDateSearchThread.IsBusy)`
`524`	`530`	`{`
`525`	`531`	`runDateSearchThread.RunWorkerAsync();`
`526`	`532`	`}`
`@@ -531,7 +537,7 @@ private void SearchDates()`
`531`	`537`	`/// </summary>`
`532`	`538`	`private void DeleteSlides()`
`533`	`539`	`{`
`534`		`- if (!runDeleteSlidesThread.IsBusy)`
	`540`	`+ if (runDeleteSlidesThread != null && !runDeleteSlidesThread.IsBusy)`
`535`	`541`	`{`
`536`	`542`	`runDeleteSlidesThread.RunWorkerAsync();`
`537`	`543`	`}`
`@@ -547,7 +553,7 @@ private void SearchSlides()`
`547`	`553`	`ClearPreview();`
`548`	`554`	`DisableToolStripButtons();`
`549`	`555`
`550`		`- if (!runSlideSearchThread.IsBusy)`
	`556`	`+ if (runSlideSearchThread != null && !runSlideSearchThread.IsBusy)`
`551`	`557`	`{`
`552`	`558`	`runSlideSearchThread.RunWorkerAsync();`
`553`	`559`	`}`
`@@ -1110,13 +1116,13 @@ private void StartScreenCapture(string folder, string macro, string format, int`
`1110`	`1116`	`}`
`1111`	`1117`
`1112`	`1118`	`// Stop the folder search thread if it's busy.`
`1113`		`- if (runDateSearchThread.IsBusy)`
	`1119`	`+ if (runDateSearchThread != null && runDateSearchThread.IsBusy)`
`1114`	`1120`	`{`
`1115`	`1121`	`runDateSearchThread.CancelAsync();`
`1116`	`1122`	`}`
`1117`	`1123`
`1118`	`1124`	`// Stop the file search thread if it's busy.`
`1119`		`- if (runSlideSearchThread.IsBusy)`
	`1125`	`+ if (runSlideSearchThread != null && runSlideSearchThread.IsBusy)`
`1120`	`1126`	`{`
`1121`	`1127`	`runSlideSearchThread.CancelAsync();`
`1122`	`1128`	`}`
`@@ -1515,17 +1521,17 @@ private void Exit()`
`1515`	`1521`	`// Close this window.`
`1516`	`1522`	`CloseWindow();`
`1517`	`1523`
`1518`		`- if (runDateSearchThread.IsBusy)`
	`1524`	`+ if (runDateSearchThread != null && runDateSearchThread.IsBusy)`
`1519`	`1525`	`{`
`1520`	`1526`	`runDateSearchThread.CancelAsync();`
`1521`	`1527`	`}`
`1522`	`1528`
`1523`		`- if (runSlideSearchThread.IsBusy)`
	`1529`	`+ if (runSlideSearchThread != null && runSlideSearchThread.IsBusy)`
`1524`	`1530`	`{`
`1525`	`1531`	`runSlideSearchThread.CancelAsync();`
`1526`	`1532`	`}`
`1527`	`1533`
`1528`		`- if (runDeleteSlidesThread.IsBusy)`
	`1534`	`+ if (runDeleteSlidesThread != null && runDeleteSlidesThread.IsBusy)`
`1529`	`1535`	`{`
`1530`	`1536`	`runDeleteSlidesThread.CancelAsync();`
`1531`	`1537`	`}`
`@@ -1864,6 +1870,7 @@ private void ParseCommandLineArguments(string[] args)`
`1864`	`1870`	`toolStripMenuItemCloseWindowOnStartCapture.Checked = true;`
`1865`	`1871`	`toolStripMenuItemScheduleAtApplicationStartup.Checked = false;`
`1866`	`1872`	`toolStripMenuItemShowSlideshowOnStopScreenCapture.Checked = false;`
	`1873`	`+ toolStripMenuItemShowSystemTrayIcon.Checked = true;`
`1867`	`1874`
`1868`	`1875`	`#endregion Default Values for Command Line Arguments/Options`
`1869`	`1876`
`@@ -1878,6 +1885,7 @@ private void ParseCommandLineArguments(string[] args)`
`1878`	`1885`	`Regex rgxCommandLineScheduleStopAt = new Regex(REGEX_COMMAND_LINE_STOPAT);`
`1879`	`1886`	`Regex rgxCommandLineScheduleStartAt = new Regex(REGEX_COMMAND_LINE_STARTAT);`
`1880`	`1887`	`Regex rgxCommandLineJpegLevel = new Regex(REGEX_COMMAND_LINE_JPEG_LEVEL);`
	`1888`	`+ Regex rgxCommandLineHideSystemTrayIcon = new Regex(REGEX_COMMAND_LINE_HIDE_SYSTEM_TRAY_ICON);`
`1881`	`1889`
`1882`	`1890`	`#region Command Line Argument Parsing`
`1883`	`1891`
`@@ -1985,6 +1993,11 @@ private void ParseCommandLineArguments(string[] args)`
`1985`	`1993`	`jpegLevel = cmdJpegLevel;`
`1986`	`1994`	`}`
`1987`	`1995`	`}`
	`1996`	`+`
	`1997`	`+ if (rgxCommandLineHideSystemTrayIcon.IsMatch(args[i]))`
	`1998`	`+ {`
	`1999`	`+ toolStripMenuItemShowSystemTrayIcon.Checked = false;`
	`2000`	`+ }`
`1988`	`2001`	`}`
`1989`	`2002`
`1990`	`2003`	`#endregion Command Line Argument Parsing`
`@@ -1998,6 +2011,8 @@ private void ParseCommandLineArguments(string[] args)`
`1998`	`2011`	`numericUpDownImageResolutionRatio.Value = ratio;`
`1999`	`2012`	`comboBoxScheduleImageFormat.SelectedItem = imageFormat;`
`2000`	`2013`
	`2014`	`+ InitializeThreads();`
	`2015`	`+`
`2001`	`2016`	`if (isScheduled)`
`2002`	`2017`	`{`
`2003`	`2018`	`toolStripMenuItemScheduleAtApplicationStartup.Checked = true;`