Index: sources/gui/qml/pages/ManagerStack.qml =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rc8ca0550f364ddbff8f37a68ce49050dfbc0ec09 --- sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision c8ca0550f364ddbff8f37a68ce49050dfbc0ec09) @@ -20,6 +20,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/pages/rxmanager" /*! * \brief ManagerStack is the screen @@ -29,10 +30,26 @@ */ StackItem { id : _root stackView.initialItem : _managerHome - ScreenItem { id: _managerHome - PlaceHolderText { screenName: qsTr("Prescriptions") } - onVisibleChanged: if (visible) _mainMenu.hidden = true + Column { id: _managerColumn + anchors { + top : parent.top + bottom : parent.bottom + left : parent.left + right : parent.right + topMargin : Variables.defaultMargin * 2 + leftMargin : Variables.defaultMargin * 2 + rightMargin : Variables.defaultMargin * 2 + bottomMargin: Variables.alarmDialogHeaderHeight + } + spacing : Variables.defaultMargin + + RxManagerHeader{ + height: 100 //TODO Calculate how much to give + } + + PlaceHolderText {screenName: qsTr("Rx Profiles")} + } } onVisibleChanged: { @@ -42,5 +59,6 @@ else { stackView.initialItem = null } + } }