Index: sources/gui/qml/main.qml =================================================================== diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -rd619b1355f03ab8e2e53956908bda66fea542224 --- sources/gui/qml/main.qml (.../main.qml) (revision 45ce6e781782be5de1480a1e7acecd1d272bcc84) +++ sources/gui/qml/main.qml (.../main.qml) (revision d619b1355f03ab8e2e53956908bda66fea542224) @@ -192,8 +192,11 @@ // see also the "Connections { target: vAlarmStatus" implementation vAlarmStatus.alarm_KeepMinimized = true } - onOkClicked : vAlarmStatus.onRequestOkay(alarmID) - onMuteClicked : vAlarmStatus.onRequestSilence() + 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 @@ -267,7 +270,7 @@ ] = Colors.alarmPriorityColors(vAlarmStatus.alarm_Priority) } - onRaiseAlarm: { + onDidAlarmRaise: { if (vAlarmStatus.alarm_Flag_alarmsSilenced) { // this is the response to the silence request // so the dialog should be closed when the request accepted @@ -282,6 +285,6 @@ } } - onNoAlarm: alarmHide() + onDidAlarmEmpty: alarmHide() } }