fix(agent): tray menu entries did not display windows and quit did no…

…t work
joshuar · Jul 3, 2023 · 1bc86b7 · 1bc86b7
1 parent e36bdf4
commit 1bc86b7
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 47 deletions.
diff --git a/internal/agent/ui.go b/internal/agent/ui.go
@@ -36,7 +36,8 @@ func newUI(appID string) fyne.App {
 func (agent *Agent) setupSystemTray(ctx context.Context) {
 	log.Debug().Caller().Msg("Creating tray icon.")
 	if desk, ok := agent.app.(desktop.App); ok {
-		menuItemAbout := fyne.NewMenuItem("About", func() {
+		log.Debug().Caller().Msg("Running in desktop mode. Setting tray menu.")
+		menuItemAbout := fyne.NewMenuItem(translator.Translate("About"), func() {
 			agent.aboutWindow(ctx)
 		})
 		menuItemIssue := fyne.
@@ -57,12 +58,17 @@ func (agent *Agent) setupSystemTray(ctx context.Context) {
 			NewMenuItem(translator.Translate("Sensors"), func() {
 				agent.sensorsWindow(ctx)
 			})
+		menuItemQuit := fyne.NewMenuItem(translator.Translate("Quit"), func() {
+			close(agent.done)
+		})
+		menuItemQuit.IsQuit = true
 		menu := fyne.NewMenu(agent.Name,
 			menuItemAbout,
 			menuItemIssue,
 			menuItemFeatureRequest,
 			menuItemSettings,
-			menuItemSensors)
+			menuItemSensors,
+			menuItemQuit)
 		desk.SetSystemTrayMenu(menu)
 	}
 }

diff --git a/internal/translations/catalog.go b/internal/translations/catalog.go
diff --git a/internal/translations/locales/en/out.gotext.json b/internal/translations/locales/en/out.gotext.json
@@ -44,34 +44,9 @@
             "fuzzy": true
         },
         {
-            "id": "App Version: {Version}\tHA Version: {HassVersion}",
-            "message": "App Version: {Version}\tHA Version: {HassVersion}",
-            "translation": "App Version: {Version}\tHA Version: {HassVersion}",
-            "translatorComment": "Copied from source.",
-            "placeholders": [
-                {
-                    "id": "Version",
-                    "string": "%[1]s",
-                    "type": "string",
-                    "underlyingType": "string",
-                    "argNum": 1,
-                    "expr": "agent.Version"
-                },
-                {
-                    "id": "HassVersion",
-                    "string": "%[2]s",
-                    "type": "interface{}",
-                    "underlyingType": "interface{}",
-                    "argNum": 2,
-                    "expr": "hassVersion"
-                }
-            ],
-            "fuzzy": true
-        },
-        {
-            "id": "Ok",
-            "message": "Ok",
-            "translation": "Ok",
+            "id": "About",
+            "message": "About",
+            "translation": "About",
             "translatorComment": "Copied from source.",
             "fuzzy": true
         },
@@ -103,6 +78,45 @@
             "translatorComment": "Copied from source.",
             "fuzzy": true
         },
+        {
+            "id": "Quit",
+            "message": "Quit",
+            "translation": "Quit",
+            "translatorComment": "Copied from source.",
+            "fuzzy": true
+        },
+        {
+            "id": "App Version: {Version}\tHA Version: {HassVersion}",
+            "message": "App Version: {Version}\tHA Version: {HassVersion}",
+            "translation": "App Version: {Version}\tHA Version: {HassVersion}",
+            "translatorComment": "Copied from source.",
+            "placeholders": [
+                {
+                    "id": "Version",
+                    "string": "%[1]s",
+                    "type": "string",
+                    "underlyingType": "string",
+                    "argNum": 1,
+                    "expr": "agent.Version"
+                },
+                {
+                    "id": "HassVersion",
+                    "string": "%[2]s",
+                    "type": "interface{}",
+                    "underlyingType": "interface{}",
+                    "argNum": 2,
+                    "expr": "hassVersion"
+                }
+            ],
+            "fuzzy": true
+        },
+        {
+            "id": "Ok",
+            "message": "Ok",
+            "translation": "Ok",
+            "translatorComment": "Copied from source.",
+            "fuzzy": true
+        },
         {
             "id": "{Name}: {S}",
             "message": "{Name}: {S}",