fix: Modify the SSID location on the wireless network configuration page

1. Modify the SSID location on the wireless network configuration page 2. Wireless network connection attempt to connect, wait to pull up the network panel and enter password 3. Handle VPN disconnection 4. System proxy URL with Required prompt pms: BUG-286953 pms: BUG-291225 pms: BUG-287101
linuxdeepin · Dec 12, 2024 · d2c1810 · d2c1810
1 parent 6ef47f7
commit d2c1810
Show file tree

Hide file tree

Showing 28 changed files with 283 additions and 213 deletions.
diff --git a/dcc-network/qml/PageDSLSettings.qml b/dcc-network/qml/PageDSLSettings.qml
@@ -61,11 +61,6 @@ DccObject {
             weight: 500
             canNotBind: false
             onEditClicked: modified = true
-            onSsidChanged: {
-                if (root.type === NetType.WirelessItem && !root.config[root.config.connection.type].hasOwnProperty("id")) {
-                    sectionGeneric.settingsID = sectionDevice.ssid
-                }
-            }
         }
         SectionPPP {
             id: sectionPPP

diff --git a/dcc-network/qml/PageSettings.qml b/dcc-network/qml/PageSettings.qml
@@ -67,11 +67,6 @@ DccObject {
             weight: 600
             type: root.type
             onEditClicked: modified = true
-            onSsidChanged: {
-                if (root.type === NetType.WirelessItem && !root.config[root.config.connection.type].hasOwnProperty("id")) {
-                    sectionGeneric.settingsID = sectionDevice.ssid
-                }
-            }
         }
     }
     onConfigChanged: {
@@ -209,6 +204,9 @@ DccObject {
                     } else {
                         nConfig["connection"]["interface-name"] = devConfig.interfaceName
                     }
+                    if (nConfig["connection"].type === "802-11-wireless" && !devConfig.hasOwnProperty("ssid")) {
+                        devConfig["ssid"] = nConfig["connection"]["id"]
+                    }
 
                     nConfig[config.connection.type] = devConfig
                     if (item) {

diff --git a/dcc-network/qml/PageSystemProxy.qml b/dcc-network/qml/PageSystemProxy.qml
@@ -55,7 +55,6 @@ DccObject {
                                          "method": method
                                      })
                     }
