Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml
===================================================================
diff -u -r07fa2cd47bf538e89c48fc7d425674f20afc9f2a -r4da79084388ac25822ab24fb52ec1ca4083b50cc
--- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml	(.../EndTreatmentRinsebackStack.qml)	(revision 07fa2cd47bf538e89c48fc7d425674f20afc9f2a)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml	(.../EndTreatmentRinsebackStack.qml)	(revision 4da79084388ac25822ab24fb52ec1ca4083b50cc)
@@ -44,14 +44,7 @@
 
     // Rinseback
     EndTreatmentRinsebackInit       { id: _endTreatmentRinsebackInit        }
-    EndTreatmentRinseback           { id: _endTreatmentRinseback
-        StackView.onActivating  : {
-            _headerBar.titleText = qsTr("Rinseback")
-        }
-    }
-    EndTreatmentRinsebackComplete   { id: _endTreatmentRinsebackComplete    }
-    EndTreatmentAdditional          { id: _endTreatmentAdditional           }
-    EndTreatmentRinsebackReconnect  { id: _endTreatmentRinsebackReconnect   }
+    EndTreatmentRinseback           { id: _endTreatmentRinseback            }
 
     Connections                     { target: stackView
         function onCurrentItemChanged() {
@@ -61,35 +54,26 @@
 
     Connections                     { target: _endTreatmentRinsebackInit
         function onRinsebackClicked             ( vValue ) { vTreatmentAdjustmentRinseback.doStart              ()} //82.0
-        function onTreatmentEndClicked          ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd       ()} //82.8
-        function onTreatmentBackClicked         ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack      ()} //82.9
     }
     Connections                     { target: _endTreatmentRinseback
         function onAccelerateClicked            ( vValue ) { vTreatmentAdjustmentRinseback.doIncrement          ()} //82.1
         function onDeccelerateClicked           ( vValue ) { vTreatmentAdjustmentRinseback.doDecrement          ()} //82.2
         function onPauseClicked                 ( vValue ) { vTreatmentAdjustmentRinseback.doPause              ()} //82.3
         function onResumeClicked                ( vValue ) { vTreatmentAdjustmentRinseback.doResume             ()} //82.4
-        function onEndClicked                   ( vValue ) { vTreatmentAdjustmentRinseback.doEnd                ()} //82.5
     }
-    Connections                     { target: _endTreatmentRinsebackComplete
-        function onAdditionalClicked            ( vValue ) { vTreatmentAdjustmentRinseback.doAdditional         ()} //82.6
-        function onTreatmentBackClicked         ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack      ()} //82.9
-        function onConfirmClicked               ( vValue ) { vTreatmentAdjustmentRinseback.doConfirm            ()} //82.7
-        function onTreatmentEndClicked          ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd       ()} //82.8
+
+    Connections                     { target: _rinsebackCompleteDialog
+        function onAccepted ()                  { vTreatmentAdjustmentRinseback.doAdditional()          }   // Fluid Blus
+        function onRejected ()                  { vTreatmentAdjustmentRinseback.doTreatmentEnd()        }   // End Treatment
+        function onExtraButtonClicked ()        { vTreatmentAdjustmentRinseback.doConfirm ()            }   // Recirculate
     }
-    Connections                     { target: _endTreatmentRinsebackReconnect
-        function onTreatmentBackClicked         ( vValue ) { vTreatmentAdjustmentRinseback.doResume             ()} //82.4
-        function onConfirmClicked               ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack      ()} //82.9
-        function onTreatmentEndClicked          ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd       ()} //82.8
-    }
 
     Connections { target: vTDTreatmentStates
         function onRbInitChanged                ( vValue ) { page( _endTreatmentRinsebackInit        , vValue    )}
         function onRbRunChanged                 ( vValue ) { page( _endTreatmentRinseback            , vValue    )}
         function onRbPausedChanged              ( vValue ) { page( _endTreatmentRinseback            , vValue    )}
-        function onRbStopChanged                ( vValue ) { page( _endTreatmentRinsebackComplete    , vValue    )}
-        function onRbAdditionalChanged          ( vValue ) { page( _endTreatmentAdditional           , vValue    )}
-        function onRbReconnectChanged           ( vValue ) { page( _endTreatmentRinsebackReconnect   , vValue    )}
+        function onRbStopChanged                ( vValue ) { if ( vValue ) { _rinsebackCompleteDialog.open()     }}
+        function onRbAdditionalChanged          ( vValue ) { page( _endTreatmentRinseback            , vValue    )}
     }
 
     Connections { target: vTreatmentAdjustmentRinseback
@@ -100,36 +84,6 @@
             // and let them cleared for their own message when each get visible.
             _endTreatmentRinsebackInit      .reasonText = vTreatmentAdjustmentRinseback.text();
             _endTreatmentRinseback          .reasonText = vTreatmentAdjustmentRinseback.text();
-            _endTreatmentRinsebackComplete  .reasonText = vTreatmentAdjustmentRinseback.text();
-            _endTreatmentRinsebackReconnect .reasonText = vTreatmentAdjustmentRinseback.text();
         }
     }
 }
-
-//  TODO : stackView manual performance enhanced.
-// // an idea that is being worked on for later performance imporovement
-// // if the stackview becomes slow this idea is a manual transition with animation to be replacecd with stackView
-//   PropertyAnimation { id: _rbInitAnimation
-//           target: _endTreatmentRinsebackInit
-//           property: "opacity"
-//           duration: 1000
-//           to: vTDTreatmentStates.rbInit ? 1 : 0
-//   }
-//   PropertyAnimation { id: _rbStopAnimation
-//           target: _endTreatmentRinsebackComplete
-//           property: "opacity"
-//           duration: 1000
-//           to: vTDTreatmentStates.rbStop ? 1 : 0
-//   }
-//   Connections { target: vTDTreatmentStates
-//       onStateTriggered : { // this property is a TRIGGER and shall be set at the end of the property setters functions list
-//           _endTreatmentRinsebackInit      .visible = vTDTreatmentStates.rbInit
-//           _endTreatmentRinseback          .visible = vTDTreatmentStates.rbRun || vTDTreatmentStates.rbPaused
-//           _endTreatmentRinsebackComplete  .visible = vTDTreatmentStates.rbStop
-//           _endTreatmentAdditional         .visible = vTDTreatmentStates.rbAdditional
-//
-//       }
-//       onRbInitChanged: _rbInitAnimation.running = true
-//       onRbStopChanged: _rbStopAnimation.running = true
-//   }
-//