From d31ae550352b8271537c4a876c54f7099fc5de42 Mon Sep 17 00:00:00 2001
From: Chenx Dust <chenx_dust@outlook.com>
Date: Sun, 23 Aug 2026 22:49:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=94=B9=E8=BF=9B=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=88=86=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/ADVANCED_USAGE.md                        |   4 +-
 .../dialogs/settingwindow/settingwindow.ui    | 216 ++++++++----------
 2 files changed, 103 insertions(+), 117 deletions(-)

diff --git a/docs/ADVANCED_USAGE.md b/docs/ADVANCED_USAGE.md
index 6d29115..a73eb3a 100644
--- a/docs/ADVANCED_USAGE.md
+++ b/docs/ADVANCED_USAGE.md
@@ -11,7 +11,7 @@
 
 ### 方式一：本软件作为主代理
 
-- 在“功能”-“设置”-“核心” 页面中设置“直连代理”为 Clash 等软件监听的端口（以 7890 为例 http://127.0.0.1:7890）；
+- 在“功能”-“设置”-“高级” 页面中设置“直连代理”为 Clash 等软件监听的端口（以 7890 为例 http://127.0.0.1:7890）；
 - 注意勾选“允许外部访问”；
 - 开启本软件的系统代理；
 - 启动 Clash 时不需要打开系统代理或 TUN，即可正确转发流量。
@@ -23,7 +23,7 @@
 ### 方式二：Clash 作为主代理
 
 - 清空本软件的系统代理；
-- 在 “功能”-“设置”-“核心” 页面中设置 SOCK5 的代理端口（以 11080 为例），以下为推荐配置：
+- 在 “功能”-“设置”-“高级” 页面中设置 SOCK5 的代理端口（以 11080 为例），以下为推荐配置：
 
 在 Clash 的代理配置中添加一个代理服务器：
 
diff --git a/presentation/dialogs/settingwindow/settingwindow.ui b/presentation/dialogs/settingwindow/settingwindow.ui
index 1bf4c23..477b552 100644
--- a/presentation/dialogs/settingwindow/settingwindow.ui
+++ b/presentation/dialogs/settingwindow/settingwindow.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>520</width>
-    <height>600</height>
+    <height>642</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -271,25 +271,111 @@
         </spacer>
        </item>
        <item row="1" column="0">
-        <widget class="QGroupBox" name="protocolGroupBox">
+        <widget class="QGroupBox" name="commonGroupBox">
          <property name="title">
-          <string>协议</string>
+          <string>通用</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
-          <item>
-           <widget class="QRadioButton" name="atrustRadioButton">
+         <layout class="QGridLayout" name="commonLayout">
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="serverAddressLineEdit">
             <property name="text">
-             <string>aTrust</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
+             <string>trust.hitsz.edu.cn</string>
             </property>
            </widget>
           </item>
-          <item>
-           <widget class="QRadioButton" name="easyconnectRadioButton">
+          <item row="0" column="1" colspan="4">
+           <layout class="QHBoxLayout" name="protocolLayout">
+            <item>
+             <widget class="QRadioButton" name="atrustRadioButton">
+              <property name="text">
+               <string>aTrust</string>
+              </property>
+              <property name="checked">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QRadioButton" name="easyconnectRadioButton">
+              <property name="text">
+               <string>EasyConnect</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="2" column="1" colspan="4">
+           <widget class="QLineEdit" name="usernameLineEdit">
+            <property name="placeholderText">
+             <string>VPN 账号</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="commonTabLable2">
             <property name="text">
-             <string>EasyConnect</string>
+             <string>账号</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="commonTabLable3">
+            <property name="text">
+             <string>密码</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="3" colspan="2">
+           <widget class="QSpinBox" name="serverPortSpinBox">
+            <property name="maximum">
+             <number>65535</number>
+            </property>
+            <property name="value">
+             <number>443</number>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="2">
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="zjuConnectTabLabel1">
+            <property name="text">
+             <string>服务器地址</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="protocolLabel">
+            <property name="text">
+             <string>协议</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="4">
+           <widget class="QCheckBox" name="passwordVisibleCheckBox">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1" colspan="3">
+           <widget class="QLineEdit" name="passwordLineEdit">
+            <property name="echoMode">
+             <enum>QLineEdit::EchoMode::Password</enum>
+            </property>
+            <property name="placeholderText">
+             <string>VPN 密码</string>
             </property>
            </widget>
           </item>
@@ -405,76 +491,7 @@
          </layout>
         </widget>
        </item>
-       <item row="2" column="0">
-        <widget class="QGroupBox" name="credentialGroup">
-         <property name="title">
-          <string>保存的凭据</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout_6">
-          <item row="4" column="0">
-           <spacer name="horizontalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Orientation::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Policy::Preferred</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>120</width>
-              <height>0</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="passwordLineEdit">
-            <property name="echoMode">
-             <enum>QLineEdit::EchoMode::Password</enum>
-            </property>
-            <property name="placeholderText">
-             <string>VPN 密码</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="commonTabLable2">
-            <property name="text">
-             <string>账号</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="commonTabLable3">
-            <property name="text">
-             <string>密码</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QCheckBox" name="passwordVisibleCheckBox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" colspan="2">
-           <widget class="QLineEdit" name="usernameLineEdit">
-            <property name="placeholderText">
-             <string>VPN 账号</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="3" column="0">
+       <item row="4" column="0">
         <widget class="QGroupBox" name="authInfoGroupBox">
          <property name="title">
           <string>aTrust 认证信息</string>
@@ -680,7 +697,7 @@
      </widget>
      <widget class="QWidget" name="zjuConnectTab">
       <attribute name="title">
-       <string>核心</string>
+       <string>高级</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3">
        <item row="8" column="1" colspan="3">
@@ -697,13 +714,6 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="serverAddressLineEdit">
-         <property name="text">
-          <string>trust.hitsz.edu.cn</string>
-         </property>
-        </widget>
-       </item>
        <item row="10" column="0">
         <widget class="QLabel" name="zjuConnectTabLabel6_3">
          <property name="text">
@@ -735,13 +745,6 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="zjuConnectTabLabel1">
-         <property name="text">
-          <string>服务器地址</string>
-         </property>
-        </widget>
-       </item>
        <item row="8" column="0">
         <widget class="QLabel" name="zjuConnectTabLabel10">
          <property name="text">
@@ -825,13 +828,6 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="2">
-        <widget class="QLabel" name="label">
-         <property name="text">
-          <string>:</string>
-         </property>
-        </widget>
-       </item>
        <item row="16" column="0" colspan="4">
         <layout class="QGridLayout" name="gridLayout_4">
          <item row="0" column="1">
@@ -992,16 +988,6 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="3">
-        <widget class="QSpinBox" name="serverPortSpinBox">
-         <property name="maximum">
-          <number>65535</number>
-         </property>
-         <property name="value">
-          <number>443</number>
-         </property>
-        </widget>
-       </item>
        <item row="11" column="1" colspan="3">
         <widget class="QLineEdit" name="keepAliveUrlLineEdit">
          <property name="placeholderText">