Index: sources/gui/qml/pages/ManagerStack.qml =================================================================== diff -u -r47e53a72dae5a817465b3ef0be9f98a9dd16f60a -rb4d8fe6f11b7cdf0c631b3ab35ba36f18e0d7bc4 --- sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision 47e53a72dae5a817465b3ef0be9f98a9dd16f60a) +++ sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision b4d8fe6f11b7cdf0c631b3ab35ba36f18e0d7bc4) @@ -35,22 +35,34 @@ StackItem { id : _root stackView.initialItem : _managerHome RxManager { id: _managerHome -// anchors { -// fill : parent -// topMargin : Variables.defaultMargin * 2 -// leftMargin : Variables.defaultMargin * 3 -// rightMargin : Variables.defaultMargin * 3 -// bottomMargin: Variables.alarmDialogHeaderHeight -// } onAddProfile:{ + _createProfile.clear(true) page( _createProfile) } + onVisibleChanged: { + if (visible){ + _mainMenu.hidden = false + vRxProfiles.doInitRxProfilesList() + } + } } 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. + isRxProfile : true + header.stepNames : [] + onConfirmClicked : vTreatmentCreate.parametersValidated + ? _root.confirm() + : _createProfile.validate() + onBackClicked : vTreatmentCreate.parametersValidated + ? vTreatmentCreate.doCancel() + : pop() + } + function confirm(){ + print("confirm") + vTreatmentCreate.doAddRxProfile() + pop() + } onVisibleChanged: { if (visible) {