root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-28 07:14:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: system tray support zh language

Browse Source
This commit is contained in:
GyDi
2022-10-28 00:40:29 +08:00
parent f166fb132e
commit 2f9a3fa942
5 changed files with 154 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src-tauri/src/core/mod.rs
View File

@@ -16,6 +16,7 @@ mod hotkey;
mod service;
mod sysopt;
mod timer;
pub mod tray;
pub use self::service::*;
@@ -64,8 +65,7 @@ impl Core {
drop(sysopt);
let handle = self.handle.lock();
log_if_err!(handle.update_systray());
log_if_err!(handle.update_systray_clash());
log_if_err!(handle.update_systray_part());
drop(handle);
let mut hotkey = self.hotkey.lock();
@@ -136,7 +136,7 @@ impl Core {
if has_mode {
let handle = self.handle.lock();
handle.update_systray_clash()?;
handle.update_systray_part()?;
}
Ok(())
@@ -155,6 +155,7 @@ impl Core {
let system_proxy = patch.enable_system_proxy;
let proxy_bypass = patch.system_proxy_bypass;
let proxy_guard = patch.enable_proxy_guard;
let language = patch.language;
#[cfg(target_os = "windows")]
{
@@ -197,9 +198,13 @@ impl Core {
sysopt.guard_proxy();
}
if system_proxy.is_some() || tun_mode.is_some() {
// 更新tray
if language.is_some() {
let handle = self.handle.lock();
handle.update_systray()?;
} else if system_proxy.is_some() || tun_mode.is_some() {
let handle = self.handle.lock();
handle.update_systray_part()?;
}
if patch.hotkeys.is_some() {
@@ -232,7 +237,7 @@ impl Core {
// update tray
let handle = handle.lock();
handle.refresh_clash();
log_if_err!(handle.update_systray_clash());
log_if_err!(handle.update_systray_part());
});
Ok(())