Index: sources/gui/qml/main.qml =================================================================== diff -u -r6d62bbaca6363f7ff83715f78607cb60a4736771 -r255df1f61af0193b8f2f9630bdf3ce68be0f5e29 --- sources/gui/qml/main.qml (.../main.qml) (revision 6d62bbaca6363f7ff83715f78607cb60a4736771) +++ sources/gui/qml/main.qml (.../main.qml) (revision 255df1f61af0193b8f2f9630bdf3ce68be0f5e29) @@ -111,6 +111,8 @@ VAlarmStatus { id: vAlarmStatus onRaiseAlarm: { updateAlarm(); + _alarm.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced + _notification.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced if (vAlarmStatus.alarm_Priority === GuiActions.ALARM_PRIORITY_HIGH) { _notification.visible = true; @@ -120,7 +122,7 @@ _alarm.visible = true; } } - } + } onHideAlarm: { _alarm.visible = false; @@ -206,12 +208,14 @@ _notification.description = vAlarmStatus.text; [_notification.backgroundColor, _notification.textColor] = getRootTextFromAlarmLevel(vAlarmStatus.alarm_Priority); [_notification.titleBarBackground, _notification.titleBarForeground] = getAlarmTopBarColors(vAlarmStatus.alarm_Priority); - _notification.dismissBtn.callback = (function() {_GuiView.doActionTransmit(GuiActions.AlarmSilence, - [GuiActions.Request, 1, 2, 3, 4, 5])}); + _alarm.backgroundColor = _notification.titleBarBackground; + _notification.dismissBtn.callback = (function() { + vAlarmStatus.requestSilence(); + }); } - NotificationDialog { id: _notification + Alarm { id: _notification onClosed: { _alarm.visible = true; }