Index: sources/gui/qml/pages/postTreatment/PostTreatmentRecirculate.qml =================================================================== diff -u -rfd25d67f37410037f22be9c6e958b100e3790de9 -r28a383251ad37c669202c0a717ff90b8fc21a442 --- sources/gui/qml/pages/postTreatment/PostTreatmentRecirculate.qml (.../PostTreatmentRecirculate.qml) (revision fd25d67f37410037f22be9c6e958b100e3790de9) +++ sources/gui/qml/pages/postTreatment/PostTreatmentRecirculate.qml (.../PostTreatmentRecirculate.qml) (revision 28a383251ad37c669202c0a717ff90b8fc21a442) @@ -7,7 +7,7 @@ * * \file PostTreatmentRecirculate.qml * \author (last) Behrouz NematiPour - * \date (last) 30-Jan-2021 + * \date (last) 09-Feb-2021 * \author (original) Behrouz NematiPour * \date (original) 30-Jan-2021 * @@ -29,9 +29,14 @@ property alias reasonText : _notification.text - signal resumeClicked() - signal endClicked () + signal reconnectClicked () + 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 @@ -43,9 +48,25 @@ font.pixelSize: Fonts.fontPixelTitle } + Rectangle { + color : Colors.backgroundDialog + width : _private.sectionWidth + height : _private.sectionHeight + border.width: 2 + border.color: Colors.borderDisableButton + radius: 10 + anchors.centerIn: parent + 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 @@ -55,22 +76,19 @@ bottomMargin : spacing } - TouchRect { id : _resumeTouchRect + TouchRect { id : _backTreatmentTouchRect visible : true - button.onPressed: resumeClicked() - text.text : qsTr("RESUME") + text.text : qsTr("RECONNECT") width : _buttonGroup.buttonsWidth - borderColor : Colors.white - onClicked : resumeClicked() + color : borderColor + onClicked : reconnectClicked() } - TouchRect { id : _endTouchRect + TouchRect { id : _endTreatmentTouchRect visible : true - button.onPressed: endClicked() - text.text : qsTr("END") + text.text : qsTr("END TREATMENT") width : _buttonGroup.buttonsWidth - borderColor : Colors.white - onClicked : endClicked() + onClicked : treatmentEndClicked() } }