Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml =================================================================== diff -u -r26af78da75502c56dcff8ad402e63d64a496f341 -rab7efbd73d4a4c0a0a10886629f9a5975ca08315 --- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 26af78da75502c56dcff8ad402e63d64a496f341) +++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision ab7efbd73d4a4c0a0a10886629f9a5975ca08315) @@ -60,12 +60,11 @@ VTreatmentSaline { id: vTreatmentSaline } contentItem: Column { id :_content - spacing : Variables.defaultMargin * 4 - leftPadding : Variables.defaultMargin - rightPadding: Variables.defaultMargin + spacing : Variables.defaultMargin * 3 Text { id: _descriptionText text : qsTr("Total Saline Delivered") + height: Variables.contentHeight font.pixelSize : Fonts.fontPixelFluidText color : Colors.fluidText horizontalAlignment: Text.AlignHCenter @@ -76,26 +75,28 @@ width: parent.width - Variables.defaultMargin ProgressBar { id: _fluidProgressBar - width: progressBarArea.width - Variables.defaultMargin + width: progressBarArea.width + 10 //- Variables.defaultMargin - height : Variables.progressbarFluidHeight * 4 + height : Variables.progressbarFluidHeight * 3 minText.visible : false maxText.visible : false marker.visible : false color: "cyan"// update later - maximum : _fluidTarget.value + maximum : valueCumulative value : valueDelivered decimal : _root.valueDecimal radius: 9 progressRadius: radius } - Label { id: _fluidTarget - property real value: valueCumulative + Label { id: _valueDelivered + property real value: valueDelivered + anchors { - verticalCenter: _fluidTargetUnit.verticalCenter - right: _fluidTargetUnit.left + verticalCenter: __valueDeliveredUnit.verticalCenter + right: __valueDeliveredUnit.left + rightMargin: 5 } font.pixelSize : Fonts.fontPixelFluidText font.weight : Font.DemiBold @@ -104,10 +105,11 @@ } - Label { id: _fluidTargetUnit + Label { id: __valueDeliveredUnit property real value: 0 anchors { bottom: _fluidProgressBar.top + bottomMargin: Variables.defaultMargin right: _fluidProgressBar.right } font.pixelSize : Fonts.fontPixelFluidText @@ -117,9 +119,11 @@ } TouchRect { id: _startFluidButton - width : progressBarArea.width - Variables.defaultMargin - height: Variables.contentHeight + width : _fluidProgressBar.width + height: Variables.contentHeight + 10 + radius: 9 + text.text: buttonText backgroundColor: borderColor textColor: isDisabled || isWaitPump ? Colors.textButton : Colors.textDisableButton