Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r6581def57942b1c1ef56a2f2feb74559946517b9 -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 6581def57942b1c1ef56a2f2feb74559946517b9) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) @@ -20,8 +20,6 @@ import "qrc:/globals" import "qrc:/components" import "qrc:/pages/treatment/adjustments" -import "qrc:/pages/pretreatment" -import "qrc:/pages/posttreatment" /*! * \brief TreatmentStack is the screen @@ -50,24 +48,21 @@ y : Variables.mainMenuHeight * -1 position : MainMenu.Position.Top hidden : true - titles : [ qsTr("Back") , qsTr("Treatment") , qsTr("Trending") , qsTr("Settings") ] + titles : [ qsTr("Treatment") , qsTr("Trending") , qsTr("Settings") ] spacing : 20 leftPdding : 20 partitionWidth : 100 // Todo Important : max width should be the width for all bottons hasRightText : true hasLogo : true } - + TreatmentBloodPrime { id: _treatmentBloodPrime } TreatmentUltrafiltrationItem{ id: _treatmentUltrafiltrationItem } - TreatmentStart { id: _treatmentStart - onBackClicked : { - _root.backClicked() - } + TreatmentHome { id: _treatmentHome onSectionFlowClicked : { _treatmentAdjustmentFlow.open() } - onSectionVitalsClicked: { + onSectionVitalsClicked : { // no page yet } onSectionPressuresClicked: { @@ -153,23 +148,24 @@ Connections { target: vHDOperationMode // The initail screen should be the Blood Prime, since that one is the earlier state in the list. // also since it is being used in two stacks In-Treatment and also in End-Treatmet is has been defined in the MainStack. - onInTreatmentChanged : { page( _postTreatmentBloodPrime , vinTreatment )} + onInTreatmentChanged : { page( _treatmentBloodPrime , vinTreatment )} } - Connections { target: _postTreatmentBloodPrime + Connections { target: _treatmentBloodPrime onVisibleChanged: { - if (_postTreatmentBloodPrime.visible) { + if (_treatmentBloodPrime.visible) { _treatmentMenu.hidden = true } } } Connections { target: vHDTreatmentStates // in-Treatmet - onTxDialysisChanged : { page( _treatmentStart , vtxDialysis )} + onTxBloodPrimeChanged : { page( _treatmentBloodPrime , vtxBloodPrime )} + onTxDialysisChanged : { page( _treatmentHome , vtxDialysis )} } Connections { target: _mainHome - onStartTreatment : { page ( _treatmentStart )} + onStartTreatment : { page ( _treatmentHome )} } }