Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -rf06b3645936db64dff09721cf625a6a8530e3f0a -r0f83de066c8a116195a3cc60577d597ef9654c55 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision f06b3645936db64dff09721cf625a6a8530e3f0a) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 0f83de066c8a116195a3cc60577d597ef9654c55) @@ -112,33 +112,35 @@ // this will change later to the actual message text // and the instruction would be in the dialog content - titleText : vAlarmStatus.title - titlePixelSize : Fonts.fontPixelAlarmTitle - instructionModel : vAlarmStatus.instructions - 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 - minVisible : ! vAlarmStatus.alarm_Flag_noMinimize - countDown : vTreatmentStop.countDown - countDownVisible : vTDOpMode.inTreatment + titleText : vAlarmStatus.title + titlePixelSize : Fonts.fontPixelAlarmTitle + instructionModel : vAlarmStatus.instructions + 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 + temporaryBreakVisible : ! vAlarmStatus.alarm_Flag_noTemporaryBreak + minVisible : ! vAlarmStatus.alarm_Flag_noMinimize + countDown : vTreatmentStop.countDown + countDownVisible : vTDOpMode.inTreatment && ( vTDTreatmentStates.txStop || vTDTreatmentStates.txRinseback || vTDTreatmentStates.txEnd ) && vTreatmentStop.total - onMuteClicked : vAlarmStatus.doSilence () - onResumeClicked : vAlarmStatus.doUserActionResume () - onRinsebackClicked : vAlarmStatus.doUserActionRinseback() - onEndClicked : vAlarmStatus.doUserActionEnd () - onOkClicked : vAlarmStatus.doUserActionOk () - onListClicked : alarmList () - onMinimizeClicked : alarmMinimize () + onMuteClicked : vAlarmStatus.doSilence () + onResumeClicked : vAlarmStatus.doUserActionResume () + onRinsebackClicked : vAlarmStatus.doUserActionRinseback () + onEndClicked : vAlarmStatus.doUserActionEnd () + onTemporaryBreakClicked : vAlarmStatus.doUserActionTemporaryBreak () + onOkClicked : vAlarmStatus.doUserActionOk () + onListClicked : alarmList () + onMinimizeClicked : alarmMinimize () } AlarmListDialog { id : _alarmListDialog