From 9af1f909904f41127c609c844ab5d7f428d6e26f Mon Sep 17 00:00:00 2001 From: MystiPanda Date: Sat, 9 Dec 2023 11:03:19 +0800 Subject: [PATCH] feat: Support different tray icon for linux --- ...-activated.png => tray-icon-activated.png} | Bin ...in-tray-icon-tun.png => tray-icon-tun.png} | Bin src-tauri/icons/tray-icon.png | Bin 12013 -> 1538 bytes src-tauri/icons/win-tray-icon.png | Bin 1538 -> 0 bytes src-tauri/src/core/tray.rs | 23 +++++-------- src-tauri/tauri.conf.json | 32 +----------------- src-tauri/tauri.linux.conf.json | 13 +++++++ src-tauri/tauri.macos.conf.json | 18 ++++++++++ src-tauri/tauri.windows.conf.json | 25 ++++++++++++++ 9 files changed, 66 insertions(+), 45 deletions(-) rename src-tauri/icons/{win-tray-icon-activated.png => tray-icon-activated.png} (100%) rename src-tauri/icons/{win-tray-icon-tun.png => tray-icon-tun.png} (100%) delete mode 100644 src-tauri/icons/win-tray-icon.png create mode 100644 src-tauri/tauri.linux.conf.json create mode 100644 src-tauri/tauri.macos.conf.json create mode 100644 src-tauri/tauri.windows.conf.json diff --git a/src-tauri/icons/win-tray-icon-activated.png b/src-tauri/icons/tray-icon-activated.png similarity index 100% rename from src-tauri/icons/win-tray-icon-activated.png rename to src-tauri/icons/tray-icon-activated.png diff --git a/src-tauri/icons/win-tray-icon-tun.png b/src-tauri/icons/tray-icon-tun.png similarity index 100% rename from src-tauri/icons/win-tray-icon-tun.png rename to src-tauri/icons/tray-icon-tun.png diff --git a/src-tauri/icons/tray-icon.png b/src-tauri/icons/tray-icon.png index be2533a7ffd32a09b800d27e302a0f41afa74bea..29616c85b5cf343451974488a753d4b8addd746f 100644 GIT binary patch literal 1538 zcmV+d2L1VoP)F2YgX*iHmF($VbB`S{N{d*;ln+Sc!@coF7J~{zFsZ`IlJFer0 z*In{3FlfXmSIo@7I|hDw|KcT$g=3$5NpJ6769kb1NTJ}-*SA@+_((*wHUM85z$P;3ZUf&b=!gl+r|kJzwbr4rF1qPc0qmCE-c`uq2a)mI`K-}hDjW5a}Dtbu!n_ugk_ zN;LqU=guD;Jx*mJ*^0Y%{hZd;2D-a{tNbA3=+P6bSkc1J)Ay@5)_7iy4?p~mSbf>O z`%cx;GN115U8*t>aO~KZvTRvXGk_~b&j<{n#0X+Extya~TkDfqqa~FCD5X$JSsBXu zl$MqSfFLHxpw`+Y*$vE8)dDa+J`uE)8mbC~9KIjP=3953tK59vrCeUf*w`8F`o$9h z@aMnWqe|rlJkOCZjMe5_e{;@ZvFMp{snH37Xsl51aExfCVY6w|b~Q3`Oe3*Uv4$#xHp6jn~M{C2ugYVJb|0G+s{D{uZtI6sQ4ZUvm??32}^la44 zoexu0HP4-xI2BKcd>!xxlV|VL*2p&sON1F(aJG&93%JxR7U#NWD<|XXs@giGRHq;x zR4QXfNKT&flA|27o^59&>&rYh0(I`$%Kze;ngzegdo{aqIWHfCXAX$ybxa=qv(g2C zW=Vh|(CXGy&+jf4=I&8S5d>%6(mJ@s7F=^i`C?Iem@IOY%Iz^GA`B~UkDorVwz|63 zvEA(Z7ZETeL-L)QTtOP6*e8t6J}zR=I?9U}AE>v=)1A5BmeTAsxp6$9K%sSfiHM+e z6nkD(Qy5n2rWkxz@N58WP8d{9N8towbg!H9ZV1COvC)wWrp{hjlx4mnOU6&L8^sfQ zlyV*+xv;&aRPMMo@z)|UC$rLvRbXkv^{z4cQP6Ebj}@MDsHqkjV@fzL>~mP|3sS$1dP+!RhbUz+z%T_!K)Z(2_2dn6b2xg?*VI>S{N ofNXTBW1Zmu7`J>D_!{{9|6Cfry$Ca1;Q#;t07*qoM6N<$g7gRSD*ylh literal 12013 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 LNkvXXu0mjfrhkX( diff --git a/src-tauri/icons/win-tray-icon.png b/src-tauri/icons/win-tray-icon.png deleted file mode 100644 index 29616c85b5cf343451974488a753d4b8addd746f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1538 zcmV+d2L1VoP)F2YgX*iHmF($VbB`S{N{d*;ln+Sc!@coF7J~{zFsZ`IlJFer0 z*In{3FlfXmSIo@7I|hDw|KcT$g=3$5NpJ6769kb1NTJ}-*SA@+_((*wHUM85z$P;3ZUf&b=!gl+r|kJzwbr4rF1qPc0qmCE-c`uq2a)mI`K-}hDjW5a}Dtbu!n_ugk_ zN;LqU=guD;Jx*mJ*^0Y%{hZd;2D-a{tNbA3=+P6bSkc1J)Ay@5)_7iy4?p~mSbf>O z`%cx;GN115U8*t>aO~KZvTRvXGk_~b&j<{n#0X+Extya~TkDfqqa~FCD5X$JSsBXu zl$MqSfFLHxpw`+Y*$vE8)dDa+J`uE)8mbC~9KIjP=3953tK59vrCeUf*w`8F`o$9h z@aMnWqe|rlJkOCZjMe5_e{;@ZvFMp{snH37Xsl51aExfCVY6w|b~Q3`Oe3*Uv4$#xHp6jn~M{C2ugYVJb|0G+s{D{uZtI6sQ4ZUvm??32}^la44 zoexu0HP4-xI2BKcd>!xxlV|VL*2p&sON1F(aJG&93%JxR7U#NWD<|XXs@giGRHq;x zR4QXfNKT&flA|27o^59&>&rYh0(I`$%Kze;ngzegdo{aqIWHfCXAX$ybxa=qv(g2C zW=Vh|(CXGy&+jf4=I&8S5d>%6(mJ@s7F=^i`C?Iem@IOY%Iz^GA`B~UkDorVwz|63 zvEA(Z7ZETeL-L)QTtOP6*e8t6J}zR=I?9U}AE>v=)1A5BmeTAsxp6$9K%sSfiHM+e z6nkD(Qy5n2rWkxz@N58WP8d{9N8towbg!H9ZV1COvC)wWrp{hjlx4mnOU6&L8^sfQ zlyV*+xv;&aRPMMo@z)|UC$rLvRbXkv^{z4cQP6Ebj}@MDsHqkjV@fzL>~mP|3sS$1dP+!RhbUz+z%T_!K)Z(2_2dn6b2xg?*VI>S{N ofNXTBW1Zmu7`J>D_!{{9|6Cfry$Ca1;Q#;t07*qoM6N<$g7gRSD*ylh diff --git a/src-tauri/src/core/tray.rs b/src-tauri/src/core/tray.rs index 456c1234..d38aa313 100644 --- a/src-tauri/src/core/tray.rs +++ b/src-tauri/src/core/tray.rs @@ -135,21 +135,18 @@ impl Tray { let system_proxy = verge.enable_system_proxy.as_ref().unwrap_or(&false); let tun_mode = verge.enable_tun_mode.as_ref().unwrap_or(&false); - #[cfg(target_os = "windows")] - { - let mut indication_icon = if *system_proxy { - include_bytes!("../../icons/win-tray-icon-activated.png").to_vec() - } else { - include_bytes!("../../icons/win-tray-icon.png").to_vec() - }; + let mut indication_icon = if *system_proxy { + include_bytes!("../../icons/tray-icon-activated.png").to_vec() + } else { + include_bytes!("../../icons/tray-icon.png").to_vec() + }; - if *tun_mode { - indication_icon = include_bytes!("../../icons/win-tray-icon-tun.png").to_vec(); - } - - let _ = tray.set_icon(tauri::Icon::Raw(indication_icon)); + if *tun_mode { + indication_icon = include_bytes!("../../icons/tray-icon-tun.png").to_vec(); } + let _ = tray.set_icon(tauri::Icon::Raw(indication_icon)); + let _ = tray.get_item("system_proxy").set_selected(*system_proxy); let _ = tray.get_item("tun_mode").set_selected(*tun_mode); @@ -160,7 +157,6 @@ impl Tray { map }; - #[cfg(not(target_os = "linux"))] let _ = tray.set_tooltip(&format!( "Clash Verge {version}\n{}: {}\n{}: {}", t!("System Proxy", "系统代理"), @@ -185,7 +181,6 @@ impl Tray { pub fn on_system_tray_event(app_handle: &AppHandle, event: SystemTrayEvent) { match event { - #[cfg(not(target_os = "linux"))] SystemTrayEvent::LeftClick { .. } => Tray::on_left_click(app_handle), SystemTrayEvent::MenuItemClick { id, .. } => match id.as_str() { mode @ ("rule_mode" | "global_mode" | "direct_mode" | "script_mode") => { diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index ec3cdb09..8eed7898 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -10,13 +10,8 @@ "beforeBuildCommand": "pnpm run web:build" }, "tauri": { - "systemTray": { - "iconPath": "icons/tray-icon.ico", - "iconAsTemplate": true - }, "bundle": { "active": true, - "targets": ["deb", "appimage", "nsis", "app", "dmg", "updater"], "identifier": "io.github.clash-verge-rev.clash-verge-rev", "icon": [ "icons/32x32.png", @@ -30,32 +25,7 @@ "copyright": "© 2022 zzzgydi All Rights Reserved", "category": "DeveloperTool", "shortDescription": "A Clash Meta GUI based on tauri.", - "longDescription": "A Clash Meta GUI based on tauri.", - "deb": { - "depends": ["openssl"] - }, - "macOS": { - "frameworks": [], - "minimumSystemVersion": "", - "exceptionDomain": "", - "signingIdentity": null, - "entitlements": null - }, - "windows": { - "certificateThumbprint": null, - "digestAlgorithm": "sha256", - "timestampUrl": "", - "webviewInstallMode": { - "type": "embedBootstrapper", - "silent": true - }, - "nsis": { - "displayLanguageSelector": true, - "installerIcon": "icons/icon.ico", - "languages": ["SimpChinese", "English"], - "license": "../LICENSE" - } - } + "longDescription": "A Clash Meta GUI based on tauri." }, "updater": { "active": true, diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json new file mode 100644 index 00000000..9949323b --- /dev/null +++ b/src-tauri/tauri.linux.conf.json @@ -0,0 +1,13 @@ +{ + "tauri": { + "systemTray": { + "iconPath": "icons/tray-icon.png" + }, + "bundle": { + "targets": ["deb", "appimage", "updater"], + "deb": { + "depends": ["openssl"] + } + } + } +} diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json new file mode 100644 index 00000000..0230cd3e --- /dev/null +++ b/src-tauri/tauri.macos.conf.json @@ -0,0 +1,18 @@ +{ + "tauri": { + "systemTray": { + "iconPath": "icons/tray-icon.ico", + "iconAsTemplate": true + }, + "bundle": { + "targets": ["app", "dmg", "updater"], + "macOS": { + "frameworks": [], + "minimumSystemVersion": "", + "exceptionDomain": "", + "signingIdentity": null, + "entitlements": null + } + } + } +} diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json new file mode 100644 index 00000000..eafa6556 --- /dev/null +++ b/src-tauri/tauri.windows.conf.json @@ -0,0 +1,25 @@ +{ + "tauri": { + "systemTray": { + "iconPath": "icons/tray-icon.png" + }, + "bundle": { + "targets": ["nsis", "updater"], + "windows": { + "certificateThumbprint": null, + "digestAlgorithm": "sha256", + "timestampUrl": "", + "webviewInstallMode": { + "type": "embedBootstrapper", + "silent": true + }, + "nsis": { + "displayLanguageSelector": true, + "installerIcon": "icons/icon.ico", + "languages": ["SimpChinese", "English"], + "license": "../LICENSE" + } + } + } + } +}