Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -r21041955990385205ec1aca17ef51fc1fd9a4b29 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 21041955990385205ec1aca17ef51fc1fd9a4b29) @@ -39,7 +39,7 @@ VAlarmStatus { id: vAlarmStatus } VAlarmActiveList { id: vAlarmActiveList } - readonly property alias backgroundColor: _alarmDialog.backgroundColor + readonly property alias backgroundColor: _alarmDialog.titleBarBackground readonly property alias textColor : _alarmDialog.textColor readonly property string title : vAlarmStatus.title readonly property string message : vAlarmStatus.message @@ -93,12 +93,6 @@ _alarmBar .visible = false } - Connections { target: _alarmDialog - function onMinimizeClicked ( ) { if ( vAlarmStatus.alarm_Flag_noMinimize ) alarmList (); else alarmMinimize(); } - } - Connections { target: _alarmListDialog - function onMinimizeClicked ( ) { if ( vAlarmStatus.alarm_Flag_noMinimize ) alarmMaximize(); else alarmMinimize(); } - } Connections { target: _alarmBar function onListClicked ( ) { alarmList () } function onMaximizeClicked ( ) { alarmMaximize () } @@ -122,7 +116,6 @@ titleText : vAlarmStatus.title titlePixelSize : Fonts.fontPixelAlarmTitle description : vAlarmStatus.message - descriptionPixelSize: Fonts.fontPixelAlarmMessage alarmID : vAlarmStatus.alarm_AlarmID isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced timeout : vAlarmStatus.alarm_MuteTimeout @@ -131,13 +124,13 @@ rinsebackVisible : ! vAlarmStatus.alarm_Flag_noRinseback endVisible : ! vAlarmStatus.alarm_Flag_noEndTreatment minVisible : ! vAlarmStatus.alarm_Flag_noMinimize - titleFading : vTDOpMode.fault - countDown : vTreatmentStop.countDown + countDown : vTreatmentStop.countDown +// countDownVisible : true// countDownVisible : vTDOpMode.inTreatment && ( vTDTreatmentStates.txStop - || vTDTreatmentStates.txRinseback - || vTDTreatmentStates.txEnd + || vTDTreatmentStates.txRinseback + || vTDTreatmentStates.txEnd ) && vTreatmentStop.total @@ -146,14 +139,17 @@ onRinsebackClicked : vAlarmStatus.doUserActionRinseback() onEndClicked : vAlarmStatus.doUserActionEnd () onOkClicked : vAlarmStatus.doUserActionOk () + onListClicked : alarmList () + onMinimizeClicked : alarmMinimize () } AlarmListDialog { id : _alarmListDialog isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced timeout : vAlarmStatus.alarm_MuteTimeout minVisible : ! vAlarmStatus.alarm_Flag_noMinimize - onMuteClicked : vAlarmStatus.doSilence() - titleFading : vTDOpMode.fault + onMuteClicked : vAlarmStatus.doSilence() + onMinimizeClicked : alarmMinimize() + onListClicked : alarmMaximize() } Connections { target: vAlarmStatus