Index: sources/gui/qml/pages/settings/SettingsDG.qml
===================================================================
diff -u -r7e503c5459ec77a2816d6c7789da9b206cedbe8a -refb549a694539630ba7c1d8e348f598052b85f0f
--- sources/gui/qml/pages/settings/SettingsDG.qml	(.../SettingsDG.qml)	(revision 7e503c5459ec77a2816d6c7789da9b206cedbe8a)
+++ sources/gui/qml/pages/settings/SettingsDG.qml	(.../SettingsDG.qml)	(revision efb549a694539630ba7c1d8e348f598052b85f0f)
@@ -34,7 +34,9 @@
  *          on daily cycle at certain time of the day
  */
 SettingsBase { id: _root
-    QtObject { id: vSettingsDG
+    readonly property bool enableScheduling: false  // TODO : phase 1 doesn't have this feature (disinfection schedule)
+
+    QtObject { id: _settingsDG
         property string status: ""
         function doConfirm(vWaterFlushScheduleTimeHour          ,
                            vWaterFlushScheduleTimeMinute        ,
@@ -62,12 +64,12 @@
         _heatDisinfectionScheduleTime   .isValid &&
         _heatDisinfectionScheduleCycle  .isValid
 
-    confirmVisible  : false                                     // TODO : phase 1 doesn't have this feature (disinfection schedule)
-    confirmEnabled  : _root.isValid
+    confirmVisible  : false // phase 1 // true
+    confirmEnabled  : _root.enableScheduling
     firstFocusInput : _waterFlushScheduleTime
-    notificationText: vSettingsDG.status
+    notificationText: _settingsDG.status
     onConfirmClicked: {
-        vSettingsDG.doConfirm(
+        _settingsDG.doConfirm(
                     _waterFlushScheduleTime         .hour   ,
                     _waterFlushScheduleTime         .minute ,
                     _waterFlushScheduleCycle        .text   ,
@@ -76,8 +78,12 @@
                     _heatDisinfectionScheduleCycle  .text   )
     }
 
+    onVisibleChanged: {
+        if ( ! visible ) _root.notificationText = ""
+    }
+
     Row { id: _container
-        visible: false                                          // TODO : phase 1 doesn't have this feature (disinfection schedule)
+        visible: false // phase 1 // true
         spacing: 25
         y : Qt.inputMethod.visible && _keyboard.visible ? topMarginContent : ( (_root.height - _container.height) / 2 )
         Behavior on y { NumberAnimation { duration: Variables.keybardAnimationDuration } }
@@ -131,28 +137,19 @@
 
     Footer {
         anchors.bottomMargin: Variables.mainMenuHeight + Variables.notificationHeight + Variables.minVGap
-        childrenWidth: 300
+        childrenWidth: parent.width / 3
         children: [
-            TouchRect { text.text: qsTr("Water Flush")
-                        onClicked: vDisinfectAdjustDisinfect      .doFlush            ()},
-            TouchRect { text.text: qsTr("Heat Disinfection")
-                        onClicked: vDisinfectAdjustDisinfect      .doDisinfectHeat    ()},
-            TouchRect { text.text: qsTr("Chemical Disinfection")
-                        onClicked: vDisinfectAdjustDisinfect      .doDisinfectChemical()}
+            TouchRect { text.text: qsTr("DG Cleaning")
+                        onClicked: { vDisinfectAdjustDisinfect      .doDisinfectInitiate    () }
+            }
         ]
     }
 
     // ----- Responses
     Connections { target:  vDisinfectAdjustDisinfect
-        onAdjustmentTriggered   : {
-            if ( ! visible ) return
-            if ( vDisinfectAdjustDisinfect.adjustment_Accepted ) {
-                _root.notificationText = ""
-                _mainStack.doSettingsDisinfect() // go to disinfect stack
-                pop()                            // back to settings stack main menu
-            } else {
-                _root.notificationText = vDisinfectAdjustDisinfect.text()
-            }
+        onAdjustment_DisinfectModeTriggered: {
+            if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ _root.notificationText = ""                               }
+            else                                                { _root.notificationText = vDisinfectAdjustDisinfect.text() }
         }
     }
 }