Index: sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml
===================================================================
diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r9cd2d1e8daf48222977349cc29d06fb3d8015e71
--- sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml	(.../TreatmentBloodPrime.qml)	(revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8)
+++ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml	(.../TreatmentBloodPrime.qml)	(revision 9cd2d1e8daf48222977349cc29d06fb3d8015e71)
@@ -20,6 +20,7 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/pages/treatment"
 import "qrc:/pages/treatment/sections"
 
 /*!
@@ -28,6 +29,26 @@
 ScreenItem { id: _root
     objectName: "_TreatmentBloodPrime"
 
+    signal pauseClicked  ()
+    signal resumeClicked ()
+    signal endClicked    ()
+
+    signal accelerateClicked  ()
+    signal deccelerateClicked ()
+
+    signal sectionSalineClicked()
+
+    Connections { target: vTreatmentAdjustmentBloodFlowRate
+        function onAdjustmentTriggered              ( vValue ) {
+            if (vTreatmentAdjustmentBloodFlowRate.adjustment_Accepted) {
+                _notification.text = ""
+            }
+            else {
+                _notification.text = vTreatmentAdjustmentBloodFlowRate.text()
+            }
+        }
+    }
+
     Text { id: _title
         anchors {
             top: parent.top
@@ -39,51 +60,93 @@
         font.pixelSize: Fonts.fontPixelTitle
     }
 
-    ProgressCircle { id: _circle
-        diameter: 335
-        anchors.centerIn: parent
-        minimum : 0
-        maximum : vTreatmentBloodPrime.target
-        value   : vTreatmentBloodPrime.current
+    ProgressCircle { id: _volumeProgress
+        objectName          : "_volumeProgress"
+        anchors {
+            left            : parent.left
+            leftMargin      : Variables.defaultMargin * 3
+            verticalCenter  : parent.verticalCenter
+        }
+        thickness           : 35
+        circleShadowColor   : Colors.mainTreatmentLighterBlue
+        circleFillColor     : Colors.mainTreatmentDarkerBlue
+        minimum             : 0
+        maximum             : vTreatmentBloodPrime.target
+        value               : vTreatmentBloodPrime.current
 
-        Text { id: _textVolume
+        Text { id: _volumeText
+            objectName      : "_volumeText"
             anchors.centerIn: parent
-            color: Colors.textMain
-            text: vTreatmentBloodPrime.current.toFixed(0) + " " + qsTr(Variables.unitTextFluid)
-            font.pixelSize: 76
-            font.weight: Font.ExtraLight
+            height          : contentHeight
+            font {
+                pixelSize   : 76
+                weight      : Font.Light
+            }
+            color           : Colors.textMain
+            text            : vTreatmentBloodPrime.current.toFixed(0) + " " + qsTr(Variables.unitTextFluid)
         }
+    }
 
-        Text { id: _labelRate
+    TreatmentSection { id: _bloodFlow
+        objectName: "_bloodFlow"
+        anchors {
+            right           : _treatmentSaline.left
+            rightMargin     : Variables.defaultMargin
+            verticalCenter  : parent.verticalCenter
+        }
+        width           : 285
+        height          : 420
+        header.title    : qsTr("Blood Flow" )
+        header.showEdit : false
+
+        TreatmentFlowsComponent { id: _bloodFlowComponent
+            objectName      : "bloodFlowComponent"
             anchors {
-                top: parent.bottom
-                topMargin: 20
-                horizontalCenter: parent.horizontalCenter
+                top         : _bloodFlow.header.bottom
+                left        : parent.left
+                leftMargin  : Variables.defaultMargin
+                right       : parent.right
+                rightMargin : Variables.defaultMargin
             }
-            color: Colors.textMain
-            text: vTreatmentBloodFlow.setFlowRate.toFixed(0) + " " + qsTr(Variables.unitTextFlowRate)
-            font.pixelSize: 23
+            height          : 250
+            value           : vTreatmentParametersSetPoint.bloodFlow
+            precision       : Variables.bloodFlowPrecision
+            minimum         : vTreatmentRanges.bloodFlowRateMin
+            maximum         : vTreatmentRanges.bloodFlowRateMax
+            step            : vTreatmentRanges.bloodFlowRateRes
+            unitText        : Variables.unitTextFlowRate
+            buttonsEnabled  : editEnabled
+            color           : "transparent"
+
+            onIncrement     : function(newValue) { vTreatmentAdjustmentBloodFlowRate.doAdjustment(newValue) }
+            onDecrement     : function(newValue) { vTreatmentAdjustmentBloodFlowRate.doAdjustment(newValue) }
         }
     }
 
-    TreatmentPressures          { id: _pressuresTouchArea
-        // maybe now it makes sense for the ranges to be displayed
-        // arterialLowerBound  : 0 // requested to hide the bounds
-        // arterialUpperBound  : 0 // requested to hide the bounds
-        // venousLowerBound    : 0 // requested to hide the bounds
-        // venousUpperBound    : 0 // requested to hide the bounds
+    TreatmentSaline { id: _treatmentSaline
+        objectName  : "_treatmentSaline"
+        anchors {
+            right           : _treatmentPressures.left
+            rightMargin     : Variables.defaultMargin
+            verticalCenter  : parent.verticalCenter
+        }
+        width       : _bloodFlow.width
+        height      : _bloodFlow.height
 
-//        isTouchable         : false
-//        x       : Variables.screenGridLeftColumnX
-//        y       : Variables.screenGridRow1Y
-//        width   : Variables.screenGridAreaWidth
-//        height  : Variables.screenGridAreaHeightRow1
+        onEditClicked: sectionSalineClicked()
     }
-    Line { x: 0; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength }
 
-    onVisibleChanged: {
-        if (visible) {
-            _mainMenu.hidden = true
+    TreatmentPressures { id: _treatmentPressures
+        objectName      : "_treatmentPressures"
+        anchors {
+            right           : parent.right
+            rightMargin     : _volumeProgress.anchors.leftMargin
+            verticalCenter  : parent.verticalCenter
         }
+        width           : 750
+        height      : _bloodFlow.height
+        header.showEdit : false
     }
+
+    NotificationBarSmall { id: _notification ; height: 60}
 }