Merge pull request #56 from WeiqinYang1994/issue175

Pull Request For Issue #1, #2, #4, #7, #8, #9, #28 AND fix issues according to @cskeogh's reviewing comment
lodestone · May 11, 2021 · a028cc5 · a028cc5
2 parents 84b8e36 + 9f0f9a1
commit a028cc5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/source/main/modules/window-manager/index.ts b/source/main/modules/window-manager/index.ts
@@ -315,7 +315,10 @@ export default class WindowManager {
     }
 
     this._mainWindow.on('show', () => {
-      this._addTray()
+      const leaveAppRunning = Boolean(global.config.get('system.leaveAppRunning'))
+      if (leaveAppRunning) {
+        this._addTray()
+      }
     })
 
     // Listens to events from the window

diff --git a/source/win-preferences/schema/advanced.js b/source/win-preferences/schema/advanced.js
@@ -38,7 +38,7 @@ export default {
       },
       {
         type: 'checkbox',
-        label: 'Leave app running in the notification area', // trans('dialog.preferences.leave_app_running'),
+        label: process.platform === 'darwin' ? 'Show app in the notification area' : 'Leave app running in the notification area',
         model: 'system.leaveAppRunning'
       }
     ],