侧边栏&页面管理的功能和实时更新

Author: lzy98276

app/Language/modules/custom_settings.py

@@ -12,7 +12,7 @@
         "roll_call_method": {
             "name": "点名控制面板位置",
             "description": "设置点名控制面板的位置",
-            "combo_items": ["左侧", "右侧", "左侧底部", "右侧底部"],
+            "combo_items": ["左侧", "右侧"],
         },
         "show_name": {
             "name": "名称设置按钮",
@@ -54,10 +54,15 @@
             "description": "控制是否显示抽取人数/组数的标签",
             "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
         },
+        "roll_call_remaining_button": {
+            "name": "查看剩余名单按钮",
+            "description": "控制是否显示查看剩余名单按钮",
+            "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
+        },
         "lottery_method": {
             "name": "抽奖控制面板位置",
             "description": "设置抽奖控制面板的位置",
-            "combo_items": ["左侧", "右侧", "左侧底部", "右侧底部"],
+            "combo_items": ["左侧", "右侧"],
         },
         "show_lottery_name": {
             "name": "名称设置按钮",
@@ -89,10 +94,15 @@
             "description": "控制是否显示中奖数量标签",
             "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
         },
+        "lottery_remaining_button": {
+            "name": "查看剩余名单按钮",
+            "description": "控制是否显示查看剩余名单按钮",
+            "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
+        },
         "custom_method": {
             "name": "自定义抽控制面板位置",
             "description": "设置自定义抽控制面板的位置",
-            "combo_items": ["左侧", "右侧", "左侧底部", "右侧底部"],
+            "combo_items": ["左侧", "右侧"],
         },
         "reset_custom": {
             "name": "重置自定义抽按钮",
@@ -134,5 +144,10 @@
             "description": "控制是否显示自定义抽取人数/组数的标签",
             "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
         },
+        "custom_remaining_button": {
+            "name": "查看剩余名单按钮",
+            "description": "控制是否显示查看剩余名单按钮",
+            "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
+        },
     }
-}
+}

app/Language/modules/sidebar_tray_management.py

@@ -9,7 +9,7 @@
         },
         "edge_settings": {"name": "贴边设置", "description": "配置浮动窗口的贴边设置"},
         "startup_display_floating_window": {
-            "name": "软件启动时显示浮窗",
+            "name": "启动时显示浮窗",
             "description": "控制软件启动时是否自动显示浮动窗口",
             "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
         },
@@ -18,7 +18,7 @@
             "description": "调整浮动窗口的透明度",
         },
         "reset_floating_window_position_button": {
-            "name": "重置浮窗位置按钮",
+            "name": "重置浮窗位置",
             "description": "将浮动窗口位置重置为默认位置",
             "pushbutton_name": "重置位置",
         },
@@ -45,7 +45,7 @@
             ],
         },
         "floating_window_placement": {
-            "name": "浮窗排列",
+            "name": "浮窗排列方式",
             "description": "设置浮动窗口中控件的排列方式",
             "combo_items": ["矩形排列", "竖向排列", "横向排列"],
         },
@@ -55,9 +55,9 @@
             "combo_items": ["图标+文字", "图标", "文字"],
         },
         "floating_window_stick_to_edge": {
-            "name": "贴边设置",
+            "name": "贴边功能",
             "description": "控制浮动窗口是否自动贴边",
-            "switchbutton_name": {"enable": "贴边", "disable": "不贴边"},
+            "switchbutton_name": {"enable": "启用", "disable": "禁用"},
         },
         "floating_window_stick_to_edge_recover_seconds": {
             "name": "贴边收纳时间",
@@ -76,7 +76,7 @@
     "ZH_CN": {
         "title": {
             "name": "侧边栏/托盘管理",
-            "description": "配置侧边栏/托盘管理相关设置",
+            "description": "配置侧边栏和系统托盘相关设置",
         }
     }
 }
