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

Merge PR #723: Settings entries configuration

Browse Source
This commit is contained in:
Jenkins nymea 2021-12-13 17:59:46 +01:00
commit 7f24e9d51d
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nymea-app/ui/Configuration.qml
View File

@ -10,4 +10,10 @@ ConfigurationBase {
showCommunityLinks: true
networkSettingsEnabled: true
apiSettingsEnabled: true
mqttSettingsEnabled: true
webServerSettingsEnabled: true
zigbeeSettingsEnabled: true
modbusSettingsEnabled: true
}

8
nymea-app/ui/ConfigurationBase.qml
View File

@ -8,4 +8,12 @@ Item {
property string connectionWizard: ""
property bool showCommunityLinks: false
// Enable/disable entries in the system settings
property bool networkSettingsEnabled: false
property bool apiSettingsEnabled: false
property bool mqttSettingsEnabled: false
property bool webServerSettingsEnabled: false
property bool zigbeeSettingsEnabled: false
property bool modbusSettingsEnabled: false
}

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

@ -92,6 +92,8 @@ Page {
Layout.fillWidth: true
Material.elevation: layout.isGrid ? 1 : 0
visible: Configuration.networkSettingsEnabled
padding: 0
NymeaSwipeDelegate {
width: parent.width
@ -124,6 +126,8 @@ Page {
Layout.fillWidth: true
Material.elevation: layout.isGrid ? 1 : 0
visible: Configuration.apiSettingsEnabled
padding: 0
NymeaSwipeDelegate {
width: parent.width
@ -139,7 +143,7 @@ Page {
Pane {
Layout.fillWidth: true
Material.elevation: layout.isGrid ? 1 : 0
visible: engine.jsonRpcClient.ensureServerVersion("1.11")
visible: engine.jsonRpcClient.ensureServerVersion("1.11") && Configuration.mqttSettingsEnabled
padding: 0
NymeaSwipeDelegate {
@ -157,6 +161,8 @@ Page {
Layout.fillWidth: true
Material.elevation: layout.isGrid ? 1 : 0
visible: Configuration.webServerSettingsEnabled
padding: 0
NymeaSwipeDelegate {
width: parent.width
@ -167,13 +173,13 @@ Page {
wrapTexts: false
onClicked: pageStack.push(Qt.resolvedUrl("system/WebServerSettingsPage.qml"))
}
}
Pane {
Layout.fillWidth: true
Material.elevation: layout.isGrid ? 1 : 0
visible: engine.jsonRpcClient.ensureServerVersion("5.3")
visible: engine.jsonRpcClient.ensureServerVersion("5.3") && Configuration.zigbeeSettingsEnabled
padding: 0
NymeaSwipeDelegate {
@ -190,7 +196,7 @@ Page {
Pane {
Layout.fillWidth: true
Material.elevation: layout.isGrid ? 1 : 0
visible: engine.jsonRpcClient.ensureServerVersion("5.6")
visible: engine.jsonRpcClient.ensureServerVersion("5.6") && Configuration.modbusSettingsEnabled
padding: 0
NymeaSwipeDelegate {