✨加入多张网卡信息的输出逻辑，将鼠标放在 MAC 和本地 IP 标题上面就可，修改多出口网页版的显示逻辑，从桌面服务转到QtWebEngine，关于界面微调

✨加入多张网卡信息的输出逻辑，将鼠标放在 MAC 和本地 IP 标题上面就可，修改多出口网页版的显示逻辑，从桌面服务转到QtWebEngine，关于界面微调

Author: Ne0W0r1d

.github/workflows/deploy.yml

@@ -20,7 +20,7 @@ jobs:
             artifact: CipherTools-Linux-qt610
           # Windows Qt 6.10
           - os: windows-latest
-            qt: 6.10.1
+            qt: 6.5.3
             artifact: CipherTools-Windows
 
     runs-on: ${{ matrix.os }}
@@ -36,6 +36,11 @@ jobs:
         uses: jurplel/install-qt-action@v4
         with:
           version: ${{ matrix.qt }}
+          modules: >
+            qtwebengine
+            qtwebchannel
+            qtpositioning
+          aqtversion: '==3.1.*'
           cache: true
 
       - name: Remove MinGW from PATH
@@ -56,7 +61,7 @@ jobs:
         shell: cmd
         run: |
           cd build
-          nmake
+          nmake /NOLOGO
           windeployqt release\CipherTools.exe
           del /q release\*.obj
           del /q release\*.h

git_img/sc.png

@@ -27,7 +27,7 @@ about::about(QWidget *parent)
     ui->toolversion->setText(AKT_VERSION);//版本信息
     ui->env->setText(systemname.toUpper() + " (" + distro + ")");// 显示系统环境
 
-    connect(ui->aboutqt, &QPushButton::clicked, this, [=]() {
+    connect(ui->qt, &QPushButton::clicked, this, [=]() {
         QMessageBox::aboutQt(this, "关于 Qt");
     }); //打开关于 Qt
 

src/About.cpp

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>587</width>
-    <height>233</height>
+    <height>229</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,7 +17,7 @@
    <property name="geometry">
     <rect>
      <x>350</x>
-     <y>180</y>
+     <y>200</y>
      <width>221</width>
      <height>20</height>
     </rect>
@@ -33,46 +33,18 @@
    <property name="geometry">
     <rect>
      <x>320</x>
-     <y>200</y>
+     <y>180</y>
      <width>251</width>
      <height>20</height>
     </rect>
    </property>
    <property name="text">
-    <string>本软件基于 Qt，使用 MIT 协议自由开源</string>
+    <string>使用 MIT 协议自由开源</string>
    </property>
    <property name="alignment">
     <set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
    </property>
   </widget>
-  <widget class="QLabel" name="qticon">
-   <property name="geometry">
-    <rect>
-     <x>110</x>
-     <y>180</y>
-     <width>50</width>
-     <height>35</height>
-    </rect>
-   </property>
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="mouseTracking">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-   <property name="pixmap">
-    <pixmap resource="Resource.qrc">:/Resource/qt.png</pixmap>
-   </property>
-   <property name="scaledContents">
-    <bool>true</bool>
-   </property>
-  </widget>
   <widget class="QLabel" name="env_table">
    <property name="geometry">
     <rect>
@@ -151,23 +123,10 @@
     <string>工具箱版本：</string>
    </property>
   </widget>
-  <widget class="QPushButton" name="aboutqt">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>190</y>
-     <width>86</width>
-     <height>26</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string>关于 Qt</string>
-   </property>
-  </widget>
   <widget class="QLabel" name="label">
    <property name="geometry">
     <rect>
-     <x>480</x>
+     <x>470</x>
      <y>10</y>
      <width>100</width>
      <height>120</height>
@@ -195,6 +154,38 @@
     <bool>true</bool>
    </property>
   </widget>
+  <widget class="QPushButton" name="qt">
+   <property name="geometry">
+    <rect>
+     <x>20</x>
+     <y>177</y>
+     <width>141</width>
+     <height>40</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="icon">
+    <iconset resource="Resource.qrc">
+     <normaloff>:/Resource/qt.svg</normaloff>:/Resource/qt.svg</iconset>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>142</width>
+     <height>44</height>
+    </size>
+   </property>
+   <property name="autoExclusive">
+    <bool>false</bool>
+   </property>
+  </widget>
  </widget>
  <resources>
   <include location="Resource.qrc"/>

src/About.ui

@@ -1,4 +1,4 @@
-QT       += core gui network
+QT       += core gui network webenginewidgets
 TARGET = CipherTools
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets