feat: add configure to tray menu (#104)

README.md

@@ -21,9 +21,9 @@ Tips: **Hold `Alt` and strike `Backtick/Tab` to cycle through, press `Alt + Back
 
 ## Configuration
 
-The window-switcher supports custom shortcuts, enabling and disabling certain functions, and all of these can be set through the configuration file.
+Window-Switcher offers various customization options to tailor its behavior to your preferences. You can define custom keyboard shortcuts, enable or disable specific features, and fine-tune settings through a configuration file.
 
-The configuration file must be named `window-switcher.ini` and located in the same directory as `window-switcher.exe` for the changes to take effect.  
+To personalize Window-Switcher, you'll need a configuration file named `window-switcher.ini`. This file should be placed in the same directory as the `window-switcher.exe` file. Once you've made changes to the configuration, make sure to restart Window-Switcher so your new settings can take effect.
 
 Here is the default configuration:
 

src/app.rs

@@ -1,4 +1,4 @@
-use crate::config::Config;
+use crate::config::{edit_config_file, Config};
 use crate::foreground::ForegroundWatcher;
 use crate::keyboard::KeyboardListener;
 use crate::startup::Startup;
@@ -40,6 +40,7 @@ pub const WM_USER_MODIFIER_KEYUP: u32 = 6001;
 pub const WM_USER_HOOTKEY: u32 = 6002;
 pub const IDM_EXIT: u32 = 1;
 pub const IDM_STARTUP: u32 = 2;
+pub const IDM_CONFIGURE: u32 = 3;
 
 pub fn start(config: &Config) -> Result<()> {
     info!("start config={:?}", config);
@@ -254,6 +255,11 @@ impl App {
                             let app = get_app(hwnd)?;
                             app.startup.toggle()?;
                         }
+                        IDM_CONFIGURE => {
+                            if let Err(err) = edit_config_file() {
+                                alert!("{err}");
+                            }
+                        }
                         _ => {}
                     }
                 }
@@ -274,7 +280,7 @@ impl App {
         Ok(unsafe { DefWindowProcW(hwnd, msg, wparam, lparam) })
     }
 
-    pub fn switch_windows(&mut self, hwnd: HWND, reverse: bool) -> Result<bool> {
+    fn switch_windows(&mut self, hwnd: HWND, reverse: bool) -> Result<bool> {
         let windows = list_windows(self.config.switch_windows_ignore_minimal)?;
         debug!(
             "switch windows: hwnd:{hwnd:?} reverse:{reverse} state:{:?}",

src/config.rs

@@ -1,4 +1,4 @@
-use std::{collections::HashSet, path::PathBuf};
+use std::{collections::HashSet, fs, path::PathBuf, process::Command};
 
 use anyhow::{anyhow, Result};
 use ini::Ini;
@@ -12,7 +12,9 @@ use crate::utils::get_exe_folder;
 pub const SWITCH_WINDOWS_HOTKEY_ID: u32 = 1;
 pub const SWITCH_APPS_HOTKEY_ID: u32 = 2;
 
-#[derive(Debug, Clone)]
+const DEFAULT_CONFIG: &str = include_str!("../window-switcher.ini");
+
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Config {
     pub trayicon: bool,
     pub log_level: LevelFilter,
@@ -255,6 +257,45 @@ impl Hotkey {
     }
 }
 
+pub fn load_config() -> Result<Config> {
+    let filepath = get_config_path()?;
+    let conf = Ini::load_from_file(&filepath)
+        .map_err(|err| anyhow!("Failed to load config file '{}', {err}", filepath.display()))?;
+    Config::load(&conf)
+}
+
+pub(crate) fn edit_config_file() -> Result<bool> {
+    let filepath = get_config_path()?;
+    debug!("open config file '{}'", filepath.display());
+    if !filepath.exists() {
+        fs::write(&filepath, DEFAULT_CONFIG).map_err(|err| {
+            anyhow!(
+                "Failed to write config file '{}', {err}",
+                filepath.display()
+            )
+        })?;
+    }
+    let exit = Command::new("notepad.exe")
+        .arg(&filepath)
+        .spawn()
+        .map_err(|err| anyhow!("Failed to open config file '{}', {err}", filepath.display()))?
+        .wait()
+        .map_err(|err| {
+            anyhow!(
+                "Failed to close config file '{}', {err}",
+                filepath.display()
+            )
+        })?;
+
+    Ok(exit.success())
+}
+
+fn get_config_path() -> Result<PathBuf> {
+    let folder = get_exe_folder()?;
+    let config_path = folder.join("window-switcher.ini");
+    Ok(config_path)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/lib.rs

@@ -13,4 +13,4 @@ mod startup;
 mod trayicon;
 
 pub use crate::app::start;
-pub use crate::config::Config;
+pub use crate::config::{load_config, Config};

src/main.rs

@@ -6,12 +6,7 @@ use std::{
     path::Path,
 };
 
-use ini::Ini;
-use window_switcher::{
-    alert, start,
-    utils::{get_exe_folder, SingleInstance},
-    Config,
-};
+use window_switcher::{alert, load_config, start, utils::SingleInstance};
 
 fn main() {
     if let Err(err) = run() {
@@ -38,14 +33,6 @@ fn run() -> Result<()> {
     start(&config)
 }
 
-fn load_config() -> Result<Config> {
-    let folder = get_exe_folder()?;
-    let ini_file = folder.join("window-switcher.ini");
-    let conf =
-        Ini::load_from_file(ini_file).map_err(|err| anyhow!("Failed to load ini file, {err}"))?;
-    Config::load(&conf)
-}
-
 fn prepare_log_file(path: &Path) -> std::io::Result<File> {
     if path.exists() {
         OpenOptions::new().append(true).open(path)

src/trayicon.rs

@@ -1,4 +1,4 @@
-use crate::app::{IDM_EXIT, IDM_STARTUP, NAME, WM_USER_TRAYICON};
+use crate::app::{IDM_CONFIGURE, IDM_EXIT, IDM_STARTUP, NAME, WM_USER_TRAYICON};
 
 use anyhow::{anyhow, Result};
 use windows::core::w;
@@ -14,6 +14,7 @@ use windows::Win32::UI::WindowsAndMessaging::{
 };
 
 const ICON_BYTES: &[u8] = include_bytes!("../assets/icon.ico");
+const TEXT_CONFIGURE: PCWSTR = w!("Configure");
 const TEXT_STARTUP: PCWSTR = w!("Startup");
 const TEXT_EXIT: PCWSTR = w!("Exit");
 
@@ -87,6 +88,7 @@ impl TrayIcon {
         let startup_flags = if startup { MF_CHECKED } else { MF_UNCHECKED };
         unsafe {
             let hmenu = CreatePopupMenu().map_err(|err| anyhow!("Failed to create menu, {err}"))?;
+            AppendMenuW(hmenu, MF_STRING, IDM_CONFIGURE as usize, TEXT_CONFIGURE)?;
             AppendMenuW(hmenu, startup_flags, IDM_STARTUP as usize, TEXT_STARTUP)?;
             AppendMenuW(hmenu, MF_STRING, IDM_EXIT as usize, TEXT_EXIT)?;
             Ok(hmenu)