Index: denali.qrc
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- denali.qrc	(.../denali.qrc)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ denali.qrc	(.../denali.qrc)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -47,6 +47,7 @@
         <file alias="ProgressBarEx.qml">sources/gui/qml/components/ProgressBarEx.qml</file>
         <file alias="CloseButton.qml">sources/gui/qml/components/CloseButton.qml</file>
         <file alias="ConfirmButton.qml">sources/gui/qml/components/ConfirmButton.qml</file>
+        <file alias="TickMarks.qml">sources/gui/qml/components/TickMarks.qml</file>
     </qresource>
     <qresource prefix="/">
         <file>qtquickcontrols2.conf</file>
@@ -75,6 +76,7 @@
         <file alias="TreatmentTime.qml">sources/gui/qml/pages/treatment/sections/TreatmentTime.qml</file>
     </qresource>
     <qresource prefix="/pages/treatment/adjustments">
-        <file alias="TreatmentFlowAdjustment.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentFlowAdjustment.qml</file>
+        <file alias="TreatmentAdjustmentFlow.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml</file>
+        <file alias="TreatmentAdjustmentBase.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml</file>
     </qresource>
 </RCC>
Index: sources/gui/qml/components/BackButton.qml
===================================================================
diff -u -r62efc6d8ead9b39b47859fdc9c0661f30b5941d0 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/BackButton.qml	(.../BackButton.qml)	(revision 62efc6d8ead9b39b47859fdc9c0661f30b5941d0)
+++ sources/gui/qml/components/BackButton.qml	(.../BackButton.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/components/Circle.qml
===================================================================
diff -u -r94f7349bd073a732dba5295250fc0e26f740743c -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/Circle.qml	(.../Circle.qml)	(revision 94f7349bd073a732dba5295250fc0e26f740743c)
+++ sources/gui/qml/components/Circle.qml	(.../Circle.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 import QtQuick.Shapes 1.12
 
 // Project
Index: sources/gui/qml/components/LogoD.qml
===================================================================
diff -u -r62efc6d8ead9b39b47859fdc9c0661f30b5941d0 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/LogoD.qml	(.../LogoD.qml)	(revision 62efc6d8ead9b39b47859fdc9c0661f30b5941d0)
+++ sources/gui/qml/components/LogoD.qml	(.../LogoD.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/components/MainMenu.qml
===================================================================
diff -u -refb033a62e24fe2d804221ea0cb496c5411fdb2b -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision efb033a62e24fe2d804221ea0cb496c5411fdb2b)
+++ sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/components/ModalDialog.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/ModalDialog.qml	(.../ModalDialog.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/components/ModalDialog.qml	(.../ModalDialog.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,7 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick.Controls 2.12 // Dialog
 
 // Project
 //  Qml imports
@@ -53,7 +53,6 @@
     onVisibleChanged: {
         if (autoHide && visible) {
             _autoHideAnimation.start()
-            console.debug("_autoHideAnimation started")
         }
     }
 
@@ -64,7 +63,6 @@
         duration: autoHideDuration
         //easing.type: Easing.InOutQuad
         onFinished: {
-            console.debug("_autoHideAnimation finished")
             _root.visible = false
         }
     }
Index: sources/gui/qml/components/PlaceHolderText.qml
===================================================================
diff -u -r8c69137f18382bdc55a5678e6ed44a7683fe4dea -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/PlaceHolderText.qml	(.../PlaceHolderText.qml)	(revision 8c69137f18382bdc55a5678e6ed44a7683fe4dea)
+++ sources/gui/qml/components/PlaceHolderText.qml	(.../PlaceHolderText.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/components/ProgressCircle.qml
===================================================================
diff -u -r94f7349bd073a732dba5295250fc0e26f740743c -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/ProgressCircle.qml	(.../ProgressCircle.qml)	(revision 94f7349bd073a732dba5295250fc0e26f740743c)
+++ sources/gui/qml/components/ProgressCircle.qml	(.../ProgressCircle.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/components/ProgressRect.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/ProgressRect.qml	(.../ProgressRect.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/components/ProgressRect.qml	(.../ProgressRect.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/components/RangeBar.qml
===================================================================
diff -u -r9391d4058233e096350d9dc3ced79aed8ed93b38 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/RangeBar.qml	(.../RangeBar.qml)	(revision 9391d4058233e096350d9dc3ced79aed8ed93b38)
+++ sources/gui/qml/components/RangeBar.qml	(.../RangeBar.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/components/RangeMarker.qml
===================================================================
diff -u -r732bc047743c99a157cf147f5313194867c1f5e3 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/RangeMarker.qml	(.../RangeMarker.qml)	(revision 732bc047743c99a157cf147f5313194867c1f5e3)
+++ sources/gui/qml/components/RangeMarker.qml	(.../RangeMarker.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/components/ScreenItem.qml
===================================================================
diff -u -r62efc6d8ead9b39b47859fdc9c0661f30b5941d0 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/ScreenItem.qml	(.../ScreenItem.qml)	(revision 62efc6d8ead9b39b47859fdc9c0661f30b5941d0)
+++ sources/gui/qml/components/ScreenItem.qml	(.../ScreenItem.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/components/Slider.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/Slider.qml	(.../Slider.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/components/Slider.qml	(.../Slider.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -25,11 +25,12 @@
 RangeRect { id: _root
     property alias  value       : _progressRect.value
     property int    step        : 1
+    property bool   ticks       : false
 
     property alias  color       : _progressRect.color
     property alias  bgColor     : _root.color
 
-    property real   handlerWidth: 34
+    property real   handlerWidth: 35
 
     height          : Variables.progressbarHeight
     touchMargin     : 25
@@ -38,13 +39,13 @@
     maximum         : 0
 
     minText {
-        visible : true
+        visible          : true
         anchors.topMargin: Variables.sliderTextMargin
         font.pixelSize   : Fonts.fontPixelSliderMarker
         font.bold        : false
     }
     maxText {
-        visible : true
+        visible          : true
         anchors.topMargin: Variables.sliderTextMargin
         font.pixelSize   : Fonts.fontPixelSliderMarker
         font.bold        : false
@@ -61,11 +62,11 @@
         if ( x > width ) {
             value = maximum
         } else
-            if (step === 1) { // only for performance othewise formula works perfectly fine.
-                value = getPosition(x)
-            } else {
-                value = Math.floor((getPosition(x) - minimum) / step) * step + minimum
-            }
+        if (step === 1) { // only for performance othewise formula works perfectly fine for any step.
+            value = getPosition(x)
+        } else {
+            value = Math.round((getPosition(x) - minimum) / step) * step + minimum
+        }
     }
 
     ProgressRect { id: _progressRect
@@ -85,6 +86,18 @@
         }
     }
 
+    // used loader for performance since it may not always be required.
+    // and can be a heavy Component
+    Loader { id: _ticksLoader
+        active          : ticks
+        anchors.fill    : parent
+        sourceComponent : TickMarks {
+            minimum     : _root.minimum
+            maximum     : _root.maximum
+            step        : _root.step
+        }
+    }
+
     onDragged: {
         setValue(vMouseEvent.x)
     }
@@ -102,13 +115,9 @@
         height  : diameter
         radius  : diameter
         color   : "white"
-        Rectangle {
-            property real diameter  : parent.diameter - 8
-            anchors.centerIn: parent
-            width   : diameter
-            height  : diameter
-            radius  : diameter
-            color   : Colors.highlightProgressBar
+        border  {
+            width: 4
+            color: Colors.highlightProgressBar
         }
     }
 }
Index: sources/gui/qml/components/StackItem.qml
===================================================================
diff -u -r62efc6d8ead9b39b47859fdc9c0661f30b5941d0 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/StackItem.qml	(.../StackItem.qml)	(revision 62efc6d8ead9b39b47859fdc9c0661f30b5941d0)
+++ sources/gui/qml/components/StackItem.qml	(.../StackItem.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,7 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
+import QtQuick.Controls 2.12 // StackView
 
 // Project
 //  Qml imports
@@ -23,7 +23,7 @@
 /*!
  * \brief   The parent container of screens in StackView
  */
-ScreenItem { id : _root
+Item { id : _root
     property alias stackView: _stackView
 
     width : Variables.applicationWidth
Index: sources/gui/qml/components/TextRect.qml
===================================================================
diff -u -r442d1c4f53c96991d4103485ff5ff683ed00d4f7 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/TextRect.qml	(.../TextRect.qml)	(revision 442d1c4f53c96991d4103485ff5ff683ed00d4f7)
+++ sources/gui/qml/components/TextRect.qml	(.../TextRect.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/components/TickMarks.qml
===================================================================
diff -u
--- sources/gui/qml/components/TickMarks.qml	(revision 0)
+++ sources/gui/qml/components/TickMarks.qml	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -0,0 +1,63 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright                                                       \n
+ *          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,  \n
+ *          IN PART OR IN WHOLE,                                    \n
+ *          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n
+ *
+ * \file    Slider.qml
+ * \date    2020/03/13
+ * \author  Behrouz NematiPour
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+
+// Project
+
+//  Qml imports
+import "qrc:/globals"
+
+/*!
+ * \brief   Denali project TickMarks
+ */
+Item { id : _root
+    // if loader used then assign ranges when used.
+    // since loader get the parenthood and it has no range definition.
+    property int    minimum     : parent.minimum
+    property int    maximum     : parent.maximum
+    property int    step        : parent.step
+
+    property color  color       : Colors.backgroundDialog
+
+    property int    orientation : Line.Orientation.Vertical
+    property int    length      : parent.height
+    property int    thickness   : 1
+    property bool   textVisible : false
+    anchors.fill: parent
+
+    Repeater { id : _repeater
+        model: (maximum - minimum) / step + 1
+        Line { id: _line
+            orientation : _root.orientation
+            thickness   : _root.thickness
+            color       : _root.color
+            length      : _root.length
+            x: (((index * step) * (parent.width - parent.x)) / (maximum - minimum))
+            y: 0
+            Text { id : _text
+                visible: textVisible
+                color: _root.color
+                font.pixelSize: 10
+                text: (index * step) + minimum
+                anchors {
+                    top: parent.bottom
+                    topMargin: 5
+                    horizontalCenter: parent.horizontalCenter
+                }
+            }
+        }
+    }
+}
Index: sources/gui/qml/components/TimeText.qml
===================================================================
diff -u -r94f7349bd073a732dba5295250fc0e26f740743c -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/TimeText.qml	(.../TimeText.qml)	(revision 94f7349bd073a732dba5295250fc0e26f740743c)
+++ sources/gui/qml/components/TimeText.qml	(.../TimeText.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 
Index: sources/gui/qml/components/TitleText.qml
===================================================================
diff -u -r227f28b202f81ab3dd04a81868697025ccab6220 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/TitleText.qml	(.../TitleText.qml)	(revision 227f28b202f81ab3dd04a81868697025ccab6220)
+++ sources/gui/qml/components/TitleText.qml	(.../TitleText.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/components/TouchArea.qml
===================================================================
diff -u -r442d1c4f53c96991d4103485ff5ff683ed00d4f7 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/TouchArea.qml	(.../TouchArea.qml)	(revision 442d1c4f53c96991d4103485ff5ff683ed00d4f7)
+++ sources/gui/qml/components/TouchArea.qml	(.../TouchArea.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/components/TouchRect.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/components/TouchRect.qml	(.../TouchRect.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/components/TouchRect.qml	(.../TouchRect.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/dialogs/AutoHideInfo.qml
===================================================================
diff -u -r56eea041fb0995182b3d3ea0c0ac19e4933a2d3d -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/dialogs/AutoHideInfo.qml	(.../AutoHideInfo.qml)	(revision 56eea041fb0995182b3d3ea0c0ac19e4933a2d3d)
+++ sources/gui/qml/dialogs/AutoHideInfo.qml	(.../AutoHideInfo.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/dialogs/PowerOff.qml
===================================================================
diff -u -r94f7349bd073a732dba5295250fc0e26f740743c -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/dialogs/PowerOff.qml	(.../PowerOff.qml)	(revision 94f7349bd073a732dba5295250fc0e26f740743c)
+++ sources/gui/qml/dialogs/PowerOff.qml	(.../PowerOff.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/globals/Variables.qml	(.../Variables.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -45,7 +45,7 @@
 
     readonly property int columnSpacing         : 25    //K:D //20
 
-    readonly property int dialogMargin          : 80
+    readonly property int dialogMargin          : mainMenuHeight * 2
     readonly property int dialogWidth           : applicationWidth  - dialogMargin
     readonly property int dialogHeight          : applicationHeight - dialogMargin
     readonly property int dialogRadius          : 10
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -43,7 +43,7 @@
             ProgressBarEx
         ProgressRect
         Slider
-    RangeBar
+        RangeBar
 
 -Dialog
     ModalDialog
@@ -53,7 +53,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  C++ imports
@@ -109,7 +108,6 @@
     VAlarmStatus                { id: vAlarmStatus              }
     VPowerOff                   { id: vPowerOff
         onPoweroff_statusChanged: {
-            console.debug("vpoweroff_status", vpoweroff_status)
             switch (vpoweroff_status) {
             case GuiActions.Command:
                 _powerOffDialog.open()
Index: sources/gui/qml/pages/ManagerHome.qml
===================================================================
diff -u -r62efc6d8ead9b39b47859fdc9c0661f30b5941d0 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/ManagerHome.qml	(.../ManagerHome.qml)	(revision 62efc6d8ead9b39b47859fdc9c0661f30b5941d0)
+++ sources/gui/qml/pages/ManagerHome.qml	(.../ManagerHome.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/pages/ManagerStack.qml
===================================================================
diff -u -r62efc6d8ead9b39b47859fdc9c0661f30b5941d0 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/ManagerStack.qml	(.../ManagerStack.qml)	(revision 62efc6d8ead9b39b47859fdc9c0661f30b5941d0)
+++ sources/gui/qml/pages/ManagerStack.qml	(.../ManagerStack.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -r595ed1fbe8066960afd4c8fea168208e81b173d9 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision 595ed1fbe8066960afd4c8fea168208e81b173d9)
+++ sources/gui/qml/pages/SettingsHome.qml	(.../SettingsHome.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 import Gui.Actions 0.1;
Index: sources/gui/qml/pages/SettingsStack.qml
===================================================================
diff -u -r62efc6d8ead9b39b47859fdc9c0661f30b5941d0 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/SettingsStack.qml	(.../SettingsStack.qml)	(revision 62efc6d8ead9b39b47859fdc9c0661f30b5941d0)
+++ sources/gui/qml/pages/SettingsStack.qml	(.../SettingsStack.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml
===================================================================
diff -u -r9e57e4c990afab0996def98521d4f9fee83f96d8 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/treatment/TreatmentCreate.qml	(.../TreatmentCreate.qml)	(revision 9e57e4c990afab0996def98521d4f9fee83f96d8)
+++ sources/gui/qml/pages/treatment/TreatmentCreate.qml	(.../TreatmentCreate.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 //  Qml imports
Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml	(.../TreatmentHome.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,10 +14,8 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
-import Gui.Actions 0.1;
 
 //  Qml imports
 import "qrc:/globals"
@@ -58,7 +56,6 @@
 
     onVisibleChanged: {
         if (visible) {
-            console.debug("TreatmentHome", visible)
             _mainMenu.hidden = false
         }
     }
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 
@@ -51,11 +50,11 @@
     TreatmentStart          { id:       _treatmentStart
         onBackPressed           : pop ()
         onSectionFlowClicked    : {
-            _treatmentFlowAdjustment.open()
+            _treatmentAdjustmentFlow.open()
         }
     }
 
-    TreatmentFlowAdjustment { id:       _treatmentFlowAdjustment
+    TreatmentAdjustmentFlow { id:       _treatmentAdjustmentFlow
         onCloseClicked          : close()
     }
 
Index: sources/gui/qml/pages/treatment/TreatmentStart.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/treatment/TreatmentStart.qml	(.../TreatmentStart.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/pages/treatment/TreatmentStart.qml	(.../TreatmentStart.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,10 +14,8 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
-import Gui.Actions 0.1;
 
 //  Qml imports
 import "qrc:/globals"
@@ -95,7 +93,6 @@
     TreatmentTime               { id: _treatmentTime }
 
     onVisibleChanged: {
-        console.debug("TreatmentHome", visible)
         if (visible) {
             _mainMenu.hidden = true
             _treatmentMenu.hidden = false
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
===================================================================
diff -u
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(revision 0)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -0,0 +1,59 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright                                                       \n
+ *          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,  \n
+ *          IN PART OR IN WHOLE,                                    \n
+ *          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n
+ *
+ * \file    TreatmentAdjustmentBase.qml
+ * \date    2020/03/22
+ * \author  Behrouz NematiPour
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+
+// Project
+
+//  Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+
+/*!
+ * \brief   TreatmentAdjustmentBase.qml is the base screen
+ *          For all adjustment screens in treatment
+ */
+ModalDialog { id: _root
+
+    property string titleText: ""
+
+    signal   closeClicked()
+    signal confirmClicked()
+
+    header:
+    Rectangle { id : _headerRect
+        ConfirmButton {
+            anchors.left: parent.left
+            onClicked : confirmClicked()
+        }
+
+        TitleText {
+            text: qsTr("FLOWS")
+            font.pixelSize: Fonts.fontPixelButton
+            color: Colors.textMain
+            height: Variables.mainMenuHeight
+            anchors {
+                top: parent.top
+                horizontalCenter: parent.horizontalCenter
+                margins: 35
+            }
+        }
+
+        CloseButton {
+            anchors.right: parent.right
+            onClicked : closeClicked()
+        }
+    }
+}
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
===================================================================
diff -u
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml	(revision 0)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -0,0 +1,98 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright                                                       \n
+ *          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,  \n
+ *          IN PART OR IN WHOLE,                                    \n
+ *          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n
+ *
+ * \file    TreatmentAdjustmentFlow.qml
+ * \date    2020/03/18
+ * \author  Behrouz NematiPour
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+
+// Project
+
+//  Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+
+/*!
+ * \brief   TreatmentAdjustmentFlow.qml is the screen
+ *          To adjust the treatment blood/dialysate flow
+ */
+TreatmentAdjustmentBase { id: _root
+
+    property alias      bloodFlowRateValue   :     _bloodFlowSlider.value
+    property alias      bloodFlowRateMinimum :     _bloodFlowSlider.minimum
+    property alias      bloodFlowRateMaximum :     _bloodFlowSlider.maximum
+    property alias      bloodFlowRateStep    :     _bloodFlowSlider.step
+
+    property alias  dialysateFlowRateValue   : _dialysateFlowSlider.value
+    property alias  dialysateFlowRateMinimum : _dialysateFlowSlider.minimum
+    property alias  dialysateFlowRateMaximum : _dialysateFlowSlider.maximum
+    property alias  dialysateFlowRateStep    : _dialysateFlowSlider.step
+
+    property string unit        : qsTr("mL")
+    property int    textWidth   : 200
+
+    Column { id : _flowsColumn
+        spacing: 100
+        anchors.centerIn: parent
+        Row { id : _bloodFlowRow
+            spacing: 100
+            anchors.horizontalCenter: parent.horizontalCenter
+            TextRect { id: _bloodFlowTextRect
+                anchors.top: parent.top
+                anchors.topMargin: 25
+                width: textWidth
+                title: qsTr("Blood Flow Rate")
+                label: _bloodFlowSlider.value
+                extra: _root.unit
+                labelFont.weight: Font.ExtraLight
+            }
+            Slider { id : _bloodFlowSlider
+                anchors.verticalCenter: parent.verticalCenter
+                width   : 600
+                height  : 5
+                minimum : 100
+                maximum : 500
+                unit    : _root.unit
+                step    : Variables.bloodFlowResolution
+                ticks   : true
+            }
+        }
+        Line {
+            anchors.horizontalCenter: parent.horizontalCenter
+            length  : _root.width - 100
+            color   : "#5f809d"
+        }
+        Row { id : _dialysateInletFlowRow
+            spacing: 100
+            anchors.horizontalCenter: parent.horizontalCenter
+            TextRect { id: _dialysateInletFlowTextRect
+                anchors.top: parent.top
+                anchors.topMargin: 25
+                width: textWidth
+                title: qsTr("Dialysate Flow Rate")
+                label: _dialysateFlowSlider.value
+                extra: _root.unit
+                labelFont.weight: Font.ExtraLight
+            }
+            Slider { id : _dialysateFlowSlider
+                anchors.verticalCenter: parent.verticalCenter
+                width   : 600
+                height  : 5
+                minimum : 100
+                maximum : 600
+                unit    : _root.unit
+                step    : Variables.dialysateFlowResolution
+                ticks   : true
+            }
+        }
+    }
+}
Fisheye: Tag cd7de5f6d239a11615ba8c6c03339a10996486ca refers to a dead (removed) revision in file `sources/gui/qml/pages/treatment/adjustments/TreatmentFlowAdjustment.qml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(.../TreatmentFlows.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml	(.../TreatmentFlows.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,7 +14,6 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
 
Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml	(.../TreatmentFluid.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml	(.../TreatmentFluid.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,10 +14,8 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
-import Gui.Actions 0.1;
 
 //  Qml imports
 import "qrc:/globals"
Index: sources/gui/qml/pages/treatment/sections/TreatmentInfusion.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/treatment/sections/TreatmentInfusion.qml	(.../TreatmentInfusion.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/pages/treatment/sections/TreatmentInfusion.qml	(.../TreatmentInfusion.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,10 +14,8 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
-import Gui.Actions 0.1;
 
 //  Qml imports
 import "qrc:/globals"
Index: sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml	(.../TreatmentPressure.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml	(.../TreatmentPressure.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,10 +14,8 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
-import Gui.Actions 0.1;
 
 //  Qml imports
 import "qrc:/globals"
Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -r4a6abe765f03feae8100ec660aa04aa218d4dfa3 -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision 4a6abe765f03feae8100ec660aa04aa218d4dfa3)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml	(.../TreatmentTime.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,11 +14,8 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
-import QtQuick.Shapes 1.12
 
 // Project
-import Gui.Actions 0.1;
 
 //  Qml imports
 import "qrc:/globals"
Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(.../TreatmentUltrafiltration.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml	(.../TreatmentUltrafiltration.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,10 +14,8 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
-import Gui.Actions 0.1;
 
 //  Qml imports
 import "qrc:/globals"
Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
===================================================================
diff -u -r79bf4dda5c027044ebd0014e7deac42a058a7fcf -rcd7de5f6d239a11615ba8c6c03339a10996486ca
--- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml	(.../TreatmentVitals.qml)	(revision 79bf4dda5c027044ebd0014e7deac42a058a7fcf)
+++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml	(.../TreatmentVitals.qml)	(revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
@@ -14,10 +14,8 @@
 
 // Qt
 import QtQuick 2.12
-import QtQuick.Controls 2.12
 
 // Project
-import Gui.Actions 0.1;
 
 //  Qml imports
 import "qrc:/globals"