Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r0cc29248749353dfaca80fa02fdd6108173c3a71 -r88563177f10f20ced98750b2e40036201728131d --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 0cc29248749353dfaca80fa02fdd6108173c3a71) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 88563177f10f20ced98750b2e40036201728131d) @@ -23,7 +23,7 @@ import "qrc:/pages/pretreatment" import "qrc:/pages/pretreatment/create" import "qrc:/pages/treatment" -import "qrc:/pages/posttreatment" +import "qrc:/pages/endtreatment" /*! * \brief ManagerStack is the screen @@ -46,12 +46,11 @@ onBackClicked: _root.pop ( _mainHome ) } - // Post Treatment - PostTreatmentRinsebackStack { id: _postTreatmentRinsebackStack } - PostTreatmentRecirculateStack { id: _postTreatmentRecirculateStack } - PostTreatmentEndStack { id: _postTreatmentEndStack } + // End Treatment + EndTreatmentRinsebackStack { id: _endTreatmentRinsebackStack } + EndTreatmentRecirculateStack { id: _endTreatmentRecirculateStack } + EndTreatmentEndStack { id: _endTreatmentEndStack } - ScreenItem { id: _faultModeScreen PlaceHolderText { screenName: qsTr("FAULT MODE") } onVisibleChanged: if (visible) _mainMenu.hidden = true @@ -84,7 +83,6 @@ onInvalidModeChanged : { page( null , vinvalidMode )} } - // the page function is more flixible regarding our current design // and it's easier(or may not need) to modify later if required. // and is more optimized and will never leave screen empty @@ -96,9 +94,9 @@ // in-Treatmet onTxDialysisChanged : { page( _treatmentStack , vtxDialysis )} - onTxRinsebackChanged : { page( _postTreatmentRinsebackStack , vtxRinseback )} - onTxRecirculateChanged : { page( _postTreatmentRecirculateStack , vtxRecirculate )} - onTxEndChanged : { page( _postTreatmentEndStack , vtxEnd )} + onTxRinsebackChanged : { page( _endTreatmentRinsebackStack , vtxRinseback )} + onTxRecirculateChanged : { page( _endTreatmentRecirculateStack , vtxRecirculate )} + onTxEndChanged : { page( _endTreatmentEndStack , vtxEnd )} // Treatment Stop onTxStopChanged : { page( _treatmentStack , vtxStop )}