-                    console.log("method=====", method)
                 }
             }
             Connections {
@@ -113,6 +112,7 @@ DccObject {
             page: D.LineEdit {
                 topInset: 4
                 bottomInset: 4
+                placeholderText: qsTr("Required")
                 text: dccObj.config
                 Layout.fillWidth: true
                 showAlert: autoUrlAlert

diff --git a/dcc-network/qml/PageWirelessDevice.qml b/dcc-network/qml/PageWirelessDevice.qml
@@ -122,6 +122,7 @@ DccObject {
                             Layout.fillWidth: true
                             leftPadding: 36
                             contentItem: Label {
+                                verticalAlignment: Text.AlignVCenter
                                 text: model.item.name
                                 color: palette.link
                             }

diff --git a/dcc-network/qml/SectionDevice.qml b/dcc-network/qml/SectionDevice.qml
@@ -19,8 +19,6 @@ DccTitleObject {
     property var devData: []
     property bool hasMTU: false
     property string interfaceName: ""
-    property string ssid: ""
-    property bool ssidEnabled: false
 
     property string errorKey: ""
     signal editClicked
@@ -54,8 +52,6 @@ DccTitleObject {
         if (root.config.hasOwnProperty("cloned-mac-address")) {
             root.config["cloned-mac-address"] = NetUtils.macToStr(root.config["cloned-mac-address"])
         }
-        ssid = root.config.hasOwnProperty("ssid") ? root.config["ssid"] : ""
-        ssidEnabled = type === NetType.WirelessItem && !root.config.hasOwnProperty("ssid")
     }
     function getConfig() {
         let saveConfig = root.config ? root.config : {}
@@ -72,18 +68,11 @@ DccTitleObject {
             delete saveConfig["mtu"]
         }
 
-        if (type === NetType.WirelessItem) {
-            saveConfig["ssid"] = ssid
-        }
         saveConfig["band"] = root.config["band"]
         return saveConfig
     }
     function checkInput() {
         errorKey = ""
-        if (type === NetType.WirelessItem && ssid.length === 0) {
-            errorKey = "ssid"
-            return false
-        }
         if (root.config.hasOwnProperty("cloned-mac-address") && !NetUtils.macRegExp.test(root.config["cloned-mac-address"])) {
             errorKey = "cloned-mac-address"
             console.log(errorKey, root.config[errorKey])
@@ -108,36 +97,6 @@ DccTitleObject {
         weight: root.weight + 20
         pageType: DccObject.Item
         page: DccGroupView {}
-        DccObject {
-            name: "ssid"
-            parentName: root.parentName + "/devGroup"
-            weight: 10
-            displayName: qsTr("SSID")
-            pageType: DccObject.Editor
-            visible: type === NetType.WirelessItem
-            page: D.LineEdit {
-                enabled: ssidEnabled
-                placeholderText: qsTr("Required")
-                text: ssid
-                onTextChanged: {
-                    if (showAlert) {
-                        errorKey = ""
-                    }
-                    if (text !== ssid) {
-                        ssid = text
-                        root.editClicked()
-                    }
-                }
-                showAlert: errorKey === dccObj.name
-                alertDuration: 2000
-                onShowAlertChanged: {
-                    if (showAlert) {
-                        DccApp.showPage(dccObj)
-                        forceActiveFocus()
-                    }
-                }
-            }
-        }
         DccObject {
             name: "mac-address"
             parentName: root.parentName + "/devGroup"

diff --git a/dcc-network/qml/SectionGeneric.qml b/dcc-network/qml/SectionGeneric.qml
@@ -29,7 +29,7 @@ DccTitleObject {
         root.config.id = settingsID
         errorKey = ""
         console.log("root.config.id.length", root.config.id, root.config.id.length)
-        if (root.config.type !== "802-11-wireless" && root.config.id.length === 0) {
+        if (root.config.id.length === 0) {
             errorKey = "id"
         }
 
@@ -47,12 +47,13 @@ DccTitleObject {
         DccObject {
             name: "name"
             parentName: root.parentName + "/genericGroup"
-            displayName: qsTr("Name")
+            displayName: root.config.type === "802-11-wireless" ? qsTr("Name (SSID)") : qsTr("Name")
             weight: 10
-            enabled: root.config.type !== "802-11-wireless"
+            enabled: !root.config.hasOwnProperty("id") || root.config.id.length === 0
             pageType: DccObject.Editor
             page: D.LineEdit {
                 text: settingsID
+                placeholderText: qsTr("Required")
                 onTextChanged: {
                     if (showAlert) {
                         errorKey = ""

diff --git a/dcc-network/translations/network.ts b/dcc-network/translations/network.ts
@@ -342,6 +342,10 @@
         <source>Set up proxy servers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageVPN</name>
@@ -540,10 +544,6 @@
         <source>Ethernet</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>SSID</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Device MAC Addr</source>
         <translation type="unfinished"></translation>
@@ -576,10 +576,6 @@
         <source>5 GHz</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SectionGeneric</name>
@@ -595,6 +591,14 @@
         <source>Auto Connect</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name (SSID)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SectionIPv4</name>

diff --git a/dcc-network/translations/network_az.ts b/dcc-network/translations/network_az.ts
@@ -342,6 +342,10 @@
         <source>Set up proxy servers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageVPN</name>
@@ -540,10 +544,6 @@
         <source>Ethernet</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>SSID</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Device MAC Addr</source>
         <translation type="unfinished"></translation>
@@ -576,10 +576,6 @@
         <source>5 GHz</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SectionGeneric</name>
@@ -595,6 +591,14 @@
         <source>Auto Connect</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name (SSID)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SectionIPv4</name>

diff --git a/dcc-network/translations/network_bo.ts b/dcc-network/translations/network_bo.ts
@@ -342,6 +342,10 @@
         <source>Set up proxy servers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageVPN</name>
@@ -540,10 +544,6 @@
         <source>Ethernet</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>SSID</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Device MAC Addr</source>
         <translation type="unfinished"></translation>
@@ -576,10 +576,6 @@
         <source>5 GHz</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SectionGeneric</name>
@@ -595,6 +591,14 @@
         <source>Auto Connect</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name (SSID)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SectionIPv4</name>

diff --git a/dcc-network/translations/network_ca.ts b/dcc-network/translations/network_ca.ts
@@ -342,6 +342,10 @@
         <source>Set up proxy servers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageVPN</name>
@@ -540,10 +544,6 @@
         <source>Ethernet</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>SSID</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Device MAC Addr</source>
         <translation type="unfinished"></translation>
@@ -576,10 +576,6 @@
         <source>5 GHz</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SectionGeneric</name>
@@ -595,6 +591,14 @@
         <source>Auto Connect</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name (SSID)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SectionIPv4</name>

diff --git a/dcc-network/translations/network_es.ts b/dcc-network/translations/network_es.ts
@@ -342,6 +342,10 @@
         <source>Set up proxy servers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PageVPN</name>
@@ -540,10 +544,6 @@
         <source>Ethernet</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>SSID</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Device MAC Addr</source>
         <translation type="unfinished"></translation>
@@ -576,10 +576,6 @@
         <source>5 GHz</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Required</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>SectionGeneric</name>
@@ -595,6 +591,14 @@
         <source>Auto Connect</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name (SSID)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SectionIPv4</name>