Index: sources/ApplicationController.cpp =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -r787e08545efa12ddc8383de8b973ab9762de0853 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 787e08545efa12ddc8383de8b973ab9762de0853) @@ -353,6 +353,7 @@ */ void ApplicationController::keepAlive() { + // DEBUG: return; #ifndef DISABLE_KEEP_ALIVE QVariantList mData; int mFakeDataLen = gFakeData.length(); Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -r787e08545efa12ddc8383de8b973ab9762de0853 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 787e08545efa12ddc8383de8b973ab9762de0853) @@ -107,6 +107,8 @@ // List of the transmit(request) only, messages which require acknowledge back(AckBack). QList _needsAcknow { + // CONFIRM + GuiActionType::ID_DuetConfirmUIr , // POST GuiActionType::ID_UIPostFinalResultData , // Alarm Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -rf502bc55feb08cd037d9caa12086d30034fe715b -r787e08545efa12ddc8383de8b973ab9762de0853 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision f502bc55feb08cd037d9caa12086d30034fe715b) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 787e08545efa12ddc8383de8b973ab9762de0853) @@ -76,6 +76,7 @@ _alarmListDialog.visible = false _alarmBar .visible = false } + _powerItem.cancel() } function alarmList() { vAlarmActiveList.doRequest() Index: sources/gui/qml/PowerItem.qml =================================================================== diff -u -r981e534e5b3174aab7ec47de3b1ead1511dbb6ef -r787e08545efa12ddc8383de8b973ab9762de0853 --- sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision 981e534e5b3174aab7ec47de3b1ead1511dbb6ef) +++ sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision 787e08545efa12ddc8383de8b973ab9762de0853) @@ -81,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() Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r3a2114c103d6eaf2807d2f515eeb9e0fbdeabc69 -r787e08545efa12ddc8383de8b973ab9762de0853 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 3a2114c103d6eaf2807d2f515eeb9e0fbdeabc69) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 787e08545efa12ddc8383de8b973ab9762de0853) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 06-Oct-2022 + * \date (last) 10-Oct-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * Index: sources/view/confirm/VConfirm.cpp =================================================================== diff -u -rc3b7cfba3bcb4c0f45bcd4c00401d383c8da0c4a -r787e08545efa12ddc8383de8b973ab9762de0853 --- sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision c3b7cfba3bcb4c0f45bcd4c00401d383c8da0c4a) +++ sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision 787e08545efa12ddc8383de8b973ab9762de0853) @@ -74,6 +74,7 @@ break; case GuiConfirmCommand::NUM_OF_GENERIC_CONFIRM_COMMAND : /* No code */ break; } + needConfirm ( cmd == GuiConfirmCommand::GENERIC_CONFIRM_CMD_REQUEST_OPEN ); } /*! @@ -164,6 +165,7 @@ * \details the invocable slot to send user's Confirmation */ void View::VConfirm::doConfirm(bool vConfirm) { + needConfirm ( false ); DuetConfirmUIrData data; data.mId = id(); data.mConfirm = vConfirm; Index: sources/view/confirm/VConfirm.h =================================================================== diff -u -r981e534e5b3174aab7ec47de3b1ead1511dbb6ef -r787e08545efa12ddc8383de8b973ab9762de0853 --- sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision 981e534e5b3174aab7ec47de3b1ead1511dbb6ef) +++ sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision 787e08545efa12ddc8383de8b973ab9762de0853) @@ -49,6 +49,9 @@ QMap _confirms; + // ********** DYNAMIC PROPERTIES: The properties which need to be updated by each confirm message received. ********** // + READONLY( bool , needConfirm , false) + // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI