Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml =================================================================== diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -r83b9d737cd495b34a7b42f5409962a9442f3b8f4 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision 83b9d737cd495b34a7b42f5409962a9442f3b8f4) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file EndTreatmentRinsebackInit.qml * \author (last) Behrouz NematiPour - * \date (last) 09-Feb-2021 + * \date (last) 08-Feb-2024 * \author (original) Behrouz NematiPour - * \date (original) 09-Feb-2021 + * \date (original) 11-Apr-2021 * */ @@ -32,6 +32,9 @@ signal rinsebackClicked () signal treatmentEndClicked () + header.backVisible : vTreatmentTime .time_IsLeft + onBackClicked : treatmentBackClicked() + title.text : qsTr("Rinseback Setup") instructionBased : true @@ -46,21 +49,21 @@ childrenWidth : 300 anchors.fill : footer children : [ - TouchRect { id : _backTreatmentTouchRect - visible : vTreatmentTime .time_IsLeft - text.text : qsTr("BACK TO TREATMENT") - onClicked : treatmentBackClicked() + TouchRect { id : _endTreatmentTouchRect + enabled : _root.instructionIsLast + visible : true //DEN-15722: SRSHD 1231: REmoved => vTreatmentTime .time_IsLeft + text.text : qsTr("END TREATMENT") + onClicked : treatmentEndClicked() }, + TouchRect { id : _beginRinsebackTouchRect + enabled : _root.instructionIsLast visible : true isDefault : true text.text : qsTr("START RINSEBACK") onClicked : rinsebackClicked() }, - TouchRect { id : _endTreatmentTouchRect - visible : vTreatmentTime .time_IsLeft - text.text : qsTr("END TREATMENT") - onClicked : treatmentEndClicked() + Item { id: placeholder } ] }