Index: sources/gui/qml/PowerItem.qml =================================================================== diff -u -rf502bc55feb08cd037d9caa12086d30034fe715b -r787e08545efa12ddc8383de8b973ab9762de0853 --- sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision f502bc55feb08cd037d9caa12086d30034fe715b) +++ sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision 787e08545efa12ddc8383de8b973ab9762de0853) @@ -40,13 +40,14 @@ AutoHideInfo { id: _autoHideInfo } PowerOff { id: _powerOffDialog - visible : vConfirm.visible + idText : vConfirm.id titleText : vConfirm.title messageText : vConfirm.message confirmText : vConfirm.confirm - confirmVisible : ! vConfirm.isReject cancelText : vConfirm.cancel + confirmVisible : ! vConfirm.isReject notificationText: vConfirm.adjustment_ReasonText + autoClose : vConfirm.isPowerOff || vConfirm.isReject onVisibleChanged: { if (visible) _alarmItem.alarmHide() @@ -80,6 +81,11 @@ _alarmItem.alarmMaximize() } + function cancel() { + _powerOffDialog.close() + if ( vConfirm.needConfirm ) vConfirm.doConfirm( false ) + } + function reject() { // the power off is the only confirm has separate reject dialog, because the button is not only on UI and is HW as well. _autoHideInfo.showDialog( qsTr("Cannot shutdown during 'Treatment'"), // '%1').arg()