Index: leahi.pro
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -r34290f9fb980b41d888c0d1d543a0a9a17d3d309
--- leahi.pro	(.../leahi.pro)	(revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ leahi.pro	(.../leahi.pro)	(revision 34290f9fb980b41d888c0d1d543a0a9a17d3d309)
@@ -63,6 +63,7 @@
     sources/model/td/alarm \
     sources/model/td/adjustment \
     sources/model/td/adjustment/settings \
+    sources/model/td/adjustment/treatment \
     sources/model/dd    \
     sources/model/dd/data   \
     sources/model/dd/adjustment \
@@ -75,6 +76,7 @@
     sources/view/td \
     sources/view/td/data \
     sources/view/td/data/treatment \
+    sources/view/td/adjustment/treatment \
     sources/view/dd \
     sources/view/dd/data \
     sources/view/confirm \
@@ -196,6 +198,7 @@
     sources/model/MModel.h \
     sources/model/MAbstract.h \
     sources/model/MAbstractDynamic.h \
+    sources/model/MListModel.h \
     sources/device/DeviceModels.h \
     \ # ---------- Models - TD - Data                                           //// ----- @LEAHIZED
     sources/model/td/data/MTDOpModeData.h \
@@ -225,6 +228,10 @@
     sources/view/td/data/VTDBatteryData.h \
     sources/view/td/data/VTDEjectorData.h \
     sources/view/td/data/VTDOpModeData.h \
+    \ # ---------- Views - TD - Adjustment - In-Treatment
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \
+    \ # ---------- Models - TD - Adjustment - In-Treatment
+    sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.h \
     \ # ---------- Models - confirm
     sources/model/confirm/MDuetConfirmHDi.h \
     \ # ---------- Models - POST
@@ -276,7 +283,6 @@
     sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.h \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \
     \ # ---------- Models - HD - Adjustment - End-Treatment
@@ -394,7 +400,6 @@
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h \
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \
     \ # ---------- Views - HD - Adjustment - End-Treatment
@@ -537,6 +542,7 @@
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
     sources/model/MAbstractDynamic.cpp \
+    sources/model/MListModel.cpp \
     sources/device/DeviceModels.cpp \
     \ # ---------- Models - TD - Data - States
     sources/model/td/data/MTDOpModeData.cpp \
@@ -565,6 +571,8 @@
     \ # ---------- Models - Data - States
     sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \
+    \ # ---------- Models - TD - Adjustment - In-Treatment
+    sources/model/td/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \
     \ # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustPowerOff.cpp \
     \ # ---------- Models - HD - Adjustment - Settings
@@ -586,7 +594,6 @@
     sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \
-    sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \
     sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \
     \ # ---------- Models - HD - Adjustment - End-Treatment
@@ -664,6 +671,8 @@
     sources/view/td/data/VTDBatteryData.cpp \
     sources/view/td/data/VTDEjectorData.cpp \
     sources/view/td/data/VTDOpModeData.cpp \
+    \ # ---------- Views - TD - Adjustment - In-Treatment
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \
     \ # ---------- Views - CONFIRM
     sources/view/confirm/VConfirm.cpp \
     \ # ---------- Views - POST
@@ -705,7 +714,6 @@
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \
-    sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \
     sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \
     \ # ---------- Views - HD - Adjustment - End-Treatment
Index: leahi.qrc
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -r34290f9fb980b41d888c0d1d543a0a9a17d3d309
--- leahi.qrc	(.../leahi.qrc)	(revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ leahi.qrc	(.../leahi.qrc)	(revision 34290f9fb980b41d888c0d1d543a0a9a17d3d309)
@@ -44,7 +44,10 @@
         <file alias="DiagnosticsFP.qml">sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml</file>
     </qresource>
     <qresource prefix="/dialogs/headerbar">
-        <file alias="WiFiDialog.qml">sources/gui/qml/dialogs/headerbar/WiFiDialog.qml</file>
+        <file alias="HeaderbarWiFi.qml">sources/gui/qml/dialogs/headerbar/HeaderbarWiFi.qml</file>
+        <file alias="HeaderbarStorage.qml">sources/gui/qml/dialogs/headerbar/HeaderbarStorage.qml</file>
+        <file alias="HeaderbarSettings.qml">sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml</file>
+        <file alias="HeaderbarInformation.qml">sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml</file>
     </qresource>
     <qresource prefix="/images">
         <file alias="iLogoD">resources/images/Logo d.png</file>
@@ -96,6 +99,7 @@
         <file alias="iCloudSync">resources/images/CloudSync.png</file>
         <file alias="iInformation">resources/images/Information.png</file>
         <file alias="iStorage">resources/images/Storage.png</file>
+        <file alias="iHelp">resources/images/help.png</file>
     </qresource>
     <qresource prefix="/components">
         <file alias="MainMenu.qml">sources/gui/qml/components/MainMenu.qml</file>
@@ -143,14 +147,12 @@
         <file alias="DebugDataColumn.qml">sources/gui/qml/components/DebugDataColumn.qml</file>
         <file alias="RangeSlider.qml">sources/gui/qml/components/RangeSlider.qml</file>
         <file alias="MuteButton.qml">sources/gui/qml/components/MuteButton.qml</file>
-        <file alias="UpDownButton.qml">sources/gui/qml/components/UpDownButton.qml</file>
         <file alias="ImageText.qml">sources/gui/qml/components/ImageText.qml</file>
         <file alias="WaitDone.qml">sources/gui/qml/components/WaitDone.qml</file>
         <file alias="TimeCircle.qml">sources/gui/qml/components/TimeCircle.qml</file>
         <file alias="Footer.qml">sources/gui/qml/components/Footer.qml</file>
         <file alias="TextEntry.qml">sources/gui/qml/components/TextEntry.qml</file>
         <file alias="ScrollBar.qml">sources/gui/qml/components/ScrollBar.qml</file>
-        <file alias="Fader.qml">sources/gui/qml/compounds/Fader.qml</file>
         <file alias="FooterStatic.qml">sources/gui/qml/components/FooterStatic.qml</file>
         <file alias="TimeEntry.qml">sources/gui/qml/components/TimeEntry.qml</file>
         <file alias="Label.qml">sources/gui/qml/components/Label.qml</file>
@@ -162,6 +164,7 @@
         <file alias="ArrowButton.qml">sources/gui/qml/components/ArrowButton.qml</file>
         <file alias="HeaderBar.qml">sources/gui/qml/components/HeaderBar.qml</file>
         <file alias="HeaderBarPopup.qml">sources/gui/qml/components/HeaderBarPopup.qml</file>
+        <file alias="AlarmButtonRow.qml">sources/gui/qml/components/AlarmButtonRow.qml</file>
     </qresource>
     <qresource prefix="/compounds">
         <file alias="PressureRangeSlider.qml">sources/gui/qml/compounds/PressureRangeSlider.qml</file>
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -r34290f9fb980b41d888c0d1d543a0a9a17d3d309
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 34290f9fb980b41d888c0d1d543a0a9a17d3d309)
@@ -165,7 +165,7 @@
             ID_DGFilterFlushData                        = 0x600F, // ??     //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustWaterSampleReq                     = 0x5D00, // 93
             ID_AdjustWaterSampleRsp                     = 0x5E00, // 94
-            ID_AdjustWaterSampleResultReq               = 0x5F00, // 95  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
+            ID_AdjustWaterSampleResultReq               = 0x5F0F, // 95     //// ----- @CRAPIZED: had to change to avoid duplication
             // Pre-Treatment Consumables Installation Confirm
             ID_AdjustConsumablesConfirmReq              = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment SelfTest NoCartridge Progress Data
@@ -245,8 +245,8 @@
             ID_AdjustPressuresLimitsReq                 = 0x4600, // 70
             ID_AdjustPressuresLimitsRsp                 = 0x4700, // 71
 
-            ID_AdjustSalineReq                          = 0x1200, // 18
-            ID_AdjustSalineRsp                          = 0x1400, // 20
+            ID_AdjustSalineReq                          = 0x5F00, // 95
+            ID_AdjustSalineRsp                          = 0x6000, // 96
 
             ID_AdjustHeparinReq                         = 0x4B00, // 75
             ID_AdjustHeparinRsp                         = 0x4C00, // 76
Index: sources/gui/qml/main.qml
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -r34290f9fb980b41d888c0d1d543a0a9a17d3d309
--- sources/gui/qml/main.qml	(.../main.qml)	(revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 34290f9fb980b41d888c0d1d543a0a9a17d3d309)
@@ -342,50 +342,35 @@
         anchors.top: parent.top
     }
 
