Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml
===================================================================
diff -u -r35db01154f90ebfdb6174033a66f5c20af82e14d -r8be0073f796109578435eaa14edc7d3b9a2352da
--- sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 35db01154f90ebfdb6174033a66f5c20af82e14d)
+++ sources/gui/qml/pages/disinfect/DisinfectStack.qml	(.../DisinfectStack.qml)	(revision 8be0073f796109578435eaa14edc7d3b9a2352da)
@@ -36,21 +36,45 @@
     readonly property string heatTitle      : qsTr("Heat Disinfect")
     readonly property string chemicalTitle  : qsTr("Chemical Disinfect")
 
+    function doDisinfectBack    () {
+        vDisinfectAdjustDisinfect   .doDisinfectClear   ()
+        page ( _disinfectHome )
+    }
+    function doDisinfectConfirm () {
+        vDisinfectAdjustDisinfect   .doDisinfectConfirm ()
+    }
+    function doDisinfectFlush   () {
+        vDisinfectAdjustDisinfect   .doDisinfectFlush   ()
+        page( _disinfectFlush      )
+    }
+    function doDisinfectHeat    () {
+        vDisinfectAdjustDisinfect   .doDisinfectHeat    ()
+        page( _disinfectHeat       )
+    }
+    function doDisinfectChemical() {
+        vDisinfectAdjustDisinfect   .doDisinfectChemical()
+        page( _disinfectChemical   )
+    }
+    function doDisplayReasonText(vPage) {
+        if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ vPage.reasonText = ""                                }
+        else                                                { vPage.reasonText = vDisinfectAdjustDisinfect.text()  }
+    }
+
     DisinfectBase { id          :  _disinfectHome
         objectName              : "_disinfectHome"
         property int stackStepIndex : 0
         header.stepNames        : [ _root.disinfectTitle ]
         title.text              :   _root.disinfectTitle
         footer.childrenWidth    : 350
         footer.children: [
-            TouchRect { text.text: _root.flushTitle     ; onClicked: page( _disinfectFlush      )},
-            TouchRect { text.text: _root.heatTitle      ; onClicked: page( _disinfectHeat       )},
-            TouchRect { text.text: _root.chemicalTitle  ; onClicked: page( _disinfectChemical   )}
+            TouchRect { text.text: _root.flushTitle     ; onClicked: { doDisinfectFlush     () } },
+            TouchRect { text.text: _root.heatTitle      ; onClicked: { doDisinfectHeat      () } },
+            TouchRect { text.text: _root.chemicalTitle  ; onClicked: { doDisinfectChemical  () } }
         ]
         instructionBased        : true
-        header.confirmVisible   :   vDisinfectAdjustDisinfect       .canCancel           // if initiated by User from setting can be canceled.
+        header.confirmVisible   :   vDisinfectAdjustDisinfect   .hasCancel          // if initiated by User from setting can be canceled.
         header.confirmText.text : qsTr("Cancel")
-        onConfirmClicked        : { vDisinfectAdjustDisinfect       .doCancel            () }
+        onConfirmClicked        : { vDisinfectAdjustDisinfect   .doCancel           () }
     }
 
     DisinfectBase { id          :  _disinfectFlush
@@ -59,9 +83,9 @@
         title.text              :                           _root.flushTitle
         instructionBased        : true
         header.backVisible      : true
-        onBackClicked           : { page ( _disinfectHome ) }
         header.confirmVisible   : true
-        onConfirmClicked        : { vDisinfectAdjustDisinfect       .doFlush             () }
+        onBackClicked           : doDisinfectBack     ()
+        onConfirmClicked        : doDisinfectConfirm  ()
     }
 
     DisinfectBase { id          :  _disinfectHeat
@@ -70,9 +94,9 @@
         title.text              :                           _root.heatTitle
         instructionBased        : true
         header.backVisible      : true
-        onBackClicked           : { page ( _disinfectHome ) }
         header.confirmVisible   : true
-        onConfirmClicked        : { vDisinfectAdjustDisinfect       .doDisinfectHeat     () }
+        onBackClicked           : doDisinfectBack     ()
+        onConfirmClicked        : doDisinfectConfirm  ()
     }
 
     DisinfectBase { id          :  _disinfectChemical
@@ -81,25 +105,23 @@
         title.text              :                           _root.chemicalTitle
         instructionBased        : true
         header.backVisible      : true
-        onBackClicked           : { page ( _disinfectHome ) }
         header.confirmVisible   : true
-        onConfirmClicked        : { vDisinfectAdjustDisinfect       .doDisinfectChemical () }
+        onBackClicked           : doDisinfectBack     ()
+        onConfirmClicked        : doDisinfectConfirm  ()
     }
 
     // ----- Navigation
     Connections { target: vHDOperationMode
-        onStandbyWaitDisinfectChanged       : { page( _disinfectHome    , vstandbyWaitDisinfect        )} // initialItem
+        onStandbyWaitDisinfectChanged                   : { page( _disinfectHome    , vstandbyWaitDisinfect        )} // initialItem
     }
 
     // ----- Responses
     Connections { target:  vDisinfectAdjustDisinfect
-        onAdjustmentTriggered   : {
-            if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ _disinfectHome.reasonText = ""                                }
-            else                                                { _disinfectHome.reasonText = vDisinfectAdjustDisinfect.text()  }
-        }
+        onAdjustment_DisinfectStartFlushTriggered       : { doDisplayReasonText( _disinfectFlush    )}
+        onAdjustment_DisinfectStartHeatTriggered        : { doDisplayReasonText( _disinfectHeat     )}
+        onAdjustment_DisinfectStartChemicalTriggered    : { doDisplayReasonText( _disinfectChemical )}
     }
 
-
     onVisibleChanged: {
         if (visible) {
             _mainMenu.hidden = true