From e7e66e580a1d3568a0370cd40ba3692ecf02b6cb Mon Sep 17 00:00:00 2001 From: MystiPanda Date: Sat, 9 Dec 2023 17:00:58 +0800 Subject: [PATCH] chore: Remove script mode --- src-tauri/src/core/tray.rs | 14 ++++++-------- src-tauri/tauri.macos.conf.json | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src-tauri/src/core/tray.rs b/src-tauri/src/core/tray.rs index 4976130d..b7692624 100644 --- a/src-tauri/src/core/tray.rs +++ b/src-tauri/src/core/tray.rs @@ -41,10 +41,6 @@ impl Tray { "direct_mode", t!("Direct Mode", "直连模式"), )) - .add_item(CustomMenuItem::new( - "script_mode", - t!("Script Mode", "脚本模式"), - )) .add_native_item(SystemTrayMenuItem::Separator) .add_item(CustomMenuItem::new( "system_proxy", @@ -128,7 +124,6 @@ impl Tray { let _ = tray.get_item("rule_mode").set_selected(mode == "rule"); let _ = tray.get_item("global_mode").set_selected(mode == "global"); 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 = verge.latest(); @@ -142,7 +137,11 @@ impl Tray { let icon = include_bytes!("../../icons/mac-tray-icon-sys.png").to_vec(); icon } 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 { @@ -191,11 +190,10 @@ impl Tray { match event { SystemTrayEvent::LeftClick { .. } => Tray::on_left_click(app_handle), 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]; feat::change_clash_mode(mode.into()); } - "open_window" => resolve::create_window(app_handle), "system_proxy" => feat::toggle_system_proxy(), "tun_mode" => feat::toggle_tun_mode(), diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index 0230cd3e..6b182931 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -1,7 +1,7 @@ { "tauri": { "systemTray": { - "iconPath": "icons/tray-icon.ico", + "iconPath": "icons/icon.png", "iconAsTemplate": true }, "bundle": {