From 1162d5dcc1312e431d8a057b603531d29e0d159a Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Fri, 16 May 2025 22:50:54 +0800 Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E6=B7=BB=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E5=89=A9=E4=BD=99=E5=A4=A9=E6=95=B0=E4=B8=BA0=E7=9A=84?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/config.py | 2 +- app/ui/Widget.py | 12 ++++-------- app/ui/member_manager.py | 11 +++++++---- resources/version.json | 7 ++++++- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/core/config.py b/app/core/config.py index 9752465..77cfbbf 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -563,7 +563,7 @@ class MaaPlanConfig(LQConfig): class AppConfig(GlobalConfig): - VERSION = "4.3.8.2" + VERSION = "4.3.8.3" gameid_refreshed = Signal() PASSWORD_refreshed = Signal() diff --git a/app/ui/Widget.py b/app/ui/Widget.py index 7b73003..cf7f201 100644 --- a/app/ui/Widget.py +++ b/app/ui/Widget.py @@ -311,16 +311,12 @@ class SwitchSettingCard(SettingCard): self.switchButton.setChecked(isChecked) self.switchButton.setText(self.tr("On") if isChecked else self.tr("Off")) - - # 这两个函数似乎没用?我注释掉仍能运行。 - # setChecked是qfluentw中SwitchButton类的内置方法, - # Example:switchButton.setChecked(True)# 更改按钮状态为打开 - # def setChecked(self, isChecked: bool): - # self.setValue(isChecked) + def setChecked(self, isChecked: bool): + self.setValue(isChecked) - # def isChecked(self): - # return self.switchButton.isChecked() + def isChecked(self): + return self.switchButton.isChecked() class RangeSettingCard(SettingCard): diff --git a/app/ui/member_manager.py b/app/ui/member_manager.py index 9f2922f..0de0e92 100644 --- a/app/ui/member_manager.py +++ b/app/ui/member_manager.py @@ -1178,6 +1178,7 @@ class MemberManager(QWidget): def handler(checked): # 使用配置项的set方法自动触发信号 config_obj.set(config_obj.Info_Status, checked) + return handler self.user_data = Config.member_dict[self.name]["UserData"] @@ -1221,7 +1222,11 @@ class MemberManager(QWidget): switch_button = SwitchButton() switch_button.setOffText("") switch_button.setOnText("") - switch_button.setChecked(config.get(config.Info_Status))# 初始化开关状态 + # 初始化开关状态 + switch_button.setChecked(config.get(config.Info_Status)) + switch_button.setEnabled( + config.get(config.Info_RemainedDay) != 0 + ) # 将开关的bool同步 switch_button.checkedChanged.connect(handler) @@ -1248,9 +1253,7 @@ class MemberManager(QWidget): ), ) self.dashboard.setCellWidget( - int(name[3:]) - 1, - 3, - switch_button + int(name[3:]) - 1, 3, switch_button ) self.dashboard.setItem( int(name[3:]) - 1, diff --git a/resources/version.json b/resources/version.json index c4f9648..071b9bc 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,6 +1,11 @@ { - "main_version": "4.3.8.2", + "main_version": "4.3.8.3", "version_info": { + "4.3.8.3": { + "新增功能": [ + "用户仪表盘支持直接控制用户状态" + ] + }, "4.3.8.2": { "新增功能": [ "添加ADB端口号宽幅适配能力"