Index: sources/gui/qml/pages/treatment/TreatmentConfirm.qml =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -r67371c6a2861c5e8a2328984ae999bf8df4b0bb7 --- sources/gui/qml/pages/treatment/TreatmentConfirm.qml (.../TreatmentConfirm.qml) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/gui/qml/pages/treatment/TreatmentConfirm.qml (.../TreatmentConfirm.qml) (revision 67371c6a2861c5e8a2328984ae999bf8df4b0bb7) @@ -30,22 +30,22 @@ ScreenItem { id: _root objectName: "TreatmentConfirm" backgroundRect.color: Colors.backgroundMainMenu - signal backClicked() - signal confirmClicked() + signal clickedBack() + signal clickedConfirm() TopMenuBarCreateTreatment { id: _topMenuBar anchors.top: parent.top anchors.left: parent.left width: parent.width - onBackClicked: { - _root.backClicked(); + onClickedBack: { + _root.clickedBack(); } state: "confirm" } - Flickable { - id: _flickable + Flickable { id: _flickable + objectName: "_treatmentConfirmFlickable" anchors.top: _topMenuBar.bottom anchors.left: parent.left anchors.bottom: parent.bottom @@ -77,15 +77,27 @@ color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle } + // insert the treatment information table here + ConfirmTreatmentTable { + anchors.horizontalCenter: parent.horizontalCenter + } + TouchRect { id : _continueRect objectName: "_continueRect" anchors.horizontalCenter: parent.horizontalCenter text.text: qsTr("CONFIRM TREATMENT") button.onClicked: { - _root.confirmClicked() + _root.clickedConfirm() } } + + Rectangle { + id: _spacer + height: 75 + width: parent.width + color: "transparent" + } } }