Index: sources/gui/qml/components/SliderArrows.qml =================================================================== diff -u -r8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53 -rc52701259341870bc9a436fc87f84f23b340c09c --- sources/gui/qml/components/SliderArrows.qml (.../SliderArrows.qml) (revision 8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53) +++ sources/gui/qml/components/SliderArrows.qml (.../SliderArrows.qml) (revision c52701259341870bc9a436fc87f84f23b340c09c) @@ -38,7 +38,7 @@ width: Variables.sliderAdjustButtonDiameter height: Variables.sliderAdjustButtonDiameter radius: Variables.sliderAdjustButtonDiameter - border.color: _adjustValueButtonsContainer.enabled ? Colors.sliderBorderActive : Colors.sliderBorderInactive + border.color: _adjustValueButtonsContainer.enabled ? Colors.borderButton : Colors.borderDisableButton anchors.verticalCenter: parent.verticalCenter Image { id: _decrementArrowImage @@ -61,7 +61,7 @@ width: Variables.sliderAdjustButtonDiameter height: Variables.sliderAdjustButtonDiameter radius: Variables.sliderAdjustButtonDiameter - border.color: _adjustValueButtonsContainer.enabled ? Colors.sliderBorderActive : Colors.sliderBorderInactive + border.color: _adjustValueButtonsContainer.enabled ? Colors.borderButton : Colors.borderDisableButton anchors.verticalCenter: parent.verticalCenter Image { id: _incrementArrowImage Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53 -rc52701259341870bc9a436fc87f84f23b340c09c --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 8d7f8d2ac6620e92ab3cd239d7d8641113ea3e53) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision c52701259341870bc9a436fc87f84f23b340c09c) @@ -75,7 +75,7 @@ readonly property int rangeMarkerHeightShort : 20 readonly property int rangeMarkerWidth : 2 - readonly property int progressbarHeight : 30 + readonly property int progressbarHeight : 15 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,6 +126,7 @@ readonly property int ultrafiltrationProgressbarWidth : 880 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 + readonly property int ultraFiltrationProgressBarHeight :30 readonly property int silenceIconMargin : 10 readonly property int notificationBarIconMargin : 10 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -r7b4219600ec64c2860113225ced0b5fc839b8ad2 -rc52701259341870bc9a436fc87f84f23b340c09c --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision c52701259341870bc9a436fc87f84f23b340c09c) @@ -82,7 +82,7 @@ spacing: 100 anchors.centerIn: parent Row { id : _bloodFlowRow - spacing: 100 + spacing: 50 anchors.horizontalCenter: parent.horizontalCenter TextRect { id: _bloodFlowTextRect anchors.top: parent.top @@ -103,14 +103,20 @@ step : Variables.bloodFlowResolution ticks : true } + SliderArrows{ id:_bloodFlowSliderArrows + visible : true + anchors.verticalCenter : _bloodFlowSlider.verticalCenter + onIncrementValue : _bloodFlowSlider.incrementValue(true) + onDecrementValue : _bloodFlowSlider.decrementValue(true) + } } Line { anchors.horizontalCenter: parent.horizontalCenter length : _root.width - 100 color : Colors.separatorLine } Row { id : _dialysateInletFlowRow - spacing: 100 + spacing: 50 anchors.horizontalCenter: parent.horizontalCenter TextRect { id: _dialysateInletFlowTextRect anchors.top: parent.top @@ -130,6 +136,12 @@ step : Variables.dialysateFlowResolution ticks : true } + SliderArrows{ id:_dialysateFlowSliderArrows + visible : true + anchors.verticalCenter : _dialysateFlowSlider.verticalCenter + onIncrementValue : _dialysateFlowSlider.incrementValue(true) + onDecrementValue : _dialysateFlowSlider.decrementValue(true) + } } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r7b4219600ec64c2860113225ced0b5fc839b8ad2 -rc52701259341870bc9a436fc87f84f23b340c09c --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision c52701259341870bc9a436fc87f84f23b340c09c) @@ -59,7 +59,7 @@ ProgressBarEx { id: _rangeProgressBar width : Variables.ultrafiltrationProgressbarWidth - height : Variables.progressbarHeight + height : Variables.ultraFiltrationProgressBarHeight anchors { top: parent.top topMargin: 250 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -r7b4219600ec64c2860113225ced0b5fc839b8ad2 -rc52701259341870bc9a436fc87f84f23b340c09c --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision c52701259341870bc9a436fc87f84f23b340c09c) @@ -49,7 +49,7 @@ ProgressBarEx { id: _progressbarex width : Variables.ultrafiltrationProgressbarWidth - height : Variables.progressbarHeight + height : Variables.ultraFiltrationProgressBarHeight anchors { top: parent.top topMargin: 250 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -r7b4219600ec64c2860113225ced0b5fc839b8ad2 -rc52701259341870bc9a436fc87f84f23b340c09c --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision c52701259341870bc9a436fc87f84f23b340c09c) @@ -49,7 +49,7 @@ ProgressBarEx { id: _progressbarex width : Variables.ultrafiltrationProgressbarWidth - height : Variables.progressbarHeight + height : Variables.ultraFiltrationProgressBarHeight anchors { top: parent.top topMargin: 250 Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r7b4219600ec64c2860113225ced0b5fc839b8ad2 -rc52701259341870bc9a436fc87f84f23b340c09c --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 7b4219600ec64c2860113225ced0b5fc839b8ad2) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision c52701259341870bc9a436fc87f84f23b340c09c) @@ -49,7 +49,7 @@ enabled : _root.isTouchable y : 75 width : parent.width - height : Variables.progressbarHeight + height : Variables.ultraFiltrationProgressBarHeight onClicked : _root.clicked() onProgressClicked : _root.clicked()