Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
===================================================================
diff -u -re1351d7e3e0083e1c7c5842992c40622c2deae22 -rf68b226e67eb500758ee94fe015df48931240013
--- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml	(.../PreTreatmentPrimeStack.qml)	(revision e1351d7e3e0083e1c7c5842992c40622c2deae22)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml	(.../PreTreatmentPrimeStack.qml)	(revision f68b226e67eb500758ee94fe015df48931240013)
@@ -105,41 +105,39 @@
     }
 
     Connections { target: vPreTreatmentStates
-        onSelfTestDryChanged                                : { page( _preTreatmentDrySelfTest                      , vselfTestDry                          )}
-        onSelfTestDry_startChanged                          : {}
-        onSelfTestDry_waitDoorCloseChanged                  : {}
-        onSelfTestDry_usedCartridgeEntered                  : { _preTreatmentDrySelfTest        .checkList.setItem(0, vselfTestDry_usedCartridge            )}
-        onSelfTestDry_occlusionSensorsEntered               : { _preTreatmentDrySelfTest        .checkList.setItem(1, vselfTestDry_occlusionSensors         )}
-        onSelfTestDry_pressureSensorsNormalSetupEntered     : { _preTreatmentDrySelfTest        .checkList.setItem(2, true                                  )}
-        onSelfTestDry_pressureSensorsVenousSetupEntered     : {}
-        onSelfTestDry_pressureSensorsVenousEntered          : {}
-        onSelfTestDry_pressureSensorsArterialSetupEntered   : {}
-        onSelfTestDry_pressureSensorsArterialEntered        : {}
-        onSelfTestDry_pressureSensorsDecayEntered           : {}
-        onSelfTestDry_pressureSensorsStabilityEntered       : {}
-        onSelfTestDry_pressureSensorsNormalEntered          : { _preTreatmentDrySelfTest        .checkList.setItem(2, vselfTestDry_pressureSensorsNormal    )}
-        onSelfTestDry_syringePumpEntered                    : { _preTreatmentDrySelfTest        .checkList.setItem(3, vselfTestDry_syringePump              )}
-        onSelfTestDry_stoppedEntered                        : {}
-        onSelfTestDry_completeEntered                       : {}
+        function onSelfTestDryChanged                               ( vValue ) { page( _preTreatmentDrySelfTest                      , vValue       )}
+        function onSelfTestDry_startChanged                         ( vValue ) {}
+        function onSelfTestDry_waitDoorCloseChanged                 ( vValue ) {}
+        function onSelfTestDry_usedCartridgeEntered                 ( vValue ) { _preTreatmentDrySelfTest        .checkList.setItem(0, vValue       )}
+        function onSelfTestDry_occlusionSensorsEntered              ( vValue ) { _preTreatmentDrySelfTest        .checkList.setItem(1, vValue       )}
+        function onSelfTestDry_pressureSensorsNormalSetupEntered    ( vValue ) { _preTreatmentDrySelfTest        .checkList.setItem(2, true         )}
+        function onSelfTestDry_pressureSensorsVenousSetupEntered    ( vValue ) {}
+        function onSelfTestDry_pressureSensorsVenousEntered         ( vValue ) {}
+        function onSelfTestDry_pressureSensorsArterialSetupEntered  ( vValue ) {}
+        function onSelfTestDry_pressureSensorsArterialEntered       ( vValue ) {}
+        function onSelfTestDry_pressureSensorsDecayEntered          ( vValue ) {}
+        function onSelfTestDry_pressureSensorsStabilityEntered      ( vValue ) {}
+        function onSelfTestDry_pressureSensorsNormalEntered         ( vValue ) { _preTreatmentDrySelfTest        .checkList.setItem(2, vValue       )}
+        function onSelfTestDry_syringePumpEntered                   ( vValue ) { _preTreatmentDrySelfTest        .checkList.setItem(3, vValue       )}
+        function onSelfTestDry_stoppedEntered                       ( vValue ) {}
+        function onSelfTestDry_completeEntered                      ( vValue ) {}
     }
 
     Connections { target: vPreTreatmentStates
-        onPrimeChanged                                      : { page( _preTreatmentDisposablesPrime                 , vprime                                )}
-        onPrime_waitUserStartEntered                        : {}
-        onPrime_salineSetupEntered                          : { _preTreatmentDisposablesPrime   .checkList.setItem(0, true                                  )}
-        onPrime_salinePurgeAirEntered                       : {}
-        onPrime_salineCirculateBloodCircuitEntered          : { _preTreatmentDisposablesPrime   .checkList.setItem(0, vprime_salineCirculateBloodCircuit    )}
-        onPrime_reservoiOneFillCompleteEntered              : { _preTreatmentDisposablesPrime   .checkList.setItem(1, true                                  )}
-        onPrime_dialysateDialyzerEntered                    : {}
-        onPrime_reservoirTwoFillCompleteEntered             : {}
-        onPrime_dialysateBypassEntered                      : { _preTreatmentDisposablesPrime   .checkList.setItem(1, vprime_dialysateBypass                )}
-        onPrime_wetSelfTestsEntered                         : { _preTreatmentDisposablesPrime   .checkList.setItem(2, vprime_wetSelfTests                   )}
-        onPrime_pauseEntered                                : {}
-        onPrime_completeEntered                             : {}
+        function onPrimeChanged                                     ( vValue ) { page( _preTreatmentDisposablesPrime                 , vValue       )}
+        function onPrime_waitUserStartEntered                       ( vValue ) {}
+        function onPrime_salineSetupEntered                         ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItem(0, true         )}
+        function onPrime_salineCirculateBloodCircuitEntered         ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItem(0, vValue       )}
+        function onPrime_reservoiOneFillCompleteEntered             ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItem(1, true         )}
+        function onPrime_dialysateDialyzerEntered                   ( vValue ) {}
+        function onPrime_dialysateBypassEntered                     ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItem(1, vValue       )}
+        function onPrime_wetSelfTestsEntered                        ( vValue ) { _preTreatmentDisposablesPrime   .checkList.setItem(2, vValue       )}
+        function onPrime_pauseEntered                               ( vValue ) {}
+        function onPrime_completeEntered                            ( vValue ) {}
     }
 
     Connections { target: vPreTreatmentAdjustmentDisposablesPrime
-        onAdjustmentTriggered   : {
+        function onAdjustmentTriggered                              ( vValue ) {
             if ( vPreTreatmentAdjustmentDisposablesPrime.adjustment_Accepted ) {
                 _preTreatmentDisposablesPrime.reasonText = ""
             } else {
@@ -149,11 +147,13 @@
     }
 
     Connections { target: _preTreatmentDisposablesPrime
-        onConfirmClicked        : { vPreTreatmentAdjustmentPatientConnectionBegin.doBegin() }
+        function onConfirmClicked                                   ( vValue ) {
+            vPreTreatmentAdjustmentPatientConnectionBegin.doBegin()
+        }
     }
 
     Connections { target: vPreTreatmentAdjustmentPatientConnectionBegin
-        onAdjustmentTriggered   : {
+        function onAdjustmentTriggered                              ( vValue ) {
             if ( vPreTreatmentAdjustmentPatientConnectionBegin.adjustment_Accepted ) {
                 _preTreatmentDisposablesPrime.reasonText = ""
             } else {