From 8421925f9da70135048e6a09c983d5901cf833b9 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 18:21:32 +0800
Subject: [PATCH] :sparkles: Feature: add check to avoid hide dock and tray at
 the same time

---
 public/i18n/en.yml                  |  1 +
 public/i18n/zh-CN.yml               |  1 +
 public/i18n/zh-TW.yml               |  1 +
 src/renderer/pages/PicGoSetting.vue | 15 ++++++++++++---
 src/universal/types/i18n.d.ts       |  1 +
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/public/i18n/en.yml b/public/i18n/en.yml
index c781d6d..4e39fb2 100644
--- a/public/i18n/en.yml
+++ b/public/i18n/en.yml
@@ -190,6 +190,7 @@ SETTINGS_CUSTOM_MINI_ICON: Custom Mini Window Icon
 SETTINGS_COMPRESS_AND_WATERMARK: Compress and Watermark
 SETTINGS_SYNC_DELETE_CLOUD: Sync delete from cloud storage of gallery
 SETTINGS_ISHIDEDOCK: Hide Dock Icon
+SETTINGS_ISHIDEDOCK_TIPS: Not support hide dock and tray at the same time
 # shortcut-page
 
 BUILTIN_CLIPBOARD_TIPS: Use builtin clipboard function to upload instead of using scripts
diff --git a/public/i18n/zh-CN.yml b/public/i18n/zh-CN.yml
index 5595d8c..2f6747e 100644
--- a/public/i18n/zh-CN.yml
+++ b/public/i18n/zh-CN.yml
@@ -191,6 +191,7 @@ SETTINGS_CUSTOM_MINI_ICON: 是否自定义Mini窗口图标
 SETTINGS_COMPRESS_AND_WATERMARK: 设置图片水印和压缩-格式转换等参数
 SETTINGS_SYNC_DELETE_CLOUD: 相册内删除时同步删除云端文件
 SETTINGS_ISHIDEDOCK: 是否隐藏dock图标
+SETTINGS_ISHIDEDOCK_TIPS: 不支持同时隐藏dock和托盘
 
 # shortcut-page
 
diff --git a/public/i18n/zh-TW.yml b/public/i18n/zh-TW.yml
index bb3462b..ac29e4b 100644
--- a/public/i18n/zh-TW.yml
+++ b/public/i18n/zh-TW.yml
@@ -191,6 +191,7 @@ SETTINGS_CUSTOM_MINI_ICON: 自訂Mini視窗圖示
 SETTINGS_COMPRESS_AND_WATERMARK: 設置圖片浮水印和壓縮-格式轉換等參數
 SETTINGS_SYNC_DELETE_CLOUD: 從相簿中刪除並同步從雲端刪除
 SETTINGS_ISHIDEDOCK: 是否隱藏dock圖示
+SETTINGS_ISHIDEDOCK_TIPS: 不支持同時隱藏dock和托盘
 # shortcut-page
 
 SHORTCUT_NAME: 快捷鍵名稱
diff --git a/src/renderer/pages/PicGoSetting.vue b/src/renderer/pages/PicGoSetting.vue
index 7c4c2f8..24f71b8 100644
--- a/src/renderer/pages/PicGoSetting.vue
+++ b/src/renderer/pages/PicGoSetting.vue
@@ -1242,6 +1242,10 @@ function updateHelperChange (val: ICheckBoxValueType) {
 }
 
 function handleHideDockChange (val: ICheckBoxValueType) {
+  if (val && currentStartMode.value === 'no-tray') {
+    ElMessage.warning($T('SETTINGS_ISHIDEDOCK_TIPS'))
+    return
+  }
   saveConfig('settings.isHideDock', val)
   sendToMain(HIDE_DOCK, val)
 }
@@ -1457,12 +1461,17 @@ function handleLanguageChange (val: string) {
 }
 
 function handleStartModeChange (val: 'quiet' | 'mini' | 'main' | 'no-tray') {
+  if (val === 'no-tray') {
+    if (form.isHideDock) {
+      ElMessage.warning($T('SETTINGS_ISHIDEDOCK_TIPS'))
+      currentStartMode.value = 'quiet'
+      return
+    }
+    $message.info($T('TIPS_NEED_RELOAD'))
+  }
   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 7e4be41..f455d49 100644
--- a/src/universal/types/i18n.d.ts
+++ b/src/universal/types/i18n.d.ts
@@ -185,6 +185,7 @@ interface ILocales {
   SETTINGS_COMPRESS_AND_WATERMARK: string
   SETTINGS_SYNC_DELETE_CLOUD: string
   SETTINGS_ISHIDEDOCK: string
+  SETTINGS_ISHIDEDOCK_TIPS: string
   SHORTCUT_NAME: string
   SHORTCUT_BIND: string
   SHORTCUT_STATUS: string