-    SDCProgressItem              { id: _sdcProgressItem
-        // TODO: disable this later. this is only for diagnostic purpose.
-        onDoubleClicked : {
-            if ( _GuiView.dryDemoMode ) {
-                let dryDemoTempID = 99
-                let id = vConfirm.id
-                vConfirm.id = dryDemoTempID
-                vConfirm.doConfirm( true  )
-                vConfirm.id = id
-            }
-            else {
-                _diagnosticsDialog.open()
-            }
-        }
+    GuiView { id: _GuiView
+        //        Component.onCompleted: {
+        //            console.debug("GuiView - complete")
+        //        }
     }
-
     // keyboard should always be before AlarmItem to not to covet it.
-    KeyboardItem        { id: _keyboard                    }
+    KeyboardItem            { id: _keyboard                    }
 
-    WiFiDialog          { id: _wifiDialog                  }
-    LockDialog          { id: _lockDialog                  }
-    AlarmItem           { id: _alarmItem        ;   z: 996 }
-    PowerItem           { id: _powerItem        ;   z: 997 }
-    ConfirmDialog       { id: _confirmDialog    ;   z: 998 }
-    DiagnosticsDialog   { id: _diagnosticsDialog;   z: 999 }
+    HeaderbarWiFi           { id: _headerbarWifi               }
+    HeaderbarStorage        { id: _headerbarStorage            }
+    HeaderbarSettings       { id: _headerbarSettings           }
+    HeaderbarInformation    { id: _headerbarInformation        }
+    LockDialog              { id: _lockDialog                  }
+    AlarmItem               { id: _alarmItem        ;   z: 996 }
+    PowerItem               { id: _powerItem        ;   z: 997 }
+    ConfirmDialog           { id: _confirmDialog    ;   z: 998 }
+    DiagnosticsDialog       { id: _diagnosticsDialog;   z: 999 }
 
     // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem
     //       then cannot be anchored.
     NotificationBar     { id: _alarmBar
         anchors.bottom      : _mainMenu.top
-        backgroundColor     : _alarmItem.backgroundColor
+        color               : _alarmItem.backgroundColor
         textColor           : _alarmItem.textColor
         alarmID             : _alarmItem.alarm_AlarmID
         text                : _alarmItem.title
         textPixelSize       : Fonts.fontPixelAlarmBarTitle
         isSilenced          : _alarmItem.isSilenced
         timeout             : _alarmItem.timeout
-        backgroundFading    : vTDOpMode.fault
         z                   : 995
     }
-
-    GuiView { id: _GuiView
-        //        Component.onCompleted: {
-        //            console.debug("GuiView - complete")
-        //        }
-    }
 }