Merge pull request #42 from Omniaevo/develop

Close to tray in settings

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mqtt5-explorer",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "private": false,
   "license": "GPLv3",
   "description": "A simple MQTT client that supports MQTT5 protocol.",

src/App.vue

@@ -62,6 +62,9 @@ export default {
     outline() {
       this.persistSettings();
     },
+    closeToTray() {
+      this.persistSettings();
+    },
     clientId() {
       this.persistSettings();
     },

src/background.js

@@ -31,6 +31,7 @@ protocol.registerSchemesAsPrivileged([
 ]);
 
 const store = new Store();
+
 let win;
 let tray;
 
@@ -245,8 +246,10 @@ async function createWindow() {
 
   // Close to tray
   win.on("close", (event) => {
-    event.preventDefault();
-    win.hide();
+    if (store.get("close_to_tray") !== "false") {
+      event.preventDefault();
+      win.hide();
+    }
   });
 
   // Manage renderer messages
@@ -305,8 +308,14 @@ app.on("activate", () => {
 // Some APIs can only be used after this event occurs.
 app.on("ready", async () => createWindow());
 
-app.on("before-quit", () => {
+app.on("before-quit", (event) => {
+  event.preventDefault();
+
+  if (win) win.destroy();
   if (tray) tray.destroy();
+
+  app.removeAllListeners();
+  app.exit();
 });
 
 // Exit cleanly on request from parent process in development mode.

src/main.js

@@ -34,6 +34,9 @@ Vue.mixin({
     outline() {
       return this.$store.getters.getOutline;
     },
+    closeToTray() {
+      return this.$store.getters.getCloseToTray;
+    },
     darkTheme() {
       return (this.theme || "light") === "dark";
     },
@@ -81,6 +84,7 @@ Vue.mixin({
     },
     persistSettings() {
       this.$estore.set(this.settingsStore, JSON.stringify(this.allSettings));
+      this.$estore.set("close_to_tray", `${this.allSettings.closeTray}`);
     },
     loadSettings() {
       this.$store.commit(

src/store/settings.js

@@ -4,6 +4,7 @@ const settingsVuexModule = {
   state: {
     theme: "light",
     outline: false,
+    closeTray: true,
     primaryColor: {
       text: "Indie Indigo",
       value: { light: "#3F51B5", dark: "#5C6BC0" },
@@ -18,6 +19,7 @@ const settingsVuexModule = {
   mutations: {
     setTheme: (state, theme) => (state.theme = theme),
     setOutline: (state, outline) => (state.outline = outline),
+    setCloseToTray: (state, tray) => (state.closeTray = tray),
     setPrimaryColor: (state, primary) => (state.primaryColor = primary),
     setClientId: (state, clientId) => (state.clientId = clientId),
     setKeepalive: (state, keepalive) => (state.keepalive = keepalive),
@@ -27,6 +29,7 @@ const settingsVuexModule = {
     setAllSettings: (state, data) => {
       state.theme = data.theme || "light";
       state.outline = data.outline;
+      state.closeTray = data.closeTray ?? true;
       // eslint-disable-next-line prettier/prettier
       state.primaryColor = data.primaryColor || {
         text: "Indie Indigo",
@@ -44,6 +47,7 @@ const settingsVuexModule = {
     getAllSettings: (state) => state,
     getTheme: (state) => state.theme,
     getOutline: (state) => state.outline,
+    getCloseToTray: (state) => state.closeTray,
     getPrimaryColor: (state) => state.primaryColor,
     getClientId: (state) => state.clientId,
     getKeepalive: (state) => state.keepalive,

src/views/Home.vue

@@ -59,7 +59,20 @@
         </v-list-item>
 
         <v-list-item>
-          <v-switch v-model="selectedOutline" label="Outlined fields" inset />
+          <v-list-item-content class="px-3">
+            <div class="d-flex justify-space-between" style="gap: 1em">
+              <v-switch
+                v-model="selectedOutline"
+                label="Outlined fields"
+                inset
+              />
+              <v-switch
+                v-model="selectedCloseToTray"
+                label="Close to system tray"
+                inset
+              />
+            </div>
+          </v-list-item-content>
         </v-list-item>
 
         <v-divider class="mx-3" />
@@ -396,6 +409,14 @@ export default {
         this.$store.commit("setOutline", newValue);
       },
     },
+    selectedCloseToTray: {
+      get() {
+        return this.$store.getters.getCloseToTray;
+      },
+      set(newValue) {
+        this.$store.commit("setCloseToTray", newValue);
+      },
+    },
     selectedColor: {
       get() {
         return this.$store.getters.getPrimaryColor;