diff --git a/qml.qrc b/qml.qrc index 5c1dbe9..a192518 100644 --- a/qml.qrc +++ b/qml.qrc @@ -98,7 +98,7 @@ images/media-playback-start-symbolic.svg images/media-skip-backward-symbolic.svg images/media-skip-forward-symbolic.svg - qml/ControlDialog.qml + qml/ControlCenter.qml qml/CardItem.qml qml/IconButton.qml images/dark/down.svg diff --git a/qml/ControlDialog.qml b/qml/ControlCenter.qml similarity index 95% rename from qml/ControlDialog.qml rename to qml/ControlCenter.qml index f1fbe13..0731fc5 100644 --- a/qml/ControlDialog.qml +++ b/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" - visible: network.wirelessHardwareEnabled - checked: network.wirelessEnabled + : "qrc:/images/light/network-wireless-connected-100.svg" + visible: enabledConnections.wirelessHwEnabled + checked: enabledConnections.wirelessEnabled label: qsTr("Wi-Fi") - text: network.wirelessEnabled ? network.wirelessConnectionName ? - network.wirelessConnectionName : - qsTr("On") : qsTr("Off") - onClicked: network.wirelessEnabled = !network.wirelessEnabled + text: enabledConnections.wirelessEnabled ? activeConnection.wirelessName ? + activeConnection.wirelessName : + qsTr("On") : qsTr("Off") + onClicked: nmHandler.enableWireless(!checked) } CardItem { diff --git a/qml/main.qml b/qml/main.qml index 203a205..4bf725c 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -145,13 +145,13 @@ Item { onRightClicked: toggleDialog() function toggleDialog() { - if (controlDialog.visible) - controlDialog.visible = false + if (controlCenter.visible) + controlCenter.visible = false else { // 先初始化,用户可能会通过Alt鼠标左键移动位置 - controlDialog.position = Qt.point(0, 0) - controlDialog.visible = true - controlDialog.position = Qt.point(mapToGlobal(0, 0).x, mapToGlobal(0, 0).y) + controlCenter.position = Qt.point(0, 0) + controlCenter.visible = true + 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 && - network.wirelessEnabled && - network.wirelessConnectionName !== "" && + visible: enabledConnections.wirelessHwEnabled && + enabledConnections.wirelessEnabled && + activeConnection.wirelessName && wirelessIcon.status === Image.Ready } @@ -230,8 +230,8 @@ Item { } // Components - ControlDialog { - id: controlDialog + ControlCenter { + id: controlCenter } Volume { @@ -242,11 +242,15 @@ Item { id: battery } - NM.ConnectionIcon { - id: connectionIconProvider + NM.ActiveConnection { + id: activeConnection } - NM.Network { - id: network + NM.EnabledConnections { + id: enabledConnections + } + + NM.Handler { + id: nmHandler } }