Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-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 TreatmentAdjustmentUltrafiltrationConfirm.qml - * \author (last) Behrouz NematiPour - * \date (last) 30-Jul-2020 - * \author (original) Behrouz NematiPour - * \date (original) 18-May-2020 + * \file TreatmentAdjustmentUltrafiltrationConfirm.qml + * \author (last) Behrouz NematiPour + * \date (last) 19-Jul-2023 + * \author (original) Behrouz NematiPour + * \date (original) 18-May-2020 * */ @@ -31,7 +31,7 @@ contentItem.objectName: "TreatmentAdjustmentUltrafiltrationConfirm" //SquishQt testability QtObject { id: _private - property int decimalVolume: vTreatmentUltrafiltration.precision + property int decimalVolume: Variables.ultrafiltrationPrecision property int decimalRate : 0 } property real ultrafiltrationVolume : 0.000 @@ -64,7 +64,7 @@ TitleText { id : _titleText text: qsTr("To confirm new UF Volume (%1),\nselect a treatment adjustment:") .arg(ultrafiltrationVolume.toFixed(_private.decimalVolume)) - font.pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentConfirmTitle + font.pixelSize: Fonts.fontPixelTitle color: Colors.textMain height: Variables.mainMenuHeight anchors { @@ -82,9 +82,8 @@ bottomMargin: 85 horizontalCenter: parent.horizontalCenter } - - backgroundColor: Colors.backgroundButtonSelect - disabled: !(_rateAdjustmentButton.selected || _durationAdjustmentButton.selected) + isDefault : true + enabled : _rateAdjustmentButton.selected || _durationAdjustmentButton.selected text { text: qsTr("CONFIRM") font.weight: Font.DemiBold @@ -140,6 +139,7 @@ _rateAdjustmentButton.selected = false selected = true } + visible : false disabled: treatmentDuration == 0 && treatmentDurationDiff == 0 } }