2.3.1.6 - Region Select Edit implemented and fixed bug with ViewId fo…

…r new Screens and Regions.
gavinkendall · Aug 4, 2020 · 5816c1c · 5816c1c
1 parent 00ab812
commit 5816c1c
Show file tree

Hide file tree

Showing 15 changed files with 216 additions and 38 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.1.5")]
-[assembly: AssemblyFileVersion("2.3.1.5")]
+[assembly: AssemblyVersion("2.3.1.6")]
+[assembly: AssemblyFileVersion("2.3.1.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.1.5"/>
+    version="2.3.1.6"/>
   <asmv3:application>
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
       <dpiAware>True/PM</dpiAware>

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.1.5 ("Boombayah")
+    <value>Auto Screen Capture 2.3.1.6 ("Boombayah")
 Developed by Gavin Kendall (2008 - 2020)
 
 https://autoscreen.sourceforge.io/

diff --git a/interface/FormKeyboardShortcuts.Designer.cs b/interface/FormKeyboardShortcuts.Designer.cs
diff --git a/interface/FormKeyboardShortcuts.cs b/interface/FormKeyboardShortcuts.cs
@@ -19,12 +19,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 //-----------------------------------------------------------------------
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace AutoScreenCapture
@@ -108,6 +102,16 @@ private void FormKeyboardShortcuts_Load(object sender, EventArgs e)
             comboBoxKeyboardShortcutRegionSelectAutoSaveModifier2.Items.Add(AutoScreenCapture.ModifierKeys.Control.ToString());
             comboBoxKeyboardShortcutRegionSelectAutoSaveModifier2.Items.Add(AutoScreenCapture.ModifierKeys.Shift.ToString());
 
+            comboBoxKeyboardShortcutRegionSelectEditModifier1.Items.Clear();
+            comboBoxKeyboardShortcutRegionSelectEditModifier1.Items.Add(AutoScreenCapture.ModifierKeys.Alt.ToString());
+            comboBoxKeyboardShortcutRegionSelectEditModifier1.Items.Add(AutoScreenCapture.ModifierKeys.Control.ToString());
+            comboBoxKeyboardShortcutRegionSelectEditModifier1.Items.Add(AutoScreenCapture.ModifierKeys.Shift.ToString());
+
+            comboBoxKeyboardShortcutRegionSelectEditModifier2.Items.Clear();
+            comboBoxKeyboardShortcutRegionSelectEditModifier2.Items.Add(AutoScreenCapture.ModifierKeys.Alt.ToString());
+            comboBoxKeyboardShortcutRegionSelectEditModifier2.Items.Add(AutoScreenCapture.ModifierKeys.Control.ToString());
+            comboBoxKeyboardShortcutRegionSelectEditModifier2.Items.Add(AutoScreenCapture.ModifierKeys.Shift.ToString());
+
             // Map the modifier key enum value from the provided user setting to the combo box control's selected index.
             comboBoxKeyboardShortcutStartScreenCaptureModifier1.SelectedIndex = MapModifierKeyFromUserSetting(comboBoxKeyboardShortcutStartScreenCaptureModifier1, Settings.User.GetByKey("StringKeyboardShortcutStartScreenCaptureModifier1", DefaultSettings.StringKeyboardShortcutStartScreenCaptureModifier1).Value.ToString());
             comboBoxKeyboardShortcutStartScreenCaptureModifier2.SelectedIndex = MapModifierKeyFromUserSetting(comboBoxKeyboardShortcutStartScreenCaptureModifier2, Settings.User.GetByKey("StringKeyboardShortcutStartScreenCaptureModifier2", DefaultSettings.StringKeyboardShortcutStartScreenCaptureModifier2).Value.ToString());
@@ -121,13 +125,16 @@ private void FormKeyboardShortcuts_Load(object sender, EventArgs e)
             comboBoxKeyboardShortcutRegionSelectClipboardModifier2.SelectedIndex = MapModifierKeyFromUserSetting(comboBoxKeyboardShortcutRegionSelectClipboardModifier2, Settings.User.GetByKey("StringKeyboardShortcutRegionSelectClipboardModifier2", DefaultSettings.StringKeyboardShortcutRegionSelectClipboardModifier2).Value.ToString());
             comboBoxKeyboardShortcutRegionSelectAutoSaveModifier1.SelectedIndex = MapModifierKeyFromUserSetting(comboBoxKeyboardShortcutRegionSelectAutoSaveModifier1, Settings.User.GetByKey("StringKeyboardShortcutRegionSelectAutoSaveModifier1", DefaultSettings.StringKeyboardShortcutRegionSelectAutoSaveModifier1).Value.ToString());
             comboBoxKeyboardShortcutRegionSelectAutoSaveModifier2.SelectedIndex = MapModifierKeyFromUserSetting(comboBoxKeyboardShortcutRegionSelectAutoSaveModifier2, Settings.User.GetByKey("StringKeyboardShortcutRegionSelectAutoSaveModifier2", DefaultSettings.StringKeyboardShortcutRegionSelectAutoSaveModifier2).Value.ToString());
+            comboBoxKeyboardShortcutRegionSelectEditModifier1.SelectedIndex = MapModifierKeyFromUserSetting(comboBoxKeyboardShortcutRegionSelectEditModifier1, Settings.User.GetByKey("StringKeyboardShortcutRegionSelectEditModifier1", DefaultSettings.StringKeyboardShortcutRegionSelectEditModifier1).Value.ToString());
+            comboBoxKeyboardShortcutRegionSelectEditModifier2.SelectedIndex = MapModifierKeyFromUserSetting(comboBoxKeyboardShortcutRegionSelectEditModifier2, Settings.User.GetByKey("StringKeyboardShortcutRegionSelectEditModifier2", DefaultSettings.StringKeyboardShortcutRegionSelectEditModifier2).Value.ToString());
 
             textBoxKeyboardShortcutStartScreenCaptureKey.Text = Settings.User.GetByKey("StringKeyboardShortcutStartScreenCaptureKey", DefaultSettings.StringKeyboardShortcutStartScreenCaptureKey).Value.ToString().ToUpper();
             textBoxKeyboardShortcutStopScreenCaptureKey.Text = Settings.User.GetByKey("StringKeyboardShortcutStopScreenCaptureKey", DefaultSettings.StringKeyboardShortcutStopScreenCaptureKey).Value.ToString().ToUpper();
             textBoxKeyboardShortcutCaptureNowArchiveKey.Text = Settings.User.GetByKey("StringKeyboardShortcutCaptureNowArchiveKey", DefaultSettings.StringKeyboardShortcutCaptureNowArchiveKey).Value.ToString().ToUpper();
             textBoxKeyboardShortcutCaptureNowEditKey.Text = Settings.User.GetByKey("StringKeyboardShortcutCaptureNowEditKey", DefaultSettings.StringKeyboardShortcutCaptureNowEditKey).Value.ToString().ToUpper();
             textBoxKeyboardShortcutRegionSelectClipboardKey.Text = Settings.User.GetByKey("StringKeyboardShortcutRegionSelectClipboardKey", DefaultSettings.StringKeyboardShortcutRegionSelectClipboardKey).Value.ToString().ToUpper();
             textBoxKeyboardShortcutRegionSelectAutoSaveKey.Text = Settings.User.GetByKey("StringKeyboardShortcutRegionSelectAutoSaveKey", DefaultSettings.StringKeyboardShortcutRegionSelectAutoSaveKey).Value.ToString().ToUpper();
+            textBoxKeyboardShortcutRegionSelectEditKey.Text = Settings.User.GetByKey("StringKeyboardShortcutRegionSelectEditKey", DefaultSettings.StringKeyboardShortcutRegionSelectEditKey).Value.ToString().ToUpper();
         }
 
         private int MapModifierKeyFromUserSetting(ComboBox comboBox, string userSetting)
@@ -198,6 +205,12 @@ private void checkBoxUseKeyboardShortcuts_CheckedChanged(object sender, EventArg
                 comboBoxKeyboardShortcutRegionSelectAutoSaveModifier1.Enabled = true;
                 comboBoxKeyboardShortcutRegionSelectAutoSaveModifier2.Enabled = true;
                 textBoxKeyboardShortcutRegionSelectAutoSaveKey.Enabled = true;
+
+                // Region Select / Edit
+                labelRegionSelectEdit.Enabled = true;
+                comboBoxKeyboardShortcutRegionSelectEditModifier1.Enabled = true;
+                comboBoxKeyboardShortcutRegionSelectEditModifier2.Enabled = true;
+                textBoxKeyboardShortcutRegionSelectEditKey.Enabled = true;
             }
             else
             {
@@ -236,6 +249,12 @@ private void checkBoxUseKeyboardShortcuts_CheckedChanged(object sender, EventArg
                 comboBoxKeyboardShortcutRegionSelectAutoSaveModifier1.Enabled = false;
                 comboBoxKeyboardShortcutRegionSelectAutoSaveModifier2.Enabled = false;
                 textBoxKeyboardShortcutRegionSelectAutoSaveKey.Enabled = false;
+
+                // Region Select / Edit
+                labelRegionSelectEdit.Enabled = false;
+                comboBoxKeyboardShortcutRegionSelectEditModifier1.Enabled = false;
+                comboBoxKeyboardShortcutRegionSelectEditModifier2.Enabled = false;
+                textBoxKeyboardShortcutRegionSelectEditKey.Enabled = false;
             }
         }
 
@@ -246,7 +265,8 @@ private void buttonOK_Click(object sender, EventArgs e)
                 comboBoxKeyboardShortcutCaptureNowArchiveModifier1.Text.Equals(comboBoxKeyboardShortcutCaptureNowArchiveModifier2.Text) ||
                 comboBoxKeyboardShortcutCaptureNowEditModifier1.Text.Equals(comboBoxKeyboardShortcutCaptureNowEditModifier2.Text) ||
                 comboBoxKeyboardShortcutRegionSelectClipboardModifier1.Text.Equals(comboBoxKeyboardShortcutRegionSelectClipboardModifier2.Text) ||
-                comboBoxKeyboardShortcutRegionSelectAutoSaveModifier1.Text.Equals(comboBoxKeyboardShortcutRegionSelectAutoSaveModifier2.Text))
+                comboBoxKeyboardShortcutRegionSelectAutoSaveModifier1.Text.Equals(comboBoxKeyboardShortcutRegionSelectAutoSaveModifier2.Text) ||
+                comboBoxKeyboardShortcutRegionSelectEditModifier1.Text.Equals(comboBoxKeyboardShortcutRegionSelectEditModifier2.Text))
             {
                 MessageBox.Show("The first and second modifier keys (such as Alt, Control, and Shift) cannot equal each other.", "Equal Modifier Keys", MessageBoxButtons.OK, MessageBoxIcon.Warning);
             }
