Index: sources/gui/qml/pages/ManagerStack.qml =================================================================== diff -u -r68d99b718e64e99454955cb6d6fadf20972a6ea0 -r47e53a72dae5a817465b3ef0be9f98a9dd16f60a --- sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision 68d99b718e64e99454955cb6d6fadf20972a6ea0) +++ sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision 47e53a72dae5a817465b3ef0be9f98a9dd16f60a) @@ -22,6 +22,10 @@ import "qrc:/components" import "qrc:/pages/rxmanager" + +import "qrc:/pages/pretreatment" +import "qrc:/pages/pretreatment/create" + /*! * \brief ManagerStack is the screen * which contains the main stack for all the Trearment Manager screens @@ -30,27 +34,22 @@ */ StackItem { id : _root stackView.initialItem : _managerHome - ScreenItem { id: _managerHome - anchors { - fill : parent - topMargin : Variables.defaultMargin * 2 - leftMargin : Variables.defaultMargin * 3 - rightMargin : Variables.defaultMargin * 3 - bottomMargin: Variables.alarmDialogHeaderHeight + RxManager { id: _managerHome +// anchors { +// fill : parent +// topMargin : Variables.defaultMargin * 2 +// leftMargin : Variables.defaultMargin * 3 +// rightMargin : Variables.defaultMargin * 3 +// bottomMargin: Variables.alarmDialogHeaderHeight +// } + onAddProfile:{ + page( _createProfile) } + } - RxManagerHeader{id: _rxHeader - height: 100 //TODO: Calculate how much to give - } - RxManagerList{ - id: _rxManagerListView - anchors { - left : parent.left - right : parent.right - top : _rxHeader.bottom - } - model: vRxProfiles.rxProfiles - } + PreTreatmentCreate{id: _createProfile + header.stepNames: [] + onBackClicked: {pop(_createProfile)} //TODO: Need to transfer logic to go to higher level as the back fn is dependent on mode. } onVisibleChanged: {