Index: sources/gui/qml/components/Circle.qml =================================================================== diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/components/Circle.qml (.../Circle.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) +++ sources/gui/qml/components/Circle.qml (.../Circle.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -84,7 +84,7 @@ id: borderGradient anchors.fill: _shape - angle: -5 + angle: -7 source: _shape gradient: Gradient { Index: sources/gui/qml/dialogs/AutoHideInfo.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/dialogs/AutoHideInfo.qml (.../AutoHideInfo.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/dialogs/AutoHideInfo.qml (.../AutoHideInfo.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -29,7 +29,8 @@ ModalDialog { id : _root contentItem.objectName: "AutoHideInfoDialog" //SquishQt testability - property string message: "" + property string message : "" + property alias text : _titleText autoHide: true Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -38,7 +38,7 @@ readonly property int fontPixelTextRectLabel : 46 readonly property int fontPixelTextRectExtra : 28 - readonly property int fontPixelVitals : 68 + readonly property int fontPixelVitals : 60 readonly property int fontPixelRangeMarker : 16 readonly property int fontPixelRangeRectText : 14 Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -92,7 +92,7 @@ readonly property int progressbarRectHeight : 50 readonly property int progressbarRectWidth : 620 - readonly property int circleNormalDiameter : 425 + readonly property int circleNormalDiameter : 418 readonly property int progressCircleDiameterNormal : circleNormalDiameter readonly property int progressCircleDiameterSmall : 150 readonly property int opacityAnimationDuration : 1200 Index: sources/gui/qml/main.qml =================================================================== diff -u -r50e38888132835a21357dfadff7a9bb1ccfdd334 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/main.qml (.../main.qml) (revision 50e38888132835a21357dfadff7a9bb1ccfdd334) +++ sources/gui/qml/main.qml (.../main.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -260,6 +260,18 @@ Background {} + Rectangle { + id: menuBlurredBackground + objectName: "menuBlurredBackground" + color: "black" + anchors.fill: parent + z: 3 + visible: false + + Behavior on opacity { NumberAnimation { duration: 300} } + opacity : visible !== true ? 0.0 : 0.7 + } + // ----- Follow the below Z order ----- // 1 - Screens // 1 - 1 Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -15,6 +15,7 @@ // Qt import QtQuick 2.12 +import QtGraphicalEffects 1.12 // Project @@ -52,6 +53,10 @@ width: 600 height: 600 backgroundColor: "#091E31" + text.font.pixelSize: 35 + onVisibleChanged: { + menuBlurredBackground.visible = _lockDialog.visible + } Rectangle { id: _mainCircle objectName: "lockDialogMainCircle" @@ -66,7 +71,7 @@ color: "transparent" border.color: _treatmentFlows.editEnabled ? "#6697D2" : "#A47E38" - border.width: 3 + border.width: 2 Image { id : _iconImage objectName: "lockDialogIcon" @@ -86,7 +91,7 @@ color: "transparent" border.color: _treatmentFlows.editEnabled ? "#8FC1FE" : "#CDAF78" - border.width: 2 + border.width: 1 height: parent.height - 20 width: height radius : height @@ -102,7 +107,7 @@ anchors { fill: parent margins: Variables.defaultMargin - topMargin : Variables.notificationHeight + Variables.defaultMargin // FIXME: 120 - to adjust from current headerbar implementation + topMargin : Variables.notificationHeight + (Variables.defaultMargin * 2)// FIXME: 120 - to adjust from current headerbar implementation } Row { id: _topRow Index: sources/gui/qml/pages/treatment/TreatmentSection.qml =================================================================== diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) +++ sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -23,6 +23,7 @@ Rectangle { id : _root property Item contentItem : null property alias header : _header + property alias contentArea : _contentArea signal editClicked signal lockClicked @@ -49,15 +50,15 @@ contentItem: _root.contentItem } - -// DropShadow { -// anchors.fill: _root -// source: _root - -// horizontalOffset: 0 -// verticalOffset: 5 -// radius: 3.0 -// samples: 7 -// color: "#3F000000" -// } + layer.enabled: true + layer.effect: DropShadow { + id: _dropShadow + horizontalOffset: 0 + verticalOffset: 5 + radius: 3.0 + samples: 7 + color: "#50000000" + source: _root + anchors.fill: _root + } } Index: sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml =================================================================== diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) +++ sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -35,7 +35,7 @@ anchors.top: parent.top - Label { id: _title + Text { id: _title anchors { verticalCenter: parent.verticalCenter left : parent.left Index: sources/gui/qml/pages/treatment/TreatmentSectionIcon.qml =================================================================== diff -u -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/pages/treatment/TreatmentSectionIcon.qml (.../TreatmentSectionIcon.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9) +++ sources/gui/qml/pages/treatment/TreatmentSectionIcon.qml (.../TreatmentSectionIcon.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -27,6 +27,7 @@ height : iconSize + 20 radius : height border.color: "transparent" + color : "transparent" Image { id : _iconImage anchors.centerIn: parent Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml =================================================================== diff -u -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -35,14 +35,15 @@ objectName: "row" property int cellWidth : (contentItem.width / 4) - (Variables.defaultMargin) + 5 + property int cellHeight : contentItem.height - 10 spacing: Variables.defaultMargin topPadding: -Variables.defaultMargin TreatmentFlowsComponent { id: _bloodFlow objectName : "bloodFlowComponent" title : qsTr("Blood Flow") - height : contentItem.height + height : _row.cellHeight width : _row.cellWidth value : "320"//Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow) unitText : Variables.unitTextFlowRate @@ -55,7 +56,7 @@ TreatmentFlowsComponent { id: _dialysateFlow objectName : "dialysateFlowComponent" title : qsTr("Dialysate Flow") - height : contentItem.height + height : _row.cellHeight width : _row.cellWidth value : Variables.notSetVariable(vTreatmentBloodFlow.dialysateFlow_PresFlow) unitText : Variables.unitTextFlowRate @@ -68,8 +69,8 @@ TreatmentFlowsComponent { id: _dialysateTemp objectName : "dialysateTempComponent" - title : qsTr("Dialysat Temp.") - height : contentItem.height + title : qsTr("Dialysate Temp.") + height : _row.cellHeight width : _row.cellWidth value : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow) unitText : Variables.unitTextTemperature @@ -82,11 +83,12 @@ TreatmentFlowsComponent { id: _dialysateCond objectName : "dialysateCondComponent" title : qsTr("Dialysate Cond.") - height : contentItem.height + height : _row.cellHeight width : _row.cellWidth value : Variables.notSetVariable(vTreatmentBloodFlow.bloodFlow_PresFlow) unitText : Variables.unitTextDialCond showButtons : false + dropShadowEnabled : false onIncrement : print(" increment dial cond") onDecrement : print(" decrement dial cond") Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml =================================================================== diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -1,6 +1,7 @@ // Qt import QtQuick 2.12 +import QtGraphicalEffects 1.12 // Project @@ -11,14 +12,15 @@ Rectangle { id: _root - property string title : "" - property string value : "" - property string unitText : "" - property string extraText : "" + property string title : "" + property string value : "" + property string unitText : "" + property string extraText : "" - property bool showButtons : true - property bool buttonsEnabled: true - property int iconSize : 70 + property bool showButtons : true + property bool buttonsEnabled : true + property int iconSize : 70 + property bool dropShadowEnabled : true color: Colors.mainTreatmentLighterBlue radius: 5 @@ -38,7 +40,7 @@ font { pixelSize : 28 - weight : Font.Medium + weight : Font.Normal } width : _root.width @@ -119,4 +121,16 @@ color : "orange" horizontalAlignment : Text.AlignHCenter } + + layer.enabled: _root.dropShadowEnabled + layer.effect: DropShadow { + id: _dropShadow + horizontalOffset: 0 + verticalOffset: 5 + radius: 3.0 + samples: 7 + color: "#50000000" + source: _root + anchors.fill: _root + } } Index: sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml =================================================================== diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -59,9 +59,9 @@ markerOutRangeNotify: _root.valueOutRangeNotify color : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color markerBoundColor : Colors.rangeMarker - marker.text.anchors { - } + Behavior on minimum { NumberAnimation { duration: 1000 } } + Behavior on maximum { NumberAnimation { duration: 1000 } } } function expandRangeBar() { Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -49,6 +49,8 @@ header.title: qsTr("Pressures") + " (" + qsTr("mmHg") + ")" + contentArea.anchors.topMargin: Variables.defaultMargin + contentItem: Column { id: _column spacing: Variables.defaultMargin * 4 topPadding : Variables.defaultMargin @@ -108,7 +110,7 @@ right : parent.right } - iconSize : 70 + iconSize : 65 iconImage.source : "qrc:/images/arrowsExpanding" enabled : ! expandingTimer.running 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: Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -15,6 +15,7 @@ // Qt import QtQuick 2.12 +import QtGraphicalEffects 1.12 // Project @@ -48,7 +49,7 @@ anchors.fill : parent value: 45//_root.progressValue - thickness : 30 + thickness : 35 circle.shadow.color: Colors.mainTreatmentLighterBlue circle.fillColor: Colors.mainTreatmentDarkerBlue circle.showGradient: _root.isRunning @@ -129,5 +130,17 @@ textfontSize: 26 textfontWeight: Font.Medium } + + layer.enabled: true + layer.effect: DropShadow { + id: _dropShadow + horizontalOffset: 0 + verticalOffset: 5 + radius: 3.0 + samples: 7 + color: "#50000000" + source: _root + anchors.fill: _root + } } Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml =================================================================== diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r8fa24e534368d2baad16f262d31630996798977f --- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24) +++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 8fa24e534368d2baad16f262d31630996798977f) @@ -27,10 +27,10 @@ * \brief Treatment Screen Vitals section */ TreatmentSection { id: _root - readonly property string bloodSDSeparator: " / " + readonly property string bloodSDSeparator: "/" header.title: qsTr("Vitals" ) - contentArea.anchors.topMargin: Variables.defaultMargin + contentArea.anchors.topMargin: 0 contentItem: Column { id: _content spacing : Variables.defaultMargin * 4.5