Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml =================================================================== diff -u -rbc4b9e027cd54b49a73c3f7d6800a3563fc43b4c -rcba8451ac737fb0b618173a4bea37411fdaaf824 --- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision cba8451ac737fb0b618173a4bea37411fdaaf824) @@ -35,7 +35,7 @@ onVisibleChanged: { if (visible) { -// _headerBar.titleText = stackView.currentItem.headerTitle ?? "" + _headerBar.titleText = stackView.currentItem.headerTitle ?? "" } else { _headerBar.titleText = "" @@ -44,11 +44,7 @@ // Rinseback EndTreatmentRinsebackInit { id: _endTreatmentRinsebackInit } - EndTreatmentRinseback { id: _endTreatmentRinseback - StackView.onActivating : { - _headerBar.titleText = qsTr("Returning Blood") - } - } + EndTreatmentRinseback { id: _endTreatmentRinseback } EndTreatmentAdditional { id: _endTreatmentAdditional } EndTreatmentRinsebackReconnect { id: _endTreatmentRinsebackReconnect } @@ -60,15 +56,14 @@ Connections { target: _endTreatmentRinsebackInit function onRinsebackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doStart ()} //82.0 - function onTreatmentEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd ()} //82.8 - function onTreatmentBackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack ()} //82.9 +// 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: _rinsebackCompleteDialog @@ -87,8 +82,8 @@ function onRbInitChanged ( vValue ) { page( _endTreatmentRinsebackInit , vValue )} function onRbRunChanged ( vValue ) { page( _endTreatmentRinseback , vValue )} function onRbPausedChanged ( vValue ) { page( _endTreatmentRinseback , vValue )} - function onRbStopChanged ( vValue ) { print("stop" + vValue ) ;if ( vValue ) { _rinsebackCompleteDialog.open() }} - function onRbAdditionalChanged ( vValue ) { page( _endTreatmentAdditional , vValue )} + function onRbStopChanged ( vValue ) { if ( vValue ) { _rinsebackCompleteDialog.open() }} + function onRbAdditionalChanged ( vValue ) { page( _endTreatmentRinseback , vValue )} function onRbReconnectChanged ( vValue ) { page( _endTreatmentRinsebackReconnect , vValue )} }