Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml =================================================================== diff -u -r601289deb20f7059b3af5bb19e16f53974262ceb -rc749ecd5dc413ce091250af652ccba4d96f7a582 --- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 601289deb20f7059b3af5bb19e16f53974262ceb) +++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582) @@ -43,25 +43,23 @@ isStarted ? _private.textStop : _root.buttonText - header.title : qsTr("Saline" ) + header.title : qsTr("Fluid Delivery" ) QtObject { id: _private readonly property string textStart : qsTr("Start Bolus") + "" + textVolumeTarget + "<\b>" readonly property string textStop : qsTr("Stop Bolus" ) + "" + textVolumeTarget + "<\b>" readonly property string textVolumeTarget : " (" + valueTarget + unit + ")" - readonly property string mesgDisabled : qsTr("Maximum cumulative saline bolus volume delivered") - readonly property string mesgWaitForPump : "" // qsTr("Saline Bolus is starting") // Not sure if we shouls show any message at this point - readonly property string mesgRejectReason : vTreatmentAdjustmentSaline.adjustment_ReasonText } contentItem: Column { id :_content spacing : Variables.defaultMargin * 3 Text { id: _descriptionText objectName: "salineDescriptionText" - text : isStarted ? ("%1").arg(qsTr("Delivering Saline")) : qsTr("Total Saline Delivered") + text : isStarted ? ("%1").arg(qsTr("Delivering Fluid")) : qsTr("Total Fluid Delivered") height : Variables.contentHeight font.pixelSize : Fonts.fontPixelFluidText + font.weight : Font.Medium color : isStarted ? Colors.progressBarSaline : Colors.fluidText horizontalAlignment: Text.AlignHCenter } @@ -129,11 +127,4 @@ } } } - // TODO: -// notification { -// visible : true -// text    : isDisabled ? _private.mesgDisabled    : -//   isWaitPump ? _private.mesgWaitForPump : -//   _private.mesgRejectReason -// } }