Add Quit button from application.

training-yoyosan · Apr 2, 2020 · bb3ac56 · bb3ac56
1 parent 41a7036
commit bb3ac56
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 6 deletions.
diff --git a/src-electron/icons/icon.icns b/src-electron/icons/icon.icns
diff --git a/src-electron/icons/icon.ico b/src-electron/icons/icon.ico
diff --git a/src-electron/main-process/electron-main-menu-template.js b/src-electron/main-process/electron-main-menu-template.js
@@ -25,7 +25,7 @@ export const menuTemplate = [
     submenu: [
       {
         label: 'Settings',
-        accelerator: 'CmdorCtrl+,',
+        accelerator: 'CmdOrCtrl+,',
         click () {
           mainWindow.webContents.send('show-settings')
         }

diff --git a/src-electron/main-process/electron-main.js b/src-electron/main-process/electron-main.js
@@ -1,4 +1,4 @@
-import { app, BrowserWindow, nativeTheme, Menu } from 'electron'
+import { app, BrowserWindow, nativeTheme, Menu, ipcMain } from 'electron'
 import { menuTemplate } from './electron-main-menu-template'
 
 try {
@@ -19,12 +19,15 @@ if (process.env.PROD) {
 export let mainWindow
 const menu = Menu.buildFromTemplate(menuTemplate)
 
+/**
+ * app events
+ */
 app.on('ready', () => {
   /**
    * Initial window options
    */
   mainWindow = new BrowserWindow({
-    width: 1000,
+    width: 1025,
     height: 600,
     minWidth: 800,
     minHeight: 500,
@@ -52,3 +55,9 @@ app.on('window-all-closed', () => {
   app.quit()
 })
 
+/**
+ * ipc events
+ */
+ipcMain.on('quit-app', () => {
+  app.quit()
+})
diff --git a/src/layouts/Layout.vue b/src/layouts/Layout.vue
@@ -14,9 +14,9 @@
             href="https://github.com/training-yoyosan/awesome-todo"
             target="_blank"
             color="red"
-            label="Fork me on Github"/>
+            label="Fork me"/>
           <q-btn
-            label="Dismiss"
+            icon="close"
             class="q-ml-sm"
             @click="dismissBanner = true"/>
         </template>
@@ -79,6 +79,23 @@
           :key="link.title"
           v-bind="link"
         />
+
+        <q-item
+          v-if="$q.platform.is.electron"
+          clickable
+          @click="quitApp"
+          class="text-grey-5 absolute-bottom"
+        >
+          <q-item-section
+            avatar
+          >
+            <q-icon name="power_settings_new" />
+          </q-item-section>
+
+          <q-item-section>
+            <q-item-label>Quit</q-item-label>
+          </q-item-section>
+        </q-item>
       </q-list>
     </q-drawer>
 
@@ -125,7 +142,19 @@ export default {
   },
 
   methods: {
-    ...mapActions('auth', ['logoutUser'])
+    ...mapActions('auth', ['logoutUser']),
+    quitApp () {
+      if (this.$q.platform.is.electron) {
+        this.$q.dialog({
+          title: 'Confirm',
+          message: 'Would you like to quit the application?',
+          cancel: true,
+          persistent: true
+        }).onOk(() => {
+          require('electron').ipcRenderer.send('quit-app')
+        })
+      }
+    }
   }
 }
 </script>