root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-28 07:14:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(tray): add optional inline outbound modes in tray menu #5881

Browse Source 
Closes #5881
This commit is contained in:
Slinetrac
2025-12-21 10:33:19 +08:00
parent a0b12b8797
commit 23e551e384
20 changed files with 76 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src-tauri/src/config/verge.rs
View File

@@ -230,6 +230,8 @@ pub struct IVerge {
// pub enable_tray_icon: Option<bool>,
/// show proxy groups directly on tray root menu
pub tray_inline_proxy_groups: Option<bool>,
/// show outbound modes directly on tray root menu
pub tray_inline_outbound_modes: Option<bool>,
/// 自动进入轻量模式
pub enable_auto_light_weight_mode: Option<bool>,
@@ -440,6 +442,7 @@ impl IVerge {
enable_tray_speed: Some(false),
// enable_tray_icon: Some(true),
tray_inline_proxy_groups: Some(true),
tray_inline_outbound_modes: Some(false),
enable_global_hotkey: Some(true),
enable_auto_light_weight_mode: Some(false),
auto_light_weight_minutes: Some(10),
@@ -541,6 +544,7 @@ impl IVerge {
patch!(enable_tray_speed);
// patch!(enable_tray_icon);
patch!(tray_inline_proxy_groups);
patch!(tray_inline_outbound_modes);
patch!(enable_auto_light_weight_mode);
patch!(auto_light_weight_minutes);
patch!(enable_dns_settings);

54
src-tauri/src/core/tray/mod.rs
View File

@@ -771,6 +771,7 @@ async fn create_tray_menu(
let verge_settings = Config::verge().await.latest_arc();
let show_proxy_groups_inline = verge_settings.tray_inline_proxy_groups.unwrap_or(true);
let show_outbound_modes_inline = verge_settings.tray_inline_outbound_modes.unwrap_or(false);
let version = env!("CARGO_PKG_VERSION");
@@ -794,13 +795,6 @@ async fn create_tray_menu(
hotkeys.get("open_or_close_dashboard").map(|s| s.as_str()),
)?;
let current_mode_text = match current_proxy_mode {
"global" => rust_i18n::t!("tray.global"),
"direct" => rust_i18n::t!("tray.direct"),
_ => rust_i18n::t!("tray.rule"),
};
let outbound_modes_label = format!("{} ({})", texts.outbound_modes, current_mode_text);
let rule_mode = &CheckMenuItem::with_id(
app_handle,
MenuIds::RULE_MODE,
@@ -828,17 +822,27 @@ async fn create_tray_menu(
hotkeys.get("clash_mode_direct").map(|s| s.as_str()),
)?;
let outbound_modes = &Submenu::with_id_and_items(
app_handle,
MenuIds::OUTBOUND_MODES,
outbound_modes_label.as_str(),
true,
&[
rule_mode as &dyn IsMenuItem<Wry>,
global_mode as &dyn IsMenuItem<Wry>,
direct_mode as &dyn IsMenuItem<Wry>,
],
)?;
let outbound_modes = if show_outbound_modes_inline {
None
} else {
let current_mode_text = match current_proxy_mode {
"global" => rust_i18n::t!("tray.global"),
"direct" => rust_i18n::t!("tray.direct"),
_ => rust_i18n::t!("tray.rule"),
};
let outbound_modes_label = format!("{} ({})", texts.outbound_modes, current_mode_text);
Some(Submenu::with_id_and_items(
app_handle,
MenuIds::OUTBOUND_MODES,
outbound_modes_label.as_str(),
true,
&[
rule_mode as &dyn IsMenuItem<Wry>,
global_mode as &dyn IsMenuItem<Wry>,
direct_mode as &dyn IsMenuItem<Wry>,
],
)?)
};
let profiles = &Submenu::with_id_and_items(
app_handle,
@@ -946,7 +950,19 @@ async fn create_tray_menu(
let separator = &PredefinedMenuItem::separator(app_handle)?;
// 动态构建菜单项
let mut menu_items: Vec<&dyn IsMenuItem<Wry>> = vec![open_window, outbound_modes, separator, profiles];
let mut menu_items: Vec<&dyn IsMenuItem<Wry>> = vec![open_window, separator];
if show_outbound_modes_inline {
menu_items.extend_from_slice(&[
rule_mode as &dyn IsMenuItem<Wry>,
global_mode as &dyn IsMenuItem<Wry>,
direct_mode as &dyn IsMenuItem<Wry>,
]);
} else if let Some(ref outbound_modes) = outbound_modes {
menu_items.push(outbound_modes);
}
menu_items.extend_from_slice(&[separator, profiles]);
// 如果有代理节点，添加代理节点菜单
if show_proxy_groups_inline {

4
src-tauri/src/feat/config.rs
View File

@@ -103,6 +103,7 @@ fn determine_update_flags(patch: &IVerge) -> i32 {
let enable_auto_light_weight = patch.enable_auto_light_weight_mode;
let enable_external_controller = patch.enable_external_controller;
let tray_inline_proxy_groups = patch.tray_inline_proxy_groups;
let tray_inline_outbound_modes = patch.tray_inline_outbound_modes;
let enable_proxy_guard = patch.enable_proxy_guard;
let proxy_guard_duration = patch.proxy_guard_duration;
@@ -184,6 +185,9 @@ fn determine_update_flags(patch: &IVerge) -> i32 {
if tray_inline_proxy_groups.is_some() {
update_flags |= UpdateFlags::SystrayMenu as i32;
}
if tray_inline_outbound_modes.is_some() {
update_flags |= UpdateFlags::SystrayMenu as i32;
}
update_flags
}

17
src/components/setting/mods/layout-viewer.tsx
View File

@@ -436,6 +436,23 @@ export const LayoutViewer = forwardRef<DialogRef>((_, ref) => {
<Switch edge="end" />
</GuardState>
</Item>
<Item>
<ListItemText
primary={t(
"settings.components.verge.layout.fields.showOutboundModesInline",
)}
/>
<GuardState
value={verge?.tray_inline_outbound_modes ?? false}
valueProps="checked"
onCatch={onError}
onFormat={onSwitchFormat}
onChange={(e) => onChangeData({ tray_inline_outbound_modes: e })}
onGuard={(e) => patchVerge({ tray_inline_outbound_modes: e })}
>
<Switch edge="end" />
</GuardState>
</Item>
<Item>
<ListItemText

1
src/locales/ar/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "طي شريط التنقل",
"trayIcon": "أيقونة شريط المهام",
"showProxyGroupsInline": "Show Proxy Groups Inline",
"showOutboundModesInline": "Show Outbound Modes Inline",
"commonTrayIcon": "أيقونة شريط مهام عامة",
"systemProxyTrayIcon": "أيقونة شريط المهام لوكيل النظام",
"tunTrayIcon": "أيقونة شريط المهام لـ TUN",

1
src/locales/de/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "Navigationsleiste einklappen",
"trayIcon": "Tray-Symbol",
"showProxyGroupsInline": "Show Proxy Groups Inline",
"showOutboundModesInline": "Show Outbound Modes Inline",
"commonTrayIcon": "Standard-Tray-Symbol",
"systemProxyTrayIcon": "Systemproxy-Tray-Symbol",
"tunTrayIcon": "TUN-Modus-Tray-Symbol",

1
src/locales/en/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "Collapse Navigation Bar",
"trayIcon": "Tray Icon",
"showProxyGroupsInline": "Show Proxy Groups Inline",
"showOutboundModesInline": "Show Outbound Modes Inline",
"commonTrayIcon": "Common Tray Icon",
"systemProxyTrayIcon": "System Proxy Tray Icon",
"tunTrayIcon": "Tun Tray Icon",

1
src/locales/es/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "Colapsar barra de navegación",
"trayIcon": "Icono de la bandeja",
"showProxyGroupsInline": "Show Proxy Groups Inline",
"showOutboundModesInline": "Show Outbound Modes Inline",
"commonTrayIcon": "Icono de bandeja común",
"systemProxyTrayIcon": "Icono de bandeja del proxy del sistema",
"tunTrayIcon": "Icono de bandeja del modo TUN",

1
src/locales/fa/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "جمع کردن نوار ناوبری",
"trayIcon": "آیکون سینی سیستم",
"showProxyGroupsInline": "Show Proxy Groups Inline",
"showOutboundModesInline": "Show Outbound Modes Inline",
"commonTrayIcon": "آیکون مشترک سینی سیستم",
"systemProxyTrayIcon": "آیکون سینی پراکسی سیستم",
"tunTrayIcon": "آیکون سینی Tun",

1
src/locales/id/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "Ciutkan bilah navigasi",
"trayIcon": "Ikon Tray",
"showProxyGroupsInline": "Show Proxy Groups Inline",
"showOutboundModesInline": "Show Outbound Modes Inline",
"commonTrayIcon": "Ikon Tray Umum",
"systemProxyTrayIcon": "Ikon Tray Proksi Sistem",
"tunTrayIcon": "Ikon Tray Tun",

1
src/locales/jp/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "ナビゲーションバーを折りたたむ",
"trayIcon": "トレイアイコン",
"showProxyGroupsInline": "Show Proxy Groups Inline",
"showOutboundModesInline": "Show Outbound Modes Inline",
"commonTrayIcon": "通常のトレイアイコン",
"systemProxyTrayIcon": "システムプロキシトレイアイコン",
"tunTrayIcon": "TUNモードトレイアイコン",

1
src/locales/ko/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "내비게이션 바 접기",
"trayIcon": "트레이 아이콘",
"showProxyGroupsInline": "프록시 그룹 인라인 표시",
"showOutboundModesInline": "Show Outbound Modes Inline",
"commonTrayIcon": "공용 트레이 아이콘",
"systemProxyTrayIcon": "시스템 프록시 트레이 아이콘",
"tunTrayIcon": "TUN 트레이 아이콘",

1
src/locales/ru/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "Свернуть панель навигации",
"trayIcon": "Иконка в трее",
"showProxyGroupsInline": "Show Proxy Groups Inline",
"showOutboundModesInline": "Show Outbound Modes Inline",
"commonTrayIcon": "Общий значок в трее",
"systemProxyTrayIcon": "Значок системного прокси в трее",
"tunTrayIcon": "Значок TUN в трее",

1
src/locales/tr/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "Gezinme çubuğunu daralt",
"trayIcon": "Tepsi Simgesi",
"showProxyGroupsInline": "Show Proxy Groups Inline",
"showOutboundModesInline": "Show Outbound Modes Inline",
"commonTrayIcon": "Genel Tepsi Simgesi",
"systemProxyTrayIcon": "Sistem Vekil Tepsi Simgesi",
"tunTrayIcon": "Tun Tepsi Simgesi",

1
src/locales/tt/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "Навигация панелен җыю",
"trayIcon": "Трей иконкасы",
"showProxyGroupsInline": "Show Proxy Groups Inline",
"showOutboundModesInline": "Show Outbound Modes Inline",
"commonTrayIcon": "Гомуми трей иконкасы",
"systemProxyTrayIcon": "Системалы прокси иконкасы",
"tunTrayIcon": "Tun (виртуаль адаптер) иконкасы",

1
src/locales/zh/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "收起导航栏",
"trayIcon": "托盘图标",
"showProxyGroupsInline": "将代理组显示在托盘一级菜单",
"showOutboundModesInline": "将出站模式显示在托盘一级菜单",
"commonTrayIcon": "常规托盘图标",
"systemProxyTrayIcon": "系统代理托盘图标",
"tunTrayIcon": "TUN 模式托盘图标",

1
src/locales/zhtw/settings.json
View File

@@ -212,6 +212,7 @@
"collapseNavBar": "收起導覽列",
"trayIcon": "系統匣圖示",
"showProxyGroupsInline": "將代理組顯示在系統匣一級選單",
"showOutboundModesInline": "將出站模式顯示在系統匣一級選單",
"commonTrayIcon": "一般系統匣圖示",
"systemProxyTrayIcon": "系統代理系統匣圖示",
"tunTrayIcon": "虛擬網路介面卡模式系統匣圖示",

1
src/types/generated/i18n-keys.ts
View File

@@ -432,6 +432,7 @@ export const translationKeys = [
"settings.components.verge.layout.fields.collapseNavBar",
"settings.components.verge.layout.fields.trayIcon",
"settings.components.verge.layout.fields.showProxyGroupsInline",
"settings.components.verge.layout.fields.showOutboundModesInline",
"settings.components.verge.layout.fields.commonTrayIcon",
"settings.components.verge.layout.fields.systemProxyTrayIcon",
"settings.components.verge.layout.fields.tunTrayIcon",

1
src/types/generated/i18n-resources.ts
View File

@@ -626,6 +626,7 @@ export interface TranslationResources {
navIcon: string;
preferSystemTitlebar: string;
proxyGroupIcon: string;
showOutboundModesInline: string;
showProxyGroupsInline: string;
systemProxyTrayIcon: string;
toastPosition: string;

1
src/types/global.d.ts vendored
View File

@@ -823,6 +823,7 @@ interface IVergeConfig {
// enable_tray_speed?: boolean;
// enable_tray_icon?: boolean;
tray_inline_proxy_groups?: boolean;
tray_inline_outbound_modes?: boolean;
enable_tun_mode?: boolean;
enable_auto_light_weight_mode?: boolean;
auto_light_weight_minutes?: number;