Index: sources/gui/qml/components/StoppedSlider.qml =================================================================== diff -u -r242b8c4292cd5e1cd7a71fe8f590d676aa17153c -rf8c80661c806c50047e81d581df0dd6e05f1c8ef --- sources/gui/qml/components/StoppedSlider.qml (.../StoppedSlider.qml) (revision 242b8c4292cd5e1cd7a71fe8f590d676aa17153c) +++ sources/gui/qml/components/StoppedSlider.qml (.../StoppedSlider.qml) (revision f8c80661c806c50047e81d581df0dd6e05f1c8ef) @@ -58,8 +58,7 @@ bgColor : Colors.ufAdjustmentProgressBarBg highlightActiveColor : Colors.ufAdjustmentDeltaFill handlerActiveColor : Colors.backgroundButtonSelect - border.color : _slider.isActive ? Colors.ufProgressBarBorder : Colors.borderDisableButton - progressBorderActiveColor: _slider.borderColor + hasBorder : false diameter : Variables.progressbarHandler touchMargin : Variables.createTreatmentSliderMargin handler.z : 5 Index: sources/gui/qml/compounds/LabelUnitContainer.qml =================================================================== diff -u -r0022c3993c47e74c2d17c7f07f78fa1751a034f6 -rf8c80661c806c50047e81d581df0dd6e05f1c8ef --- sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision 0022c3993c47e74c2d17c7f07f78fa1751a034f6) +++ sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision f8c80661c806c50047e81d581df0dd6e05f1c8ef) @@ -37,7 +37,7 @@ color : Colors.panelBackgroundColor border { - width: 1 + width: Variables.panelBorderWidth color: valid ? Colors.panelBorderColor : Colors.panelInvalidBorderColor } Index: sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml =================================================================== diff -u -r0022c3993c47e74c2d17c7f07f78fa1751a034f6 -rf8c80661c806c50047e81d581df0dd6e05f1c8ef --- sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml (.../TreatmentAdjustmentUltrafiltrationMetrics.qml) (revision 0022c3993c47e74c2d17c7f07f78fa1751a034f6) +++ sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml (.../TreatmentAdjustmentUltrafiltrationMetrics.qml) (revision f8c80661c806c50047e81d581df0dd6e05f1c8ef) @@ -29,44 +29,63 @@ property real setVolume : 0 property real volumeRemoved : 0 - component ValueContainer: LabelUnitContainer { id: _valueContainer - property alias value: _value.text - + component ValueItem: Rectangle { id: _valueItem + property alias label : _label.text + property alias value : _value.text + property color textColor : Colors.fluidText anchors.centerIn : parent width : 350 height : 60 - titleText.font { - pixelSize : Fonts.fontPixelButton - weight : Font.Medium + radius : 5 + color : Colors.panelBackgroundColor + border { + width : Variables.panelBorderWidth + color : Colors.panelBorderColor } - contentItem: Item { id: _containerContentItem + Item { id: _textContainer + anchors.centerIn: parent + width : childrenRect.width + height : parent.height + + Text { id: _label + anchors{ + left : parent.left + verticalCenter : parent.verticalCenter + } + width : contentWidth + color : textColor + font { + pixelSize : Fonts.fontPixelButton + weight : Font.Medium + } + } + Text { id: _value - anchors { - right : parent.right - rightMargin : Variables.defaultMargin + anchors{ + left : _label.right verticalCenter : parent.verticalCenter } + width : contentWidth + color : textColor font { - pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentMetrics - weight : Font.DemiBold + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentMetrics + weight : Font.DemiBold } - color : titleText.color } } } - ValueContainer { id: _volumeRemovedContainer + ValueItem { id: _ufVolumeRemovedItem anchors.horizontalCenterOffset : -(width/2 + 30) - titleText.color : Colors.fluidText - text : qsTr("UF Volume Removed:") + label : qsTr("UF Volume Removed: ") value : _root.volumeRemoved.toFixed(Variables.ultrafiltrationPrecision) } - ValueContainer { id: _volumeGoalContainer - anchors.horizontalCenterOffset : -(_volumeRemovedContainer.anchors.horizontalCenterOffset) - titleText.color : Colors.ufVolumeGoalText - text : qsTr("UF Volume Goal:") + ValueItem { id: _ufVolumeGoalItem + anchors.horizontalCenterOffset : -(_ufVolumeRemovedItem.anchors.horizontalCenterOffset) + textColor : Colors.ufVolumeGoalText + label : qsTr("UF Volume Goal: ") value : _root.setVolume.toFixed(Variables.ultrafiltrationPrecision) } } Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r0022c3993c47e74c2d17c7f07f78fa1751a034f6 -rf8c80661c806c50047e81d581df0dd6e05f1c8ef --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 0022c3993c47e74c2d17c7f07f78fa1751a034f6) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision f8c80661c806c50047e81d581df0dd6e05f1c8ef) @@ -151,9 +151,8 @@ readonly property color ufVolumeGoalText : "#f5be59" readonly property color ufNotificationBarBg : "#0f2841" readonly property color ufProgressBarFill : "#2083FA" - readonly property color ufProgressBarBorder : "#416897" readonly property color ufAdjustmentDeltaFill : "#747974" - readonly property color ufAdjustmentProgressBarBg : "#2c517b" + readonly property color ufAdjustmentProgressBarBg : "#2C517D" readonly property color progressBarMinMax : "#c7c7c7" // ---------- < PRS > Related Section ---------- Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r0022c3993c47e74c2d17c7f07f78fa1751a034f6 -rf8c80661c806c50047e81d581df0dd6e05f1c8ef --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 0022c3993c47e74c2d17c7f07f78fa1751a034f6) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision f8c80661c806c50047e81d581df0dd6e05f1c8ef) @@ -1,5 +1,4 @@ -/*! - * +/*! * * Copyright (c) 2019-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN @@ -76,6 +75,8 @@ readonly property int dialogRadius : 10 readonly property int alarmDialogRadius : 30 + readonly property int panelBorderWidth : 1 + readonly property int rangeRectMargin : 1 readonly property int rangeRectRadius : 2 readonly property int rangeRectTextMargin : 10 @@ -140,6 +141,7 @@ readonly property int treatmentPressureTitleWidth : 125 readonly property int treatmentPressureValueWidth : 140 + readonly property int ultrafiltrationHeaderMargin : 50 readonly property int ultrafiltrationProgressbarWidth : 880 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r0022c3993c47e74c2d17c7f07f78fa1751a034f6 -rf8c80661c806c50047e81d581df0dd6e05f1c8ef --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 0022c3993c47e74c2d17c7f07f78fa1751a034f6) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision f8c80661c806c50047e81d581df0dd6e05f1c8ef) @@ -63,7 +63,7 @@ TreatmentAdjustmentUltrafiltrationMetrics { id: _ufMetrics anchors { top : parent.top - topMargin : Variables.defaultMargin * 2 + topMargin : Variables.ultrafiltrationHeaderMargin horizontalCenter: parent.horizontalCenter } setVolume : _setVolumeSlider.value Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -r0022c3993c47e74c2d17c7f07f78fa1751a034f6 -rf8c80661c806c50047e81d581df0dd6e05f1c8ef --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 0022c3993c47e74c2d17c7f07f78fa1751a034f6) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision f8c80661c806c50047e81d581df0dd6e05f1c8ef) @@ -60,7 +60,7 @@ TreatmentAdjustmentUltrafiltrationMetrics { id: _ufMetrics anchors { top : parent.top - topMargin : Variables.defaultMargin * 2 + topMargin : Variables.ultrafiltrationHeaderMargin horizontalCenter: parent.horizontalCenter } setVolume : _private.setVolume