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

chore: Remove script mode

Browse Source
This commit is contained in:
MystiPanda 2023-12-09 17:00:58 +08:00
parent 689d689d3b
commit e7e66e580a
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,10 +41,6 @@ impl Tray {
"direct_mode", "direct_mode",
t!("Direct Mode", "直连模式"), t!("Direct Mode", "直连模式"),
)) ))
.add_item(CustomMenuItem::new(
"script_mode",
t!("Script Mode", "脚本模式"),
))
.add_native_item(SystemTrayMenuItem::Separator) .add_native_item(SystemTrayMenuItem::Separator)
.add_item(CustomMenuItem::new( .add_item(CustomMenuItem::new(
"system_proxy", "system_proxy",
@ -128,7 +124,6 @@ impl Tray {
let _ = tray.get_item("rule_mode").set_selected(mode == "rule"); let _ = tray.get_item("rule_mode").set_selected(mode == "rule");
let _ = tray.get_item("global_mode").set_selected(mode == "global"); let _ = tray.get_item("global_mode").set_selected(mode == "global");
let _ = tray.get_item("direct_mode").set_selected(mode == "direct"); let _ = tray.get_item("direct_mode").set_selected(mode == "direct");
let _ = tray.get_item("script_mode").set_selected(mode == "script");
let verge = Config::verge(); let verge = Config::verge();
let verge = verge.latest(); let verge = verge.latest();
@ -142,7 +137,11 @@ impl Tray {
let icon = include_bytes!("../../icons/mac-tray-icon-sys.png").to_vec(); let icon = include_bytes!("../../icons/mac-tray-icon-sys.png").to_vec();
icon icon
} else { } else {
include_bytes!("../../icons/tray-icon.png").to_vec() #[cfg(not(target_os = "macos"))]
let icon = include_bytes!("../../icons/tray-icon.png").to_vec();
#[cfg(target_os = "macos")]
let icon = include_bytes!("../../icons/icon.png").to_vec();
icon
}; };
if *tun_mode { if *tun_mode {
@ -191,11 +190,10 @@ impl Tray {
match event { match event {
SystemTrayEvent::LeftClick { .. } => Tray::on_left_click(app_handle), SystemTrayEvent::LeftClick { .. } => Tray::on_left_click(app_handle),
SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() { SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() {
mode @ ("rule_mode" | "global_mode" | "direct_mode" | "script_mode") => { mode @ ("rule_mode" | "global_mode" | "direct_mode") => {
let mode = &mode[0..mode.len() - 5]; let mode = &mode[0..mode.len() - 5];
feat::change_clash_mode(mode.into()); feat::change_clash_mode(mode.into());
} }
"open_window" => resolve::create_window(app_handle), "open_window" => resolve::create_window(app_handle),
"system_proxy" => feat::toggle_system_proxy(), "system_proxy" => feat::toggle_system_proxy(),
"tun_mode" => feat::toggle_tun_mode(), "tun_mode" => feat::toggle_tun_mode(),

2
src-tauri/tauri.macos.conf.json
View File

@ -1,7 +1,7 @@
{ {
"tauri": { "tauri": {
"systemTray": { "systemTray": {
"iconPath": "icons/tray-icon.ico", "iconPath": "icons/icon.png",
"iconAsTemplate": true "iconAsTemplate": true
}, },
"bundle": { "bundle": {