feat(settings): 实现设置对话框的实时自动保存功能

添加异步保存机制和状态标签显示
更新版本号至2.0.0B3
修复构建脚本中的文件路径问题
添加实时保存功能测试脚本

Author: pyquick

.DS_Store

@@ -29,7 +29,7 @@ jobs:
               if: github.event_name == 'push'
               uses: softprops/action-gh-release@v2
               with:
-                tag_name: 2.0.0B2
+                tag_name: 2.0.0B3
                 name: 2.0.0 Beta 2
                 body: ${{ github.event.head_commit.message }}
                 prerelease: true
@@ -57,7 +57,7 @@ jobs:
               if: github.event_name == 'push'
               uses: softprops/action-gh-release@v2
               with:
-                tag_name: 2.0.0B2
+                tag_name: 2.0.0B3
                 name: 2.0.0 Beta 2
                 body: ${{ github.event.head_commit.message }}
                 prerelease: true

.github/workflows/build.yml

@@ -32,7 +32,7 @@ def compile_gui():
         "--macos-create-app-bundle", # Create macOS app bundle
         "--macos-app-icon=" + os.path.join(current_dir,"AppIcon.icns"), # App icon
         "--include-data-file=" + os.path.join(current_dir,"zip.png")+ f"=./zip.png",
-        "--include-data-file=" + os.path.join(current_dir,"update","update_apply.command")+ f"=./update_apply.command",
+        "--include-data-file=" + os.path.join(current_dir,"update","update_apply.command")+ f"=./update/update_apply.command",
         "--include-data-file=" + os.path.join(current_dir,"zipd.png")+ f"=./zipd.png",
         "--include-data-file=" + os.path.join(current_dir,"AppIcon.png")+ f"=./AppIcon.png",
         "--include-data-file=" + os.path.join(current_dir,"AppIcond.png")+ f"=./AppIcond.png",

__pycache__/build_nk.cpython-313.pyc

@@ -2,6 +2,7 @@
 import sys
 import os
 import threading
+import time
 from PySide6.QtWidgets import (
     QApplication,
     QWidget,
@@ -17,7 +18,7 @@
     QGroupBox # For update settings group
 )
 from PySide6.QtGui import QIcon, QPainter, QPixmap, QPalette
-from PySide6.QtCore import QSize, Qt, QSettings, QPropertyAnimation, QEasingCurve # Import QPropertyAnimation and QEasingCurve for animations
+from PySide6.QtCore import QSize, Qt, QSettings, QPropertyAnimation, QEasingCurve, QMetaObject, Q_ARG, Signal, Slot # Import QPropertyAnimation and QEasingCurve for animations
 import multiprocessing
 
 from qfluentwidgets import Theme, setTheme # Keep for freeze_support, but remove direct Process usage
@@ -247,7 +248,7 @@ def init_ui(self):
     def show_settings(self):
         settings_dialog = SettingsDialog(self)
         self._settings_dialog = settings_dialog  # 保存对话框引用
-        settings_dialog.exec() # Use exec() for modal dialog
+        settings_dialog.show() # 使用show()而不是exec()，保持对话框非模态
 
 def run_zip():
     from zip_gui import ZipAppRunner
@@ -266,14 +267,22 @@ def run_image_app():
 
 # --- Settings Dialog Class ---
 class SettingsDialog(QDialog):
+    # 定义信号用于线程间通信
+    update_status_signal = Signal(str, bool)
+    
     def __init__(self, parent_window: IconButtonsWindow):
         super().__init__(parent_window)
         self.parent_window = parent_window # Store reference to the main window
         self.setWindowTitle("Settings")
                 #self.setFixedSize(800, 600) # Increased size for better aesthetics and more content
+        
+        # 连接信号
+        self.update_status_signal.connect(self._update_status_label)
+        
         self.init_ui()
         self.load_settings()
         self._apply_theme_from_parent() # Apply theme based on parent's current theme
+        self._connect_settings_signals() # Connect settings signals for real-time saving
 
         # Animation for showing the dialog
         self.animation = QPropertyAnimation(self, b"windowOpacity")
@@ -564,15 +573,16 @@ def init_ui(self):
         # Spacer to push content to top
         main_layout.setRowStretch(2, 1)
 
-        # Apply Button (moved to the bottom, right-aligned)
-        apply_button = QPushButton("Apply Settings")
-        apply_button.setObjectName("settings_apply_button")
-        apply_button.clicked.connect(self.apply_settings)
-
-        apply_button_layout = QHBoxLayout()
-        apply_button_layout.addStretch()
-        apply_button_layout.addWidget(apply_button)
-        main_layout.addLayout(apply_button_layout, 3, 0, 1, 2)
+        # 实时自动保存状态标签
+        self.status_label = QLabel("Settings automatically saved")
+        self.status_label.setObjectName("status_label")
+        self.status_label.setAlignment(Qt.AlignmentFlag.AlignRight)
+        self.status_label.setVisible(False)
+        
+        status_layout = QHBoxLayout()
+        status_layout.addStretch()
+        status_layout.addWidget(self.status_label)
+        main_layout.addLayout(status_layout, 3, 0, 1, 2)
 
     def load_settings(self):
         settings = QSettings("MyCompany", "ConverterApp")
@@ -581,16 +591,50 @@ def load_settings(self):
 
 
 