@@ -90,28 +90,120 @@
         },
         "roll_call_sidebar_position": {
             "name": "点名侧边栏位置",
-            "description": "配置点名侧边栏位置",
+            "description": "配置点名功能在侧边栏中的位置",
             "combo_items": ["顶部", "底部", "不显示"],
         },
         "custom_roll_call_sidebar_position": {
             "name": "自定义抽侧边栏位置",
-            "description": "配置自定义抽侧边栏位置",
+            "description": "配置自定义抽功能在侧边栏中的位置",
             "combo_items": ["顶部", "底部", "不显示"],
         },
         "lottery_sidebar_position": {
             "name": "抽奖侧边栏位置",
-            "description": "配置抽奖侧边栏位置",
+            "description": "配置抽奖功能在侧边栏中的位置",
             "combo_items": ["顶部", "底部", "不显示"],
         },
         "main_window_history": {
             "name": "主窗口历史记录位置",
-            "description": "配置主窗口历史记录位置",
+            "description": "配置历史记录功能在侧边栏中的位置",
             "combo_items": ["顶部", "底部", "不显示"],
         },
         "settings_icon": {
             "name": "设置图标位置",
-            "description": "配置侧边栏管理设置图标位置",
+            "description": "配置设置图标在侧边栏中的位置",
             "combo_items": ["顶部", "底部", "不显示"],
         },
     }
 }
+
+# 设置窗口侧边栏语言配置
+sidebar_management_settings = {
+    "ZH_CN": {
+        "title": {
+            "name": "设置窗口侧边栏",
+            "description": "配置设置窗口的侧边栏",
+        },
+        "home": {
+            "name": "首页位置",
+            "description": "设置首页在侧边栏中的位置",
+            "combo_items": ["顶部", "底部", "不显示"],
+        },
+        "base_settings": {
+            "name": "基础设置位置",
+            "description": "设置基础设置项在侧边栏中的位置",
+            "combo_items": ["顶部", "底部", "不显示"],
+        },
+        "name_management": {
+            "name": "名单管理位置",
+            "description": "设置名单管理项在侧边栏中的位置",
+            "combo_items": ["顶部", "底部", "不显示"],
+        },
+        "draw_settings": {
+            "name": "抽取设置位置",
+            "description": "设置抽取设置项在侧边栏中的位置",
+            "combo_items": ["顶部", "底部", "不显示"],
+        },
+        "notification_service": {
+            "name": "通知服务位置",
+            "description": "设置通知服务项在侧边栏中的位置",
+            "combo_items": ["顶部", "底部", "不显示"],
+        },
+        "security_settings": {
+            "name": "安全设置位置",
+            "description": "设置安全设置项在侧边栏中的位置",
+            "combo_items": ["顶部", "底部", "不显示"],
+        },
+        "personal_settings": {
+            "name": "个性设置位置",
+            "description": "设置个性设置项在侧边栏中的位置",
+            "combo_items": ["顶部", "底部"],
+        },
+        "voice_settings": {
+            "name": "语音设置位置",
+            "description": "设置语音设置项在侧边栏中的位置",
+            "combo_items": ["顶部", "底部", "不显示"],
+        },
+        "settings_history": {
+            "name": "设置历史记录位置",
+            "description": "设置历史记录项在侧边栏中的位置",
+            "combo_items": ["顶部", "底部", "不显示"],
+        },
+        "more_settings": {
+            "name": "更多设置位置",
+            "description": "设置更多设置项在侧边栏中的位置",
+            "combo_items": ["顶部", "底部", "不显示"],
+        },
+    }
+}
+
+# 托盘管理语言配置
+tray_management = {
+    "ZH_CN": {
+        "title": {"name": "托盘管理", "description": "配置系统托盘相关设置"},
+        "show_hide_main_window": {
+            "name": "暂时显示/隐藏主界面",
+            "description": "控制主界面的显示和隐藏",
+            "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
+        },
+        "open_settings": {
+            "name": "打开设置窗口",
+            "description": "控制是否在托盘菜单中显示设置窗口选项",
+            "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
+        },
+        "show_hide_float_window": {
+            "name": "暂时显示/隐藏浮窗",
+            "description": "控制浮动窗口的显示和隐藏",
+            "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
+        },
+        "restart": {
+            "name": "重启应用",
+            "description": "控制是否在托盘菜单中显示重启选项",
+            "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
+        },
+        "exit": {
+            "name": "退出应用",
+            "description": "控制是否在托盘菜单中显示退出选项",
+            "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
+        },
+    }
+}

