Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml =================================================================== diff -u -r07fa2cd47bf538e89c48fc7d425674f20afc9f2a -rbc4b9e027cd54b49a73c3f7d6800a3563fc43b4c --- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision 07fa2cd47bf538e89c48fc7d425674f20afc9f2a) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c) @@ -35,7 +35,7 @@ onVisibleChanged: { if (visible) { - _headerBar.titleText = stackView.currentItem.headerTitle ?? "" +// _headerBar.titleText = stackView.currentItem.headerTitle ?? "" } else { _headerBar.titleText = "" @@ -46,10 +46,9 @@ EndTreatmentRinsebackInit { id: _endTreatmentRinsebackInit } EndTreatmentRinseback { id: _endTreatmentRinseback StackView.onActivating : { - _headerBar.titleText = qsTr("Rinseback") + _headerBar.titleText = qsTr("Returning Blood") } } - EndTreatmentRinsebackComplete { id: _endTreatmentRinsebackComplete } EndTreatmentAdditional { id: _endTreatmentAdditional } EndTreatmentRinsebackReconnect { id: _endTreatmentRinsebackReconnect } @@ -71,12 +70,13 @@ 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 onAdditionalButtonClicked () { vTreatmentAdjustmentRinseback.doConfirm () } // Recirculate } + Connections { target: _endTreatmentRinsebackReconnect function onTreatmentBackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doResume ()} //82.4 function onConfirmClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack ()} //82.9 @@ -87,7 +87,7 @@ 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 onRbStopChanged ( vValue ) { print("stop" + vValue ) ;if ( vValue ) { _rinsebackCompleteDialog.open() }} function onRbAdditionalChanged ( vValue ) { page( _endTreatmentAdditional , vValue )} function onRbReconnectChanged ( vValue ) { page( _endTreatmentRinsebackReconnect , vValue )} } @@ -100,7 +100,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(); } }