2.3.3.6 - Active Window Title text comparison includes type of match …

…to use during text comparison.
gavinkendall · Jan 1, 2021 · ab565a1 · ab565a1
1 parent 7f1cdce
commit ab565a1
Show file tree

Hide file tree

Showing 12 changed files with 198 additions and 58 deletions.
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.3.3.5")]
-[assembly: AssemblyFileVersion("2.3.3.5")]
+[assembly: AssemblyVersion("2.3.3.6")]
+[assembly: AssemblyFileVersion("2.3.3.6")]
 [assembly: NeutralResourcesLanguageAttribute("en-CA")]
diff --git a/app.manifest b/app.manifest
@@ -3,7 +3,7 @@
   <assemblyIdentity
     type="win32"
     name="GavinKendall.AutoScreenCapture"
-    version="2.3.3.5"/>
+    version="2.3.3.6"/>
   <asmv3:application>
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
       <dpiAware>True/PM</dpiAware>

diff --git a/autoscreen.csproj b/autoscreen.csproj
@@ -71,10 +71,11 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>autoscreen.pfx</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -325,7 +326,6 @@
     </None>
     <Compile Include="ScreenCapture.cs" />
     <Compile Include="modules\slideshow\Slideshow.cs" />
-    <None Include="autoscreen.pfx" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="autoscreen.ico" />

diff --git a/autoscreen.pfx b/autoscreen.pfx
diff --git a/interface/FormAbout.resx b/interface/FormAbout.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="richTextBoxDeveloper.Text" xml:space="preserve">
-    <value>Auto Screen Capture 2.3.3.5 ("Boombayah")
+    <value>Auto Screen Capture 2.3.3.6 ("Boombayah")
 Developed by Gavin Kendall (2008 - 2020)
 
 SourceForge Project Site
@@ -322,6 +322,7 @@ END OF TERMS AND CONDITIONS</value>
   </data>
   <data name="richTextBoxChangelog.Text" xml:space="preserve">
     <value>Codename "Boombayah"
+2.3.3.6    Active Window Title text comparison includes type of match to use during text comparison.
 2.3.3.5    Application Focus now has Delay Before and Delay After options.
 2.3.3.4    A bug fix for saving of file when adding screenshot to collection.
 2.3.3.3    An internal list of image hash values are stored when emailing screenshots so we do not email duplicate images.

diff --git a/interface/main/FormMain-ScreenCapture.cs b/interface/main/FormMain-ScreenCapture.cs
@@ -21,6 +21,7 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using System.Text.RegularExpressions;
 
 namespace AutoScreenCapture
 {
@@ -70,7 +71,15 @@ private void EnableStartCapture()
 
                 groupBoxActiveWindowTitle.Enabled = true;
                 checkBoxActiveWindowTitle.Enabled = true;
-                textBoxActiveWindowTitle.Enabled = true;
+
+                groupBoxApplicationFocus.Enabled = true;
+                comboBoxProcessList.Enabled = true;
+                labelApplicationFocusDelayBefore.Enabled = true;
+                labelApplicationFocusDelayAfter.Enabled = true;
+                numericUpDownApplicationFocusDelayBefore.Enabled = true;
+                numericUpDownApplicationFocusDelayAfter.Enabled = true;
+                buttonApplicationFocusTest.Enabled = true;
+                buttonApplicationFocusRefresh.Enabled = true;
             }
             else
             {
@@ -107,7 +116,15 @@ private void EnableStopScreenCapture()
 
             groupBoxActiveWindowTitle.Enabled = false;
             checkBoxActiveWindowTitle.Enabled = false;
-            textBoxActiveWindowTitle.Enabled = false;
+
+            groupBoxApplicationFocus.Enabled = false;
+            comboBoxProcessList.Enabled = false;
+            labelApplicationFocusDelayBefore.Enabled = false;
+            labelApplicationFocusDelayAfter.Enabled = false;
+            numericUpDownApplicationFocusDelayBefore.Enabled = false;
+            numericUpDownApplicationFocusDelayAfter.Enabled = false;
+            buttonApplicationFocusTest.Enabled = false;
+            buttonApplicationFocusRefresh.Enabled = false;
         }
 
         /// <summary>
@@ -186,15 +203,10 @@ private void TakeScreenshot(bool captureNow)
 
                 _screenCapture.ActiveWindowProcessName = _screenCapture.GetActiveWindowProcessName();
 
-                if (!string.IsNullOrEmpty(_screenCapture.ActiveWindowTitle))
+                // Do not continue if the active window title needs to be checked and the active window title does not contain the defined text or regex pattern.
+                if (checkBoxActiveWindowTitle.Checked && !ActiveWindowTitleMatchesText())
                 {
-                    // Do not continue if the active window title needs to be checked and the active window title
-                    // does not contain the text defined in "Active Window Title Capture Text".
-                    if (checkBoxActiveWindowTitle.Checked && !string.IsNullOrEmpty(textBoxActiveWindowTitle.Text) &&
-                        !_screenCapture.ActiveWindowTitle.ToLower().Contains(textBoxActiveWindowTitle.Text.ToLower()))
-                    {
-                        return;
-                    }
+                    return;
                 }
 
                 RunRegionCaptures();
@@ -642,5 +654,35 @@ private void timerScreenCapture_Tick(object sender, EventArgs e)
                 StopScreenCapture();
             }
         }
