Index: sources/gui/qml/pages/settings/SettingsDecommission.qml =================================================================== diff -u -r49b21798fb65ce44a04ae4e771ef7c3c1c119fa6 -ra7693f04e693294338aa9829d14f4ed7aa99a7a5 --- sources/gui/qml/pages/settings/SettingsDecommission.qml (.../SettingsDecommission.qml) (revision 49b21798fb65ce44a04ae4e771ef7c3c1c119fa6) +++ sources/gui/qml/pages/settings/SettingsDecommission.qml (.../SettingsDecommission.qml) (revision a7693f04e693294338aa9829d14f4ed7aa99a7a5) @@ -34,14 +34,17 @@ confirmVisible : true confirmEnabled : vDevice.decommissionEnabled - onConfirmClicked : { - vDevice.decommission = "start" + onConfirmClicked : vDevice.decommission = "" // Need to set to something (ie: emtpy string) to trigger CPP code - // restore the binding; notificationText will now be bind to vDevice.status and correctly update - _root.notificationText = Qt.binding(function(){return vDevice.status}) - } - backVisible : true backEnabled : vDevice.decommissionEnabled - onBackClicked : _root.notificationText = "" // Note: breaks binding of notificationText property + onBackClicked : _root.notificationText = "" + + Connections{ target:vDevice + function onAcceptedChanged() { + if(_root.visible) { // indicate reset screen is shown + _root.notificationText = vDevice.status + } + } + } }