From a5cfffc2f1e70bb45b3d38f42f8a29bd4fb470c6 Mon Sep 17 00:00:00 2001
From: Jokul <wangshengshan011@163.com>
Date: Sat, 8 Aug 2026 23:32:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8C=85=E7=BB=9F=E8=AE=A1=E8=A1=8C?=
 =?UTF-8?q?=E4=BB=8E=E6=8E=A5=E5=8F=A3=E4=BF=A1=E6=81=AF=E5=8C=BA=E7=A7=BB?=
 =?UTF-8?q?=E5=88=B0=E7=B4=AF=E8=AE=A1=E6=B5=81=E9=87=8F=E5=8C=BA=E4=B8=8B?=
 =?UTF-8?q?=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

包统计与流量统计同属累计数据，放一起信息归属清晰；移除接口信息区的
包统计行，在总计行下方新增居中显示；标签加 qsTr 支持国际化
---
 package/components/NetworkPopup.qml | 69 ++++++++++++++++-------------
 translations/jnetapplet_zh_CN.ts    | 15 +++++++
 2 files changed, 52 insertions(+), 32 deletions(-)

diff --git a/package/components/NetworkPopup.qml b/package/components/NetworkPopup.qml
index e1d3286..c5bb7d7 100644
--- a/package/components/NetworkPopup.qml
+++ b/package/components/NetworkPopup.qml
@@ -300,38 +300,6 @@ Control {
             }
         }
 
-        // 包统计：收发包 + 错误/丢包（累计值，自开机起）
-        // 设计原因：包总数始终显示；错误/丢包仅在存在时显示，避免正常网卡信息过载；
-        // 箭头遵循应用惯例：↓=接收(rx)、↑=发送(tx)，与弹窗速度区/累计区一致
-        RowLayout {
-            Layout.alignment: Qt.AlignHCenter
-            spacing: 6
-            visible: popup.ready
-
-            // 收发包总数：始终显示，格式 "包 {rx}↓ {tx}↑"
-            Text {
-                text: "包 " + popup.rxPackets.toFixed(0) + "↓ " + popup.txPackets.toFixed(0) + "↑"
-                font.pixelSize: Math.round(12 * popup.fontScale)
-                color: popup.tertiaryText
-            }
-
-            // 错误数：仅在存在错误或丢包时显示，格式 "错误 {rxE}/{txE}"
-            Text {
-                text: "错误 " + popup.rxErrors.toFixed(0) + "/" + popup.txErrors.toFixed(0)
-                font.pixelSize: Math.round(12 * popup.fontScale)
-                color: popup.tertiaryText
-                visible: popup.rxErrors > 0 || popup.txErrors > 0 || popup.rxDropped > 0 || popup.txDropped > 0
-            }
-
-            // 丢包数：仅在存在错误或丢包时显示，格式 "丢包 {rxD}/{txD}"
-            Text {
-                text: "丢包 " + popup.rxDropped.toFixed(0) + "/" + popup.txDropped.toFixed(0)
-                font.pixelSize: Math.round(12 * popup.fontScale)
-                color: popup.tertiaryText
-                visible: popup.rxErrors > 0 || popup.txErrors > 0 || popup.rxDropped > 0 || popup.txDropped > 0
-            }
-        }
-
         // 分隔线1
         Rectangle {
             Layout.fillWidth: true
@@ -498,6 +466,43 @@ Control {
             Item { Layout.fillWidth: true }
         }
 
+        // 包统计：收发包 + 错误/丢包（累计值，自开机起），紧接累计流量下方
+        // 设计原因：包统计与流量统计同属"累计数据"，放一起信息归属清晰；
+        // 包总数始终显示；错误/丢包仅在存在时显示，避免正常网卡信息过载；
+        // 箭头遵循应用惯例：↓=接收(rx)、↑=发送(tx)，与总计行一致
+        RowLayout {
+            Layout.fillWidth: true
+            spacing: 6
+            visible: popup.ready
+
+            Item { Layout.fillWidth: true }
+
+            // 收发包总数：始终显示，格式 "包 {rx}↓ {tx}↑"
+            Text {
+                text: qsTr("Packets") + " " + popup.rxPackets.toFixed(0) + "↓ " + popup.txPackets.toFixed(0) + "↑"
+                font.pixelSize: Math.round(12 * popup.fontScale)
+                color: popup.tertiaryText
+            }
+
+            // 错误数：仅在存在错误或丢包时显示，格式 "错误 {rxE}/{txE}"
+            Text {
+                text: qsTr("Errors") + " " + popup.rxErrors.toFixed(0) + "/" + popup.txErrors.toFixed(0)
+                font.pixelSize: Math.round(12 * popup.fontScale)
+                color: popup.tertiaryText
+                visible: popup.rxErrors > 0 || popup.txErrors > 0 || popup.rxDropped > 0 || popup.txDropped > 0
+            }
+
+            // 丢包数：仅在存在错误或丢包时显示，格式 "丢包 {rxD}/{txD}"
+            Text {
+                text: qsTr("Dropped") + " " + popup.rxDropped.toFixed(0) + "/" + popup.txDropped.toFixed(0)
+                font.pixelSize: Math.round(12 * popup.fontScale)
+                color: popup.tertiaryText
+                visible: popup.rxErrors > 0 || popup.txErrors > 0 || popup.rxDropped > 0 || popup.txDropped > 0
+            }
+
+            Item { Layout.fillWidth: true }
+        }
+
         // 分隔线3
         Rectangle {
             Layout.fillWidth: true
diff --git a/translations/jnetapplet_zh_CN.ts b/translations/jnetapplet_zh_CN.ts
index f262667..8e993a0 100644
--- a/translations/jnetapplet_zh_CN.ts
+++ b/translations/jnetapplet_zh_CN.ts
@@ -81,6 +81,21 @@
         <source>Total</source>
         <translation>总计</translation>
     </message>
+    <message>
+        <location filename="../package/components/NetworkPopup.qml" line="474"/>
+        <source>Packets</source>
+        <translation>包</translation>
+    </message>
+    <message>
+        <location filename="../package/components/NetworkPopup.qml" line="483"/>
+        <source>Errors</source>
+        <translation>错误</translation>
+    </message>
+    <message>
+        <location filename="../package/components/NetworkPopup.qml" line="494"/>
+        <source>Dropped</source>
+        <translation>丢包</translation>
+    </message>
 </context>
 <context>
     <name>NetCommon</name>