初步完成UI美化

This commit is contained in:
DLmaster
2025-01-01 21:50:40 +08:00
parent ee40fdb3c3
commit f54e83673f
8 changed files with 416 additions and 268 deletions

View File

@@ -39,21 +39,21 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="pushButton_new">
<widget class="PushButton" name="pushButton_new">
<property name="text">
<string>新建</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_del">
<widget class="PushButton" name="pushButton_del">
<property name="text">
<string>删除</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_switch">
<widget class="PushButton" name="pushButton_switch">
<property name="text">
<string>转为</string>
</property>
@@ -73,14 +73,14 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_password">
<widget class="PushButton" name="pushButton_password">
<property name="text">
<string>显示密码</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_refresh">
<widget class="PushButton" name="pushButton_refresh">
<property name="text">
<string>刷新</string>
</property>
@@ -107,7 +107,7 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_16">
<item>
<widget class="QTableWidget" name="tableWidget_userlist_simple">
<widget class="TableWidget" name="tableWidget_userlist_simple">
<column>
<property name="text">
<string>用户名</string>
@@ -191,7 +191,7 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_17">
<item>
<widget class="QTableWidget" name="tableWidget_userlist_beta">
<widget class="TableWidget" name="tableWidget_userlist_beta">
<column>
<property name="text">
<string>用户名</string>
@@ -253,7 +253,7 @@
<property name="title">
<string>定时执行</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<layout class="QHBoxLayout" name="horizontalLayout_27">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
@@ -266,7 +266,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7" stretch="0,0">
<item>
<widget class="QCheckBox" name="checkBox_t1">
<widget class="CheckBox" name="checkBox_t1">
<property name="enabled">
<bool>true</bool>
</property>
@@ -288,7 +288,7 @@
</widget>
</item>
<item>
<widget class="QTimeEdit" name="timeEdit_1"/>
<widget class="TimePicker" name="timeEdit_1"/>
</item>
</layout>
</widget>
@@ -303,7 +303,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_16">
<item>
<widget class="QCheckBox" name="checkBox_t10">
<widget class="CheckBox" name="checkBox_t10">
<property name="enabled">
<bool>true</bool>
</property>
@@ -325,7 +325,7 @@
</widget>
</item>
<item>
<widget class="QTimeEdit" name="timeEdit_10"/>
<widget class="TimePicker" name="timeEdit_10"/>
</item>
</layout>
</widget>
@@ -340,7 +340,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QCheckBox" name="checkBox_t3">
<widget class="CheckBox" name="checkBox_t3">
<property name="enabled">
<bool>true</bool>
</property>
@@ -362,7 +362,7 @@
</widget>
</item>
<item>
<widget class="QTimeEdit" name="timeEdit_3"/>
<widget class="TimePicker" name="timeEdit_3"/>
</item>
</layout>
</widget>
@@ -377,7 +377,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<widget class="QCheckBox" name="checkBox_t2">
<widget class="CheckBox" name="checkBox_t2">
<property name="enabled">
<bool>true</bool>
</property>
@@ -399,7 +399,7 @@
</widget>
</item>
<item>
<widget class="QTimeEdit" name="timeEdit_2"/>
<widget class="TimePicker" name="timeEdit_2"/>
</item>
</layout>
</widget>
@@ -414,7 +414,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_15">
<item>
<widget class="QCheckBox" name="checkBox_t9">
<widget class="CheckBox" name="checkBox_t9">
<property name="enabled">
<bool>true</bool>
</property>
@@ -436,7 +436,7 @@
</widget>
</item>
<item>
<widget class="QTimeEdit" name="timeEdit_9"/>
<widget class="TimePicker" name="timeEdit_9"/>
</item>
</layout>
</widget>
@@ -451,7 +451,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<widget class="QCheckBox" name="checkBox_t4">
<widget class="CheckBox" name="checkBox_t4">
<property name="enabled">
<bool>true</bool>
</property>
@@ -473,7 +473,7 @@
</widget>
</item>
<item>
<widget class="QTimeEdit" name="timeEdit_4"/>
<widget class="TimePicker" name="timeEdit_4"/>
</item>
</layout>
</widget>
@@ -488,7 +488,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<widget class="QCheckBox" name="checkBox_t6">
<widget class="CheckBox" name="checkBox_t6">
<property name="enabled">
<bool>true</bool>
</property>
@@ -510,7 +510,7 @@
</widget>
</item>
<item>
<widget class="QTimeEdit" name="timeEdit_6"/>
<widget class="TimePicker" name="timeEdit_6"/>
</item>
</layout>
</widget>
@@ -525,7 +525,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="QCheckBox" name="checkBox_t5">
<widget class="CheckBox" name="checkBox_t5">
<property name="enabled">
<bool>true</bool>
</property>
@@ -547,7 +547,7 @@
</widget>
</item>
<item>
<widget class="QTimeEdit" name="timeEdit_5"/>
<widget class="TimePicker" name="timeEdit_5"/>
</item>
</layout>
</widget>
@@ -562,7 +562,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_13">
<item>
<widget class="QCheckBox" name="checkBox_t8">
<widget class="CheckBox" name="checkBox_t8">
<property name="enabled">
<bool>true</bool>
</property>
@@ -584,7 +584,7 @@
</widget>
</item>
<item>
<widget class="QTimeEdit" name="timeEdit_7"/>
<widget class="TimePicker" name="timeEdit_7"/>
</item>
</layout>
</widget>
@@ -599,7 +599,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_14">
<item>
<widget class="QCheckBox" name="checkBox_t7">
<widget class="CheckBox" name="checkBox_t7">
<property name="enabled">
<bool>true</bool>
</property>
@@ -621,7 +621,7 @@
</widget>
</item>
<item>
<widget class="QTimeEdit" name="timeEdit_8"/>
<widget class="TimePicker" name="timeEdit_8"/>
</item>
</layout>
</widget>
@@ -651,7 +651,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_main">
<widget class="BodyLabel" name="label_main">
<property name="text">
<string>调度器</string>
</property>
@@ -671,14 +671,14 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_checkstart">
<widget class="PushButton" name="pushButton_checkstart">
<property name="text">
<string>开始排查</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_runnow">
<widget class="PushButton" name="pushButton_runnow">
<property name="text">
<string>立即执行</string>
</property>
@@ -706,7 +706,7 @@
</widget>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser_run"/>
<widget class="TextBrowser" name="textBrowser_run"/>
</item>
</layout>
</widget>
@@ -728,7 +728,7 @@
</widget>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser_wait"/>
<widget class="TextBrowser" name="textBrowser_wait"/>
</item>
</layout>
</widget>
@@ -750,7 +750,7 @@
</widget>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser_over"/>
<widget class="TextBrowser" name="textBrowser_over"/>
</item>
</layout>
</widget>
@@ -772,7 +772,7 @@
</widget>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser_error"/>
<widget class="TextBrowser" name="textBrowser_error"/>
</item>
</layout>
</widget>
@@ -796,7 +796,7 @@
</widget>
</item>
<item>
<widget class="QTextBrowser" name="textBrowser_log"/>
<widget class="TextBrowser" name="textBrowser_log"/>
</item>
</layout>
</widget>
@@ -816,7 +816,7 @@
<property name="title">
<string>MAA设置</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_14">
<layout class="QHBoxLayout" name="horizontalLayout_28">
<item>
<widget class="QFrame" name="frame_maaset">
<property name="frameShape">
@@ -827,17 +827,17 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,20,2,1,2">
<item>
<widget class="QLabel" name="label_2">
<widget class="BodyLabel" name="label_2">
<property name="text">
<string>MAA路径</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_MAApath"/>
<widget class="LineEdit" name="lineEdit_MAApath"/>
</item>
<item>
<widget class="QPushButton" name="pushButton_getMAApath">
<widget class="PushButton" name="pushButton_getMAApath">
<property name="text">
<string>浏览</string>
</property>
@@ -857,7 +857,7 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_setMAA">
<widget class="PushButton" name="pushButton_setMAA">
<property name="text">
<string>设置MAA</string>
</property>
@@ -874,8 +874,8 @@
<property name="title">
<string>执行限制</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_24">
<item>
<widget class="QFrame" name="frame_routine">
<property name="frameShape">
<enum>QFrame::Shape::StyledPanel</enum>
@@ -885,7 +885,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="label_routine">
<widget class="BodyLabel" name="label_routine">
<property name="text">
<string>日常限制</string>
</property>
@@ -905,11 +905,11 @@
</spacer>
</item>
<item>
<widget class="QSpinBox" name="spinBox_routine">
<widget class="SpinBox" name="spinBox_routine">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
<width>140</width>
<height>30</height>
</size>
</property>
<property name="minimum">
@@ -930,7 +930,7 @@
</layout>
</widget>
</item>
<item row="0" column="1">
<item>
<widget class="QFrame" name="frame_annihilation">
<property name="frameShape">
<enum>QFrame::Shape::StyledPanel</enum>
@@ -940,7 +940,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="label_annihilation">
<widget class="BodyLabel" name="label_annihilation">
<property name="text">
<string>剿灭限制</string>
</property>
@@ -960,11 +960,11 @@
</spacer>
</item>
<item>
<widget class="QSpinBox" name="spinBox_annihilation">
<widget class="SpinBox" name="spinBox_annihilation">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
<width>140</width>
<height>30</height>
</size>
</property>
<property name="minimum">
@@ -985,7 +985,7 @@
</layout>
</widget>
</item>
<item row="0" column="2">
<item>
<widget class="QFrame" name="frame_annihilation_2">
<property name="frameShape">
<enum>QFrame::Shape::StyledPanel</enum>
@@ -995,7 +995,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_17">
<item>
<widget class="QLabel" name="label_num">
<widget class="BodyLabel" name="label_num">
<property name="text">
<string>运行失败重试次数上限</string>
</property>
@@ -1015,11 +1015,11 @@
</spacer>
</item>
<item>
<widget class="QSpinBox" name="spinBox_numt">
<widget class="SpinBox" name="spinBox_numt">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
<width>140</width>
<height>30</height>
</size>
</property>
<property name="minimum">
@@ -1072,7 +1072,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_22" stretch="0,1,3">
<item>
<widget class="QCheckBox" name="checkBox_silence">
<widget class="CheckBox" name="checkBox_silence">
<property name="text">
<string>后台静默代理</string>
</property>
@@ -1092,7 +1092,7 @@
</spacer>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_boss">
<widget class="LineEdit" name="lineEdit_boss">
<property name="placeholderText">
<string>安卓模拟器老板键</string>
</property>
@@ -1124,7 +1124,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_26" stretch="0,1,3,0">
<item>
<widget class="QCheckBox" name="checkBox_ifsendmail">
<widget class="CheckBox" name="checkBox_ifsendmail">
<property name="text">
<string>通过邮件通知结果</string>
</property>
@@ -1144,14 +1144,14 @@
</spacer>
</item>
<item>
<widget class="QLineEdit" name="lineEdit_mailaddress">
<widget class="LineEdit" name="lineEdit_mailaddress">
<property name="placeholderText">
<string>收信邮箱地址</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBox_ifonlyerror">
<widget class="CheckBox" name="checkBox_ifonlyerror">
<property name="text">
<string>仅推送异常信息</string>
</property>
@@ -1170,7 +1170,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_23">
<item>
<widget class="QCheckBox" name="checkBox_iftotray">
<widget class="CheckBox" name="checkBox_iftotray">
<property name="text">
<string>最小化到托盘</string>
</property>
@@ -1202,7 +1202,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_20">
<item>
<widget class="QCheckBox" name="checkBox_ifproxydirectly">
<widget class="CheckBox" name="checkBox_ifproxydirectly">
<property name="text">
<string>启动AUTO_MAA后直接代理</string>
</property>
@@ -1247,7 +1247,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_19">
<item>
<widget class="QCheckBox" name="checkBox_ifselfstart">
<widget class="CheckBox" name="checkBox_ifselfstart">
<property name="text">
<string>开机自动启动AUTO_MAA</string>
</property>
@@ -1279,7 +1279,7 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_18">
<item>
<widget class="QCheckBox" name="checkBox_ifsleep">
<widget class="CheckBox" name="checkBox_ifsleep">
<property name="text">
<string>AUTO_MAA启动时禁止电脑休眠</string>
</property>
@@ -1350,7 +1350,7 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_changePASSWORD">
<widget class="PushButton" name="pushButton_changePASSWORD">
<property name="text">
<string>修改管理密钥</string>
</property>
@@ -1408,7 +1408,7 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_check_update">
<widget class="PushButton" name="pushButton_check_update">
<property name="text">
<string> 检查版本更新 </string>
</property>
@@ -1440,7 +1440,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_15">
<item>
<widget class="QTextBrowser" name="textBrowser_tips">
<widget class="TextBrowser" name="textBrowser_tips">
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -1451,6 +1451,8 @@ li.checked::marker { content: &quot;\2612&quot;; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Microsoft YaHei UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;致用户:&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; 这是AUTO_MAA_v4.2.0-beta.1,项目初步进行界面美化。希望大家喜欢这个新年礼物!&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; 使用本程序前请先仔细阅读README.md。&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; 对于B服用户由于我们无权替您同意用户协议若出现用户协议弹窗您需要自行完成确认否则可能造成MAA卡死代理任务失败。&lt;/p&gt;
@@ -1468,7 +1470,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
</widget>
</item>
<item>
<widget class="QLabel" name="label_notice">
<widget class="BodyLabel" name="label_notice">
<property name="text">
<string>注意:在设置页执行的所有更改,不会对正在执行的任务生效;正在执行任务时,用户管理页无法编辑。</string>
</property>
@@ -1496,6 +1498,48 @@ li.checked::marker { content: &quot;\2612&quot;; }
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>PushButton</class>
<extends>QPushButton</extends>
<header location="global">qfluentwidgets</header>
</customwidget>
<customwidget>
<class>TimePicker</class>
<extends>QTimeEdit</extends>
<header location="global">qfluentwidgets</header>
</customwidget>
<customwidget>
<class>TableWidget</class>
<extends>QTableWidget</extends>
<header location="global">qfluentwidgets</header>
</customwidget>
<customwidget>
<class>LineEdit</class>
<extends>QLineEdit</extends>
<header location="global">qfluentwidgets</header>
</customwidget>
<customwidget>
<class>SpinBox</class>
<extends>QSpinBox</extends>
<header location="global">qfluentwidgets</header>
</customwidget>
<customwidget>
<class>CheckBox</class>
<extends>QCheckBox</extends>
<header location="global">qfluentwidgets</header>
</customwidget>
<customwidget>
<class>TextBrowser</class>
<extends>QTextBrowser</extends>
<header location="global">qfluentwidgets</header>
</customwidget>
<customwidget>
<class>BodyLabel</class>
<extends>QLabel</extends>
<header location="global">qfluentwidgets</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

View File

@@ -1,7 +1,7 @@
{
"main_version": "4.2.0.0",
"updater_version": "1.1.0.0",
"announcement": "\n## 新增功能\n- 提供完整打包代码\n## 修复BUG\n- 同步MAA`v5.11.1`的字段修改\n- 清除自动化中无效的整合流程\n## 程序优化\n- 调整项目结构,模块化各功能组件\n- 改用`nuitka`编译,压缩软件体积,提升运行速度",
"main_version": "4.2.0.1",
"updater_version": "1.1.0.1",
"announcement": "\n## 新增功能\n- 初步引入`qfluentwidgets`UI界面美化",
"proxy_list":[
"",
"https://gitproxy.click/",