Index: sources/gui/qml/main.qml =================================================================== diff -u -rd619b1355f03ab8e2e53956908bda66fea542224 -r43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1 --- sources/gui/qml/main.qml (.../main.qml) (revision d619b1355f03ab8e2e53956908bda66fea542224) +++ sources/gui/qml/main.qml (.../main.qml) (revision 43cdee7bb03f7fa0bd5c2bba7f9d011bb06806b1) @@ -155,48 +155,44 @@ _alarm_bar .visible = false } - NotificationBar { id: _alarm_bar - backgroundColor : _alarm_dialog.backgroundColor - textColor : _alarm_dialog.textColor - anchors.bottom : _mainMenu.top - text : vAlarmStatus.text; - isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced - timeout : vAlarmStatus.alarm_MuteTimeout + NotificationBar { id : _alarm_bar + backgroundColor : _alarm_dialog.backgroundColor + textColor : _alarm_dialog.textColor + anchors.bottom : _mainMenu.top + text : vAlarmStatus.text; + isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced + timeout : vAlarmStatus.alarm_MuteTimeout - onMaximizeClicked: { - alarmMaximize() - } - - onClicked: { - alarmMaximize() - } + onMuteClicked : vAlarmStatus.doSilence() + onMaximizeClicked : alarmMaximize() + onClicked : alarmMaximize() } - NotificationDialog { id: _alarm_dialog + NotificationDialog { id : _alarm_dialog // this will change later to the actual message text // and the instruction would be in the dialog content - titleText : "Alarm" - description : vAlarmStatus.text - alarmID : vAlarmStatus.alarm_AlarmID - isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced - timeout : vAlarmStatus.alarm_MuteTimeout - okVisible : vAlarmStatus.alarm_Flag_UserMustAck - resumeVisible : ! vAlarmStatus.alarm_Flag_noResume - rinsebackVisible: ! vAlarmStatus.alarm_Flag_noRinseback - endVisible : ! vAlarmStatus.alarm_Flag_noEndTreatment + titleText : "Alarm" + description : vAlarmStatus.text + alarmID : vAlarmStatus.alarm_AlarmID + isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced + timeout : vAlarmStatus.alarm_MuteTimeout + okVisible : vAlarmStatus.alarm_Flag_UserMustAck + resumeVisible : ! vAlarmStatus.alarm_Flag_noResume + rinsebackVisible : ! vAlarmStatus.alarm_Flag_noRinseback + endVisible : ! vAlarmStatus.alarm_Flag_noEndTreatment + onMuteClicked : vAlarmStatus.doSilence () + onResumeClicked : vAlarmStatus.doUserActionResume () + onRinsebackClicked : vAlarmStatus.doUserActionRinseback() + onEndClicked : vAlarmStatus.doUserActionEnd () + onOkClicked : vAlarmStatus.doUserActionOK () onMinimizeClicked : { alarmMinimize() // when used 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 } - onMuteClicked : vAlarmStatus.doSilence() - onOkClicked : vAlarmStatus.doNotifyUserAction(true ,false, false, false) - onResumeClicked : vAlarmStatus.doNotifyUserAction(false,true , false, false) - onRinsebackClicked : vAlarmStatus.doNotifyUserAction(false,false, true , false) - onEndClicked : vAlarmStatus.doNotifyUserAction(false,false, false, true ) } // 9 - Others @@ -271,17 +267,18 @@ } onDidAlarmRaise: { - if (vAlarmStatus.alarm_Flag_alarmsSilenced) { + let silenceMinimize = false + if (vAlarmStatus.alarm_Flag_alarmsSilenced && silenceMinimize) { // this is the response to the silence request // so the dialog should be closed when the request accepted // if not then if can stay minimized nothing happens // if can't stay minimized then it has to be shown alarmMinimize() } else { - if (! vAlarmStatus.alarm_KeepMinimized) { - alarmMaximize() - } + if (! vAlarmStatus.alarm_KeepMinimized) { + alarmMaximize() + } } }