Close to tray - WIP for #2

prayerie · Jul 5, 2023 · 47114f1 · 47114f1
1 parent fba3d37
commit 47114f1
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/JpLayoutFixer/mainform.Designer.cs b/JpLayoutFixer/mainform.Designer.cs
diff --git a/JpLayoutFixer/mainform.cs b/JpLayoutFixer/mainform.cs
@@ -16,6 +16,7 @@ public partial class mainform : Form {
         private Dictionary<string, string> layoutsDict = new Dictionary<string, string>();
         private string currentLblMsg = string.Empty;
         private string currentLblMsgJp = string.Empty;
+        private Boolean reallyClosing = false;
 
         public mainform() {
             InitializeComponent();
@@ -32,6 +33,27 @@ public mainform() {
             LoadCurrentJpLayout();
             SelectCurrentLayout();
             LocaliseComponents();
+
+            this.FormClosing += (s, e) =>
+            {
+                if (!reallyClosing) {
+                    e.Cancel = true;
+                    this.Hide();
+                }
+            };
+
+            chJpLfTrayIcon.Icon = System.Drawing.Icon.ExtractAssociatedIcon(Application.ExecutablePath);
+
+            var closeMenuItem = new MenuItem("Quit", (s, e) =>
+            {
+                reallyClosing = true;
+                Application.Exit();
+            });
+
+            chJpLfTrayIcon.ContextMenu = new ContextMenu(new MenuItem[] { closeMenuItem });
+
+            chJpLfTrayIcon.Visible = true;
+
         }
 
         private async Task CheckForUpdates() {

diff --git a/JpLayoutFixer/mainform.resx b/JpLayoutFixer/mainform.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="chJpLfTrayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>