add context menu to tray icon, for #20

mcmonkeyprojects · Sep 15, 2021 · a151ff4 · a151ff4
1 parent 6ed17d7
commit a151ff4
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 20 deletions.
diff --git a/KeyboardChatterBlocker/MainBlockerForm.Designer.cs b/KeyboardChatterBlocker/MainBlockerForm.Designer.cs
diff --git a/KeyboardChatterBlocker/MainBlockerForm.cs b/KeyboardChatterBlocker/MainBlockerForm.cs
@@ -265,18 +265,27 @@ public void MainBlockerForm_Load(object sender, EventArgs e)
         /// </summary>
         public void StatsUpdateTimer_Tick(object sender, EventArgs e)
         {
-            if (Program.Blocker.AnyKeyChange && !IsHidden && tabControl1.SelectedTab == StatsTabPage)
+            if (Program.Blocker.AnyKeyChange && !IsHidden && TabControl1.SelectedTab == StatsTabPage)
             {
                 Program.Blocker.AnyKeyChange = false;
                 PushStatsToGrid();
             }
         }
 
+        /// <summary>
+        /// If enabled, any close should fully close the form and exit the program.
+        /// </summary>
+        public bool ShouldForceClose = false;
+
         /// <summary>
         /// Event method auto-called when the form close button is pressed.
         /// </summary>
         public void MainBlockerForm_FormClosing(object sender, FormClosingEventArgs e)
         {
+            if (ShouldForceClose)
+            {
+                return;
+            }
             if (e.CloseReason != CloseReason.UserClosing) // Don't block windows shutdown, etc.
             {
                 return;
@@ -431,7 +440,7 @@ private void ChatterLogGrid_CellContentDoubleClick(object sender, DataGridViewCe
                     ConfigureKeysGrid.Rows.Add(key.Stringify(), Program.Blocker.GlobalChatterTimeLimit.ToString(), "[X]");
                 }
                 string keyText = key.Stringify();
-                tabControl1.SelectedTab = KeysTabPage;
+                TabControl1.SelectedTab = KeysTabPage;
                 foreach (DataGridViewRow row in ConfigureKeysGrid.Rows)
                 {
                     if (row.Cells[0].Value.ToString() == keyText)
@@ -563,5 +572,21 @@ private void AutoDisableProgramsList_Click(object sender, EventArgs e)
                 AddProgramTextBox.Text = selected.Text;
             }
         }
+
+        /// <summary>
+        /// Event method to handle clicks of the tray icon.
+        /// </summary>
+        private void TrayIconContextMenu_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
+        {
+            if (e.ClickedItem == ContextMenuShowButton)
+            {
+                ShowForm();
+            }
+            else if (e.ClickedItem == ContextMenuExitButton)
+            {
+                ShouldForceClose = true;
+                Close();
+            }
+        }
     }
 }
diff --git a/KeyboardChatterBlocker/MainBlockerForm.resx b/KeyboardChatterBlocker/MainBlockerForm.resx
@@ -132,6 +132,9 @@
   <metadata name="TrayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="trayIconContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>115, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="TrayIcon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>