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 => { envType = process.platform === 'win32' ? ['powershell'] : ['bash'], autoCloseConnection, proxyInTray = true, + showCurrentProxyInTray = false, triggerSysProxyShortcut = '', showFloatingWindowShortcut = '', showWindowShortcut = '', @@ -54,9 +55,11 @@ export const buildContextMenu = async (): Promise => { 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 = () => { }} /> + {proxyInTray && ( + + { + await patchAppConfig({ showCurrentProxyInTray: v }) + }} + /> + + )}