app/page_building/main_window_page.py

@@ -1,5 +1,6 @@
 # 导入库
 from PySide6.QtWidgets import QFrame
+from PySide6.QtCore import QTimer
 
 # 导入页面模板
 from app.page_building.page_template import PageTemplate
@@ -13,3 +14,34 @@ class roll_call_page(PageTemplate):
 
     def __init__(self, parent: QFrame = None):
         super().__init__(content_widget_class=roll_call, parent=parent)
+        self.roll_call_widget = None
+
+    def create_content(self):
+        """后台创建内容组件，避免堵塞进程"""
+        super().create_content()
+        # 获取点名组件实例并连接信号
+        if hasattr(self, 'contentWidget'):
+            self.roll_call_widget = self.contentWidget
+            # 连接设置变化信号
+            self.roll_call_widget.settingsChanged.connect(self.handle_settings_change)
+
+    def handle_settings_change(self):
+        """处理设置变化信号"""
+        # 清除页面缓存并重新创建
+        self.clear_content()
+        QTimer.singleShot(0, self._recreate_content)
+
+    def _recreate_content(self):
+        """重新创建内容"""
+        self.create_content()
+
+    def clear_content(self):
+        """清除内容"""
+        if self.inner_layout_personal.count() > 0:
+            item = self.inner_layout_personal.takeAt(0)
+            if item and item.widget():
+                widget = item.widget()
+                widget.setParent(None)
+                widget.deleteLater()
+        self.content_created = False
+        self.contentWidget = None

app/tools/settings_access.py

@@ -186,6 +186,18 @@ def readme_settings_async(first_level_key: str, second_level_key: str, timeout=1
     return readme_settings(first_level_key, second_level_key)
 
 
+class SettingsSignals(QObject):
+    """设置变化信号类"""
+    settingChanged = Signal(str, str, object)  # (first_level_key, second_level_key, value)
+
+# 创建全局信号实例
+_settings_signals = SettingsSignals()
+
+def get_settings_signals():
+    """获取设置信号实例"""
+    global _settings_signals
+    return _settings_signals
+
 def update_settings(first_level_key: str, second_level_key: str, value: Any):
     """更新设置
 
@@ -222,6 +234,9 @@ def update_settings(first_level_key: str, second_level_key: str, value: Any):
             json.dump(settings_data, f, ensure_ascii=False, indent=4)
 
         logger.debug(f"设置更新成功: {first_level_key}.{second_level_key} = {value}")
+        
+        # 发送设置变化信号
+        get_settings_signals().settingChanged.emit(first_level_key, second_level_key, value)
     except Exception as e:
         logger.error(f"设置更新失败: {e}")
 

app/tools/settings_default_storage.py

@@ -358,13 +358,15 @@
         "roll_call_range": {"default_value": True},
         "roll_call_gender": {"default_value": True},
         "roll_call_quantity_label": {"default_value": True},
+        "roll_call_remaining_button": {"default_value": True},
         "lottery_method": {"default_value": 1},
         "show_lottery_name": {"default_value": False},
         "reset_lottery": {"default_value": True},
         "lottery_quantity_control": {"default_value": True},
         "lottery_start_button": {"default_value": True},
         "lottery_list": {"default_value": True},
         "lottery_quantity_label": {"default_value": True},
+        "lottery_remaining_button": {"default_value": True},
         "custom_method": {"default_value": 1},
         "reset_custom": {"default_value": True},
         "custom_quantity_control": {"default_value": True},
@@ -374,6 +376,7 @@
         "custom_range_end": {"default_value": True},
         "draw_custom_method": {"default_value": True},
         "custom_quantity_label": {"default_value": True},
+        "custom_remaining_button": {"default_value": True},
     },
     "floating_window_management": {
         "title": {"default_value": None},