diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 28e9219..d71fc0c 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -10,7 +10,7 @@ use tauri::{ SystemTrayEvent, SystemTrayMenu, Window, WindowBuilder, WindowMenuEvent, WindowUrl, }; mod pake; -use pake::pake::PakeConfig; +use pake::PakeConfig; pub fn get_menu() -> Menu { // first menu diff --git a/src-tauri/src/pake.rs b/src-tauri/src/pake.rs index 7ffa898..93273bf 100644 --- a/src-tauri/src/pake.rs +++ b/src-tauri/src/pake.rs @@ -1,58 +1,56 @@ -pub mod pake { - use serde::Deserialize; +use serde::Deserialize; - #[derive(Debug, Deserialize)] - pub struct WindowConfig { - pub url: String, - pub transparent: bool, - pub fullscreen: bool, - pub width: f64, - pub height: f64, - pub resizable: bool, - pub url_type: String, +#[derive(Debug, Deserialize)] +pub struct WindowConfig { + pub url: String, + pub transparent: bool, + pub fullscreen: bool, + pub width: f64, + pub height: f64, + pub resizable: bool, + pub url_type: String, +} + +#[derive(Debug, Deserialize)] +pub struct UserAgent { + pub macos: String, + pub linux: String, + pub windows: String, +} + +#[derive(Debug, Deserialize)] +pub struct FunctionON { + pub macos: bool, + pub linux: bool, + pub windows: bool, +} + +#[derive(Debug, Deserialize)] +pub struct PakeConfig { + pub windows: Vec, + pub user_agent: UserAgent, + pub menu: FunctionON, + pub system_tray: FunctionON, +} + +impl PakeConfig { + pub fn show_menu(&self) -> bool { + #[cfg(target_os = "macos")] + let menu_status = self.menu.macos; + #[cfg(target_os = "linux")] + let menu_status = self.menu.linux; + #[cfg(target_os = "windows")] + let menu_status = self.menu.windows; + menu_status } - #[derive(Debug, Deserialize)] - pub struct UserAgent { - pub macos: String, - pub linux: String, - pub windows: String, - } - - #[derive(Debug, Deserialize)] - pub struct FunctionON { - pub macos: bool, - pub linux: bool, - pub windows: bool, - } - - #[derive(Debug, Deserialize)] - pub struct PakeConfig { - pub windows: Vec, - pub user_agent: UserAgent, - pub menu: FunctionON, - pub system_tray: FunctionON, - } - - impl PakeConfig { - pub fn show_menu(&self) -> bool { - #[cfg(target_os = "macos")] - let menu_status = self.menu.macos; - #[cfg(target_os = "linux")] - let menu_status = self.menu.linux; - #[cfg(target_os = "windows")] - let menu_status = self.menu.windows; - menu_status - } - - pub fn show_system_tray(&self) -> bool { - #[cfg(target_os = "macos")] - let tray_status = self.system_tray.macos; - #[cfg(target_os = "linux")] - let tray_status = self.system_tray.linux; - #[cfg(target_os = "windows")] - let tray_status = self.system_tray.windows; - tray_status - } + pub fn show_system_tray(&self) -> bool { + #[cfg(target_os = "macos")] + let tray_status = self.system_tray.macos; + #[cfg(target_os = "linux")] + let tray_status = self.system_tray.linux; + #[cfg(target_os = "windows")] + let tray_status = self.system_tray.windows; + tray_status } }