Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r3da1e6ce80a0edef25d2ade3da094e18791f3553 -rbe27a57e3051a56b73c3549c383fbba1f85ac8e3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 3da1e6ce80a0edef25d2ade3da094e18791f3553) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision be27a57e3051a56b73c3549c383fbba1f85ac8e3) @@ -34,7 +34,7 @@ property real volumeRemoved : vTreatmentUltrafiltration.volumeRemoved } - signal nextClicked(real vVolume) + signal continueClicked(real vVolume) function reset() { _setVolumeSlider.reset(_private.setVolume) @@ -52,7 +52,7 @@ color : Colors.ufNotificationBarBg textColor : Colors.ufVolumeGoalText textfontSize : Fonts.fontPixelUltrafiltrationAdjustmentNotification - textfontWeight : Font.Normal + textfontWeight : Font.Medium } titleText : qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume @@ -67,39 +67,51 @@ volumeRemoved : _private.volumeRemoved } - StoppedSlider { id: _setVolumeSlider + Item { id: _contentArea anchors { - top : _ufMetrics.bottom - topMargin : Variables.ultrafiltrationContentMargin - left : parent.left - leftMargin : 80 - right : parent.right - rightMargin : anchors.leftMargin - horizontalCenter: undefined + top : _ufMetrics.bottom + bottom : _continueButton.top + left : parent.left + leftMargin : 80 + right : parent.right + rightMargin : anchors.leftMargin } - decimal : Variables.ultrafiltrationPrecision - minimum : 0 - minStop : _private.volumeRemoved - maximum : 8 - unit : Variables.unitVolume - step : 0.1 - defaultValue : { defaultValue = _private.setVolume } // set without binding - active : true + + StoppedSlider { id: _setVolumeSlider + anchors { + left : parent.left + right : parent.right + verticalCenter : parent.verticalCenter + } + decimal : Variables.ultrafiltrationPrecision + minimum : 0 + minStop : _private.volumeRemoved + maximum : 8 + unit : Variables.unitVolume + step : 0.1 + defaultValue : { defaultValue = _private.setVolume } // set without binding + active : true + } } TouchRect { id: _continueButton anchors { - top : _setVolumeSlider.bottom - topMargin : 110 + bottom : information.top + bottomMargin : Variables.ultrafiltrationButtonBottomMargin horizontalCenter: parent.horizontalCenter } width : Variables.ultrafiltrationButtonWidth height : Variables.ultrafiltrationButtonHeight text { text : qsTr("Continue") - font.weight : Font.DemiBold + font { + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton + weight : Font.DemiBold + } } isDefault : true - onClicked: nextClicked( _private.valAdjust.toFixed(_private.decimal) ) + enabled : _setVolumeSlider.value.toFixed(_setVolumeSlider.decimal) !== + _private.setVolume.toFixed(_setVolumeSlider.decimal) + onClicked : continueClicked(_setVolumeSlider.value.toFixed(_setVolumeSlider.decimal)) } }