Index: sources/gui/qml/pages/settings/SettingsFactoryReset.qml =================================================================== diff -u -rf0ffeb8c9ec7a838f039b904ce253b001561b5db -rc849da4382b19f1e0cf36c39e7975b337bf6bec0 --- sources/gui/qml/pages/settings/SettingsFactoryReset.qml (.../SettingsFactoryReset.qml) (revision f0ffeb8c9ec7a838f039b904ce253b001561b5db) +++ sources/gui/qml/pages/settings/SettingsFactoryReset.qml (.../SettingsFactoryReset.qml) (revision c849da4382b19f1e0cf36c39e7975b337bf6bec0) @@ -26,12 +26,22 @@ * which asks for confirmation of performing a factory reset and doing it if confirmed */ UserConfirmation{ id: _root + title : qsTr("Factory Reset") + message : vDevice.factoryResetEnabled ? qsTr("Do you want to perform a factory reset?") + : qsTr("Resetting...") + itemIndex : SettingsStack.FactoryReset + notificationText : vDevice.status + confirmVisible : true confirmEnabled : vDevice.factoryResetEnabled - itemIndex : SettingsStack.FactoryReset + onConfirmClicked : { + vDevice.factoryReset = "start" + + // 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.factoryResetEnabled - title : qsTr("Factory Reset") - onBackClicked : _settingsHome.notificationText = "" - onConfirmClicked : vDevice.factoryReset = "start" + onBackClicked : _root.notificationText = "" // Note: breaks binding of notificationText property }