Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml =================================================================== diff -u -r56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c -r4da79084388ac25822ab24fb52ec1ca4083b50cc --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision 56b0b13aa9f9e7ae201bce1843015fe5b4b43d2c) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision 4da79084388ac25822ab24fb52ec1ca4083b50cc) @@ -28,43 +28,25 @@ EndTreatmentBase { id: _root objectName: "_EndTreatmentRinsebackInit" - signal treatmentBackClicked () signal rinsebackClicked () - signal treatmentEndClicked () - header.backVisible : vTreatmentTime .time_IsLeft - onBackClicked : treatmentBackClicked() - - title.text : qsTr("Rinseback Setup") + headerTitle : qsTr("Blood Return Setup") + descriptionText : qsTr("Blood return will %1 be allowed in:").arg("NOT") instructionBased : true hasTimeout : vTreatmentRinseback .timeoutTotal timeoutValue : vTreatmentRinseback .timeoutCountDown * 60 - footer { - width : parent.width - height : Variables.touchRectHeight + TouchRect { id : _beginRinsebackTouchRect + anchors { + bottom : _root.bottom + bottomMargin : Variables.notificationHeight * 2 + horizontalCenter: _root.horizontalCenter + } + width : Variables.defaultButtonWidth + height : Variables.defaultButtonHeight + isDefault : true + textString : qsTr("Start Blood Return") + onClicked : rinsebackClicked() } - FooterStatic { - childrenWidth : 300 - anchors.fill : footer - children : [ - 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() - }, - Item { id: placeholder - } - ] - } }