Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml
===================================================================
diff -u -r86274f18e9356126c41d848bc78bfba318638aee -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8
--- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml	(.../TreatmentPressures.qml)	(revision 86274f18e9356126c41d848bc78bfba318638aee)
+++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml	(.../TreatmentPressures.qml)	(revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8)
@@ -21,86 +21,103 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/pages/treatment"
 
 /*!
  * \brief   Treatment Screen Pressure section
  */
-TouchArea { id: _root
-
+TreatmentSection { id: _root
     property int    arterialMinimum     : vTreatmentRanges.arterialPressureMonitorMin
     property int    arterialMaximum     : vTreatmentRanges.arterialPressureMonitorMax
     property int    venousMinimum       : vTreatmentRanges.venousPressureMonitorMin
     property int    venousMaximum       : vTreatmentRanges.venousPressureMonitorMax
+    property int    tmpMinimum          : 0//vTreatmentRanges.tmpPressureMonitorMin
+    property int    tmpMaximum          : 100//vTreatmentRanges.tmpPressureMonitorMax
 
     property int    arterialLowerBound  : vTreatmentPressureOcclusion.arterialMin
     property int    arterialUpperBound  : vTreatmentPressureOcclusion.arterialMax
     property int    venousLowerBound    : vTreatmentPressureOcclusion.venousMin
     property int    venousUpperBound    : vTreatmentPressureOcclusion.venousMax
+    property int    tmpLowerBound       : 20//vTreatmentPressureOcclusion.tmpPressureLimitLowerBound
+    property int    tmpUpperBound       : 80//vTreatmentPressureOcclusion.tmpPressureLimitUpperBound
     property int    arterialPressure    : vTreatmentPressureOcclusion.arterialPressure
     property int    venousPressure      : vTreatmentPressureOcclusion.venousPressure
+    property int    tmpPressure         : 65//vTreatmentPressureOcclusion.tmpPressure
 
-    property bool   valueOutRangeNotify : true         
-    clip: false
-    x       : 0
-    y       : 0
-    width   : 200
-    height  : 200
-    isTouchable: true
-    title: qsTr("PRESSURE") + " " + qsTr("(mmHg)")
+    property bool   valueOutRangeNotify : true    
 
-    RangeBar { id: _arterialRangeBar
-        x: 0
-        y: 80
-        width   : 175
-        height  :  15
-        rangebar.color: Colors.pressuresArterialBar
-        markerOutRangeNotify: _root.valueOutRangeNotify
+    header.title                    : qsTr("Pressures") + " (" + qsTr("mmHg") + ")"
 
-        minimum     : _root.arterialMinimum
-        lowerBound  : _root.arterialLowerBound
-        upperBound  : _root.arterialUpperBound
-        maximum     : _root.arterialMaximum
-        value       : _root.arterialPressure
-        color       : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color
+    contentArea.anchors.topMargin   : Variables.defaultMargin
 
-        Text { id: _arterialText
-            anchors {
-                left: parent.left
-                top: parent.bottom
-                topMargin: 35
-            }
-            text: qsTr("Arterial")
-            font.pixelSize: Fonts.fontPixelPresseuresText
-            color: Colors.pressuresText
+    contentItem: Column { id: _column
+        property int cellHeight : Variables.contentHeight / 3
+        property int cellWidth  : contentItem.width * 0.75
+
+        spacing         : Variables.defaultMargin * 4
+        topPadding      : Variables.defaultMargin
+        leftPadding     : Variables.defaultMargin
+        rightPadding    : Variables.defaultMargin
+
+
+        TreatmentPressureComponent { id: _arterialRangeBar
+            title       : qsTr("Arterial:")
+            height      : _column.cellHeight
+            width       : _column.cellWidth
+            barColor    : Colors.pressuresArterialBar
+
+            minimum     : _root.arterialMinimum
+            lowerBound  : _root.arterialLowerBound
+            upperBound  : _root.arterialUpperBound
+            maximum     : _root.arterialMaximum
+            pressure    : _root.arterialPressure
+
+            valueOutRangeNotify : _root.valueOutRangeNotify
         }
-        onClicked: _root.clicked()
-    }
 
-    RangeBar { id: _venousRangeBar
-        x: 210
-        y: 80
-        width   : 175
-        height  :  15
-        rangebar.color: Colors.pressuresVenousBar
-        markerOutRangeNotify: _root.valueOutRangeNotify
+        TreatmentPressureComponent { id: _venousRangeBar
+            title       : qsTr("Venous:")
+            height      : _column.cellHeight
+            width       : _column.cellWidth
+            barColor    : Colors.pressuresVenousBar
 
-        minimum     : _root.venousMinimum
-        lowerBound  : _root.venousLowerBound
-        upperBound  : _root.venousUpperBound
-        maximum     : _root.venousMaximum
-        value       : _root.venousPressure
-        color       : valueOutRangeNotify ? Colors.backgroundRangeRect : rangebar.color
+            minimum     : _root.venousMinimum
+            lowerBound  : _root.venousLowerBound
+            upperBound  : _root.venousUpperBound
+            maximum     : _root.venousMaximum
+            pressure    : _root.venousPressure
 
-        Text { id: _venousText
-            anchors {
-                left: parent.left
-                top: parent.bottom
-                topMargin: 35
-            }
-            text: qsTr("Venous")
-            font.pixelSize: Fonts.fontPixelPresseuresText
-            color: Colors.pressuresText
+            valueOutRangeNotify : _root.valueOutRangeNotify
         }
-        onClicked: _root.clicked()
+
+        TreatmentPressureComponent { id: _tmpRangeBar
+            title       : qsTr("TMP:")
+            height      : _column.cellHeight
+            width       : _column.cellWidth
+            barColor    : Colors.pressuresTmpBar
+
+            minimum     : _root.tmpMinimum
+            lowerBound  : _root.tmpLowerBound
+            upperBound  : _root.tmpUpperBound
+            maximum     : _root.tmpMaximum
+            pressure    : _root.tmpPressure
+
+            valueOutRangeNotify : _root.valueOutRangeNotify
+        }
     }
+
+    ArrowButton {id : _expandingArrows
+        objectName      : "expandingArrows"
+
+        anchors {
+            top             : header.bottom
+            topMargin       : Variables.defaultMargin
+            right           : parent.right
+            rightMargin     : Variables.defaultMargin
+        }
+
+        expandingArrow  : true
+
+        onClicked       : print ("Expanding Arrows clicked")
+    }
 }