From 0574e9c6cba35e333bab71aa77a4ab1708c1eb22 Mon Sep 17 00:00:00 2001 From: DLmaster Date: Tue, 4 Feb 2025 18:48:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(gui):=20=E8=B0=83=E6=95=B4=E9=83=A8?= =?UTF-8?q?=E5=88=86=E9=80=89=E9=A1=B9=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/ui/setting.py | 125 +++++++++++++++------------------------------- 1 file changed, 39 insertions(+), 86 deletions(-) diff --git a/app/ui/setting.py b/app/ui/setting.py index f902c37..60d44b4 100644 --- a/app/ui/setting.py +++ b/app/ui/setting.py @@ -391,24 +391,19 @@ class FunctionSettingCard(HeaderCardWidget): def __init__(self, parent=None): super().__init__(parent) - self.setTitle("功能") - Layout = QVBoxLayout() - self.card_IfAllowSleep = SwitchSettingCard( icon=FluentIcon.PAGE_RIGHT, title="启动时阻止系统休眠", content="仅阻止电脑自动休眠，不会影响屏幕是否熄灭", configItem=Config.global_config.function_IfAllowSleep, ) - self.card_IfSilence = self.SilenceSettingCard(self) - # 添加各组到设置卡中 + Layout = QVBoxLayout() Layout.addWidget(self.card_IfAllowSleep) Layout.addWidget(self.card_IfSilence) - self.viewLayout.addLayout(Layout) class SilenceSettingCard(ExpandGroupSettingCard): @@ -421,16 +416,12 @@ class FunctionSettingCard(HeaderCardWidget): parent, ) - widget = QWidget() - Layout = QVBoxLayout(widget) - self.card_IfSilence = SwitchSettingCard( icon=FluentIcon.PAGE_RIGHT, title="静默模式", content="是否启用静默模式", configItem=Config.global_config.function_IfSilence, ) - self.card_BossKey = LineEditSettingCard( text="请输入安卓模拟器老版键", icon=FluentIcon.PAGE_RIGHT, @@ -439,13 +430,12 @@ class FunctionSettingCard(HeaderCardWidget): configItem=Config.global_config.function_BossKey, ) + widget = QWidget() + Layout = QVBoxLayout(widget) Layout.addWidget(self.card_IfSilence) Layout.addWidget(self.card_BossKey) - - # 调整内部布局 self.viewLayout.setContentsMargins(0, 0, 0, 0) self.viewLayout.setSpacing(0) - self.addGroupWidget(widget) @@ -453,18 +443,14 @@ class StartSettingCard(HeaderCardWidget): def __init__(self, parent=None): super().__init__(parent) - self.setTitle("启动") - Layout = QVBoxLayout() - self.card_IfSelfStart = SwitchSettingCard( icon=FluentIcon.PAGE_RIGHT, title="开机时自动启动", content="将AUTO_MAA添加到开机启动项", configItem=Config.global_config.start_IfSelfStart, ) - self.card_IfRunDirectly = SwitchSettingCard( icon=FluentIcon.PAGE_RIGHT, title="启动后直接运行", @@ -472,12 +458,9 @@ class StartSettingCard(HeaderCardWidget): configItem=Config.global_config.start_IfRunDirectly, ) - # 添加各组到设置卡中 - Layout.addWidget( - self.card_IfSelfStart, - ) + Layout = QVBoxLayout() + Layout.addWidget(self.card_IfSelfStart) Layout.addWidget(self.card_IfRunDirectly) - self.viewLayout.addLayout(Layout) @@ -485,18 +468,14 @@ class UiSettingCard(HeaderCardWidget): def __init__(self, parent=None): super().__init__(parent) - self.setTitle("界面") - Layout = QVBoxLayout() - self.card_IfShowTray = SwitchSettingCard( icon=FluentIcon.PAGE_RIGHT, title="显示托盘图标", content="常态显示托盘图标", configItem=Config.global_config.ui_IfShowTray, ) - self.card_IfToTray = SwitchSettingCard( icon=FluentIcon.PAGE_RIGHT, title="最小化到托盘", @@ -504,10 +483,9 @@ class UiSettingCard(HeaderCardWidget): configItem=Config.global_config.ui_IfToTray, ) - # 添加各组到设置卡中 + Layout = QVBoxLayout() Layout.addWidget(self.card_IfShowTray) Layout.addWidget(self.card_IfToTray) - self.viewLayout.addLayout(Layout) @@ -518,31 +496,28 @@ class NotifySettingCard(HeaderCardWidget): self.setTitle("通知") - Layout = QVBoxLayout() - self.card_IfSendErrorOnly = SwitchSettingCard( icon=FluentIcon.PAGE_RIGHT, title="仅推送异常信息", content="仅在任务出现异常时推送通知", configItem=Config.global_config.notify_IfSendErrorOnly, ) - self.card_IfPushPlyer = SwitchSettingCard( icon=FluentIcon.PAGE_RIGHT, title="推送系统通知", content="推送系统级通知，不会在通知中心停留", configItem=Config.global_config.notify_IfPushPlyer, ) - self.card_SendMail = self.SendMailSettingCard(self) self.card_ServerChan = self.ServerChanSettingCard(self) self.card_CompanyWebhookBot = self.CompanyWechatPushSettingCard(self) + + Layout = QVBoxLayout() Layout.addWidget(self.card_IfSendErrorOnly) Layout.addWidget(self.card_IfPushPlyer) Layout.addWidget(self.card_SendMail) Layout.addWidget(self.card_ServerChan) Layout.addWidget(self.card_CompanyWebhookBot) - self.viewLayout.addLayout(Layout) class SendMailSettingCard(ExpandGroupSettingCard): @@ -555,17 +530,13 @@ class NotifySettingCard(HeaderCardWidget): parent, ) - widget = QWidget() - Layout = QVBoxLayout(widget) - self.card_IfSendMail = SwitchSettingCard( icon=FluentIcon.PAGE_RIGHT, title="推送邮件通知", content="是否启用邮件通知功能", configItem=Config.global_config.notify_IfSendMail, ) - - self.MailAddress = LineEditSettingCard( + self.card_MailAddress = LineEditSettingCard( text="请输入邮箱地址", icon=FluentIcon.PAGE_RIGHT, title="邮箱地址", @@ -573,88 +544,77 @@ class NotifySettingCard(HeaderCardWidget): configItem=Config.global_config.notify_MailAddress, ) + widget = QWidget() + Layout = QVBoxLayout(widget) Layout.addWidget(self.card_IfSendMail) - Layout.addWidget(self.MailAddress) - - # 调整内部布局 + Layout.addWidget(self.card_MailAddress) self.viewLayout.setContentsMargins(0, 0, 0, 0) self.viewLayout.setSpacing(0) - self.addGroupWidget(widget) class ServerChanSettingCard(ExpandGroupSettingCard): def __init__(self, parent=None): super().__init__( FluentIcon.SETTING, - "ServerChan推送", - "通过ServerChan推送推送任务结果", + "推送ServerChan通知", + "通过ServerChan通知推送任务结果", parent, ) - widget = QWidget() - Layout = QVBoxLayout(widget) - self.card_IfServerChan = SwitchSettingCard( icon=FluentIcon.PAGE_RIGHT, - title="SeverChan推送", - content="是否SeverChan推送", + title="推送SeverChan通知", + content="是否启用SeverChan通知功能", configItem=Config.global_config.notify_IfServerChan, ) - - self.ServerChanKey = LineEditSettingCard( + self.card_ServerChanKey = LineEditSettingCard( text="请输入SendKey", icon=FluentIcon.PAGE_RIGHT, title="SendKey", content="Server酱的SendKey（SC3与SCT都可以）", configItem=Config.global_config.notify_ServerChanKey, ) - - self.ServerChanChannel = LineEditSettingCard( - text="请输入需要推送的Channel代码(SCT生效）", + self.card_ServerChanChannel = LineEditSettingCard( + text="请输入需要推送的Channel代码（SCT生效）", icon=FluentIcon.PAGE_RIGHT, title="ServerChanChannel代码", - content="可以留空，留空则默认。可以多个，请使用|隔开", + content="可以留空，留空则默认。可以多个，请使用“|”隔开", configItem=Config.global_config.notify_ServerChanChannel, ) - - self.ServerChanTag = LineEditSettingCard( + self.card_ServerChanTag = LineEditSettingCard( text="请输入加入推送的Tag（SC3生效）", icon=FluentIcon.PAGE_RIGHT, title="Tag内容", - content="可以留空，留空则默认。可以多个，请使用|隔开", + content="可以留空，留空则默认。可以多个，请使用“|”隔开", configItem=Config.global_config.notify_ServerChanTag, ) + + widget = QWidget() + Layout = QVBoxLayout(widget) Layout.addWidget(self.card_IfServerChan) - Layout.addWidget(self.ServerChanKey) - Layout.addWidget(self.ServerChanChannel) - Layout.addWidget(self.ServerChanTag) + Layout.addWidget(self.card_ServerChanKey) + Layout.addWidget(self.card_ServerChanChannel) + Layout.addWidget(self.card_ServerChanTag) self.viewLayout.setContentsMargins(0, 0, 0, 0) self.viewLayout.setSpacing(0) self.addGroupWidget(widget) - widget = QWidget() - Layout = QVBoxLayout(widget) - class CompanyWechatPushSettingCard(ExpandGroupSettingCard): def __init__(self, parent=None): super().__init__( FluentIcon.SETTING, - "企业微信机器人推送", - "通过企业微信机器人Webhook推送推送任务结果", + "推送企业微信机器人通知", + "通过企业微信机器人Webhook通知推送任务结果", parent, ) - widget = QWidget() - Layout = QVBoxLayout(widget) - self.card_IfCompanyWechat = SwitchSettingCard( icon=FluentIcon.PAGE_RIGHT, - title="企业微信机器人推送", - content="是否启用企业微信机器人推送", + title="推送企业微信机器人通知", + content="是否启用企业微信机器人通知功能", configItem=Config.global_config.notify_IfCompanyWebHookBot, ) - - self.CompanyWebHookBotUrl = LineEditSettingCard( + self.card_CompanyWebHookBotUrl = LineEditSettingCard( text="请输入Webhook的Url", icon=FluentIcon.PAGE_RIGHT, title="WebhookUrl", @@ -662,25 +622,21 @@ class NotifySettingCard(HeaderCardWidget): configItem=Config.global_config.notify_CompanyWebHookBotUrl, ) + widget = QWidget() + Layout = QVBoxLayout(widget) Layout.addWidget(self.card_IfCompanyWechat) - Layout.addWidget(self.CompanyWebHookBotUrl) + Layout.addWidget(self.card_CompanyWebHookBotUrl) self.viewLayout.setContentsMargins(0, 0, 0, 0) self.viewLayout.setSpacing(0) self.addGroupWidget(widget) - widget = QWidget() - Layout = QVBoxLayout(widget) - class SecuritySettingCard(HeaderCardWidget): def __init__(self, parent=None): super().__init__(parent) - self.setTitle("安全") - Layout = QVBoxLayout() - self.card_changePASSWORD = PushSettingCard( text="修改", icon=FluentIcon.VPN, @@ -688,8 +644,8 @@ class SecuritySettingCard(HeaderCardWidget): content="修改用于解密用户密码的管理密钥", ) + Layout = QVBoxLayout() Layout.addWidget(self.card_changePASSWORD) - self.viewLayout.addLayout(Layout) @@ -730,7 +686,6 @@ class OtherSettingCard(HeaderCardWidget): def __init__(self, parent=None): super().__init__(parent) - self.setTitle("其他") self.card_Notice = PushSettingCard( @@ -739,15 +694,13 @@ class OtherSettingCard(HeaderCardWidget): title="公告", content="查看AUTO_MAA的最新公告", ) - self.card_UserDocs = HyperlinkCard( url="https://docs.qq.com/aio/DQ2NwUHRiWGtMWHBy", - text="访问用户文档", + text="查看使用指南", icon=FluentIcon.PAGE_RIGHT, - title="用户文档", + title="使用指南", content="查看AUTO_MAA的使用教程和文档", ) - self.card_Association = self.AssociationSettingCard() Layout = QVBoxLayout()