Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -rcc7aae88f15228ff37b840946818692e444718bf -rca05e940ea4a0c567acb05c4c8777dea079b0f08 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision cc7aae88f15228ff37b840946818692e444718bf) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision ca05e940ea4a0c567acb05c4c8777dea079b0f08) @@ -56,6 +56,7 @@ EndTreatmentRecirculateStack { id: _endTreatmentRecirculateStack } EndTreatmentEndStack { id: _endTreatmentEndStack } + // Post Treatment PostTreatmentStack { id: _postTreatmentStack } @@ -159,7 +160,7 @@ function onTxRinsebackChanged ( vValue ) { page( _endTreatmentRinsebackStack , vValue )} function onTxRecirculateChanged ( vValue ) { page( _endTreatmentRecirculateStack , vValue )} - function onTxEndChanged ( vValue ) { page( _endTreatmentEndStack , vValue )} +// function onTxEndChanged ( vValue ) { page( _endTreatmentEndStack , vValue )} // Treatment Stop function onTxStopChanged ( vValue ) { page( _treatmentStack , vValue )} @@ -174,4 +175,12 @@ _mainHome.reasonText = vPreTreatmentAdjustmentInitTreatment.adjustment_ReasonText } } + + Connections { target: _endTreatmentDialog + // End Treatment -> proceed to rinceback + function onRejected () { + vTreatmentAdjustmentEnd.doAdjustment () +// page( _endTreatmentRinsebackStack ) + } + } }