Update network API

qml.qrc

@@ -98,7 +98,7 @@
         <file>images/media-playback-start-symbolic.svg</file>
         <file>images/media-skip-backward-symbolic.svg</file>
         <file>images/media-skip-forward-symbolic.svg</file>
-        <file>qml/ControlDialog.qml</file>
+        <file>qml/ControlCenter.qml</file>
         <file>qml/CardItem.qml</file>
         <file>qml/IconButton.qml</file>
         <file>images/dark/down.svg</file>

qml/ControlCenter.qml

@@ -160,14 +160,14 @@ ControlCenterDialog {
                     Layout.fillHeight: true
                     Layout.fillWidth: true
                     icon: FishUI.Theme.darkMode || checked ? "qrc:/images/dark/network-wireless-connected-100.svg"
-                                                         : "qrc:/images/light/network-wireless-connected-100.svg"
+                                                           : "qrc:/images/light/network-wireless-connected-100.svg"
-                    visible: network.wirelessHardwareEnabled
+                    visible: enabledConnections.wirelessHwEnabled
-                    checked: network.wirelessEnabled
+                    checked: enabledConnections.wirelessEnabled
                     label: qsTr("Wi-Fi")
-                    text: network.wirelessEnabled ? network.wirelessConnectionName ?
+                    text: enabledConnections.wirelessEnabled ? activeConnection.wirelessName ?
-                                                        network.wirelessConnectionName :
+                                                               activeConnection.wirelessName :
-                                                        qsTr("On") : qsTr("Off")
+                                                               qsTr("On") : qsTr("Off")
-                    onClicked: network.wirelessEnabled = !network.wirelessEnabled
+                    onClicked: nmHandler.enableWireless(!checked)
                 }
 
                 CardItem {

qml/main.qml

@@ -145,13 +145,13 @@ Item {
             onRightClicked: toggleDialog()
 
             function toggleDialog() {
-                if (controlDialog.visible)
+                if (controlCenter.visible)
-                    controlDialog.visible = false
+                    controlCenter.visible = false
                 else {
                     // 先初始化，用户可能会通过Alt鼠标左键移动位置
-                    controlDialog.position = Qt.point(0, 0)
+                    controlCenter.position = Qt.point(0, 0)
-                    controlDialog.visible = true
+                    controlCenter.visible = true
-                    controlDialog.position = Qt.point(mapToGlobal(0, 0).x, mapToGlobal(0, 0).y)
+                    controlCenter.position = Qt.point(mapToGlobal(0, 0).x, mapToGlobal(0, 0).y)
                 }
             }
 
@@ -179,12 +179,12 @@ Item {
                     width: rootItem.iconSize
                     height: width
                     sourceSize: Qt.size(width, height)
-                    source: network.wirelessIconName ? "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + network.wirelessIconName + ".svg" : ""
+                    source: activeConnection.wirelessIcon ? "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + activeConnection.wirelessIcon + ".svg" : ""
                     asynchronous: true
                     Layout.alignment: Qt.AlignCenter
-                    visible: network.enabled &&
+                    visible: enabledConnections.wirelessHwEnabled &&
-                             network.wirelessEnabled &&
+                             enabledConnections.wirelessEnabled &&
-                             network.wirelessConnectionName !== "" &&
+                             activeConnection.wirelessName &&
                              wirelessIcon.status === Image.Ready
                 }
 
@@ -230,8 +230,8 @@ Item {
     }
 
     // Components
-    ControlDialog {
+    ControlCenter {
-        id: controlDialog
+        id: controlCenter
     }
 
     Volume {
@@ -242,11 +242,15 @@ Item {
         id: battery
     }
 
-    NM.ConnectionIcon {
+    NM.ActiveConnection {
-        id: connectionIconProvider
+        id: activeConnection
     }
 
-    NM.Network {
+    NM.EnabledConnections {
-        id: network
+        id: enabledConnections
+    }
+
+    NM.Handler {
+        id: nmHandler
     }
 }