feat: system tray add tun mode

This commit is contained in:
GyDi 2022-04-13 01:09:51 +08:00
parent b9162f9576
commit 1a91249da2
No known key found for this signature in database
GPG Key ID: 1C95E0D3467B3084
3 changed files with 51 additions and 19 deletions

View File

@ -337,15 +337,6 @@ pub fn patch_verge_config(
let mut verge = verge_state.0.lock().unwrap(); let mut verge = verge_state.0.lock().unwrap();
wrap_err!(verge.patch_config(payload))?; wrap_err!(verge.patch_config(payload))?;
// change system tray
if system_proxy.is_some() {
app_handle
.tray_handle()
.get_item("system_proxy")
.set_selected(system_proxy.unwrap())
.unwrap();
}
// change tun mode // change tun mode
if tun_mode.is_some() { if tun_mode.is_some() {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
@ -363,6 +354,11 @@ pub fn patch_verge_config(
wrap_err!(clash.activate_enhanced(&profiles, false, false))?; wrap_err!(clash.activate_enhanced(&profiles, false, false))?;
} }
// change system tray
if system_proxy.is_some() || tun_mode.is_some() {
verge.update_systray(&app_handle).unwrap();
}
Ok(()) Ok(())
} }

View File

@ -8,6 +8,7 @@ use auto_launch::{AutoLaunch, AutoLaunchBuilder};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::sync::Arc; use std::sync::Arc;
use tauri::{async_runtime::Mutex, utils::platform::current_exe}; use tauri::{async_runtime::Mutex, utils::platform::current_exe};
use tauri::{AppHandle, Manager};
/// ### `verge.yaml` schema /// ### `verge.yaml` schema
#[derive(Default, Debug, Clone, Deserialize, Serialize)] #[derive(Default, Debug, Clone, Deserialize, Serialize)]
@ -291,6 +292,35 @@ impl Verge {
self.config.save_file() self.config.save_file()
} }
/// update the system tray state
pub fn update_systray(&self, app_handle: &AppHandle) -> Result<()> {
// system proxy
let system_proxy = self.config.enable_system_proxy.as_ref();
system_proxy.map(|system_proxy| {
app_handle
.tray_handle()
.get_item("system_proxy")
.set_selected(*system_proxy)
.unwrap();
});
// tun mode
let tun_mode = self.config.enable_tun_mode.as_ref();
tun_mode.map(|tun_mode| {
app_handle
.tray_handle()
.get_item("tun_mode")
.set_selected(*tun_mode)
.unwrap();
});
// update verge config
let window = app_handle.get_window("main").unwrap();
window.emit("verge://refresh-verge-config", "yes").unwrap();
Ok(())
}
} }
impl Verge { impl Verge {

View File

@ -30,6 +30,7 @@ fn main() -> std::io::Result<()> {
let tray_menu = SystemTrayMenu::new() let tray_menu = SystemTrayMenu::new()
.add_item(CustomMenuItem::new("open_window", "Show")) .add_item(CustomMenuItem::new("open_window", "Show"))
.add_item(CustomMenuItem::new("system_proxy", "System Proxy")) .add_item(CustomMenuItem::new("system_proxy", "System Proxy"))
.add_item(CustomMenuItem::new("tun_mode", "Tun Mode"))
.add_item(CustomMenuItem::new("restart_clash", "Restart Clash")) .add_item(CustomMenuItem::new("restart_clash", "Restart Clash"))
.add_native_item(SystemTrayMenuItem::Separator) .add_native_item(SystemTrayMenuItem::Separator)
.add_item(CustomMenuItem::new("quit", "Quit").accelerator("CmdOrControl+Q")); .add_item(CustomMenuItem::new("quit", "Quit").accelerator("CmdOrControl+Q"));
@ -60,17 +61,22 @@ fn main() -> std::io::Result<()> {
enable_system_proxy: Some(new_value), enable_system_proxy: Some(new_value),
..VergeConfig::default() ..VergeConfig::default()
}) { }) {
Ok(_) => { Ok(_) => verge.update_systray(app_handle).unwrap(),
app_handle Err(err) => log::error!("{err}"),
.tray_handle() }
.get_item(id.as_str()) }
.set_selected(new_value) "tun_mode" => {
.unwrap(); let verge_state = app_handle.state::<states::VergeState>();
let mut verge = verge_state.0.lock().unwrap();
// update verge config let old_value = verge.config.enable_tun_mode.clone().unwrap_or(false);
let window = app_handle.get_window("main").unwrap(); let new_value = !old_value;
window.emit("verge://refresh-verge-config", "yes").unwrap();
} match verge.patch_config(VergeConfig {
enable_tun_mode: Some(new_value),
..VergeConfig::default()
}) {
Ok(_) => verge.update_systray(app_handle).unwrap(),
Err(err) => log::error!("{err}"), Err(err) => log::error!("{err}"),
} }
} }