diff --git a/src/main/resolve/tray.ts b/src/main/resolve/tray.ts index c094608d..63c2e2cb 100644 --- a/src/main/resolve/tray.ts +++ b/src/main/resolve/tray.ts @@ -681,7 +681,7 @@ function getCustomTrayIconKey(status: TrayIconStatus): CustomTrayIconKey { return 'tun' case 'white': default: - return 'common' + return 'off' } } @@ -695,7 +695,7 @@ function getCustomTrayIconForStatus( if (customTrayIcons[iconKey]) return customTrayIcons[iconKey] if (status === 'red') { - return customTrayIcons.tun || customTrayIcons.sysProxy || customTrayIcon + return customTrayIcons.sysProxy || customTrayIcon } return customTrayIcon diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx index 06c41f6a..3b4da084 100644 --- a/src/renderer/src/App.tsx +++ b/src/renderer/src/App.tsx @@ -98,7 +98,13 @@ const App: React.FC = () => { const currentSiderCard = getSiderCardByPath(location.pathname) if (!currentSiderCard || currentSiderCard === lastSelectedSiderCard) return patchAppConfig({ lastSelectedSiderCard: currentSiderCard }) - }, [hasAppConfig, rememberSelectedSiderCard, lastSelectedSiderCard, location.pathname, patchAppConfig]) + }, [ + hasAppConfig, + rememberSelectedSiderCard, + lastSelectedSiderCard, + location.pathname, + patchAppConfig + ]) useEffect(() => { siderWidthValueRef.current = siderWidthValue diff --git a/src/renderer/src/components/settings/general-config.tsx b/src/renderer/src/components/settings/general-config.tsx index 9e5fe469..2fe6556a 100644 --- a/src/renderer/src/components/settings/general-config.tsx +++ b/src/renderer/src/components/settings/general-config.tsx @@ -49,7 +49,7 @@ import TrayIconCropModal from './tray-icon-crop-modal' const rasterTrayIconPattern = /\.(png|jpe?g|webp)$/i const macTrayIconPattern = /\.(ico|icns)$/i type TrayIconCropTarget = 'custom' | keyof ICustomTrayIcons -const customTrayIconStateKeys: (keyof ICustomTrayIcons)[] = ['common', 'sysProxy', 'tun'] +const customTrayIconStateKeys: (keyof ICustomTrayIcons)[] = ['off', 'sysProxy', 'tun'] const GeneralConfig: React.FC = () => { const { t, i18n } = useTranslation() diff --git a/src/renderer/src/locales/en-US.json b/src/renderer/src/locales/en-US.json index 177797fc..9dfc1eae 100644 --- a/src/renderer/src/locales/en-US.json +++ b/src/renderer/src/locales/en-US.json @@ -104,9 +104,8 @@ "settings.customTrayIconSelect": "Select Tray Icon", "settings.cropTrayIcon": "Crop Tray Icon", "settings.customTrayIconBase64": "Cropped icon stored", - "settings.customTrayIconFallback": "Fallback", "settings.customTrayIconStates": "State Icons", - "settings.customTrayIcon.common": "Off", + "settings.customTrayIcon.off": "Off", "settings.customTrayIcon.sysProxy": "System Proxy", "settings.customTrayIcon.tun": "TUN", "settings.selectTrayIcon": "Select Icon", diff --git a/src/renderer/src/locales/fa-IR.json b/src/renderer/src/locales/fa-IR.json index 9cafdc49..b36c8b57 100644 --- a/src/renderer/src/locales/fa-IR.json +++ b/src/renderer/src/locales/fa-IR.json @@ -99,9 +99,8 @@ "settings.customTrayIconSelect": "انتخاب آیکون تری", "settings.cropTrayIcon": "برش آیکون تری", "settings.customTrayIconBase64": "آیکون برش‌خورده ذخیره شد", - "settings.customTrayIconFallback": "جایگزین", "settings.customTrayIconStates": "آیکون‌های وضعیت", - "settings.customTrayIcon.common": "خاموش", + "settings.customTrayIcon.off": "خاموش", "settings.customTrayIcon.sysProxy": "پراکسی سیستم", "settings.customTrayIcon.tun": "TUN", "settings.selectTrayIcon": "انتخاب آیکون", diff --git a/src/renderer/src/locales/ru-RU.json b/src/renderer/src/locales/ru-RU.json index 5c53339f..111c898b 100644 --- a/src/renderer/src/locales/ru-RU.json +++ b/src/renderer/src/locales/ru-RU.json @@ -101,9 +101,8 @@ "settings.customTrayIconSelect": "Выбрать значок трея", "settings.cropTrayIcon": "Обрезать значок трея", "settings.customTrayIconBase64": "Обрезанный значок сохранен", - "settings.customTrayIconFallback": "Запасной", "settings.customTrayIconStates": "Значки состояний", - "settings.customTrayIcon.common": "Выключено", + "settings.customTrayIcon.off": "Выключено", "settings.customTrayIcon.sysProxy": "Системный прокси", "settings.customTrayIcon.tun": "TUN", "settings.selectTrayIcon": "Выбрать значок", diff --git a/src/renderer/src/locales/zh-CN.json b/src/renderer/src/locales/zh-CN.json index 934fcc58..9761578b 100644 --- a/src/renderer/src/locales/zh-CN.json +++ b/src/renderer/src/locales/zh-CN.json @@ -104,9 +104,8 @@ "settings.customTrayIconSelect": "选择托盘图标", "settings.cropTrayIcon": "裁剪托盘图标", "settings.customTrayIconBase64": "已储存裁剪图标", - "settings.customTrayIconFallback": "备用", "settings.customTrayIconStates": "状态图标", - "settings.customTrayIcon.common": "关闭", + "settings.customTrayIcon.off": "关闭", "settings.customTrayIcon.sysProxy": "系统代理", "settings.customTrayIcon.tun": "TUN", "settings.selectTrayIcon": "选择图标", diff --git a/src/renderer/src/locales/zh-TW.json b/src/renderer/src/locales/zh-TW.json index 6be410fe..c1bf6ea0 100644 --- a/src/renderer/src/locales/zh-TW.json +++ b/src/renderer/src/locales/zh-TW.json @@ -104,9 +104,8 @@ "settings.customTrayIconSelect": "選擇托盤圖標", "settings.cropTrayIcon": "裁剪托盤圖標", "settings.customTrayIconBase64": "已儲存裁剪圖標", - "settings.customTrayIconFallback": "備用", "settings.customTrayIconStates": "狀態圖標", - "settings.customTrayIcon.common": "關閉", + "settings.customTrayIcon.off": "關閉", "settings.customTrayIcon.sysProxy": "系統代理", "settings.customTrayIcon.tun": "TUN", "settings.selectTrayIcon": "選擇圖標", diff --git a/src/shared/types.d.ts b/src/shared/types.d.ts index 1ec8f35a..7aec6031 100644 --- a/src/shared/types.d.ts +++ b/src/shared/types.d.ts @@ -259,7 +259,7 @@ interface INetworkLatencyTarget { } interface ICustomTrayIcons { - common?: string + off?: string sysProxy?: string tun?: string }