Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r99a56ec30f1ca4f401e744766bde4f6fac291752 -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) @@ -40,6 +40,10 @@ readonly property alias isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced readonly property alias timeout : vAlarmStatus.alarm_MuteTimeout + function clearAlarm() { + vAlarmStatus.doClearCondition() + } + // Alarms function alarmMinimize() { _alarmDialog .visible = false @@ -99,7 +103,6 @@ // by the next alarm status received. // see also the "Connections { target: vAlarmStatus" implementation vAlarmStatus.alarm_KeepMinimized = true - // DEBUG: vAlarmStatus.doClearCondition() } } @@ -117,15 +120,14 @@ onAlarm_Flag_UserMustAckChanged : vAlarmStatus.alarm_KeepMinimized = false onAlarm_AlarmIDChanged : vAlarmStatus.alarm_KeepMinimized = false onAlarm_Flag_alarmsSilencedChanged : vAlarmStatus.alarm_KeepMinimized = vAlarmStatus.alarm_Flag_alarmsSilenced - onAlarm_PriorityChanged: { - [ + onAlarm_PriorityChanged: [ _alarmDialog.titleBarBackground, _alarmDialog.titleBarForeground, _alarmDialog.backgroundColor , _alarmDialog.textColor , - ] = Colors.alarmPriorityColors(vAlarmStatus.alarm_Priority) - } + ] = Colors.alarmPriorityColors(vAlarmStatus.alarm_Priority) + onDidAlarmRaise: { let silenceMinimize = false if (vAlarmStatus.alarm_Flag_alarmsSilenced && silenceMinimize) { @@ -136,9 +138,9 @@ alarmMinimize() } else { - if (! vAlarmStatus.alarm_KeepMinimized) { - alarmMaximize() - } + if (! vAlarmStatus.alarm_KeepMinimized) { + alarmMaximize() + } } }