2.2.0.6 - An existing label can now be selected from a drop down list of available labels and applying a label to each screenshot is now determined by a checkbox value

Author: igloo-gkendall

FormMain.Designer.cs

@@ -333,8 +333,10 @@ private void LoadSettings()
                 numericUpDownKeepScreenshotsForDays.Value = Convert.ToDecimal(Settings.User.GetByKey("IntKeepScreenshotsForDays", defaultValue: 30).Value);
                 Log.Write("IntKeepScreenshotsForDays = " + numericUpDownKeepScreenshotsForDays.Value);
 
-                textBoxScreenshotLabel.Text = Settings.User.GetByKey("StringScreenshotLabel", defaultValue: string.Empty).Value.ToString();
-                Log.Write("StringScreenshotLabel = " + textBoxScreenshotLabel.Text);
+                comboBoxScreenshotLabel.Text = Settings.User.GetByKey("StringScreenshotLabel", defaultValue: string.Empty).Value.ToString();
+                Log.Write("StringScreenshotLabel = " + comboBoxScreenshotLabel.Text);
+
+                checkBoxScreenshotLabel.Checked = Convert.ToBoolean(Settings.User.GetByKey("BoolApplyScreenshotLabel", defaultValue: false).Value);
 
                 EnableStartCapture();
 
@@ -576,7 +578,8 @@ private void SaveSettings()
                 Settings.User.GetByKey("BoolLockScreenCaptureSession", defaultValue: false).Value = checkBoxPassphraseLock.Checked;
                 Settings.User.GetByKey("StringPassphrase", defaultValue: string.Empty).Value = textBoxPassphrase.Text;
                 Settings.User.GetByKey("IntKeepScreenshotsForDays", defaultValue: 30).Value = numericUpDownKeepScreenshotsForDays.Value;
-                Settings.User.GetByKey("StringScreenshotLabel", defaultValue: string.Empty).Value = textBoxScreenshotLabel.Text;
+                Settings.User.GetByKey("StringScreenshotLabel", defaultValue: string.Empty).Value = comboBoxScreenshotLabel.Text;
+                Settings.User.GetByKey("BoolApplyScreenshotLabel", defaultValue: false).Value = checkBoxScreenshotLabel.Checked;
 
                 Settings.User.Save();
 
@@ -631,6 +634,12 @@ private void ShowInterface()
                 SearchDates();
                 SearchScreenshots();
 
+                List<string> labels = _screenshotCollection.GetLabels();
+                labels.Sort();
+
+                comboBoxScreenshotLabel.DataSource = labels;
+                comboBoxScreenshotLabel.Text = Settings.User.GetByKey("StringScreenshotLabel", defaultValue: string.Empty).Value.ToString();
+
                 Show();
 
                 Visible = true;
@@ -1084,7 +1093,8 @@ private void EnableStartCapture()
                 dateTimePickerScheduleStartAt.Enabled = true;
                 dateTimePickerScheduleStopAt.Enabled = true;
 
-                textBoxScreenshotLabel.Enabled = true;
+                checkBoxScreenshotLabel.Enabled = true;
+                comboBoxScreenshotLabel.Enabled = true;
             }
             else
             {
@@ -1122,7 +1132,8 @@ private void EnableStopScreenCapture()
             dateTimePickerScheduleStartAt.Enabled = false;
             dateTimePickerScheduleStopAt.Enabled = false;
 
-            textBoxScreenshotLabel.Enabled = false;
+            checkBoxScreenshotLabel.Enabled = false;
+            comboBoxScreenshotLabel.Enabled = false;
         }
 
         /// <summary>
@@ -2669,7 +2680,7 @@ private void RunRegionCaptures()
                             resolutionRatio: region.ResolutionRatio,
                             viewId: region.ViewId,
                             bitmap: bitmap,
-                            label: textBoxScreenshotLabel.Text,
+                            label: checkBoxScreenshotLabel.Checked ? comboBoxScreenshotLabel.Text : string.Empty,
                             windowTitle: _screenCapture.ActiveWindowTitle,
                             screenCollection: formScreen.ScreenCollection,
                             regionCollection: formRegion.RegionCollection,
@@ -2711,7 +2722,7 @@ private void RunScreenCaptures()
                                 resolutionRatio: screen.ResolutionRatio,
                                 viewId: screen.ViewId,
                                 bitmap: bitmap,
-                                label: textBoxScreenshotLabel.Text,
+                                label: checkBoxScreenshotLabel.Checked ? comboBoxScreenshotLabel.Text : string.Empty,
                                 windowTitle: _screenCapture.ActiveWindowTitle,
                                 screenCollection: formScreen.ScreenCollection,
                                 regionCollection: formRegion.RegionCollection,
@@ -2752,7 +2763,7 @@ private void RunScreenCaptures()
                                     resolutionRatio: screen.ResolutionRatio,
                                     viewId: screen.ViewId,
                                     bitmap: bitmap,
-                                    label: textBoxScreenshotLabel.Text,
+                                    label: checkBoxScreenshotLabel.Checked ? comboBoxScreenshotLabel.Text : string.Empty,
                                     windowTitle: _screenCapture.ActiveWindowTitle,
                                     screenCollection: formScreen.ScreenCollection,
                                     regionCollection: formRegion.RegionCollection,

FormMain.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.2.0.5")]
-[assembly: AssemblyFileVersion("2.2.0.5")]
+[assembly: AssemblyVersion("2.2.0.6")]
+[assembly: AssemblyFileVersion("2.2.0.6")]
 [assembly: NeutralResourcesLanguageAttribute("en-CA")]

Properties/AssemblyInfo.cs

@@ -3,7 +3,7 @@
   <assemblyIdentity
     type="win32"
     name="GavinKendall.AutoScreenCapture"
-    version="2.2.0.5"/>
+    version="2.2.0.6"/>
   <asmv3:application>
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
       <dpiAware>True/PM</dpiAware>

app.manifest

@@ -161,6 +161,11 @@ public  List<Slide> GetSlides(string filterType, string filterValue, string date
             return slides;
         }
 
+        public List<string> GetLabels()
+        {
+            return _screenshotList.Where(x => x.Label != null && !string.IsNullOrEmpty(x.Label)).Select(x => x.Label).Distinct().ToList();
+        }
+
         public  Screenshot GetScreenshot(string slideName, Guid viewId)
         {
             Screenshot foundScreenshot = new Screenshot();

screenshots/ScreenshotCollection.cs

@@ -13,7 +13,7 @@ namespace AutoScreenCapture
     public static class Settings
     {
         public static readonly string ApplicationName = "Auto Screen Capture";
-        public static readonly string ApplicationVersion = "2.2.0.5";
+        public static readonly string ApplicationVersion = "2.2.0.6";
         public static readonly string ApplicationCodename = "Dalek";
 
         public static SettingCollection Application;
@@ -90,6 +90,7 @@ public static void Initialize()
                 User.Add(new Setting("StringPassphrase", string.Empty));
                 User.Add(new Setting("IntKeepScreenshotsForDays", 30));
                 User.Add(new Setting("StringScreenshotLabel", string.Empty));
+                User.Add(new Setting("BoolApplyScreenshotLabel", false));
 
                 User.Save();
             }