Index: sources/gui/qml/pages/MainStack.qml
===================================================================
diff -u -r265ce7409a0ea99a4ae059f5ce7978c9cdb10631 -rf68b226e67eb500758ee94fe015df48931240013
--- sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision 265ce7409a0ea99a4ae059f5ce7978c9cdb10631)
+++ sources/gui/qml/pages/MainStack.qml	(.../MainStack.qml)	(revision f68b226e67eb500758ee94fe015df48931240013)
@@ -125,7 +125,7 @@
     }
 
     Connections { target: vSettings
-        onNoCANBusChanged: {
+        function onNoCANBusChanged              ( vValue ) {
             //// DEBUG:
             // console.debug("vSettings.noCANBus"      , vSettings         .noCANBus   ,
             //               "vHDOperationMode.init"   , vHDOperationMode  .init       ,
@@ -142,27 +142,27 @@
     }
 
     Connections { target: vHDOperationMode
-        onIsTreatmentChanged            : { if( visTreatment    ) _mainMenu.isTreatment()                        }
-        onIsManagerChanged              : { if( visManager      ) _mainMenu.isManager  ()                        }
-        onIsSettingsChanged             : { if( visSettings     ) _mainMenu.isSettings ()                        }
+        function onIsTreatmentChanged           ( vValue ) { if( vValue ) _mainMenu.isTreatment()                }
+        function onIsManagerChanged             ( vValue ) { if( vValue ) _mainMenu.isManager  ()                }
+        function onIsSettingsChanged            ( vValue ) { if( vValue ) _mainMenu.isSettings ()                }
 
-        onFaultChanged                  : { page( _faultModeScreen                  , vfault    && ! vSettings.noCANBus )}
-        onServiceChanged                : { page( _serviceModeScreen                , vservice                  )}
-        onInitChanged                   : { page( _postModeScreen                   , vinit     && ! vSettings.noCANBus )
-                                            if  ( vinit ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run
+        function onFaultChanged                 ( vValue ) { page( _faultModeScreen                 , vValue    && ! vSettings.noCANBus  )}
+        function onServiceChanged               ( vValue ) { page( _serviceModeScreen               , vValue    )}
+        function onInitChanged                  ( vValue ) { page( _postModeScreen                  , vValue    && ! vSettings.noCANBus  )
+                                                             if( vValue ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run
         }
 
-        onHomeChanged                   : { page( _mainHome                         , vhome                     )}
-        onStandbyChanged                : { /* It depends on the subModes of the standBy. Handled by onHome.  */ }
-        onStandbyStartChanged           : { /* It depends on the subModes of the standBy. Handled by onHome.  */ }
-        onStandbyWaitTreatmentChanged   : { /* It depends on the subModes of the standBy. Handled by onHome.  */ }
-        onStandbyWaitDisinfectChanged   : { page( _disinfectStack                   , vstandbyWaitDisinfect     )}
+        function onHomeChanged                  ( vValue ) { page( _mainHome                        , vValue    )}
+        function onStandbyChanged               ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome.  */   }
+        function onStandbyStartChanged          ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome.  */   }
+        function onStandbyWaitTreatmentChanged  ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome.  */   }
+        function onStandbyWaitDisinfectChanged  ( vValue ) { page( _disinfectStack                  , vValue    )}
 
-        onValidateParametersChanged     : { page( _preTreatmentCreateStack          , vvalidateParameters       )}
-        onPreTreatmentChanged           : { page( _preTreatmentStack                , vpreTreatment             )}
-        onInTreatmentChanged            : { page( _treatmentStack                   , vinTreatment              )}
-        onPostTreatmentChanged          : { page( _postTreatmentStack               , vpostTreatment            )}
-        onInvalidModeChanged            : { page( null                              , vinvalidMode              )}
+        function onValidateParametersChanged    ( vValue ) { page( _preTreatmentCreateStack         , vValue    )}
+        function onPreTreatmentChanged          ( vValue ) { page( _preTreatmentStack               , vValue    )}
+        function onInTreatmentChanged           ( vValue ) { page( _treatmentStack                  , vValue    )}
+        function onPostTreatmentChanged         ( vValue ) { page( _postTreatmentStack              , vValue    )}
+        function onInvalidModeChanged           ( vValue ) { page( null                             , vValue    )}
     }
 
     // the page function is more flixible regarding our current design
@@ -171,25 +171,25 @@
     // also with what ever order they have been push with the reverse/correct animation will be poped or pushed.
     Connections { target: vHDTreatmentStates
         // Blood Prime
-        onBpRampChanged             : { page( null                              ,  vbpRamp                  )}
+        function onBpRampChanged                ( vValue ) { page( null                             , vValue    )}
 
         // in-Treatmet
-        onTxDialysisChanged         : { page( _treatmentStack                   ,  vtxDialysis              )}
+        function onTxDialysisChanged            ( vValue ) { page( _treatmentStack                  , vValue    )}
 
-        onTxRinsebackChanged        : { page( _endTreatmentRinsebackStack       ,  vtxRinseback             )}
-        onTxRecirculateChanged      : { page( _endTreatmentRecirculateStack     ,  vtxRecirculate           )}
-        onTxEndChanged              : { page( _endTreatmentEndStack             ,  vtxEnd                   )}
+        function onTxRinsebackChanged           ( vValue ) { page( _endTreatmentRinsebackStack      , vValue    )}
+        function onTxRecirculateChanged         ( vValue ) { page( _endTreatmentRecirculateStack    , vValue    )}
+        function onTxEndChanged                 ( vValue ) { page( _endTreatmentEndStack            , vValue    )}
 
         // Treatment Stop
-        onTxStopChanged             : { page( _treatmentStack                   ,  vtxStop                  )}
-        onTsRecirculateChanged      : { page( null                              ,  vtsRecirculate           )}
-        onTsRecirculateDialysateChanged : { page( null                          ,  vtsRecirculateDialysate  )}
-        onTsRecirculateBloodChanged     : { page( null                          ,  vtsRecirculateBlood      )}
-        onTsRecirculateNoChanged    : { page( null                              ,  vtsRecirculateNo         )}
+        function onTxStopChanged                ( vValue ) { page( _treatmentStack                  , vValue    )}
+        function onTsRecirculateChanged         ( vValue ) { page( null                             , vValue    )}
+        function onTsRecirculateDialysateChanged( vValue ) { page( null                             , vValue    )}
+        function onTsRecirculateBloodChanged    ( vValue ) { page( null                             , vValue    )}
+        function onTsRecirculateNoChanged       ( vValue ) { page( null                             , vValue    )}
     }
 
     Connections { target: vPreTreatmentAdjustmentInitTreatment
-        onAdjustmentTriggered: {
+        function onAdjustmentTriggered          ( vValue ) {
             _mainHome.reasonText = vPreTreatmentAdjustmentInitTreatment.adjustment_ReasonText
         }
     }