diff --git a/src-tauri/src/wa/cmd.rs b/src-tauri/src/app/cmd.rs similarity index 100% rename from src-tauri/src/wa/cmd.rs rename to src-tauri/src/app/cmd.rs diff --git a/src-tauri/src/wa/menu.rs b/src-tauri/src/app/menu.rs similarity index 99% rename from src-tauri/src/wa/menu.rs rename to src-tauri/src/app/menu.rs index b779e43..41fd16e 100644 --- a/src-tauri/src/wa/menu.rs +++ b/src-tauri/src/app/menu.rs @@ -1,10 +1,9 @@ +use crate::utils; use tauri::{ utils::assets::EmbeddedAssets, AboutMetadata, AppHandle, Context, CustomMenuItem, Manager, Menu, MenuItem, Submenu, SystemTrayEvent, WindowMenuEvent, }; -use crate::utils; - // --- Menu pub fn init(context: &Context) -> Menu { let name = &context.package_info().name; diff --git a/src-tauri/src/wa/mod.rs b/src-tauri/src/app/mod.rs similarity index 100% rename from src-tauri/src/wa/mod.rs rename to src-tauri/src/app/mod.rs diff --git a/src-tauri/src/wa/setup.rs b/src-tauri/src/app/setup.rs similarity index 99% rename from src-tauri/src/wa/setup.rs rename to src-tauri/src/app/setup.rs index 287fd95..7ffbbdd 100644 --- a/src-tauri/src/wa/setup.rs +++ b/src-tauri/src/app/setup.rs @@ -1,6 +1,5 @@ -use tauri::{utils::config::WindowUrl, window::WindowBuilder, App, TitleBarStyle}; - use crate::utils; +use tauri::{utils::config::WindowUrl, window::WindowBuilder, App, TitleBarStyle}; pub fn init(app: &mut App) -> std::result::Result<(), Box> { let conf = utils::get_tauri_conf().unwrap(); diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index ae878c5..f8dd9ca 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -3,20 +3,17 @@ windows_subsystem = "windows" )] +mod app; mod utils; -mod wa; +use app::{cmd, menu, setup}; use tauri::SystemTray; -use wa::{cmd, menu, setup}; fn main() { let context = tauri::generate_context!(); tauri::Builder::default() - .invoke_handler(tauri::generate_handler![ - cmd::drag_window, - cmd::fullscreen, - ]) + .invoke_handler(tauri::generate_handler![cmd::drag_window, cmd::fullscreen,]) .setup(setup::init) .menu(menu::init(&context)) .system_tray(SystemTray::new())