Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r7b71ec23c53c04a24e3db8ace0ca4825ec57d721 -r96489f39e521506dcce961606c317edbd7a21c05 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 7b71ec23c53c04a24e3db8ace0ca4825ec57d721) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 96489f39e521506dcce961606c317edbd7a21c05) @@ -129,80 +129,60 @@ height : 60 visible : ! _alarmBar.visible && text - property int source: -1 - - onTextChanged: { - if (text === "") { - source = -1 - } - } - CloseButton { id: _dismissButton objectName: "_dismissButton" anchors { - top: parent.top - bottom: parent.bottom - right: parent.right - margins: 20 + top : parent.top + bottom : parent.bottom + right : parent.right + margins : 20 } - width: height - visible: true - onClicked: { _notification.text = "" } + width : height + visible : true + onClicked : { _notification.text = "" } } } Connections { target: vTreatmentAdjustmentBloodFlowRate function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentBloodFlowRate.adjustment_Accepted) { - if (_notification.source === 0) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentBloodFlowRate.text() - _notification.source = 0 } } } Connections { target: vTreatmentAdjustmentDialysateFlowRate function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentDialysateFlowRate.adjustment_Accepted) { - if (_notification.source === 1) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentDialysateFlowRate.text() - _notification.source = 1 } } } Connections { target: vTreatmentAdjustmentDialysateTemperature function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentDialysateTemperature.adjustment_Accepted) { - if (_notification.source === 2) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentDialysateTemperature.text() - _notification.source = 2 } } } Connections { target: vTreatmentAdjustmentSaline function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentSaline.adjustment_Accepted) { - if (_notification.source === 3) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentSaline.text() - _notification.source = 3 } } }