From 4043dbfb25997dd80a0ec88536d0f3f8e8091532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92=E8=B5=AB=E8=90=9D?=
 <ma_shiqing@163.com>
Date: Sun, 9 Apr 2023 17:58:09 +0800
Subject: [PATCH] :sparkles: Feature: on macos, tray icon can be hidden now

---
 public/i18n/en.yml                  |  1 +
 public/i18n/zh-CN.yml               |  1 +
 public/i18n/zh-TW.yml               |  1 +
 src/main/lifeCycle/index.ts         | 14 ++++++++------
 src/renderer/pages/PicGoSetting.vue | 11 ++++++++++-
 src/universal/types/i18n.d.ts       |  1 +
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/public/i18n/en.yml b/public/i18n/en.yml
index 25de946..c781d6d 100644
--- a/public/i18n/en.yml
+++ b/public/i18n/en.yml
@@ -120,6 +120,7 @@ SETTINGS_MIGRATE_FROM_PICGO_FAILED: Import failed
 SETTINGS_START_MODE: Default Start Mode
 SETTINGS_START_MODE_MINI: Mini Window
 SETTINGS_START_MODE_MAIN: Main Window
+SETTINGS_START_MODE_NO_TRAY: No Tray
 SETTINGS_START_MODE_QUIET: Quiet Mode
 SETTINGS_CLICK_TO_OPEN: Click to Open
 SETTINGS_SET_LOG_FILE: Set Log File
diff --git a/public/i18n/zh-CN.yml b/public/i18n/zh-CN.yml
index 98da3c2..5595d8c 100644
--- a/public/i18n/zh-CN.yml
+++ b/public/i18n/zh-CN.yml
@@ -120,6 +120,7 @@ SETTINGS_MIGRATE_FROM_PICGO_FAILED: 导入失败
 SETTINGS_START_MODE: 启动模式
 SETTINGS_START_MODE_MINI: mini窗口
 SETTINGS_START_MODE_MAIN: 主窗口
+SETTINGS_START_MODE_NO_TRAY: 隐藏托盘
 SETTINGS_START_MODE_QUIET: 静默启动
 SETTINGS_CLICK_TO_OPEN: 点击打开
 SETTINGS_SET_LOG_FILE: 设置日志文件
diff --git a/public/i18n/zh-TW.yml b/public/i18n/zh-TW.yml
index a30052c..bb3462b 100644
--- a/public/i18n/zh-TW.yml
+++ b/public/i18n/zh-TW.yml
@@ -121,6 +121,7 @@ SETTINGS_START_MODE: 啟動模式
 SETTINGS_START_MODE_MINI: mini窗口
 SETTINGS_START_MODE_MAIN: 主窗口
 SETTINGS_START_MODE_QUIET: 靜默啟動
+SETTINGS_START_MODE_NO_TRAY: 隐藏托盘
 SETTINGS_CLICK_TO_OPEN: 點擊打開
 SETTINGS_SET_LOG_FILE: 設定記錄檔案
 SETTINGS_CLICK_TO_SET: 點擊設定
diff --git a/src/main/lifeCycle/index.ts b/src/main/lifeCycle/index.ts
index aa731fb..db41a51 100644
--- a/src/main/lifeCycle/index.ts
+++ b/src/main/lifeCycle/index.ts
@@ -154,8 +154,15 @@ class LifeCycle {
           ])
         )
       }
-      createTray()
+      const startMode = db.get('settings.startMode') || 'quiet'
+      if (startMode !== 'no-tray' && process.platform === 'darwin') {
+        createTray()
+      }
       db.set('needReload', false)
+      const isHideDock = db.get('settings.isHideDock') || false
+      if (isHideDock) {
+        app.dock.hide()
+      }
       updateChecker()
       // 不需要阻塞
       process.nextTick(() => {
@@ -175,7 +182,6 @@ class LifeCycle {
       }
       await remoteNoticeHandler.init()
       remoteNoticeHandler.triggerHook(IRemoteNoticeTriggerHook.APP_START)
-      const startMode = db.get('settings.startMode') || 'quiet'
       if (startMode === 'mini') {
         windowManager.create(IWindowList.MINI_WINDOW)
         const miniWindow = windowManager.get(IWindowList.MINI_WINDOW)!
@@ -204,10 +210,6 @@ class LifeCycle {
         settingWindow.show()
         settingWindow.focus()
       }
-      const isHideDock = db.get('settings.isHideDock') || false
-      if (isHideDock) {
-        app.dock.hide()
-      }
     }
     app.whenReady().then(readyFunction)
   }
diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue
index db1c23f..7c4c2f8 100644
--- a/src/renderer/pages/PicGoSetting.vue
+++ b/src/renderer/pages/PicGoSetting.vue
@@ -63,6 +63,12 @@
                   :label="$T('SETTINGS_START_MODE_MINI')"
                   :value="'mini'"
                 />
+                <el-option
+                  v-if="os === 'darwin'"
+                  key="no-tray"
+                  :label="$T('SETTINGS_START_MODE_NO_TRAY')"
+                  :value="'no-tray'"
+                />
                 <el-option
                   key="main"
                   :label="$T('SETTINGS_START_MODE_MAIN')"
@@ -1450,10 +1456,13 @@ function handleLanguageChange (val: string) {
   sendToMain(GET_PICBEDS)
 }
 
-function handleStartModeChange (val: 'quiet' | 'mini' | 'main') {
+function handleStartModeChange (val: 'quiet' | 'mini' | 'main' | 'no-tray') {
   saveConfig({
     'settings.startMode': val
   })
+  if (val === 'no-tray') {
+    $message.info($T('TIPS_NEED_RELOAD'))
+  }
 }
 
 function goConfigPage () {
diff --git a/src/universal/types/i18n.d.ts b/src/universal/types/i18n.d.ts
index 9cda86e..7e4be41 100644
--- a/src/universal/types/i18n.d.ts
+++ b/src/universal/types/i18n.d.ts
@@ -114,6 +114,7 @@ interface ILocales {
   SETTINGS_START_MODE: string
   SETTINGS_START_MODE_MINI: string
   SETTINGS_START_MODE_MAIN: string
+  SETTINGS_START_MODE_NO_TRAY: string
   SETTINGS_START_MODE_QUIET: string
   SETTINGS_CLICK_TO_OPEN: string
   SETTINGS_SET_LOG_FILE: string