From e1b8c9960ab44e34275367591746c4df3e20083e Mon Sep 17 00:00:00 2001
From: Memory <134070804+Memory2314@users.noreply.github.com>
Date: Fri, 14 Nov 2025 21:58:24 +0800
Subject: [PATCH] feat: show current proxy in tray

---
 src/main/resolve/tray.ts                             |  5 ++++-
 .../src/components/settings/general-config.tsx       | 12 ++++++++++++
 src/renderer/src/locales/en-US.json                  |  1 +
 src/renderer/src/locales/zh-CN.json                  |  1 +
 src/shared/types.d.ts                                |  1 +
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/resolve/tray.ts b/src/main/resolve/tray.ts
index 7d344e0..e8751c2 100644
--- a/src/main/resolve/tray.ts
+++ b/src/main/resolve/tray.ts
@@ -39,6 +39,7 @@ export const buildContextMenu = async (): Promise<Menu> => {
     envType = process.platform === 'win32' ? ['powershell'] : ['bash'],
     autoCloseConnection,
     proxyInTray = true,
+    showCurrentProxyInTray = false,
     triggerSysProxyShortcut = '',
     showFloatingWindowShortcut = '',
     showWindowShortcut = '',
@@ -54,9 +55,11 @@ export const buildContextMenu = async (): Promise<Menu> => {
     try {
       const groups = await mihomoGroups()
       groupsMenu = groups.map((group) => {
+        const groupLabel = showCurrentProxyInTray ? `${group.name} | ${group.now}` : group.name;
+        
         return {
           id: group.name,
-          label: group.name,
+          label: groupLabel,
           type: 'submenu',
           submenu: group.all.map((proxy) => {
             const delay = proxy.history.length ? proxy.history[proxy.history.length - 1].delay : -1
diff --git a/src/renderer/src/components/settings/general-config.tsx b/src/renderer/src/components/settings/general-config.tsx
index fa1df54..773c157 100644
--- a/src/renderer/src/components/settings/general-config.tsx
+++ b/src/renderer/src/components/settings/general-config.tsx
@@ -49,6 +49,7 @@ const GeneralConfig: React.FC = () => {
     useDockIcon = true,
     showTraffic = false,
     proxyInTray = true,
+    showCurrentProxyInTray = false,
     disableTray = false,
     disableTrayIconColor = false,
     disableAnimations = false,
@@ -342,6 +343,17 @@ const GeneralConfig: React.FC = () => {
                 }}
               />
             </SettingItem>
+            {proxyInTray && (
+              <SettingItem title={t('settings.showCurrentProxyInTray')} divider>
+                <Switch
+                  size="sm"
+                  isSelected={showCurrentProxyInTray}
+                  onValueChange={async (v) => {
+                    await patchAppConfig({ showCurrentProxyInTray: v })
+                  }}
+                />
+              </SettingItem>
+            )}
             <SettingItem
               title={t('settings.showTraffic', {
                 context: platform === 'win32' ? 'windows' : 'mac'
diff --git a/src/renderer/src/locales/en-US.json b/src/renderer/src/locales/en-US.json
index 1dad587..c941cd9 100644
--- a/src/renderer/src/locales/en-US.json
+++ b/src/renderer/src/locales/en-US.json
@@ -65,6 +65,7 @@
   "settings.floatingWindowCompatModeTooltip": "Disables transparency effects to prevent crashes on some Windows systems. Recommended to keep enabled for stability",
   "settings.disableTray": "Disable Tray Icon",
   "settings.proxyInTray": "Show Proxy Info in Tray Menu",
+  "settings.showCurrentProxyInTray": "Show Current Proxy in Tray Menu",
   "settings.disableTrayIconColor": "Disable Tray Icon Color Changes",
   "settings.disableAnimations": "Disable Animation Effects",
   "settings.showTraffic_windows": "Show Network Speed in Taskbar",
diff --git a/src/renderer/src/locales/zh-CN.json b/src/renderer/src/locales/zh-CN.json
index 8c97c59..4ef68ee 100644
--- a/src/renderer/src/locales/zh-CN.json
+++ b/src/renderer/src/locales/zh-CN.json
@@ -65,6 +65,7 @@
   "settings.floatingWindowCompatModeTooltip": "禁用透明效果以避免在某些 Windows 系统上崩溃，建议保持开启以确保稳定性",
   "settings.disableTray": "禁用托盘图标",
   "settings.proxyInTray": "在托盘菜单显示代理信息",
+  "settings.showCurrentProxyInTray": "托盘菜单显示当前代理",
   "settings.disableTrayIconColor": "禁用托盘图标颜色变化",
   "settings.disableAnimations": "禁用动画效果",
   "settings.showTraffic_windows": "在任务栏显示网速",
diff --git a/src/shared/types.d.ts b/src/shared/types.d.ts
index d190012..7619899 100644
--- a/src/shared/types.d.ts
+++ b/src/shared/types.d.ts
@@ -272,6 +272,7 @@ interface IAppConfig {
   originDNS?: string
   useWindowFrame: boolean
   proxyInTray: boolean
+  showCurrentProxyInTray: boolean
   siderOrder: string[]
   siderWidth: number
   appTheme: AppTheme