+
+        private bool ActiveWindowTitleMatchesText()
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(_screenCapture.ActiveWindowTitle) && !string.IsNullOrEmpty(textBoxActiveWindowTitle.Text))
+                {
+                    if (radioButtonCaseSensitiveMatch.Checked)
+                    {
+                        return _screenCapture.ActiveWindowTitle.Contains(textBoxActiveWindowTitle.Text);
+                    }
+                    else if (radioButtonCaseInsensitiveMatch.Checked)
+                    {
+                        return _screenCapture.ActiveWindowTitle.ToLower().Contains(textBoxActiveWindowTitle.Text.ToLower());
+                    }
+                    else if (radioButtonRegularExpressionMatch.Checked)
+                    {
+                        return Regex.IsMatch(_screenCapture.ActiveWindowTitle, textBoxActiveWindowTitle.Text);
+                    }
+                }
+
+                return false;
+            }
+            catch (Exception ex)
+            {
+                Log.WriteExceptionMessage("FormMain-ScreenCapture::ActiveWindowTitleMatchesText", ex);
+
+                return false;
+            }
+        }
     }
 }
diff --git a/interface/main/FormMain-Settings.cs b/interface/main/FormMain-Settings.cs
@@ -194,10 +194,47 @@ private void LoadSettings()
 
                 checkBoxScreenshotLabel.Checked = Convert.ToBoolean(Settings.User.GetByKey("ApplyScreenshotLabel", DefaultSettings.ApplyScreenshotLabel).Value);
 
-                // The user can compare the current Active Window Title text to compare against what the text they've defined.
+                // Active Window Title
                 checkBoxActiveWindowTitle.Checked = Convert.ToBoolean(Settings.User.GetByKey("ActiveWindowTitleCaptureCheck", DefaultSettings.ActiveWindowTitleCaptureCheck).Value);
                 textBoxActiveWindowTitle.Text = Settings.User.GetByKey("ActiveWindowTitleCaptureText", DefaultSettings.ActiveWindowTitleCaptureText).Value.ToString();
 
+                if (checkBoxActiveWindowTitle.Checked)
+                {
+                    textBoxActiveWindowTitle.Enabled = true;
+                    radioButtonCaseSensitiveMatch.Enabled = true;
+                    radioButtonCaseInsensitiveMatch.Enabled = true;
+                    radioButtonRegularExpressionMatch.Enabled = true;
+                }
+                else
+                {
+                    textBoxActiveWindowTitle.Enabled = false;
+                    radioButtonCaseSensitiveMatch.Enabled = false;
+                    radioButtonCaseInsensitiveMatch.Enabled = false;
+                    radioButtonRegularExpressionMatch.Enabled = false;
+                }
+
+                radioButtonCaseSensitiveMatch.Checked = false;
+                radioButtonCaseInsensitiveMatch.Checked = false;
+                radioButtonRegularExpressionMatch.Checked = false;
+
+                int activeWindowTitleMatchType = Convert.ToInt32(Settings.User.GetByKey("ActiveWindowTitleMatchType", DefaultSettings.ActiveWindowTitleMatchType).Value);
+
+                switch (activeWindowTitleMatchType)
+                {
+                    case 1:
+                        radioButtonCaseSensitiveMatch.Checked = true;
+                        break;
+
+                    case 2:
+                        radioButtonCaseInsensitiveMatch.Checked = true;
+                        break;
+
+                    case 3:
+                        radioButtonRegularExpressionMatch.Checked = true;
+                        break;
+                }
+
+
                 // Application Focus
                 RefreshApplicationFocusList();
 
@@ -235,10 +272,23 @@ private void SaveSettings()
                 Settings.User.GetByKey("ScreenshotLabel", DefaultSettings.ScreenshotLabel).Value = comboBoxScreenshotLabel.Text.Trim();
                 Settings.User.GetByKey("ApplyScreenshotLabel", DefaultSettings.ApplyScreenshotLabel).Value = checkBoxScreenshotLabel.Checked;
 
-                // Active Window Title text comparison check.
+                // Active Window Title
                 Settings.User.GetByKey("ActiveWindowTitleCaptureCheck", DefaultSettings.ActiveWindowTitleCaptureCheck).Value = checkBoxActiveWindowTitle.Checked;
                 Settings.User.GetByKey("ActiveWindowTitleCaptureText", DefaultSettings.ActiveWindowTitleCaptureText).Value = textBoxActiveWindowTitle.Text.Trim();
 
+                if (radioButtonCaseSensitiveMatch.Checked)
+                {
+                    Settings.User.GetByKey("ActiveWindowTitleMatchType", DefaultSettings.ActiveWindowTitleMatchType).Value = 1;
+                }
+                else if (radioButtonCaseInsensitiveMatch.Checked)
+                {
+                    Settings.User.GetByKey("ActiveWindowTitleMatchType", DefaultSettings.ActiveWindowTitleMatchType).Value = 2;
+                }
+                else if (radioButtonRegularExpressionMatch.Checked)
+                {
+                    Settings.User.GetByKey("ActiveWindowTitleMatchType", DefaultSettings.ActiveWindowTitleMatchType).Value = 3;
+                }
+
                 // Application Focus
                 Settings.User.GetByKey("ApplicationFocus", DefaultSettings.ApplicationFocus).Value = comboBoxProcessList.Text;
                 Settings.User.GetByKey("ApplicationFocusDelayBefore", DefaultSettings.ApplicationFocusDelayBefore).Value = (int)numericUpDownApplicationFocusDelayBefore.Value;