Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rb84d1c20f9bad35e1406bbc84cd70bfa8bef810f --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision b84d1c20f9bad35e1406bbc84cd70bfa8bef810f) @@ -41,8 +41,8 @@ VTreatmentRanges { id: vTreatmentRanges } VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } VHDTreatmentStates { id: vHDTreatmentStates - property bool ufPaused : ufState === GuiActions.UF_PAUSED_STATE - property bool txPaused : subMode === GuiActions.TREATMENT_DIALYSIS_STATE + property bool ufPaused : ufState === GuiActions.UF_PAUSED_STATE + property bool txPaused : subMode === ! GuiActions.TREATMENT_DIALYSIS_STATE } // Components Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rb84d1c20f9bad35e1406bbc84cd70bfa8bef810f --- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision b84d1c20f9bad35e1406bbc84cd70bfa8bef810f) @@ -32,14 +32,16 @@ // comes from the broadcast Treatment States salineState field readonly property bool isDisabled : vTreatmentAdjustmentSaline.isDisabled - readonly property string textAfterStarted : qsTr("STOP BOLUS" ) - readonly property string textAfterStopped : qsTr("START BOLUS") - readonly property string textAfterDisabled : qsTr("START BOLUS") // it stays at START but should be disabled. - readonly property string mesgAfterDisabled : qsTr("Maximum cumulative saline bolus volume delivered") - readonly property string mesgRejectReason : vTreatmentAdjustmentSaline.adjustment_ReasonText + QtObject { id: _private + readonly property string textStart : qsTr("START BOLUS") + readonly property string textStop : qsTr("STOP BOLUS" ) + readonly property string textVolumeTarget : "(" + valueTarget + unit + ")" + readonly property string mesgAfterDisabled : qsTr("Maximum cumulative saline bolus volume delivered") + readonly property string mesgRejectReason : vTreatmentAdjustmentSaline.adjustment_ReasonText + } isTouchable : ! _root.isDisabled - buttonText : _root.isStarted ? textAfterStarted : textAfterStopped + buttonText : _root.isDisabled ? _private.textStart : _root.isStarted ? _private.textStop : _private.textStart + " " + _private.textVolumeTarget title : qsTr("SALINE BOLUS") unit : Variables.unitTextSaline @@ -55,6 +57,6 @@ notification { visible : true - text : isDisabled ? mesgAfterDisabled : mesgRejectReason + text : isDisabled ? _private.mesgAfterDisabled : _private.mesgRejectReason } }