Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml =================================================================== diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) +++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -15,6 +15,7 @@ // Qt import QtQuick 2.12 +import QtGraphicalEffects 1.12 // Project import VTreatmentSaline 0.1; @@ -38,19 +39,18 @@ property int valueDecimal : Variables.salinePrecision property int valueTarget : vTreatmentSaline.target || vTreatmentAdjustmentSaline.target - property int valueCumulative: vTreatmentSaline.cumulative - property int valueDelivered : vTreatmentSaline.delivered + property int valueCumulative: 100// vTreatmentSaline.cumulative + property int valueDelivered : 30// vTreatmentSaline.delivered property string buttonText : ( isDisabled || isWaitPump ) ? _private.textStart : isStarted ? _private.textStop : _private.textStart - header.title: qsTr("Saline" ) header.showEdit: false QtObject { id: _private - readonly property string textStart : qsTr("Start Bolus") + textVolumeTarget - readonly property string textStop : qsTr("Stop Bolus" ) + textVolumeTarget + 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 @@ -70,12 +70,12 @@ horizontalAlignment: Text.AlignHCenter } - Item { id: progressBarArea - height: Variables.contentHeight + Item { id: _progressBarArea + height: 30 width: parent.width - Variables.defaultMargin ProgressBar { id: _fluidProgressBar - width: progressBarArea.width + 10 //- Variables.defaultMargin + width: _progressBarArea.width + 10 height : Variables.progressbarFluidHeight * 3 minText.visible : false @@ -98,7 +98,7 @@ right: __valueDeliveredUnit.left rightMargin: 5 } - font.pixelSize : 18//Fonts.fontPixelFluidText + font.pixelSize : 18 font.weight : Font.DemiBold text: value width: contentWidth @@ -112,7 +112,7 @@ bottomMargin: Variables.defaultMargin right: _fluidProgressBar.right } - font.pixelSize : 18//Fonts.fontPixelFluidText + font.pixelSize : 18 text: _root.unit width: contentWidth } @@ -123,7 +123,7 @@ height: Variables.contentHeight + 10 radius: 9 - + text.textFormat: Text.RichText text.text: buttonText backgroundColor: borderColor textColor: Colors.textButton @@ -136,8 +136,18 @@ if ( isStarted ) vTreatmentAdjustmentSaline.doStop () // IN_PROGRESS } + layer.enabled: true + layer.effect: DropShadow { + id: _dropShadow + horizontalOffset: 0 + verticalOffset: 3 + radius: 3.0 + samples: 7 + color: "#50000000" + source: _startFluidButton + anchors.fill: _startFluidButton + } } - } // TODO: