linuxdeepin · caixr23 · Dec 12, 2024 · Dec 12, 2024
diff --git a/dcc-network/qml/network.qml b/dcc-network/qml/network.qml
@@ -0,0 +1,22 @@
+// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later
+import org.deepin.dcc 1.0
+
+DccObject {
+    property string cmd
+    function showPage() {
+        if (cmd.length !== 0 && children.length !== 0) {
+            children[0].showPage(cmd)
+        }
+    }
+    name: "network"
+    parentName: "root"
+    displayName: qsTr("Network")
+    icon: "dcc_network"
+    weight: 50
+    onChildrenChanged: showPage()
+    onActive: cmdParam => {
+                  cmd = cmdParam
+                  showPage()
+              }
+}
diff --git a/dcc-network/qml/networkMain.qml b/dcc-network/qml/networkMain.qml
@@ -14,61 +14,8 @@ DccObject {
     property var wiredDevs: []
     property var wirelessDevs: []
 
-    name: "network"
-    parentName: "root"
-    displayName: qsTr("Network")
-    icon: "dcc_network"
-    weight: 50
-    Component {
-        id: wiredComponent
-        PageWiredDevice {}
-    }
-    Component {
-        id: wirelessComponent
-        PageWirelessDevice {}
-    }
-
-    PageVPN {
-        id: vpnPage
-        name: "networkVpn"
-        parentName: "network"
-        weight: 3010
-    }
-    PageSystemProxy {
-        id: systemProxyPage
-        name: "systemProxy"
-        parentName: "network"
-        weight: 3020
-    }
-    PageAppProxy {
-        id: appProxyPage
-        name: "applicationProxy"
-        parentName: "network"
-        weight: 3030
-    }
-    PageHotspot {
-        id: hotspotPage
-        name: "personalHotspot"
-        parentName: "network"
-        weight: 3040
-    }
-    PageAirplane {
-        name: "airplaneMode"
-        parentName: "network"
-        weight: 3050
-        item: dccData.root
-    }
-    PageDSL {
-        id: dslPage
-        name: "dsl"
-        parentName: "network"
-        weight: 3060
-    }
-    PageDetails {
-        id: detailsPage
-        name: "networkDetails"
-        parentName: "network"
-        weight: 3070
+    function showPage(cmd) {
+        dccData.exec(NetManager.ShowPage, cmd, {})
     }
     function updateDevice() {
         const delWiredDevs = wiredDevs.concat()
@@ -152,17 +99,74 @@ DccObject {
             delDev.destroy()
         }
     }
+    Component {
+        id: wiredComponent
+        PageWiredDevice {
+            property var showPage: root.showPage
+        }
+    }
+    Component {
+        id: wirelessComponent
+        PageWirelessDevice {
+            property var showPage: root.showPage
+        }
+    }
+
+    PageVPN {
+        id: vpnPage
+        property var showPage: root.showPage
+        name: "networkVpn"
+        parentName: "network"
+        weight: 3010
+    }
+    PageSystemProxy {
+        id: systemProxyPage
+        property var showPage: root.showPage
+        name: "systemProxy"
+        parentName: "network"
+        weight: 3020
+    }
+    PageAppProxy {
+        id: appProxyPage
+        property var showPage: root.showPage
+        name: "applicationProxy"
+        parentName: "network"
+        weight: 3030
+    }
+    PageHotspot {
+        id: hotspotPage
+        property var showPage: root.showPage
+        name: "personalHotspot"
+        parentName: "network"
+        weight: 3040
+    }
+    PageAirplane {
+        name: "airplaneMode"
+        property var showPage: root.showPage
+        parentName: "network"
+        weight: 3050
+        item: dccData.root
+    }
+    PageDSL {
+        id: dslPage
+        property var showPage: root.showPage
+        name: "dsl"
+        parentName: "network"
+        weight: 3060
+    }
+    PageDetails {
+        id: detailsPage
+        property var showPage: root.showPage
+        name: "networkDetails"
+        parentName: "network"
+        weight: 3070
+    }
     Connections {
         target: dccData.root
         function onChildrenChanged() {
             updateDevice()
         }
     }
-    onActive: cmd => {
-                  if (cmd.length !== 0) {
-                      dccData.exec(NetManager.FindConnectInfo, cmd, {})
-                  }
-              }
     Component.onCompleted: {
         updateDevice()
     }

diff --git a/dcc-network/translations/network.ts b/dcc-network/translations/network.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_az.ts b/dcc-network/translations/network_az.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_bo.ts b/dcc-network/translations/network_bo.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_ca.ts b/dcc-network/translations/network_ca.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_es.ts b/dcc-network/translations/network_es.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_fi.ts b/dcc-network/translations/network_fi.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_fr.ts b/dcc-network/translations/network_fr.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_hu.ts b/dcc-network/translations/network_hu.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_it.ts b/dcc-network/translations/network_it.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_ja.ts b/dcc-network/translations/network_ja.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_ko.ts b/dcc-network/translations/network_ko.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_nb_NO.ts b/dcc-network/translations/network_nb_NO.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_pl.ts b/dcc-network/translations/network_pl.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_pt_BR.ts b/dcc-network/translations/network_pt_BR.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_ru.ts b/dcc-network/translations/network_ru.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_uk.ts b/dcc-network/translations/network_uk.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_zh_CN.ts b/dcc-network/translations/network_zh_CN.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation>网络</translation>

diff --git a/dcc-network/translations/network_zh_HK.ts b/dcc-network/translations/network_zh_HK.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/dcc-network/translations/network_zh_TW.ts b/dcc-network/translations/network_zh_TW.ts
@@ -1688,7 +1688,7 @@
     </message>
 </context>
 <context>
-    <name>networkMain</name>
+    <name>network</name>
     <message>
         <source>Network</source>
         <translation type="unfinished"></translation>

diff --git a/net-view/operation/netmanager.cpp b/net-view/operation/netmanager.cpp
@@ -436,9 +436,9 @@ void NetManagerPrivate::exec(NetManager::CmdType cmd, const QString &id, const Q
         QString file = param.value("file").toString();
         m_managerThread->exportConnect(id, file);
     } break;
-    case NetManager::FindConnectInfo: {
+    case NetManager::ShowPage: {
         if (!id.isEmpty()) {
-            m_managerThread->findConnectInfo(id);
+            m_managerThread->showPage(id);
         }
     } break;
     default:

diff --git a/net-view/operation/netmanager.h b/net-view/operation/netmanager.h
@@ -78,7 +78,7 @@ class NetManager : public QObject
         ImportConnect,     // 导入配置
         ImportError,       // 导入出错
         ExportConnect,     // 导出配置
-        FindConnectInfo,   // 查找配置 任务栏打开网络配置界面
+        ShowPage,          // 查找配置 任务栏打开网络配置界面
     };
     Q_ENUM(CmdType)