Index: sources/gui/qml/main.qml =================================================================== diff -u -r1a364403f0d1839397054b1eca4d51201b0cf943 -r733dbd53c542d94baa4862b6d657aa555209ee00 --- sources/gui/qml/main.qml (.../main.qml) (revision 1a364403f0d1839397054b1eca4d51201b0cf943) +++ sources/gui/qml/main.qml (.../main.qml) (revision 733dbd53c542d94baa4862b6d657aa555209ee00) @@ -111,21 +111,22 @@ VAlarmStatus { id: vAlarmStatus onRaiseAlarm: { updateAlarm(); - _alarm.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced _notification.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced + _notification_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced, + vAlarmStatus.alarm_MuteTimeout); if (vAlarmStatus.alarm_Priority === GuiActions.ALARM_PRIORITY_HIGH) { _notification.visible = true; - _alarm.visible = false; + _notification_bar.visible = false; } else { if (!_notification.visible) { - _alarm.visible = true; + _notification_bar.visible = true; } } } onHideAlarm: { - _alarm.visible = false; + _notification_bar.visible = false; _notification.visible = false; } } @@ -186,18 +187,20 @@ } - NotificationBar { id: _alarm + NotificationBar { id: _notification_bar anchors.bottom: _mainMenu.top level : vAlarmStatus.alarm_Priority text : vAlarmStatus.text; + isSilenced: vAlarmStatus.alarm_Flag_alarmsSilenced; + MouseArea { id: _TouchArea anchors.fill: parent; onClicked: { updateAlarm(); _notification.visible = true; - _alarm.visible = false; + _notification_bar.visible = false; } } @@ -208,12 +211,12 @@ _notification.description = vAlarmStatus.text; [_notification.backgroundColor, _notification.textColor] = getRootTextFromAlarmLevel(vAlarmStatus.alarm_Priority); [_notification.titleBarBackground, _notification.titleBarForeground] = getAlarmTopBarColors(vAlarmStatus.alarm_Priority); - _alarm.backgroundColor = _notification.titleBarBackground; + _notification_bar.backgroundColor = _notification.titleBarBackground; } Alarm { id: _notification onClosed: { - _alarm.visible = true; + _notification_bar.visible = true; } onPressedOkay: { _notification.visible = false;