Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -102,19 +102,33 @@ onEndClicked : vAlarmStatus.doUserActionEnd () onOkClicked : vAlarmStatus.doUserActionOk () onMinimizeClicked : { - alarmMinimize() - // when user minimizes the alarm it can stay minimized until otherwize is set - // by the next alarm status received. - // see also the "Connections { target: vAlarmStatus" implementation - vAlarmStatus.alarm_KeepMinimized = true + if ( vAlarmStatus.alarm_Flag_noMinimize ) { + alarmList() + } + else { + alarmMinimize() + // when user minimizes the alarm it can stay minimized until otherwize is set + // by the next alarm status received. + // see also the "Connections { target: vAlarmStatus" implementation + vAlarmStatus.alarm_KeepMinimized = true + } } } AlarmListDialog { id : _alarmListDialog - isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced - timeout : vAlarmStatus.alarm_MuteTimeout - onMuteClicked : vAlarmStatus.doSilence() - onMinimizeClicked : alarmMinimize() + isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced + timeout : vAlarmStatus.alarm_MuteTimeout + minVisible : ! vAlarmStatus.alarm_Flag_noMinimize + onMuteClicked : vAlarmStatus.doSilence() + onMinimizeClicked : { + if ( vAlarmStatus.alarm_Flag_noMinimize ) { + alarmMaximize() + } + else { + alarmMinimize() + } + } + titleFading : vHDOperationMode.fault }