[*] update normally

Author: heng30

Cargo.lock

@@ -281,7 +281,7 @@ impl SpeakerRecorder {
     }
 
     fn find_default_output(&self) -> Result<Option<(u32, String)>, SpeakerError> {
-        log::info!("Star search output audio devices...");
+        log::info!("Start search output audio devices...");
 
         let registry = self
             .core

lib/recorder/src/record_speaker.rs

@@ -14,6 +14,7 @@ description.workspace = true
 [dependencies]
 log.workspace = true
 slint.workspace = true
+pmacro.workspace = true
 once_cell.workspace = true
 
 [target.'cfg(any(target_os = "windows", target_os = "linux", target_os = "macos", target_os = "android"))'.dependencies]

wayshot/Cargo.toml

@@ -1,12 +1,16 @@
 //! Configuration management module
-//! 
+//!
 //! Handles application configuration loading, saving, and management.
 //! Supports platform-specific configuration directories and automatic
 //! configuration file creation.
 
-use anyhow::{bail, Context, Result};
+use crate::slint_generatedAppWindow::{
+    SettingControl as UISettingControl, SettingRecorder as UISettingRecorder,
+};
+use anyhow::{Context, Result, bail};
 use log::debug;
 use once_cell::sync::Lazy;
+use pmacro::SlintFromConvert;
 use serde::{Deserialize, Serialize};
 use std::{fs, path::PathBuf, sync::Mutex};
 use uuid::Uuid;
@@ -21,7 +25,7 @@ const CARGO_TOML: &str = include_str!("../Cargo.toml");
 static CONFIG: Lazy<Mutex<Config>> = Lazy::new(|| Mutex::new(Config::default()));
 
 /// Android-specific application directories structure
-/// 
+///
 /// Provides platform-specific directory paths for Android applications.
 #[cfg(feature = "android")]
 pub struct AppDirs {
@@ -34,11 +38,11 @@ pub struct AppDirs {
 #[cfg(feature = "android")]
 impl AppDirs {
     /// Creates new Android application directories
-    /// 
+    ///
     /// # Parameters
     /// - `name`: Application package name
     /// - `_`: Compatibility parameter (unused)
-    /// 
+    ///
     /// # Returns
     /// - `Some(AppDirs)` if successful, `None` otherwise
     pub fn new(name: Option<&str>, _: bool) -> Option<Self> {
@@ -53,7 +57,7 @@ impl AppDirs {
 }
 
 /// Main configuration structure containing all application settings
-/// 
+///
 /// Includes paths, preferences, proxy settings, and AI model configurations.
 #[derive(Serialize, Deserialize, Default, Debug, Clone)]
 pub struct Config {
@@ -76,17 +80,17 @@ pub struct Config {
     pub appid: String,
 
     pub preference: Preference,
-    pub proxy: Proxy,
-    pub ai_model: AiModel,
+    pub recorder: Recorder,
+    pub control: Control,
 }
 
 /// User preference settings for the application
-/// 
+///
 /// Contains window settings, font preferences, language, and UI options.
 #[derive(Serialize, Deserialize, Debug, Clone, Derivative)]
 #[derivative(Default)]
 pub struct Preference {
-    #[derivative(Default(value = "1200"))]
+    #[derivative(Default(value = "1000"))]
     pub win_width: u32,
 
     #[derivative(Default(value = "800"))]
@@ -110,40 +114,38 @@ pub struct Preference {
     pub is_dark: bool,
 }
 
-/// Proxy configuration settings
-/// 
-/// Supports both HTTP and SOCKS5 proxy configurations.
-#[derive(Serialize, Deserialize, Debug, Clone, Derivative)]
+#[derive(Serialize, Deserialize, Default, Debug, Clone, SlintFromConvert)]
+#[from("UISettingRecorder")]
+pub struct Recorder {
+    pub save_dir: String,
+    pub remove_temporary_files: bool,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, Derivative, SlintFromConvert)]
 #[derivative(Default)]
-pub struct Proxy {
-    #[derivative(Default(value = "\"127.0.0.1\".to_string()"))]
-    pub http_url: String,
+#[from("UISettingControl")]
+pub struct Control {
+    pub screen: String,
+    pub input_audio: String,
 
-    #[derivative(Default(value = "3128"))]
-    pub http_port: u16,
+    #[derivative(Default(value = "100.0"))]
+    pub input_audio_sound: f32,
 
-    #[derivative(Default(value = "\"127.0.0.1\".to_string()"))]
-    pub socks5_url: String,
+    #[derivative(Default(value = "true"))]
+    pub enable_input_audio: bool,
 
-    #[derivative(Default(value = "1080"))]
-    pub socks5_port: u16,
-}
+    #[derivative(Default(value = "100.0"))]
+    pub desktop_speaker_sound: f32,
 
-/// AI model configuration settings
-/// 
-/// Contains API endpoints, model names, and authentication keys for AI services.
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-pub struct AiModel {
-    pub api_base_url: String,
-    pub model_name: String,
-    pub api_key: String,
+    #[derivative(Default(value = "true"))]
+    pub enable_desktop_speaker: bool,
 }
 
 impl Config {
     /// Initializes the configuration
-    /// 
+    ///
     /// Loads package metadata, creates directories, and loads configuration file.
-    /// 
+    ///
     /// # Returns
     /// - `Result<()>` indicating success or failure
     pub fn init(&mut self) -> Result<()> {
@@ -183,10 +185,10 @@ impl Config {
     }
 
     /// Creates application directories and sets up paths
-    /// 
+    ///
     /// # Parameters
     /// - `app_dirs`: Platform-specific application directories
-    /// 
+    ///
     /// # Returns
     /// - `Result<()>` indicating success or failure
     fn crate_dirs(&mut self, app_dirs: &AppDirs) -> Result<()> {
@@ -206,7 +208,7 @@ impl Config {
     }
 
     /// Loads configuration from file or creates default if not exists
-    /// 
+    ///
     /// # Returns
     /// - `Result<()>` indicating success or failure
     fn load(&mut self) -> Result<()> {
@@ -252,7 +254,7 @@ impl Config {
     }
 
     /// Saves the current configuration to file
-    /// 
+    ///
     /// # Returns
     /// - `Result<()>` indicating success or failure
     pub fn save(&self) -> Result<()> {
@@ -265,33 +267,33 @@ impl Config {
 }
 
 /// Generates a default application ID using UUID v4
-/// 
+///
 /// # Returns
 /// - Random UUID string
 fn appid_default() -> String {
     Uuid::new_v4().to_string()
 }
 
 /// Initializes the global configuration
-/// 
+///
 /// This should be called once at application startup.
 pub fn init() {
     CONFIG.lock().unwrap().init().unwrap();
 }
 
 /// Returns a clone of the current configuration
-/// 
+///
 /// # Returns
 /// - Current configuration instance
 pub fn all() -> Config {
     CONFIG.lock().unwrap().clone()
 }
 
 /// Saves a new configuration and updates the global instance
-/// 
+///
 /// # Parameters
 /// - `conf`: New configuration to save
-/// 
+///
 /// # Returns
 /// - `Result<()>` indicating success or failure
 pub fn save(conf: Config) -> Result<()> {