Index: sources/gui/qml/main.qml
===================================================================
diff -u -rbb8fb02ae21e519371acb4b78d5d64879534d82e -r6b60df9d8468e2134c7de32bd0f6215cef33269b
--- sources/gui/qml/main.qml	(.../main.qml)	(revision bb8fb02ae21e519371acb4b78d5d64879534d82e)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 6b60df9d8468e2134c7de32bd0f6215cef33269b)
@@ -6,8 +6,8 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    main.qml
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      27-Apr-2023
+ * \author  (last)      Mohammed Suleiman
+ * \date    (last)      21-Jul-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  24-Sep-2019
  *
@@ -111,6 +111,7 @@
 import VPostTreatmentAdjustmentTreatmentLog                 0.1
 // Disinfection
 import VDisinfectAdjustDisinfect                            0.1
+import VAdjustDGCleaningUsage                               0.1
 
 // Confirm
 import VConfirm     0.1
@@ -239,6 +240,7 @@
 
     // --- Disinfection
     VDisinfectAdjustDisinfect                           { id: vDisinfectAdjustDisinfect                             }
+    VAdjustDGCleaningUsage                              { id: vAdjustDGCleaningUsage                                }
 
     Background {}
 
@@ -257,16 +259,18 @@
         function isManager    () { _mainMenu.itemPressed(1) }
         function isSettings   () { _mainMenu.itemPressed(2) }
 
-        hidden: true // it should be hidden by default since the landing screen changed to init and it does not have the main menu untill the POST passes.
-        titles          : [ qsTr("Treatment") , qsTr("Manager") , qsTr("Settings") ]
-        visibleItems    : [       true        ,       false     ,       true       ]
-        Component.onCompleted: {
+        disable                 : _GuiView.manufactSetup
+        hidden                  : true // it should be hidden by default since the landing screen changed to init and it does not have the main menu until the POST passes.
+        titles                  : [ qsTr("Treatment") , qsTr("Manager") , qsTr("Settings") ]
+        visibleItems            : [       true        ,       false     ,       true       ]
+        Component.onCompleted   : {
             _settingsStack.visible = false
             _managerStack .visible = false
             _mainStack    .visible = true
         }
 
         onItemPressed: {
+            if ( disable ) return
             _mainStack    .visible = vIndex == 0
             _managerStack .visible = vIndex == 1
             _settingsStack.visible = vIndex == 2
@@ -334,11 +338,7 @@
         verticalAlignment   : Text.AlignBottom
 
         height  : 15
-        text    : Variables.notSetVariable(vTreatmentVitals.systolic__rt, 2) + "/" +
-                  Variables.notSetVariable(vTreatmentVitals.diastolic_rt, 2) + "/" +
-                  Variables.notSetVariable(vTreatmentVitals.heartRate_rt, 2) + ":" +
-                   vBluetooth.pairedAddr                                     + " " +
-                  (vBluetooth.notification || vDevice.status)
+        text    : "B:" + vBluetooth.pairedAddr
         font.pixelSize: 14
     }
 
@@ -353,7 +353,7 @@
         verticalAlignment   : Text.AlignBottom
 
         height  : 15
-        text    : "Vital Timer: " + vTreatmentVitals.min_left + " : " + vTreatmentVitals.sec_left
+        //DEBUG text    : "Vital Timer: " + vTreatmentVitals.min_left + " : " + vTreatmentVitals.sec_left
         font.pixelSize: 14
     }
 
@@ -421,6 +421,7 @@
         anchors.bottom      : _mainMenu.top
         backgroundColor     : _alarmItem.backgroundColor
         textColor           : _alarmItem.textColor
+        alarmID             : _alarmItem.alarm_AlarmID
         text                : _alarmItem.title
         textPixelSize       : Fonts.fontPixelAlarmBarTitle
         isSilenced          : _alarmItem.isSilenced