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

Merge PR #242: Some fixes in the add device results page

Browse Source
This commit is contained in:
Jenkins 2019-09-20 01:21:27 +02:00
commit 4c6182ba4b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nymea-app/ui/thingconfiguration/SetupWizard.qml
View File

@ -64,7 +64,7 @@ Page {
busyOverlay.shown = false
if (params["deviceError"] !== "DeviceErrorNoError") {
busyOverlay.shown = false;
internalPageStack.push(resultsPage, {success: false})
internalPageStack.push(resultsPage, {deviceError: params["deviceError"], message: params["displayMessage"]});
return;
}
@ -86,15 +86,16 @@ Page {
}
onConfirmPairingReply: {
busyOverlay.shown = false
internalPageStack.push(resultsPage, {success: params["deviceError"] === "DeviceErrorNoError", deviceId: params["deviceId"], message: params["displayMessage"]})
internalPageStack.push(resultsPage, {deviceError: params["deviceError"], deviceId: params["deviceId"], message: params["displayMessage"]})
}
onAddDeviceReply: {
print("Device added:", JSON.stringify(params))
busyOverlay.shown = false;
internalPageStack.push(resultsPage, {success: params["deviceError"] === "DeviceErrorNoError", deviceId: params["deviceId"]})
internalPageStack.push(resultsPage, {deviceError: params["deviceError"], deviceId: params["deviceId"], message: params["displayMessage"]})
}
onReconfigureDeviceReply: {
busyOverlay.shown = false;
internalPageStack.push(resultsPage, {success: params["deviceError"] === "DeviceErrorNoError", deviceId: params["deviceId"]})
internalPageStack.push(resultsPage, {deviceError: params["deviceError"], deviceId: params["deviceId"], message: params["displayMessage"]})
}
}
@ -486,10 +487,12 @@ Page {
Page {
id: resultsView
property bool success
property string deviceId
property string deviceError
property string message
readonly property bool success: deviceError === "DeviceErrorNoError"
readonly property var device: root.device ? root.device : engine.deviceManager.devices.getDevice(deviceId)
ColumnLayout {