Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -rf06b3645936db64dff09721cf625a6a8530e3f0a -r4bb515b8b2cd9791b6411dd7d596767f2d0c0644 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision f06b3645936db64dff09721cf625a6a8530e3f0a) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 4bb515b8b2cd9791b6411dd7d596767f2d0c0644) @@ -125,11 +125,6 @@ minVisible : ! vAlarmStatus.alarm_Flag_noMinimize countDown : vTreatmentStop.countDown countDownVisible : vTDOpMode.inTreatment - && ( - vTDTreatmentStates.txStop - || vTDTreatmentStates.txRinseback - || vTDTreatmentStates.txEnd - ) && vTreatmentStop.total onMuteClicked : vAlarmStatus.doSilence () Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -r4bb515b8b2cd9791b6411dd7d596767f2d0c0644 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision bea36be2766046e63c4e82539a630b5cee7ce1c6) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 4bb515b8b2cd9791b6411dd7d596767f2d0c0644) @@ -238,8 +238,8 @@ Rectangle { id: _timerRect property int countDown : 0 - height: 70 - width: parent.width / 3 + height : 70 + width : parent.width / 3 anchors { bottom : _alarmID.top @@ -249,41 +249,40 @@ } color : "#FFECEC" - radius : 10 + radius : height Text { id: _astrix anchors { - left: parent.left - leftMargin: Variables.defaultMargin - top: _timerDescription.top + left : parent.left + leftMargin : Variables.defaultMargin * 3 + top : _timerDescription.top } - color : "#AB352E" - text : "*" + color : "#AB352E" + text : "*" font.pixelSize : 25 font.weight : Font.Medium } Text { id: _timerDescription anchors { - verticalCenter: parent.verticalCenter - left: _astrix.right + verticalCenter : parent.verticalCenter + left : _astrix.right } color : "black" text : qsTr("Rinseback will not be allowed in:") font.pixelSize : 25 font.weight : Font.Medium - } TimeText { id: _timeoutText seconds : countDown * 60 anchors { verticalCenter : parent.verticalCenter - left: _timerDescription.right + left : _timerDescription.right } - height: _titleBar.height + height : _titleBar.height textPixelSize : 35 textWeight : Font.Bold secondsVisible : false