Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
===================================================================
diff -u -r86274f18e9356126c41d848bc78bfba318638aee -r4746b6bcbf4def7888f7b29d72431b28e6672f12
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml	(.../TreatmentAdjustmentUltrafiltrationEdit.qml)	(revision 86274f18e9356126c41d848bc78bfba318638aee)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml	(.../TreatmentAdjustmentUltrafiltrationEdit.qml)	(revision 4746b6bcbf4def7888f7b29d72431b28e6672f12)
@@ -30,114 +30,73 @@
     contentItem.objectName: "TreatmentAdjustmentUltrafiltrationEdit"  //SquishQt testability
     QtObject { id: _private
         property int  decimal   : Variables.ultrafiltrationPrecision
-        property real minAdjust : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min
-        property real valAdjust : _volumeSlider.value
-        property real maxAdjust : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max
-
-        property real min       : vTreatmentUltrafiltration.minimum
-        property real val       : vTreatmentUltrafiltration.volumeRemoved
-        property real max       : vTreatmentUltrafiltration.maximum
+        property real setVolume     : vTreatmentUltrafiltration.setVolume
+        property real volumeRemoved : vTreatmentUltrafiltration.volumeRemoved
     }
 
     signal   nextClicked(real vVolume)
 
     function reset() {
-        _volumeSlider.value = _private.max
+        _setVolumeSlider.reset(_private.setVolume)
     }
 
       closeVisible  : false
     confirmVisible  : false
        backVisible  : true
 
    information {
-       visible     : true && information.text && ! notification.visible
-       imageSource : ufInfoImageSource
-       text        : ufInfoText
+        visible     : true && information.text && ! notification.visible
+        imageSource : ufInfoImageSource
+        text        : ufInfoText
+        radius          : 0
+        color           : Colors.ufNotificationBarBg
+        textColor       : Colors.ufVolumeGoalText
+        textfontSize    : Fonts.fontPixelUltrafiltrationAdjustmentNotification
+        textfontWeight  : Font.Normal
    }
 
-    titleText   : qsTr("ULTRAFILTRATION VOLUME") + "   " + Variables.unitTextUltrafiltrationVolume
+    titleText   : qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume
 
-    ProgressBarEx { id: _rangeProgressBar
-        width   : Variables.ultrafiltrationProgressbarWidth
-        height  : Variables.ultraFiltrationProgressBarHeight
+    TreatmentAdjustmentUltrafiltrationMetrics { id: _ufMetrics
         anchors {
-            top         : parent.top
-            topMargin   : 250
-            right       : parent.right
-            rightMargin : _volumeSliderArrows.width + Variables.sliderAdjustButtonSpacing*2
+            top             : parent.top
+            topMargin       : Variables.defaultMargin * 2
+            horizontalCenter: parent.horizontalCenter
         }
-        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
+        setVolume       : _setVolumeSlider.value
+        volumeRemoved   : _private.volumeRemoved
     }
 
-    Slider { id: _volumeSlider
-        // TODO : These two values shall get from a model
-        property int minGapValue: 0 // No gap for now.
-        property int maxGapValue: 0 // No gap for now.
-
-        readonly property int minPrgWidth: _rangeProgressBar.maximum - _rangeProgressBar.minimum
-        readonly property int maxPrgWidth: _rangeProgressBar.maximum - _rangeProgressBar.minimum
-        readonly property int minGapWidth: minPrgWidth > 0 ? (minGapValue * _rangeProgressBar.width) / minPrgWidth : 0
-        readonly property int maxGapWidth: maxPrgWidth > 0 ? (maxGapValue * _rangeProgressBar.width) / maxPrgWidth : 0
-
+    SliderUfAdjustment { id: _setVolumeSlider
         anchors {
-            top: _rangeProgressBar.bottom
-            topMargin: 50
+            top             : _ufMetrics.bottom
+            topMargin       : 160
+            left            : parent.left
+            leftMargin      : 80
+            right           : parent.right
+            rightMargin     : anchors.leftMargin
+            horizontalCenter: undefined
         }
-
-        x       : _rangeProgressBar.x       + minGapWidth               + _rangeProgressBar.progressWidth
-        width   : _rangeProgressBar.width   - maxGapWidth - minGapWidth - _rangeProgressBar.progressWidth
-        height  : Variables.ultraFiltrationEditSliderHeight
-        step    : 0.100
-        stepSnap: true
-        ticks   : true
-        decimal : _private.decimal
-        minimum : _private.minAdjust + minGapValue
-        maximum : _private.maxAdjust - maxGapValue
+        minimum         : 0
+        minStop         : _private.volumeRemoved
+        maximum         : 20
+        defaultValue    : { defaultValue =_private.setVolume } // set without binding
+        unit            : Variables.unitVolume
     }
 
-    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
-        text    : _private.valAdjust.toFixed(_private.decimal)
-        font {
-            pixelSize  : Fonts.fontPixelUltrafiltrationAdjustmentEditValue
-        }
+    TouchRect { id: _continueButton
         anchors {
+            top             : _setVolumeSlider.bottom
+            topMargin       : 110
             horizontalCenter: parent.horizontalCenter
-            top             : parent.top
-            topMargin       : 150
         }
-    }
-
-    TouchRect { id: _nextButton
-        width   : 530
-        height  :  95
-        anchors {
-            top: parent.top
-            topMargin: 460
-            horizontalCenter: parent.horizontalCenter
-        }
-        isDefault: true
+        width       : Variables.ultrafiltrationButtonWidth
+        height      : Variables.ultrafiltrationButtonHeight
         text {
-            text: qsTr("NEXT")
-            font.weight   : Font .DemiBold
-            font.pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentNextButton
+            text        : qsTr("Continue")
+            font.weight : Font.DemiBold
         }
+        isDefault   : true
         onClicked: nextClicked( _private.valAdjust.toFixed(_private.decimal) )
     }
 }