@@ -266,13 +286,16 @@ private void buttonOK_Click(object sender, EventArgs e)
                 Settings.User.SetValueByKey("StringKeyboardShortcutRegionSelectClipboardModifier2", comboBoxKeyboardShortcutRegionSelectClipboardModifier2.Text.ToString());
                 Settings.User.SetValueByKey("StringKeyboardShortcutRegionSelectAutoSaveModifier1", comboBoxKeyboardShortcutRegionSelectAutoSaveModifier1.Text.ToString());
                 Settings.User.SetValueByKey("StringKeyboardShortcutRegionSelectAutoSaveModifier2", comboBoxKeyboardShortcutRegionSelectAutoSaveModifier2.Text.ToString());
+                Settings.User.SetValueByKey("StringKeyboardShortcutRegionSelectEditModifier1", comboBoxKeyboardShortcutRegionSelectEditModifier1.Text.ToString());
+                Settings.User.SetValueByKey("StringKeyboardShortcutRegionSelectEditModifier2", comboBoxKeyboardShortcutRegionSelectEditModifier2.Text.ToString());
 
                 Settings.User.SetValueByKey("StringKeyboardShortcutStartScreenCaptureKey", textBoxKeyboardShortcutStartScreenCaptureKey.Text.ToString().ToUpper());
                 Settings.User.SetValueByKey("StringKeyboardShortcutStopScreenCaptureKey", textBoxKeyboardShortcutStopScreenCaptureKey.Text.ToString().ToUpper());
                 Settings.User.SetValueByKey("StringKeyboardShortcutCaptureNowArchiveKey", textBoxKeyboardShortcutCaptureNowArchiveKey.Text.ToString().ToUpper());
                 Settings.User.SetValueByKey("StringKeyboardShortcutCaptureNowEditKey", textBoxKeyboardShortcutCaptureNowEditKey.Text.ToString().ToUpper());
                 Settings.User.SetValueByKey("StringKeyboardShortcutRegionSelectClipboardKey", textBoxKeyboardShortcutRegionSelectClipboardKey.Text.ToString().ToUpper());
                 Settings.User.SetValueByKey("StringKeyboardShortcutRegionSelectAutoSaveKey", textBoxKeyboardShortcutRegionSelectAutoSaveKey.Text.ToString().ToUpper());
+                Settings.User.SetValueByKey("StringKeyboardShortcutRegionSelectEditKey", textBoxKeyboardShortcutRegionSelectEditKey.Text.ToString().ToUpper());
 
                 Settings.User.Save();