Update network API

pull/7/head
rekols 4 years ago
parent 2691820fd7
commit e3b7b56b2b

@ -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>

@ -161,13 +161,13 @@ ControlCenterDialog {
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
visible: enabledConnections.wirelessHwEnabled
checked: enabledConnections.wirelessEnabled
label: qsTr("Wi-Fi")
text: network.wirelessEnabled ? network.wirelessConnectionName ?
network.wirelessConnectionName :
text: enabledConnections.wirelessEnabled ? activeConnection.wirelessName ?
activeConnection.wirelessName :
qsTr("On") : qsTr("Off")
onClicked: network.wirelessEnabled = !network.wirelessEnabled
onClicked: nmHandler.enableWireless(!checked)
}
CardItem {

@ -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
}
}

Loading…
Cancel
Save