mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-01-29 08:45:41 +08:00
feat: update tray tooltip to include reassembled version format #4727
This commit is contained in:
4
src-tauri/Cargo.lock
generated
4
src-tauri/Cargo.lock
generated
@@ -2244,9 +2244,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "flexi_logger"
|
name = "flexi_logger"
|
||||||
version = "0.31.6"
|
version = "0.31.7"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ec8ef54b052574866f68674c7646369a05dda785cf0ab8e3be94992fd92cd64b"
|
checksum = "31e5335674a3a259527f97e9176a3767dcc9b220b8e29d643daeb2d6c72caf8b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"log",
|
"log",
|
||||||
|
|||||||
@@ -412,17 +412,24 @@ impl Tray {
|
|||||||
let tun_text = t("TUN").await;
|
let tun_text = t("TUN").await;
|
||||||
let profile_text = t("Profile").await;
|
let profile_text = t("Profile").await;
|
||||||
|
|
||||||
let version = env!("CARGO_PKG_VERSION");
|
let v = env!("CARGO_PKG_VERSION");
|
||||||
|
let reassembled_version = v.split_once('+').map_or(v.to_string(), |(main, rest)| {
|
||||||
|
format!("{main}+{}", rest.split('.').next().unwrap_or(""))
|
||||||
|
});
|
||||||
|
|
||||||
|
let tooltip = format!(
|
||||||
|
"Clash Verge {}\n{}: {}\n{}: {}\n{}: {}",
|
||||||
|
reassembled_version,
|
||||||
|
sys_proxy_text,
|
||||||
|
switch_map[system_proxy],
|
||||||
|
tun_text,
|
||||||
|
switch_map[tun_mode],
|
||||||
|
profile_text,
|
||||||
|
current_profile_name
|
||||||
|
);
|
||||||
|
|
||||||
if let Some(tray) = app_handle.tray_by_id("main") {
|
if let Some(tray) = app_handle.tray_by_id("main") {
|
||||||
let _ = tray.set_tooltip(Some(&format!(
|
let _ = tray.set_tooltip(Some(&tooltip));
|
||||||
"Clash Verge {version}\n{}: {}\n{}: {}\n{}: {}",
|
|
||||||
sys_proxy_text,
|
|
||||||
switch_map[system_proxy],
|
|
||||||
tun_text,
|
|
||||||
switch_map[tun_mode],
|
|
||||||
profile_text,
|
|
||||||
current_profile_name
|
|
||||||
)));
|
|
||||||
} else {
|
} else {
|
||||||
log::warn!(target: "app", "更新托盘提示失败: 托盘不存在");
|
log::warn!(target: "app", "更新托盘提示失败: 托盘不存在");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user