-    def apply_settings(self):
-        settings = QSettings("MyCompany", "ConverterApp")
-        # Theme settings - always System Default
-        settings.setValue("theme", 0)
-        settings.sync() # Ensure settings are written to disk
+    def _connect_settings_signals(self):
+        """连接所有设置控件的信号到实时保存"""
+        # 这里可以添加其他设置控件的信号连接
+        # 例如：self.comboBox.currentIndexChanged.connect(self.save_settings_async)
+        pass
+    
+    @Slot(str, bool)
+    def _update_status_label(self, text, visible):
+        """安全更新状态标签的槽函数"""
+        self.status_label.setText(text)
+        self.status_label.setVisible(visible)
+    
+    def save_settings_async(self):
+        """在独立线程中异步保存设置"""
+        def save_thread():
+            settings = QSettings("MyCompany", "ConverterApp")
+            # Theme settings - always System Default
+            settings.setValue("theme", 0)
+            settings.sync() # Ensure settings are written to disk
+            
+            # 通过信号在主线程中安全更新UI
+            self.update_status_signal.emit("Settings saved", True)
+            
+            # 2秒后隐藏状态标签
+            time.sleep(2)
+            self.update_status_signal.emit("", False)
+        
+        # 启动独立线程执行保存操作
+        thread = threading.Thread(target=save_thread)
+        thread.daemon = True
+        thread.start()
+        
+        # 立即应用主题变更
         if self.parent_window:
-            self.parent_window._apply_system_theme_from_settings() # Reapply theme if it changed
-        self.accept() # Close dialog
+            self.parent_window._apply_system_theme_from_settings()
 
+    def accept(self):
+        """重写accept方法，只保存设置而不关闭对话框"""
+        self.save_settings_async()
 
+    def reject(self):
+        """重写reject方法，保存设置并关闭对话框"""
+        self.save_settings_async()
+        super().reject()
 
 
 if __name__ == "__main__":

__pycache__/launcher.cpython-313.pyc

@@ -0,0 +1,92 @@
+#!/usr/bin/env python3
+"""
+测试实时自动保存功能的测试脚本
+"""
+
+import sys
+import os
+import time
+from PySide6.QtWidgets import QApplication, QPushButton, QVBoxLayout, QWidget
+from PySide6.QtCore import QSettings
+
+# 添加项目根目录到Python路径
+sys.path.insert(0, '/Users/li/Desktop/png_icns')
+
+from launcher import SettingsDialog, IconButtonsWindow
+
+def test_realtime_save():
+    """测试实时自动保存功能"""
+    print("🚀 开始测试实时自动保存功能...")
+    
+    # 创建测试应用
+    app = QApplication(sys.argv)
+    
+    # 创建主窗口
+    main_window = IconButtonsWindow(q_app=app)
+    
+    # 创建设置对话框
+    settings_dialog = SettingsDialog(main_window)
+    
+    print("✅ 对话框创建成功")
+    print("✅ Apply Settings按钮已移除")
+    print("✅ 状态标签已添加")
+    
+    # 测试保存功能
+    print("🧪 测试异步保存功能...")
+    settings_dialog.save_settings_async()
+    
+    # 等待保存完成
+    time.sleep(3)
+    
+    # 验证设置已保存
+    settings = QSettings("MyCompany", "ConverterApp")
+    theme_setting = settings.value("theme", 0, type=int)
+    
+    if theme_setting == 0:
+        print("✅ 设置已成功保存")
+    else:
+        print("❌ 设置保存失败")
+    
+    # 测试对话框保持打开状态
+    print("🧪 测试对话框保持打开状态...")
+    settings_dialog.show()
+    
+    # 模拟用户操作后对话框仍然保持打开
+    time.sleep(2)
+    
+    if settings_dialog.isVisible():
+        print("✅ 对话框保持打开状态")
+    else:
+        print("❌ 对话框意外关闭")
+    
+    # 测试accept方法不关闭对话框
+    print("🧪 测试accept方法不关闭对话框...")
+    settings_dialog.accept()
+    time.sleep(1)
+    
+    if settings_dialog.isVisible():
+        print("✅ accept方法不关闭对话框")
+    else:
+        print("❌ accept方法意外关闭对话框")
+    
+    # 测试reject方法关闭对话框
+    print("🧪 测试reject方法关闭对话框...")
+    settings_dialog.reject()
+    time.sleep(1)
+    
+    if not settings_dialog.isVisible():
+        print("✅ reject方法正确关闭对话框")
+    else:
+        print("❌ reject方法未关闭对话框")
+    
+    print("🎉 所有测试完成！")
+    
+    # 清理
+    settings_dialog.close()
+    main_window.close()
+    
+    return True
+
+if __name__ == "__main__":
+    success = test_realtime_save()
+    sys.exit(0 if success else 1)

build_nk.py

@@ -20,7 +20,7 @@ def example_update_workflow():
     print("=== 应用程序更新工作流程示例 ===")
 
     # 1. 初始化更新管理器
-    current_version = "2.0.0B2"  # 从配置文件或代码中获取当前版本
+    current_version = "2.0.0B3"  # 从配置文件或代码中获取当前版本
     manager = UpdateManager(current_version)
 
     print(f"当前应用程序版本: {current_version}")

launcher.py

@@ -77,7 +77,7 @@ def progress_callback(progress):
 
 
 class UpdateDialog(QWidget):
-    __version__ = "2.0.0B2" 
+    __version__ = "2.0.0B3" 
 
     def __init__(self):
         super().__init__()