Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml =================================================================== diff -u -r8fa24e534368d2baad16f262d31630996798977f -r7caa737179a8c31825ae6445f593ac7ff5f95080 --- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) +++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080) @@ -35,18 +35,18 @@ // if saline started but still is waiting for pump the button is disabled so user won't tap multiple times. readonly property bool isDisabled : vHDTreatmentStates.sbMaxReached readonly property bool isWaitPump : vHDTreatmentStates.sbWaitPump - readonly property string unit : Variables.unitTextFluid + readonly property string unit : Variables.unitTextFluid property int valueDecimal : Variables.salinePrecision property int valueTarget : vTreatmentSaline.target || vTreatmentAdjustmentSaline.target - property int valueCumulative: 100// vTreatmentSaline.cumulative - property int valueDelivered : 30// vTreatmentSaline.delivered + property int valueCumulative: vTreatmentSaline.cumulative + property int valueDelivered : vTreatmentSaline.delivered property string buttonText : ( isDisabled || isWaitPump ) ? _private.textStart : isStarted ? _private.textStop : _private.textStart - header.title: qsTr("Saline" ) - header.showEdit: false + header.title : qsTr("Saline" ) + header.showEdit : false QtObject { id: _private readonly property string textStart : qsTr("Start Bolus") + "" + textVolumeTarget + "<\b>" @@ -60,73 +60,70 @@ VTreatmentSaline { id: vTreatmentSaline } contentItem: Column { id :_content - spacing : Variables.defaultMargin * 3 + spacing : Variables.defaultMargin * 3 Text { id: _descriptionText text : qsTr("Total Saline Delivered") - height: Variables.contentHeight + height : Variables.contentHeight font.pixelSize : Fonts.fontPixelFluidText color : Colors.fluidText horizontalAlignment: Text.AlignHCenter } Item { id: _progressBarArea - height: 30 - width: parent.width - Variables.defaultMargin + height : 30 + width : parent.width - Variables.defaultMargin ProgressBar { id: _fluidProgressBar - width: _progressBarArea.width + 10 - - height : Variables.progressbarFluidHeight * 3 + width : _progressBarArea.width + 10 + height : Variables.progressbarFluidHeight * 3 minText.visible : false maxText.visible : false marker.visible : false gradientStart : Colors.progressBarGradientStart gradientEnd : Colors.progressBarGradientEnd - maximum : valueCumulative - value : valueDelivered - decimal : _root.valueDecimal - radius: 9 - progressRadius: radius + maximum : valueCumulative + value : valueDelivered + decimal : _root.valueDecimal + radius : 9 + progressRadius : radius } Label { id: _valueDelivered property real value: valueDelivered anchors { - verticalCenter: __valueDeliveredUnit.verticalCenter - right: __valueDeliveredUnit.left - rightMargin: 5 + verticalCenter : __valueDeliveredUnit.verticalCenter + right : __valueDeliveredUnit.left + rightMargin : 5 } font.pixelSize : 18 font.weight : Font.DemiBold - text: value - width: contentWidth - + text : value + width : contentWidth } Label { id: __valueDeliveredUnit property real value: 0 anchors { - bottom: _fluidProgressBar.top + bottom : _fluidProgressBar.top bottomMargin: Variables.defaultMargin - right: _fluidProgressBar.right + right : _fluidProgressBar.right } font.pixelSize : 18 - text: _root.unit - width: contentWidth + text : _root.unit + width : contentWidth } } TouchRect { id: _startFluidButton - width : _fluidProgressBar.width - height: Variables.contentHeight + 10 - - radius: 9 - text.textFormat: Text.RichText - text.text: buttonText - backgroundColor: borderColor - textColor: Colors.textButton + width : _fluidProgressBar.width + height : Variables.contentHeight + 10 + radius : 9 + text.textFormat : Text.RichText + text.text : buttonText + backgroundColor : borderColor + textColor : Colors.textButton text.font { weight : Font.DemiBold pixelSize : 20 @@ -136,16 +133,15 @@ if ( isStarted ) vTreatmentAdjustmentSaline.doStop () // IN_PROGRESS } - layer.enabled: true - layer.effect: DropShadow { - id: _dropShadow + layer.enabled : true + layer.effect : DropShadow { id: _dropShadow horizontalOffset: 0 - verticalOffset: 3 - radius: 3.0 - samples: 7 - color: "#50000000" - source: _startFluidButton - anchors.fill: _startFluidButton + verticalOffset : 3 + radius : 3.0 + samples : 7 + color : "#50000000" + source : _startFluidButton + anchors.fill : _startFluidButton } } }