Index: sources/gui/qml/components/ConfirmButton.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/components/ConfirmButton.qml (.../ConfirmButton.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/components/ConfirmButton.qml (.../ConfirmButton.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -20,7 +20,7 @@ import "qrc:/globals" TouchRect { id : _root - width : 155 + width : Variables.confirmButtonWidth height : 50 text { text: qsTr("CONFIRM") Index: sources/gui/qml/components/ProgressBar.qml =================================================================== diff -u -r7b4219600ec64c2860113225ced0b5fc839b8ad2 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) +++ sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -62,9 +62,6 @@ color : Colors.highlightProgressBar onClicked : progressClicked() - - isRoundedEnds: _root.isRoundedEnds - hasBorder : _root.hasBorder } RangeMarker { id: _marker Index: sources/gui/qml/components/ProgressBarEx.qml =================================================================== diff -u -r7b4219600ec64c2860113225ced0b5fc839b8ad2 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) +++ sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -48,8 +48,5 @@ maxText.visible: visible margin : 0 onClicked: extraClicked() - - isRoundedEnds: _root.isRoundedEnds - hasBorder : _root.hasBorder } } Index: sources/gui/qml/components/RangeBar.qml =================================================================== diff -u -r7b4219600ec64c2860113225ced0b5fc839b8ad2 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) +++ sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -44,9 +44,6 @@ property bool lowerTextHorizontalCenter: true property bool upperTextHorizontalCenter: true - isRoundedEnds: false - hasBorder : false - RangeRect { id: _rangeRect color: "red" x : ((parent.width * (lowerBound - parent.minimum)) / (parent.maximum - parent.minimum)) @@ -64,9 +61,6 @@ minText.anchors.leftMargin : lowerTextHorizontalCenter ? -minText.width / 2 : 0 maxText.anchors.rightMargin : upperTextHorizontalCenter ? -maxText.width / 2 : 0 - isRoundedEnds : false - hasBorder : false - RangeMarker { id: _rangeMarkerLowerBound decimal : _root.decimal text.visible: false Index: sources/gui/qml/components/RangeRect.qml =================================================================== diff -u -r8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/components/RangeRect.qml (.../RangeRect.qml) (revision 8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53) +++ sources/gui/qml/components/RangeRect.qml (.../RangeRect.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -43,9 +43,6 @@ property real touchMargin : 0 property real leftRightTouchMargin: 0 - property bool isRoundedEnds : true - property bool hasBorder : true - property color borderColor : Colors.sliderBorderInactive function adjustOverlap() { // Due to font size not being fixed and be different depending on text, @@ -68,11 +65,7 @@ height : parent.height color : Colors.backgroundRangeRect - radius : isRoundedEnds ? (height/2) : Variables.rangeRectRadius - border.width: hasBorder ? Variables.rangeRectBorderWidth : 0 - border.color: borderColor - Text { id: _textMinimum visible : false font.pixelSize : Fonts.fontPixelRangeRectText Index: sources/gui/qml/components/RangeSlider.qml =================================================================== diff -u -r8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53) +++ sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -70,6 +70,10 @@ property bool showTickmarks : true ///< Indicate whether tickMarks should be shown property bool isTickMarksRound : true ///< Indicate whether the tickmakrs are round + property bool isRoundedEnds : true + property bool hasBorder : true + property color borderColor : Colors.borderDisableButton + onHasAdjustChanged : { setAdjusted() } @@ -88,10 +92,11 @@ touchMargin : 25 leftRightTouchMargin: _root.diameter / 2 - isRoundedEnds : true - hasBorder : true - borderColor : (_root.minAdjusted && _root.maxAdjusted) ? Colors.sliderBorderActive : Colors.sliderBorderInactive + radius : _root.isRoundedEnds ? (height/2) : Variables.rangeRectRadius + border.width: _root.hasBorder ? Variables.rangeRectBorderWidth : 0 + border.color: (_root.minAdjusted && _root.maxAdjusted) ? Colors.borderButton : Colors.borderDisableButton + minimum : 0 maximum : 0 @@ -252,11 +257,12 @@ x : minmaxDiff ? ((parent.width * (lowerBound - parent.minimum)) / minmaxDiff) : minmaxDiff width : minmaxDiff ? ((parent.width * (upperBound - lowerBound )) / minmaxDiff) : minmaxDiff height : parent.height + radius : _root.isRoundedEnds ? (height/2) : Variables.rangeRectRadius + border.width: _root.hasBorder ? Variables.rangeRectBorderWidth : 0 + border.color: (_root.minAdjusted && _root.maxAdjusted) ? Colors.borderButton : Colors.borderDisableButton + decimal : _root.decimal - isRoundedEnds : _root.isRoundedEnds - hasBorder : _root.hasBorder - borderColor : (_root.minAdjusted && _root.maxAdjusted) ? Colors.sliderBorderActive : Colors.sliderBorderInactive minText { visible: false Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r228cbe41bce11893d843d6caf0271b8571abedac -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 228cbe41bce11893d843d6caf0271b8571abedac) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -50,6 +50,10 @@ property int tickMarksThickness : 2 + property bool isRoundedEnds : true + property bool hasBorder : true + property color borderColor : Colors.borderDisableButton + signal activeChanged() signal handleSelected() @@ -118,8 +122,12 @@ height : Variables.progressbarHeight touchMargin : 25 leftRightTouchMargin: _handler.width/2 - borderColor : _root.isActive ? Colors.sliderBorderActive : Colors.sliderBorderInactive + radius : _root.isRoundedEnds ? (height/2) : Variables.rangeRectRadius + + border.width: _root.hasBorder ? Variables.rangeRectBorderWidth : 0 + border.color: _root.isActive ? Colors.borderButton : Colors.borderDisableButton + minimum : 0 maximum : 0 @@ -230,12 +238,13 @@ decimal : _root.decimal minimum : _root.minimum maximum : _root.maximum - leftRightTouchMargin: _handler.width/2 - isRoundedEnds : _root.isRoundedEnds - hasBorder : _root.hasBorder - borderColor : _root.isActive ? Colors.sliderBorderActive : Colors.sliderBorderInactive + radius : _root.isRoundedEnds ? (height/2) : Variables.rangeRectRadius + + border.width: _root.hasBorder ? Variables.rangeRectBorderWidth : 0 + border.color: _root.isActive ? Colors.borderButton : Colors.borderDisableButton + // propagation is not working on drag ! onDragged: { _root.dragged(vMouseEvent) Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -119,9 +119,6 @@ handlerVisible : _root.adjustable isActive : _root.active ticks : true - isRoundedEnds : true - hasBorder : true - borderColor : _root.active ? Colors.sliderBorderActive : Colors.sliderBorderInactive onDragged : { setInteractive(false) ; ; setActiveValid( );} onPressed : { setInteractive(false) ; _root.pressed ( ) ; } onReleased : { setInteractive(true ) ; _root.released( ) ; } @@ -130,7 +127,6 @@ SliderArrows{ id:_sliderArrows visible : true - enabled: _root.active anchors.verticalCenter : _slider.verticalCenter anchors.left : _slider.right anchors.leftMargin : Variables.sliderAdjustButtonLeftMargin Index: sources/gui/qml/compounds/PressureRangeSlider.qml =================================================================== diff -u -r7b4219600ec64c2860113225ced0b5fc839b8ad2 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) +++ sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -117,9 +117,6 @@ maximum : _root.maximum value : _root.value - isRoundedEnds: false - hasBorder : false - minText.visible : _root.lowerBound !== minimum maxText.visible : _root.upperBound !== maximum Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -121,9 +121,6 @@ readonly property color createTreatmentTextReady : white readonly property color createTreatmentInvalidParam : red - readonly property color sliderBorderActive : "white" - readonly property color sliderBorderInactive : createTreatmentTextNotReady - readonly property color scrollBarBgColor :"white" //"#80696969" // half transparent dimgray // ---------- < PRS > Related Section ---------- Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rc52701259341870bc9a436fc87f84f23b340c09c -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision c52701259341870bc9a436fc87f84f23b340c09c) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -33,6 +33,7 @@ readonly property int dialogIconHorizontalOffset : 25 readonly property int headerHeight : 100 readonly property int headerButtonsMargin : 35 + readonly property int confirmButtonWidth : 155 readonly property int mainMenuHeight : 70 @@ -75,7 +76,7 @@ readonly property int rangeMarkerHeightShort : 20 readonly property int rangeMarkerWidth : 2 - readonly property int progressbarHeight : 15 + readonly property int progressbarHeight : 30 readonly property int progressbarHandler : 35 readonly property int progressbarHandlerBorderWidth : 4 readonly property int progressbarRectMargin : 0 // default as 0 to avoid progressRect having a thicker border than slider body @@ -126,7 +127,7 @@ readonly property int ultrafiltrationProgressbarWidth : 880 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 - readonly property int ultraFiltrationProgressBarHeight :30 + readonly property int ultraFiltrationProgressBarHeight : 30 readonly property int silenceIconMargin : 10 readonly property int notificationBarIconMargin : 10 Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r7b4219600ec64c2860113225ced0b5fc839b8ad2 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -92,8 +92,6 @@ topMargin : 15 horizontalCenter: parent.horizontalCenter } - isRoundedEnds: false - hasBorder : false } WaitDone { id: _hdWaitdone Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -425,11 +425,6 @@ stepSnap : true hasAdjust : true - // slider visuals - showTickmarks : true - isRoundedEnds : true - isTickMarksRound: true - // Texts lowerText.visible : true lowerText.font.pixelSize : Fonts.fontPixelFluidText Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml =================================================================== diff -u -rbbbaf4c6c5aead284b9e8ab71d7c039621c754d3 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision bbbaf4c6c5aead284b9e8ab71d7c039621c754d3) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -41,25 +41,38 @@ titleText: qsTr("TREATMENT DURATION") - Column { id : _column - width: 880 - spacing: 65 + Item { id : _container + readonly property int sideMarginSize: Variables.headerButtonsMargin + Variables.confirmButtonWidth/2 - _durationSliderArrows.width/2 // Centers on the confirmButton + width : _root.width + height : 200 anchors.centerIn: parent + TimeText { id: _currentTimeText seconds: vTreatmentTime.time_Elapsed secondsVisible: true textPixelSize: Fonts.fontPixelDurationCurTime anchors.horizontalCenter: parent.horizontalCenter + anchors.top: _container.top + anchors.bottom: _durationSlider.top + anchors.bottomMargin: 65 } Slider { id : _durationSlider - width : _column.width - _durationSliderArrows.width + // The distance from parent's right side to the rightmost of slider - with slider arrows and spacings considered + readonly property int sliderAndArrowSpacing : Variables.sliderAdjustButtonSpacing + _durationSlider.handler.width/2 + readonly property int distanceFromSide : _durationSlider.sliderAndArrowSpacing + _durationSliderArrows.width + _container.sideMarginSize + width : _container.width - (distanceFromSide * 2) // determine the size of slider to center minimum : vTreatmentRanges.treatmentRanges_Duration_Min // in Minutes maximum : vTreatmentRanges.treatmentRanges_Duration_Max // in Minutes step : Variables.durationResolution - stepSnap: true - minText.visible: false - maxText.visible: false - ticks: true + stepSnap : true + minText.visible : false + maxText.visible : false + ticks : true + + anchors.right : _durationSliderArrows.left + anchors.rightMargin : _durationSlider.sliderAndArrowSpacing + anchors.bottom : _container.bottom + TimeText { id: _durationText seconds: 60 * _durationSlider.value // in Minutes => to Seconds secondsVisible: false @@ -71,15 +84,16 @@ horizontalCenter: _durationSlider.handler.horizontalCenter } } - SliderArrows{ id: _durationSliderArrows - visible : true - anchors.verticalCenter : _durationSlider.verticalCenter - anchors.left : _durationSlider.right - anchors.leftMargin : Variables.sliderAdjustButtonLeftMargin + } + SliderArrows{ id: _durationSliderArrows + visible : true + anchors.verticalCenter : _durationSlider.verticalCenter + anchors.right : _container.right + anchors.rightMargin : _container.sideMarginSize - onIncrementValue : _durationSlider.incrementValue(true) - onDecrementValue : _durationSlider.decrementValue(true) - } + onIncrementValue : _durationSlider.incrementValue(true) + onDecrementValue : _durationSlider.decrementValue(true) } } + } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -rc52701259341870bc9a436fc87f84f23b340c09c -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision c52701259341870bc9a436fc87f84f23b340c09c) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -61,19 +61,17 @@ width : Variables.ultrafiltrationProgressbarWidth height : Variables.ultraFiltrationProgressBarHeight anchors { - top: parent.top - topMargin: 250 - horizontalCenter: parent.horizontalCenter + top : parent.top + topMargin : 250 + right : parent.right + rightMargin : _volumeSliderArrows.width + Variables.sliderAdjustButtonSpacing*2 } decimal : _private.decimal minimum : _private.min // suppose to be always 0 // DEN-6022 // _private.maxAdjust => _private.min maximum : _private.maxAdjust value : _private.val valueEx : _private.valAdjust progressEx.maxText.visible: false - - isRoundedEnds: false - hasBorder : false } Slider { id: _volumeSlider @@ -102,6 +100,16 @@ maximum : _private.maxAdjust - maxGapValue } + SliderArrows{ id: _volumeSliderArrows + visible : true + anchors.verticalCenter : _volumeSlider.verticalCenter + anchors.right : parent.right + anchors.rightMargin : Variables.sliderAdjustButtonSpacing + + onIncrementValue : _volumeSlider.incrementValue(true) + onDecrementValue : _volumeSlider.decrementValue(true) + } + Text { id: _textVolume visible : true color : Colors.textMain Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -rc52701259341870bc9a436fc87f84f23b340c09c -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision c52701259341870bc9a436fc87f84f23b340c09c) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -60,9 +60,6 @@ maximum : _private.maximum value : _private.value valueEx : 0 - - isRoundedEnds: false - hasBorder : false } TouchRect { id: _editButton Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -rc52701259341870bc9a436fc87f84f23b340c09c -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision c52701259341870bc9a436fc87f84f23b340c09c) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -60,9 +60,6 @@ maximum : _private.maximum value : _private.value valueEx : 0 - - isRoundedEnds: false - hasBorder : false } TouchRect { id: _pauseButton Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml =================================================================== diff -u -r7b4219600ec64c2860113225ced0b5fc839b8ad2 -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) +++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -126,8 +126,6 @@ maximum : _fluidTarget.value value : 0 decimal : _root.valueDecimal - isRoundedEnds: false - hasBorder: false } Text { id: _cumulativeText Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -rc52701259341870bc9a436fc87f84f23b340c09c -r89426b2b3d45008f5e6cb19e0c7adef3a242ce36 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision c52701259341870bc9a436fc87f84f23b340c09c) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 89426b2b3d45008f5e6cb19e0c7adef3a242ce36) @@ -62,8 +62,5 @@ valueEx : 0 marker.color : isUFPaused ? "dimgray" : Colors.rangeMarker - - isRoundedEnds: false - hasBorder : false } }