Index: sources/gui/qml/pages/settings/SettingsDecommission.qml =================================================================== diff -u -r80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803 -r364cf0959b78d4e86c7220fb878c5246c9d7d6bd --- sources/gui/qml/pages/settings/SettingsDecommission.qml (.../SettingsDecommission.qml) (revision 80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803) +++ sources/gui/qml/pages/settings/SettingsDecommission.qml (.../SettingsDecommission.qml) (revision 364cf0959b78d4e86c7220fb878c5246c9d7d6bd) @@ -25,16 +25,25 @@ * \brief SettingsDecommission is the screen * which asks for confirmation of performing a factory reset and doing it if confirmed */ -UserConfirmation{ id: _root +UserConfirmation { id : _root message : vDevice.decommissionEnabled ? qsTr("Do you want to perform the %1?").arg(title.toLowerCase()) : qsTr("Please wait ...") itemIndex : SettingsStack.Decommission notificationText : vDevice.status confirmVisible : true confirmEnabled : vDevice.decommissionEnabled - onConfirmClicked : vDevice.decommission = "" // Need to set to something (ie: emtpy string) to trigger CPP code backVisible : true backEnabled : vDevice.decommissionEnabled + + onConfirmClicked : { + _confirmDialog.titleText = _root.title + _confirmDialog.open() + } + Connections { target: _confirmDialog + function onAccepted() { + vDevice.decommission = "" // Need to set to something (ie: emtpy string) to trigger CPP code + } + } }