Index: sources/gui/qml/main.qml =================================================================== diff -u -rd8004655ec64da6c8806b9a074a0cb07d799ddf9 -radf89000bad1a50ec33114ea76d65621a1d351d5 --- sources/gui/qml/main.qml (.../main.qml) (revision d8004655ec64da6c8806b9a074a0cb07d799ddf9) +++ sources/gui/qml/main.qml (.../main.qml) (revision adf89000bad1a50ec33114ea76d65621a1d351d5) @@ -154,22 +154,23 @@ onClickedNotificationBar: { updateAlarm(); + vAlarmStatus.onSetMinimize(false); _alarm_bar.visible = false; _alarm_dialog.visible = true; } } - function isAlarmHighPriority() { - return vAlarmStatus.alarm_Priority === GuiActions.ALARM_PRIORITY_HIGH; - } - function updateAlarm() { _alarm_dialog.titleText = "Alarm"; _alarm_dialog.description = vAlarmStatus.text; _alarm_dialog.alarmID = vAlarmStatus.alarm_AlarmID; [_alarm_dialog.backgroundColor, _alarm_dialog.textColor] = getRootTextFromAlarmLevel(vAlarmStatus.alarm_Priority); [_alarm_dialog.titleBarBackground, _alarm_dialog.titleBarForeground] = getAlarmTopBarColors(vAlarmStatus.alarm_Priority); _alarm_bar.backgroundColor = _alarm_dialog.titleBarBackground; + + _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced; + _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced, vAlarmStatus.alarm_MuteTimeout); + _alarm_dialog.silenceBtn.visible = !vAlarmStatus.alarm_Flag_alarmsSilenced; } NotificationDialog { id: _alarm_dialog @@ -178,13 +179,13 @@ onClickedOkay: { _alarm_dialog.visible = false; _alarm_bar.visible = true; - vAlarmStatus.requestOkay(alarmID) + vAlarmStatus.onRequestOkay(alarmID) } onClickedSilence: { _alarm_dialog.visible = false; _alarm_bar.visible = true; - vAlarmStatus.requestSilence(); + vAlarmStatus.onRequestSilence(); } } @@ -292,17 +293,13 @@ Connections { target: vAlarmStatus onRaiseAlarm: { updateAlarm(); - _alarm_dialog.isSilenced = vAlarmStatus.alarm_Flag_alarmsSilenced - _alarm_bar.toggleSilence(vAlarmStatus.alarm_Flag_alarmsSilenced, - vAlarmStatus.alarm_MuteTimeout); - if (isAlarmHighPriority()) { + if (vAlarmStatus.minimizeAlarm) { + _alarm_dialog.visible = false; + _alarm_bar.visible = true; + } else { _alarm_dialog.visible = true; _alarm_bar.visible = false; - } else { - if (!_alarm_dialog.visible) { - _alarm_bar.visible = true; - } } }