Index: sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackComplete.qml =================================================================== diff -u -rfd25d67f37410037f22be9c6e958b100e3790de9 -r28a383251ad37c669202c0a717ff90b8fc21a442 --- sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackComplete.qml (.../PostTreatmentRinsebackComplete.qml) (revision fd25d67f37410037f22be9c6e958b100e3790de9) +++ sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackComplete.qml (.../PostTreatmentRinsebackComplete.qml) (revision 28a383251ad37c669202c0a717ff90b8fc21a442) @@ -7,7 +7,7 @@ * * \file PostTreatmentRinsebackComplete.qml * \author (last) Behrouz NematiPour - * \date (last) 03-Feb-2021 + * \date (last) 09-Feb-2021 * \author (original) Behrouz NematiPour * \date (original) 03-Feb-2021 * @@ -30,9 +30,14 @@ property alias reasonText : _notification.text signal additionalClicked () - signal recirculateClicked () - signal endClicked () + signal confirmClicked () + signal treatmentEndClicked () + QtObject { id: _private + property int sectionSpace : 30 + property int sectionWidth : _root.width * 2/3 - sectionSpace * 1.5 + property int sectionHeight: _root.width * 1/3 - sectionSpace * 1.5 + } Text { id: _title anchors { top: parent.top @@ -44,9 +49,62 @@ font.pixelSize: Fonts.fontPixelTitle } + Rectangle { + color : Colors.backgroundDialog + width : _private.sectionWidth + height : _private.sectionHeight + border.width: 2 + border.color: Colors.borderDisableButton + radius: 10 + anchors { + verticalCenter: parent.verticalCenter + left: parent.left + leftMargin: _private.sectionSpace + } + Column { + spacing : 10 + anchors.fill: parent + anchors.margins: _private.sectionSpace + Text { id: _titleSteps + anchors.left: parent.left + color: Colors.white + text: qsTr("Please Disconnet") + font.pixelSize: Fonts.fontPixelButton + } + + Text { id: _steps + anchors.left: parent.left + anchors.leftMargin: _private.sectionSpace + color: Colors.white + text: qsTr("First Step\nSecond Step\nThird Step\n") + font.pixelSize: Fonts.fontPixelButton + } + } + } + + Rectangle { + color : Colors.backgroundDialog + width : _private.sectionHeight + height : _private.sectionHeight + border.width: 2 + border.color: Colors.borderDisableButton + radius: 10 + anchors { + verticalCenter: parent.verticalCenter + right: parent.right + rightMargin: _private.sectionSpace + } + Text { id: _visualAID + anchors.centerIn: parent + color: Colors.white + text: qsTr("Visual AID\nplaceholder") + font.pixelSize: Fonts.fontPixelButton + } + } + Row { id: _buttonGroup property int buttonsWidth : 300 - spacing: 50 + spacing: 75 anchors { bottom : parent.bottom @@ -56,28 +114,26 @@ bottomMargin : spacing } - TouchRect { id : _additionalTouchRect + TouchRect { id : _backTreatmentTouchRect visible : true text.text : qsTr("ADDITIONAL") width : _buttonGroup.buttonsWidth - borderColor : Colors.white onClicked : additionalClicked() } - TouchRect { id : _recirculateTouchRect + TouchRect { id : _beginRinsebackTouchRect visible : true - text.text : qsTr("RECIRCULATE") + text.text : qsTr("CONFIRM") width : _buttonGroup.buttonsWidth - borderColor : Colors.white - onClicked : recirculateClicked() + color : borderColor + onClicked : confirmClicked() } - TouchRect { id : _disposablesTouchRect - visible : true // true if only treatment is not already complete - text.text : qsTr("END") + TouchRect { id : _endTreatmentTouchRect + visible : true // TODO: true if only treatment is not already complete + text.text : qsTr("END TREATMENT") width : _buttonGroup.buttonsWidth - borderColor : Colors.white - onClicked : endClicked() + onClicked : treatmentEndClicked() } }