ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it ZigBee again

Browse Source 
While there is a document that says it is Zigbee, that document is
not consistent on its own and ZigBee seems to be more commonly used,
even by the ZigBee Alliance themselves.
This commit is contained in:
Michael Zanetti 2020-11-28 14:02:09 +01:00
parent 45fd91c80e
commit 1e14cbc71f
4 changed files with 14 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nymea-app/ui/SettingsPage.qml
View File

@ -162,8 +162,8 @@ Page {
NymeaListItemDelegate {
width: parent.width
iconName: "../images/zigbee.svg"
text: qsTr("Zigbee")
subText: qsTr("Configure Zigbee networks")
text: qsTr("ZigBee")
subText: qsTr("Configure ZigBee networks")
prominentSubText: false
wrapTexts: false
onClicked: pageStack.push(Qt.resolvedUrl("system/ZigbeeSettingsPage.qml"))

10
nymea-app/ui/system/ZigbeeAddNetworkPage.qml
View File

@ -97,19 +97,19 @@ SettingsPageBase {
Label {
Layout.fillWidth: true
wrapMode: Text.WordWrap
text: qsTr("No Zigbee adapters or serial ports are available on this system. Connect a Zigbee adapter via USB or UART serial port.")
text: qsTr("No ZigBee adapters or serial ports are available on this system. Connect a ZigBee adapter via USB or UART serial port.")
}
}
SettingsPageSectionHeader {
text: qsTr("Available Zigbee adapters")
text: qsTr("Available ZigBee adapters")
visible: recognizedAdapters.count > 0
}
Label {
Layout.fillWidth: true
Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
text: qsTr("Please select the Zigbee adapter on which the new network will be created.")
text: qsTr("Please select the ZigBee adapter on which the new network will be created.")
font.pixelSize: app.smallFont
wrapMode: Text.WordWrap
visible: recognizedAdapters.count > 0
@ -142,7 +142,7 @@ SettingsPageBase {
Layout.fillWidth: true; Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
wrapMode: Text.WordWrap
font.pixelSize: app.smallFont
text: qsTr("Please verify that the Zigbee adapter is properly connected to a serial port and select the appropriate port.")
text: qsTr("Please verify that the ZigBee adapter is properly connected to a serial port and select the appropriate port.")
visible: serialPorts.count > 0
}
@ -178,7 +178,7 @@ SettingsPageBase {
headerIcon: "../images/stock_usb.svg"
title: qsTr("Serial port options")
text: qsTr("Please select the serial port options for using the Zigbee adapter")
text: qsTr("Please select the serial port options for using the ZigBee adapter")
standardButtons: Dialog.Ok | Dialog.Cancel
RowLayout {

4
nymea-app/ui/system/ZigbeeNetworkPage.qml
View File

@ -93,7 +93,7 @@ SettingsPageBase {
}
SettingsPageSectionHeader {
text: qsTr("Adding zigbee devices")
text: qsTr("Network control")
}
NymeaListItemDelegate {
@ -121,7 +121,7 @@ SettingsPageBase {
Layout.leftMargin: app.margins
Layout.rightMargin: app.margins
enabled: network.networkState === ZigbeeNetwork.ZigbeeNetworkStateOnline
text: root.network.permitJoiningEnabled ? qsTr("Extend network open duration") : qsTr("Open network for new Zigbee devices")
text: root.network.permitJoiningEnabled ? qsTr("Extend network open duration") : qsTr("Open network for new ZigBee devices")
onClicked: root.zigbeeManager.setPermitJoin(root.network.networkUuid)
}

67
nymea-app/ui/system/ZigbeeSettingsPage.qml
View File

@ -38,13 +38,13 @@ import Nymea 1.0
SettingsPageBase {
id: root
header: NymeaHeader {
text: qsTr("Zigbee")
text: qsTr("ZigBee")
backButtonVisible: true
onBackPressed: pageStack.pop()
HeaderButton {
imageSource: "../images/add.svg"
text: qsTr("Add Zigbee network")
text: qsTr("Add ZigBee network")
onClicked: pageStack.push(Qt.resolvedUrl("ZigbeeAddNetworkPage.qml"), {zigbeeManager: zigbeeManager})
}
}
@ -71,14 +71,14 @@ SettingsPageBase {
// }
SettingsPageSectionHeader {
text: qsTr("Zigbee networks")
text: qsTr("ZigBee networks")
}
Label {
Layout.fillWidth: true
Layout.leftMargin: app.margins; Layout.rightMargin: app.margins
wrapMode: Text.WordWrap
text: qsTr("There are no Zigbee networks set up yet. In order to use Zigbee, create a Zigbee network.")
text: qsTr("There are no ZigBee networks set up yet. In order to use ZigBee, create a ZigBee network.")
visible: zigbeeManager.networks.count == 0
}
@ -97,65 +97,8 @@ SettingsPageBase {
Button {
Layout.fillWidth: true
Layout.margins: app.margins
text: qsTr("Add a Zigbee network")
text: qsTr("Add a ZigBee network")
onClicked: pageStack.push(Qt.resolvedUrl("ZigbeeAddNetworkPage.qml"), {zigbeeManager: zigbeeManager})
}
// SettingsPageSectionHeader {
// text: qsTr("Available Zigbee adapters")
// }
// Repeater {
// id: recognizedAdaptersRepeater
// model: ZigbeeAdaptersProxy {
// id: recognizedAdaptersProxy
// manager: zigbeeManager
// onlyUnused: true
//// hardwareFilter: ZigbeeAdaptersProxy.HardwareFilterRecognized
// }
// delegate: NymeaListItemDelegate {
// Layout.fillWidth: true
// property ZigbeeAdapter adapter: recognizedAdaptersProxy.get(index)
// iconName: "../images/stock_usb.svg"
// progressive: false
// text: model.description + " - " + model.serialPort
// subText: adapter.serialPort + " - " + adapter.baudRate + " - " + adapter.backendType + " - " + adapter.serialNumber
// onClicked: {
// zigbeeManager.addNetwork(adapter.serialPort, adapter.baudRate, adapter.backendType)
//// pageStack.pop()
// }
// }
// }
// // List networks
// SettingsPageSectionHeader {
// text: qsTr("Zigbee networks")
// }
// Repeater {
// model: zigbeeManager.networks
// delegate: NymeaListItemDelegate {
// Layout.fillWidth: true
// property var network: zigbeeManager.networks.get(index)
// iconName: "../images/zigbee.svg"
// text: model.macAddress
// subText: model.serialPort + " - " + model.firmwareVersion
// onClicked: pageStack.push(Qt.resolvedUrl("ZigbeeNetworkPage.qml"), { network: network })
// }
// }
// NymeaListItemDelegate {
// Layout.fillWidth: true
// text: qsTr("Add Zigbee network")
// subText: qsTr("Set up a new Zigbee network")
// prominentSubText: false
// onClicked: {
// pageStack.push(Qt.resolvedUrl("../system/ZigbeeNetworkAddPage.qml"), {zigbeeManager: zigbeeManager})
// }
// }
}