From f18d0ab9230a4fa45a33536fb39cc5a3394c14c0 Mon Sep 17 00:00:00 2001 From: Pylogmon Date: Mon, 27 Nov 2023 19:55:42 +0800 Subject: [PATCH 1/3] fix: Tray Icon Tooltip is Empty --- src-tauri/src/core/tray.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src-tauri/src/core/tray.rs b/src-tauri/src/core/tray.rs index 01a50452..2b1274d1 100644 --- a/src-tauri/src/core/tray.rs +++ b/src-tauri/src/core/tray.rs @@ -143,6 +143,14 @@ impl Tray { let _ = tray.get_item("system_proxy").set_selected(*system_proxy); let _ = tray.get_item("tun_mode").set_selected(*tun_mode); + #[cfg(not(target_os = "linux"))] + let _ = tray.set_tooltip(&format!( + "Clash Verge {}\nSystem Proxy: {}\nTun Mode: {}", + app_handle.package_info().version, + system_proxy, + tun_mode + )); + Ok(()) } From 64a9079ce46ecdc37ee5f156de62e9b53e42cba6 Mon Sep 17 00:00:00 2001 From: Pylogmon Date: Mon, 27 Nov 2023 20:04:47 +0800 Subject: [PATCH 2/3] chore: Add Translation --- src-tauri/src/core/tray.rs | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src-tauri/src/core/tray.rs b/src-tauri/src/core/tray.rs index 2b1274d1..c8294dc3 100644 --- a/src-tauri/src/core/tray.rs +++ b/src-tauri/src/core/tray.rs @@ -107,6 +107,20 @@ impl Tray { } pub fn update_part(app_handle: &AppHandle) -> Result<()> { + let zh = { Config::verge().latest().language == Some("zh".into()) }; + + let version = app_handle.package_info().version.to_string(); + + macro_rules! t { + ($en: expr, $zh: expr) => { + if zh { + $zh + } else { + $en + } + }; + } + let mode = { Config::clash() .latest() @@ -145,10 +159,9 @@ impl Tray { #[cfg(not(target_os = "linux"))] let _ = tray.set_tooltip(&format!( - "Clash Verge {}\nSystem Proxy: {}\nTun Mode: {}", - app_handle.package_info().version, - system_proxy, - tun_mode + "Clash Verge {version}\n{}: {system_proxy}\n{}: {tun_mode}", + t!("System Proxy", "系统代理"), + t!("TUN Mode", "Tun 模式") )); Ok(()) From 92e712a508b865332dc67223201f456833819147 Mon Sep 17 00:00:00 2001 From: Pylogmon Date: Mon, 27 Nov 2023 20:10:31 +0800 Subject: [PATCH 3/3] chore: fix style --- src-tauri/src/core/tray.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src-tauri/src/core/tray.rs b/src-tauri/src/core/tray.rs index c8294dc3..2c756404 100644 --- a/src-tauri/src/core/tray.rs +++ b/src-tauri/src/core/tray.rs @@ -157,11 +157,20 @@ impl Tray { let _ = tray.get_item("system_proxy").set_selected(*system_proxy); let _ = tray.get_item("tun_mode").set_selected(*tun_mode); + let switch_map = { + let mut map = std::collections::HashMap::new(); + map.insert(true, "on"); + map.insert(false, "off"); + map + }; + #[cfg(not(target_os = "linux"))] let _ = tray.set_tooltip(&format!( - "Clash Verge {version}\n{}: {system_proxy}\n{}: {tun_mode}", + "Clash Verge {version}\n{}: {}\n{}: {}", t!("System Proxy", "系统代理"), - t!("TUN Mode", "Tun 模式") + switch_map[system_proxy], + t!("TUN Mode", "Tun 模式"), + switch_map[tun_mode] )); Ok(())