Index: leahi.pro
===================================================================
diff -u -r66ed4277f1a2219554e1920f3701c1eb438e9a0a -ra471fb4ea8141e82e46344e00ec790410b09fceb
--- leahi.pro	(.../leahi.pro)	(revision 66ed4277f1a2219554e1920f3701c1eb438e9a0a)
+++ leahi.pro	(.../leahi.pro)	(revision a471fb4ea8141e82e46344e00ec790410b09fceb)
@@ -67,6 +67,10 @@
     sources/model/dd/data   \
     sources/model/dd/adjustment \
     sources/model/dd/adjustment/settings \
+    sources/model/fp    \
+    sources/model/fp/data   \
+    sources/model/fp/adjustment \
+    sources/model/fp/adjustment/settings \
     sources/view \
     sources/view/td \
     sources/view/td/data \
@@ -75,6 +79,8 @@
     sources/view/dd/data \
     sources/view/confirm \
     sources/view/settings \
+    sources/view/fp \
+    sources/view/fp/data \
     \
     sources/gui \
     sources/utility \
@@ -128,6 +134,7 @@
     common/AlarmDefs.h \
     common/Compatible.h \
     common/DDDefs.h \
+    common/FPDefs.h \
     common/TDDefs.h \
     common/MsgDefs.h \
     \ # Main
@@ -153,6 +160,15 @@
     sources/model/dd/data/MDDPressuresData.h \
     sources/model/dd/data/MDDTemperaturesData.h \
     sources/model/dd/data/MDDValvesStatesData.h \
+    sources/model/fp/adjustment/settings/MAdjustFPVersionsResponse.h \
+    sources/model/fp/data/MFPBoostPumpData.h \
+    sources/model/fp/data/MFPConductivityData.h \
+    sources/model/fp/data/MFPFlowData.h \
+    sources/model/fp/data/MFPLevelData.h \
+    sources/model/fp/data/MFPPressuresData.h \
+    sources/model/fp/data/MFPROPumpData.h \
+    sources/model/fp/data/MFPTemperatureData.h \
+    sources/model/fp/data/MFPValvesStatesData.h \
     sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \
@@ -195,6 +211,14 @@
     sources/view/dd/data/VDDPressuresData.h \
     sources/view/dd/data/VDDTemperaturesData.h \
     sources/view/dd/data/VDDValvesStatesData.h \
+    sources/view/fp/data/VFPBoostPumpData.h \
+    sources/view/fp/data/VFPConductivityData.h \
+    sources/view/fp/data/VFPFlowData.h \
+    sources/view/fp/data/VFPLevelData.h \
+    sources/view/fp/data/VFPPressuresData.h \
+    sources/view/fp/data/VFPROPumpData.h \
+    sources/view/fp/data/VFPTemperatureData.h \
+    sources/view/fp/data/VFPValvesStatesData.h \
     sources/view/hd/data/VTreatmentRanges.h \
     sources/view/td/data/VTDAirBubbleData.h \
     sources/view/td/data/VTDAirPumpData.h \
@@ -459,6 +483,15 @@
     sources/model/dd/data/MDDPressuresData.cpp \
     sources/model/dd/data/MDDTemperaturesData.cpp \
     sources/model/dd/data/MDDValvesStatesData.cpp \
+    sources/model/fp/adjustment/settings/MAdjustFPVersionsResponse.cpp \
+    sources/model/fp/data/MFPBoostPumpData.cpp \
+    sources/model/fp/data/MFPConductivityData.cpp \
+    sources/model/fp/data/MFPFlowData.cpp \
+    sources/model/fp/data/MFPLevelData.cpp \
+    sources/model/fp/data/MFPPressuresData.cpp \
+    sources/model/fp/data/MFPROPumpData.cpp \
+    sources/model/fp/data/MFPTemperatureData.cpp \
+    sources/model/fp/data/MFPValvesStatesData.cpp \
     sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \
@@ -491,6 +524,14 @@
     sources/view/dd/data/VDDPressuresData.cpp \
     sources/view/dd/data/VDDTemperaturesData.cpp \
     sources/view/dd/data/VDDValvesStatesData.cpp \
+    sources/view/fp/data/VFPBoostPumpData.cpp \
+    sources/view/fp/data/VFPConductivityData.cpp \
+    sources/view/fp/data/VFPFlowData.cpp \
+    sources/view/fp/data/VFPLevelData.cpp \
+    sources/view/fp/data/VFPPressuresData.cpp \
+    sources/view/fp/data/VFPROPumpData.cpp \
+    sources/view/fp/data/VFPTemperatureData.cpp \
+    sources/view/fp/data/VFPValvesStatesData.cpp \
     sources/view/hd/data/post/VHDPOSTData.cpp \
     sources/bluetooth/BluetoothInterface.cpp \
     sources/cloudsync/CloudSyncController.cpp \
Index: leahi.qrc
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra471fb4ea8141e82e46344e00ec790410b09fceb
--- leahi.qrc	(.../leahi.qrc)	(revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ leahi.qrc	(.../leahi.qrc)	(revision a471fb4ea8141e82e46344e00ec790410b09fceb)
@@ -45,6 +45,9 @@
     </qresource>
     <qresource prefix="/dialogs/headerbar">
         <file alias="WiFiDialog.qml">sources/gui/qml/dialogs/headerbar/WiFiDialog.qml</file>
+        <file alias="StorageDialog.qml">sources/gui/qml/dialogs/headerbar/StorageDialog.qml</file>
+        <file alias="SettingsDialog.qml">sources/gui/qml/dialogs/headerbar/SettingsDialog.qml</file>
+        <file alias="InformationDialog.qml">sources/gui/qml/dialogs/headerbar/InformationDialog.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/qml/main.qml
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra471fb4ea8141e82e46344e00ec790410b09fceb
--- sources/gui/qml/main.qml	(.../main.qml)	(revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision a471fb4ea8141e82e46344e00ec790410b09fceb)
@@ -342,26 +342,13 @@
         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()
-            }
-        }
-    }
-
     // keyboard should always be before AlarmItem to not to covet it.
     KeyboardItem        { id: _keyboard                    }
 
     WiFiDialog          { id: _wifiDialog                  }
+    StorageDialog       { id: _storageDialog               }
+    SettingsDialog      { id: _settingsDialog              }
+    InformationDialog   { id: _informationDialog           }
     LockDialog          { id: _lockDialog                  }
     AlarmItem           { id: _alarmItem        ;   z: 996 }
     PowerItem           { id: _powerItem        ;   z: 997 }
@@ -372,20 +359,13 @@
     //       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")
-        //        }
-    }
 }