Index: denali.qrc =================================================================== diff -u -raf0eb3014623933ce3cffac481477d11b3b9c5b5 -rc1ceb8df87b195e8a1b9dc09e0bbab9c6655c308 --- denali.qrc (.../denali.qrc) (revision af0eb3014623933ce3cffac481477d11b3b9c5b5) +++ denali.qrc (.../denali.qrc) (revision c1ceb8df87b195e8a1b9dc09e0bbab9c6655c308) @@ -244,7 +244,7 @@ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml - sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebaReconnect.qml + sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml =================================================================== diff -u -raf0eb3014623933ce3cffac481477d11b3b9c5b5 -rc1ceb8df87b195e8a1b9dc09e0bbab9c6655c308 --- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision af0eb3014623933ce3cffac481477d11b3b9c5b5) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision c1ceb8df87b195e8a1b9dc09e0bbab9c6655c308) @@ -84,7 +84,6 @@ } } - // Disconnect RecirculateBase { id: _recirculateDisconnect title.text : qsTr("Recirculate Disconnect") Fisheye: Tag c1ceb8df87b195e8a1b9dc09e0bbab9c6655c308 refers to a dead (removed) revision in file `sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebaReconnect.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml =================================================================== diff -u --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml (revision 0) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml (revision c1ceb8df87b195e8a1b9dc09e0bbab9c6655c308) @@ -0,0 +1,65 @@ +/*! + * + * Copyright (c) 2021-2023 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 EndTreatmentRinsebackReconnect.qml + * \author (last) Behrouz NematiPour + * \date (last) 19-July-2023 + * \author (original) Behrouz NematiPour + * \date (original) 19-July-2023 + * + */ + +// Qt +import QtQuick 2.12 + +// Qml imports +import "qrc:/globals" +import "qrc:/components" +import "qrc:/pages/endtreatment" + +/*! + * \brief the end treatment rinseback reconnect screen + */ +EndTreatmentBase { id: _root + objectName: "_EndTreatmentRinsebackReconnect" + + signal treatmentBackClicked () + signal treatmentEndClicked () + + title.text : qsTr("Rinseback Reconnect") + instructionBased : true + + header.confirmEnabled : true + header.confirmVisible : vTreatmentTime .time_IsLeft + + header.backEnabled : true + header.backVisible : vTreatmentTime .time_IsLeft + onBackClicked : treatmentBackClicked() + + hasTimeout : vTreatmentRinseback .timeoutTotal + timeoutValue : vTreatmentRinseback .timeoutCountDown * 60 + + footer { + width : parent.width + height : Variables.touchRectHeight + } + + FooterStatic { + childrenWidth : 300 + anchors.fill : footer + children : [ + TouchRect { id : _endTreatmentTouchRect + visible : true // after the rinseback complete user can always end the treatment, regardless of incomplete or completed treatment + text.text : qsTr("END TREATMENT") + isDefault : ! vTreatmentTime .time_IsLeft + onClicked : treatmentEndClicked() + }, + Item {}, + Item {} + ] + } +}