bump version

Author: Mikachu2333

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name    = "SC_Starter"
-version = "2.10.2"
+version = "2.10.3"
 # 记得更新 types.rs 中 res的版本
-edition = "2021"
+edition = "2024"
 build   = "build.rs"
 
 [profile.release]
@@ -17,15 +17,16 @@ codegen-units = 1
 vergen = { version = "9.1.0", features = ["build"] }
 
 [target.'cfg(windows)'.build-dependencies]
-tauri-winres = "0.3.5"
+tauri-winres = "0.3.6"
 
 
 [dependencies]
-directories     = "6.0.0"
-single-instance = "0.3.3"
-windows-hotkeys = "0.2.1"
-toml            = "1.1.0"
-toml_edit       = "0.25.8"
-tray-icon       = "0.21.3"
-tao             = "0.35.0"
-mslnk           = "0.1.8"
+win_msgbox_timeout = "1.2.1"
+directories        = "6.0.0"
+single-instance    = "0.3.3"
+windows-hotkeys    = "0.2.1"
+toml               = "1.1.2"
+toml_edit          = "0.25.11"
+tray-icon          = "0.24.0"
+tao                = "0.35.2"
+mslnk              = "0.1.8"

src/config.rs

@@ -6,12 +6,10 @@
 //! - 验证配置有效性
 //! - 转换配置格式
 
-use crate::{
-    msgbox::{self, error_msgbox},
-    types::*,
-};
+use crate::types::*;
 use std::{collections::HashMap, fs, path::PathBuf};
 use toml::Value;
+use win_msgbox_timeout::error_msgbox;
 
 /// 读取并解析TOML配置文件
 ///
@@ -154,7 +152,7 @@ fn get_kvs_from_config(
     // 在配置处理后通知用户错误
     if !errors.is_empty() {
         let error_message = format!("配置文件中存在以下问题:\n{}", errors.join("\n"));
-        msgbox::error_msgbox(error_message, "Configuration Error", 0);
+        error_msgbox(error_message, "Configuration Error", 0);
     }
     user_settings
 }

src/file_ops.rs

@@ -6,22 +6,21 @@
 //! - 执行外部程序
 //! - 监控文件状态并自动恢复
 
-use crate::{
-    msgbox::*,
-    types::{FileExist, PathInfos, RES_HASH_SHA1},
-};
+use crate::types::{FileExist, PathInfos, RES_HASH_SHA1};
 use std::{
     collections::HashMap,
     fs,
     os::windows::process::CommandExt,
     path::Path,
     process::Command,
     sync::{
+        Arc,
         atomic::{AtomicBool, Ordering},
-        mpsc, Arc,
+        mpsc,
     },
     thread,
 };
+use win_msgbox_timeout::{error_msgbox, info_msgbox, notify_msgbox_standalone, wait_notifications};
 
 /// 检查所需文件是否存在及其状态
 ///

src/hotkeys.rs

@@ -6,19 +6,21 @@
 //! - 管理快捷键线程
 //! - 管理启动应用程序的进程状态
 
+use crate::file_ops::{execute_process, open_config};
 use crate::types::*;
 use crate::window_handle::{is_process_running, set_window_topmost_by_pid};
-use crate::{file_ops::{execute_process, open_config}, msgbox::error_msgbox};
 use std::{
     sync::{
+        Arc, Mutex,
         atomic::{AtomicBool, Ordering},
-        mpsc, Arc, Mutex,
+        mpsc,
     },
     thread,
     {path::PathBuf, thread::JoinHandle},
 };
 use tao::event_loop::EventLoopProxy;
-use windows_hotkeys::{singlethreaded::HotkeyManager, HotkeyManagerImpl};
+use win_msgbox_timeout::error_msgbox;
+use windows_hotkeys::{HotkeyManagerImpl, singlethreaded::HotkeyManager};
 
 /// 设置全局快捷键并返回事件发送器
 ///
@@ -65,7 +67,12 @@ pub fn set_hotkeys(
             key_groups.get("screen_capture").unwrap().vkey,
             &key_groups.get("screen_capture").unwrap().mod_keys,
             move || {
-                let args = crate::file_ops::build_capture_args(comp_val, scale_val, &save_path_clone, false);
+                let args = crate::file_ops::build_capture_args(
+                    comp_val,
+                    scale_val,
+                    &save_path_clone,
+                    false,
+                );
                 execute_process(&exe_path_clone, args, gui_clone.clone(), notification, lang);
             },
         );
@@ -175,8 +182,19 @@ pub fn set_hotkeys(
             key_groups.get("screen_capture_long").unwrap().vkey,
             &key_groups.get("screen_capture_long").unwrap().mod_keys,
             move || {
-                let args = crate::file_ops::build_capture_args(comp_val2, scale_val2, &save_path_clone, true);
-                execute_process(&exe_path_clone, args, gui_clone.clone(), notification2, lang);
+                let args = crate::file_ops::build_capture_args(
+                    comp_val2,
+                    scale_val2,
+                    &save_path_clone,
+                    true,
+                );
+                execute_process(
+                    &exe_path_clone,
+                    args,
+                    gui_clone.clone(),
+                    notification2,
+                    lang,
+                );
             },
         );
         if hotkey_scl.is_err() {

src/main.rs

@@ -12,7 +12,6 @@
 mod config;
 mod file_ops;
 mod hotkeys;
-mod msgbox;
 mod tray;
 mod types;
 mod window_handle;
@@ -27,12 +26,13 @@ use single_instance::SingleInstance;
 use std::{
     path::PathBuf,
     sync::{
-        atomic::{AtomicBool, Ordering},
         Arc, Mutex,
+        atomic::{AtomicBool, Ordering},
     },
 };
 use tao::event_loop::EventLoop;
 use tray_icon::MouseButton;
+use win_msgbox_timeout::error_msgbox;
 
 /// 随机生成的GUID，用于程序单例检测
 /// 防止程序多开造成快捷键冲突
@@ -52,7 +52,7 @@ fn main() {
     let instance = match SingleInstance::new(PROCESS_ID) {
         Ok(inst) => Box::new(inst),
         Err(e) => {
-            msgbox::error_msgbox(
+            error_msgbox(
                 format!("Failed to create single instance lock: {}", e),
                 "Fatal Error",
                 0,
@@ -62,7 +62,7 @@ fn main() {
     };
     if !instance.is_single() {
         // 检测到已有实例在运行时，显示提示并退出
-        msgbox::error_msgbox("Avoid Multiple.", "", 2);
+        error_msgbox("Avoid Multiple.", "", 2);
         panic!("Multiple!")
     };
 
@@ -81,7 +81,7 @@ fn main() {
     let binding = match directories::BaseDirs::new() {
         Some(bd) => bd,
         None => {
-            msgbox::error_msgbox(
+            error_msgbox(
                 "Failed to determine base directories (LOCALAPPDATA missing?).",
                 "Fatal Error",
                 0,