Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r2124420a19819f672e9180979ff3762dc083eb7f -r13e65c3d271d503c2e2e2f1f20736652c470f8cc --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 2124420a19819f672e9180979ff3762dc083eb7f) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 13e65c3d271d503c2e2e2f1f20736652c470f8cc) @@ -7,7 +7,7 @@ * * \file AlarmItem.qml * \author (last) Behrouz NematiPour - * \date (last) 07-Oct-2021 + * \date (last) 18-Mar-2022 * \author (original) Behrouz NematiPour * \date (original) 01-Mar-2021 * @@ -31,6 +31,9 @@ * This item needs to work with the NotificationBar component. */ Item { id : _root + + readonly property bool _DEBUG_DISABLE_MAXIMIZE_: false // due to touch screen issue on some devices, the maximized alarm can't be minimized to see the screen underneath. + anchors.fill: parent VAlarmStatus { id: vAlarmStatus } @@ -49,6 +52,12 @@ // Alarms dialog/bar navigation handling ----- vvvvv ----- function alarmMinimize() { + // The has alarm check has been added here to let other components call this function, + // without worrying about the alarmDialog popoing up without an alarm present. + // Look at the PowerItem as an example. + if ( ! vAlarmStatus.hasAlarm ) return + + _alarmDialog .visible = false _alarmListDialog.visible = false _alarmBar .visible = true @@ -57,11 +66,15 @@ // The has alarm check has been added here to let other components call this function, // without worrying about the alarmDialog popoing up without an alarm present. // Look at the PowerItem as an example. - if ( ! vAlarmStatus.hasAlarm ) return; + if ( ! vAlarmStatus.hasAlarm ) return - _alarmDialog .visible = true - _alarmListDialog.visible = false - _alarmBar .visible = false + if ( _root._DEBUG_DISABLE_MAXIMIZE_ ) { + alarmMinimize() + } else { + _alarmDialog .visible = true + _alarmListDialog.visible = false + _alarmBar .visible = false + } } function alarmList() { vAlarmActiveList.doRequest() @@ -116,7 +129,7 @@ minVisible : ! vAlarmStatus.alarm_Flag_noMinimize titleFading : vHDOperationMode.fault countDown : vTreatmentStop.countDown - countDownVisible : vHDTreatmentStates.txStop && vTreatmentStop.total + countDownVisible : vHDOperationMode.inTreatment && vHDTreatmentStates.txStop && vTreatmentStop.total onMuteClicked : vAlarmStatus.doSilence () onResumeClicked : vAlarmStatus.doUserActionResume ()