Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -r73b965e55528619f22a12ae3b3408c9dcecc9144 -rbd476995001c165188e4c86010bf8b0505d2ca35 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 73b965e55528619f22a12ae3b3408c9dcecc9144) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision bd476995001c165188e4c86010bf8b0505d2ca35) @@ -1,14 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. - * \copyright \n - * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n - * IN PART OR IN WHOLE, \n - * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * Copyright (c) 2020-2022 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 TreatmentAdjustmentBase.qml - * \date 2020/03/22 - * \author Behrouz NematiPour + * \author (last) Behrouz NematiPour + * \date (last) 18-Jun-2021 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2020 * */ @@ -33,26 +34,24 @@ property bool closeVisible: true property bool confirmVisible: true property bool backVisible: false - property bool pausedVisible: false + property alias information: _information signal closeClicked() signal confirmClicked() signal backClicked() onVisibleChanged: { - notification.text = "" + notificationText = "" } header: Rectangle { id : _headerRect ConfirmButton { id : _confirmButton visible: _root.confirmVisible - anchors.left: parent.left onClicked : confirmClicked() } BackButton { id : _backButton visible: _root.backVisible - anchors.left: parent.left onClicked : backClicked() } @@ -70,14 +69,20 @@ CloseButton { id : _closeButton visible: _root.closeVisible - anchors.right: parent.right - onClicked : closeClicked() + anchors.left: parent.left + onClicked : { + closeClicked() + close() + } } } - NotificationBarSmall { id: _pausedNotification - visible : pausedVisible && !notification.visible - text : qsTr("Ultrafiltration is paused.") - imageSource: "qrc:/images/iPauseGray" + // this notification shall not be confused with the _notification in the parent ModalDailog + // this meant to be used specifically as current state notification like paused/off in UF + // it is also available in TreatmentAdjustmentFlow and TreatmentAdjustmentDuration but not used. + NotificationBarSmall { id: _information + visible : false + imageSource : "" + text : "" } }