Index: sources/gui/qml/components/MainMenu.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 --- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) @@ -121,6 +121,10 @@ width : partitionWidth height : parent.height text.text : isItemVisible(index) ? modelData : "" // didn't change the visibility to preserve the button location and just didn't display the title and highlihgt bar. + text.anchors.verticalCenter: undefined + text.anchors.bottom: text.parent.bottom + text.bottomPadding: 15 + border.width: 0 onPressed: { emit_itemPressed(index) Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r8e68dd3887ebc15349dc726746d5e395a742f900 -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 8e68dd3887ebc15349dc726746d5e395a742f900) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) @@ -35,7 +35,7 @@ readonly property int headerButtonsMargin : 35 readonly property int confirmButtonWidth : 155 - readonly property int mainMenuHeight : 85 + readonly property int mainMenuHeight : 100 readonly property int minVGap : 15 readonly property int minVGap2 : 30 @@ -59,7 +59,7 @@ readonly property int touchRectHeight : 85 //K:D //70 readonly property int touchRectRadius : 45 - readonly property int titleBottomPadding : 25 + readonly property int bottomPaddingTitle : 10 readonly property int columnSpacing : 25 //K:D //20 @@ -181,7 +181,7 @@ readonly property int sliderAdjustButtonBorderWidth : 2 readonly property int sliderAdjustButtonSpacing : 20 readonly property int sliderAdjustButtonDiameter : 50 - readonly property int sliderAdjustButtonLeftMargin : 30 + readonly property int sliderAdjustButtonLeftMargin : 40 readonly property int sliderAdjustButtonRightMargin : 50 readonly property int sliderAdjustPressAndHoldRefreshRate : 250 Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) @@ -79,7 +79,7 @@ top : parent.top topMargin : vHDTreatmentStates.rbAdditional ? _root.height/2 - height/2 : // move the progress circle in the center of the screen - 170 + Variables.screenGridRow1LineY } minimum : 0 Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) @@ -74,9 +74,9 @@ Text { id: _salineVolumeLabel anchors.left : _beginRinsebackTouchRect.text.right anchors.bottom : _beginRinsebackTouchRect.text.top - anchors.leftMargin : 5 + anchors.leftMargin : 0 text : qsTr("(50mL)") - font.pixelSize : Fonts.fontPixelFluidVolume + font.pixelSize : Fonts.fontPixelFluidVolume * 0.7 color : _beginRinsebackTouchRect.text.color } } Index: sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml =================================================================== diff -u -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 --- sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) +++ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) @@ -31,7 +31,7 @@ Text { id: _title anchors { top: parent.top - topMargin: 80 + topMargin: Variables.screenGridRow1Y horizontalCenter: parent.horizontalCenter } color: Colors.textMain Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) @@ -107,6 +107,7 @@ anchors.verticalCenter : _bloodFlowSlider.verticalCenter onIncrementValue : _bloodFlowSlider.incrementValue(true) onDecrementValue : _bloodFlowSlider.decrementValue(true) + leftPadding: -50 } } Line { @@ -139,6 +140,7 @@ anchors.verticalCenter : _dialysateFlowSlider.verticalCenter onIncrementValue : _dialysateFlowSlider.incrementValue(true) onDecrementValue : _dialysateFlowSlider.decrementValue(true) + leftPadding: -50 } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) @@ -96,6 +96,7 @@ height : 50 anchors.top : parent.top anchors.left : parent.left + leftPadding : 50 horizontalAlignment : Text.AlignLeft font.pixelSize : Fonts.fontPixelPresseuresLabel color : Colors.textMain @@ -125,7 +126,7 @@ SliderArrows{ id : _sliderArrows anchors.left : _slider.right - anchors.leftMargin : 30 + anchors.leftMargin : 50 anchors.verticalCenter : _slider.verticalCenter onIncrementValue : _slider.incrementValue(true) onDecrementValue : _slider.decrementValue(true) Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) @@ -63,8 +63,7 @@ anchors { top : parent.top topMargin : 250 - right : parent.right - rightMargin : _volumeSliderArrows.width + Variables.sliderAdjustButtonSpacing*2 + horizontalCenter: parent.horizontalCenter } decimal : _private.decimal minimum : _private.min // suppose to be always 0 // DEN-6022 // _private.maxAdjust => _private.min @@ -86,7 +85,8 @@ anchors { top: _rangeProgressBar.bottom - topMargin: 50 + topMargin: 100 + horizontalCenter: parent.horizontalCenter } x : _rangeProgressBar.x + minGapWidth + _rangeProgressBar.progressWidth @@ -103,8 +103,8 @@ SliderArrows{ id: _volumeSliderArrows visible : true anchors.verticalCenter : _volumeSlider.verticalCenter - anchors.right : parent.right - anchors.rightMargin : Variables.sliderAdjustButtonSpacing + anchors.left : _volumeSlider.right + anchors.leftMargin : 50 onIncrementValue : _volumeSlider.incrementValue(true) onDecrementValue : _volumeSlider.decrementValue(true)