Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r114e8fceae5f2d68b69b433b258f37c90866434b -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 114e8fceae5f2d68b69b433b258f37c90866434b) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file AlarmItem.qml * \author (last) Behrouz NematiPour - * \date (last) 02-Feb-2023 + * \date (last) 24-Jan-2024 * \author (original) Behrouz NematiPour * \date (original) 01-Mar-2021 * @@ -46,6 +46,7 @@ readonly property alias isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced readonly property alias timeout : vAlarmStatus.alarm_MuteTimeout readonly property alias alarm_AlarmID : vAlarmStatus.alarm_AlarmID + readonly property alias hasAlarm : vAlarmStatus.hasAlarm function clearAlarm() { vAlarmStatus.doClearCondition() @@ -72,6 +73,9 @@ // Look at the PowerItem as an example. if ( ! vAlarmStatus.hasAlarm ) return + // close the user confirmation dialog if the alarm dialog is going to be dispalyed + _confirmDialog.close() + if ( _root._DEBUG_DISABLE_MAXIMIZE_ ) { alarmMinimize() } else {