shkong/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev synced 2025-05-05 23:13:44 +08:00
Code Packages Projects Releases Activity

chore: revert

Browse Source
This commit is contained in:
huzibaca 2024-10-06 01:09:59 +08:00
parent 5fdb52d8d0
commit c5eacd1627
2 changed files with 57 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src-tauri/src/core/tray.rs
View File

@ -364,25 +364,51 @@ fn create_tray_menu(
.unwrap(); .unwrap();
let separator = &PredefinedMenuItem::separator(app_handle).unwrap(); let separator = &PredefinedMenuItem::separator(app_handle).unwrap();
let enable = {
Config::verge()
.latest()
.enable_service_mode
.unwrap_or(false)
};
let menu = tauri::menu::MenuBuilder::new(app_handle) let menu = if enable {
.items(&[ tauri::menu::MenuBuilder::new(app_handle)
open_window, .items(&[
separator, open_window,
rule_mode, separator,
global_mode, rule_mode,
direct_mode, global_mode,
separator, direct_mode,
system_proxy, separator,
tun_mode, system_proxy,
copy_env, tun_mode,
open_dir, copy_env,
more, open_dir,
separator, more,
quit, separator,
]) quit,
.build() ])
.unwrap(); .build()
.unwrap()
} else {
tauri::menu::MenuBuilder::new(app_handle)
.items(&[
open_window,
separator,
rule_mode,
global_mode,
direct_mode,
separator,
system_proxy,
copy_env,
open_dir,
more,
separator,
quit,
])
.build()
.unwrap()
};
Ok(menu) Ok(menu)
} }

15
src/components/setting/setting-system.tsx
View File

@ -67,9 +67,20 @@ const SettingSystem = ({ onError }: Props) => {
onCatch={onError} onCatch={onError}
onFormat={onSwitchFormat} onFormat={onSwitchFormat}
onChange={(e) => { onChange={(e) => {
onChangeData({ enable_tun_mode: e }); if (serviceStatus !== "active") {
onChangeData({ enable_tun_mode: false });
} else {
onChangeData({ enable_tun_mode: e });
}
}}
onGuard={(e) => {
if (serviceStatus !== "active" && e) {
Notice.error(t("Please Enable Service Mode"));
return Promise.resolve();
} else {
return patchVerge({ enable_tun_mode: e });
}
}} }}
onGuard={(e) => patchVerge({ enable_tun_mode: e })}
> >
<Switch edge="end" /> <Switch edge="end" />
</GuardState> </GuardState>