Index: sources/gui/qml/compounds/LabelUnitContainer.qml =================================================================== diff -u -rf2aa3ee850de1023cfc011b845ed0364d251b749 -r135c320c850b09365c04e03d95195412c12fba72 --- sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision f2aa3ee850de1023cfc011b845ed0364d251b749) +++ sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision 135c320c850b09365c04e03d95195412c12fba72) @@ -59,7 +59,7 @@ } Text { id: _unit - anchors.bottom : _title.bottom + anchors.baseline: _title.baseline text : _root.unitText.length > 0 ? ("(%1)").arg(_root.unitText) : "" color : Colors.offWhite font.pixelSize : 22 Index: sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml =================================================================== diff -u -r975e1964b60365b24c74be139c6b84369a7248ce -r135c320c850b09365c04e03d95195412c12fba72 --- sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml (.../TreatmentAdjustmentUltrafiltrationMetrics.qml) (revision 975e1964b60365b24c74be139c6b84369a7248ce) +++ sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml (.../TreatmentAdjustmentUltrafiltrationMetrics.qml) (revision 135c320c850b09365c04e03d95195412c12fba72) @@ -26,51 +26,68 @@ * that display the ultrafiltration volume removed and goal. */ Item { id: _root - property real setVolume : 0 - property real volumeRemoved : 0 + property real setVolume : 0 + property real volumeRemoved : 0 + property color volumeRemovedColor : Colors.fluidText implicitWidth : (_ufVolumeRemovedItem.width * 2) + Variables.columnSpacing implicitHeight : _ufVolumeRemovedItem.height component ValueItem: Rectangle { id: _valueItem property alias label : _label.text property alias value : _value.text - property color textColor : Colors.fluidText + property color textColor : Colors.offWhite anchors.centerIn : parent - width : 350 - height : 60 + width : 425 + height : 63 radius : 5 color : Colors.panelBackgroundColor border { width : Variables.panelBorderWidth color : Colors.panelBorderColor } - Item { id: _textContainer + Item { id: _contentItem anchors.centerIn: parent width : childrenRect.width height : parent.height Text { id: _label - anchors{ + anchors { left : parent.left verticalCenter : parent.verticalCenter } width : contentWidth - color : textColor + color : _valueItem.textColor font { - pixelSize : Fonts.fontPixelButton - weight : Font.Medium + pixelSize : 23 + weight : Font.Medium } } + Text { id: _unit + anchors { + left : _label.right + leftMargin : 5 + baseline : _label.baseline + } + width : contentWidth + text : ("(%1) :").arg(Variables.unitVolume) + color : _valueItem.textColor + font { + pixelSize : 20 + } + } + Text { id: _value anchors{ - left : _label.right - verticalCenter : parent.verticalCenter + left : _unit.right + leftMargin : 5 + baseline : _label.baseline } - width : contentWidth - color : textColor + width : 60 + horizontalAlignment : Text.AlignLeft + color : _valueItem.textColor font { pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentMetrics weight : Font.DemiBold @@ -85,7 +102,7 @@ horizontalCenterOffset : -(width + Variables.columnSpacing)/2 verticalCenter : parent.verticalCenter } - label : qsTr("UF Volume Removed: ") + label : qsTr("UF Volume Removed") value : _root.volumeRemoved.toFixed(Variables.ultrafiltrationPrecision) } @@ -95,8 +112,8 @@ horizontalCenterOffset : -(_ufVolumeRemovedItem.anchors.horizontalCenterOffset) verticalCenter : parent.verticalCenter } - textColor : Colors.ufVolumeGoalText - label : qsTr("UF Volume Goal: ") - value : _root.setVolume.toFixed(Variables.ultrafiltrationPrecision) + textColor : _root.volumeRemovedColor + label : qsTr("UF Volume Goal") + value : _root.setVolume.toFixed(Variables.ultrafiltrationPrecision) } } Index: sources/gui/qml/compounds/ValueAdjuster.qml =================================================================== diff -u -rf2aa3ee850de1023cfc011b845ed0364d251b749 -r135c320c850b09365c04e03d95195412c12fba72 --- sources/gui/qml/compounds/ValueAdjuster.qml (.../ValueAdjuster.qml) (revision f2aa3ee850de1023cfc011b845ed0364d251b749) +++ sources/gui/qml/compounds/ValueAdjuster.qml (.../ValueAdjuster.qml) (revision 135c320c850b09365c04e03d95195412c12fba72) @@ -32,58 +32,78 @@ property bool canRefresh : false property alias textColor : _text.color - // fix floating-point precision issue - readonly property int multiplier : Math.pow(10, decimal) - readonly property real stepVal : calculatePrecisionValue(step) - readonly property real minVal : calculatePrecisionValue(minimum) - readonly property real val : calculatePrecisionValue(value) + QtObject { id: _private + // fix floating-point precision issue + readonly property int multiplier : Math.pow(10, decimal) + readonly property real stepVal : calculatePrecisionValue(step) + readonly property real minVal : calculatePrecisionValue(minimum) + readonly property real maxVal : calculatePrecisionValue(maximum) + readonly property real val : calculatePrecisionValue(value) - readonly property bool canIncrement : isActive ? value < maximum : true - readonly property bool canDecrement : isActive ? canOff ? value > 0 : - value > minimum : true + readonly property bool canIncrement : isActive ? value < maximum : true + readonly property bool canDecrement : isActive ? canOff ? value > 0 : + value > minimum : true + + // round the value based on the given precision (not step) + function calculatePrecisionValue(value) { + return Math.round(value * _private.multiplier) / _private.multiplier + } - signal didChange (real vValue) - signal didActiveChange (bool vState) + // return a fixed point int from the inputted float (using the set precision) + function fixedValue(value) { + return Math.round(value * _private.multiplier) + } - onIsActiveChanged : { - if ( canRefresh ) { canRefresh = false; return; } + function increment() { + if ( ! isActive ) { didActiveChange(true); return } - if ( isActive ) { didChange(_root.defaultValue) } - } + let tValue = _private.val + if (canOff && _private.val < _private.minVal) { + tValue = _private.minVal + } + else { + let fixedVal = _private.fixedValue(_private.val) + let fixedStep = _private.fixedValue(_private.stepVal) + let fixedDelta = fixedStep - (fixedVal % fixedStep) + tValue = (fixedVal + fixedDelta) / _private.multiplier + tValue = Math.min(_private.maxVal, tValue) + } - // round the value based on the given precision (not step) - function calculatePrecisionValue(value) { - return Math.round(value * multiplier) / multiplier - } + didChange(tValue) + } - function refresh() { canRefresh = true } + function decrement() { + if ( ! isActive ) { didActiveChange(true); return } - function clear() { didActiveChange(false) } + let tValue = _private.val + if (canOff && _private.val === _private.minVal) { + tValue = 0 + } + else { + let fixedVal = _private.fixedValue(_private.val) + let fixedStep = _private.fixedValue(_private.stepVal) + let fixedDelta = fixedVal % fixedStep + tValue = (fixedVal - (fixedDelta > 0 ? fixedDelta : fixedStep)) / _private.multiplier + tValue = Math.max(_private.minVal, tValue) + } - function increment() { - let tValue = value - let stepDelta = calculatePrecisionValue(stepVal - (val % stepVal)) - let tStep = (stepDelta === 0) ? stepVal : stepDelta - if ( ! isActive ) { didActiveChange(true); return; } - - if ( canOff ) { tValue = val < minVal ? minVal : val + tStep } - else { tValue += tStep } - - didChange(tValue) + didChange(tValue) + } } - function decrement() { - let tValue = val - let stepDelta = calculatePrecisionValue(val % stepVal) - let tStep = (stepDelta === 0) ? stepVal : stepDelta - if ( ! isActive ) { didActiveChange(true); return; } + signal didChange (real vValue) + signal didActiveChange (bool vState) - if ( canOff ) { tValue = val > minVal ? val - tStep : 0 } - else { tValue -= tStep } + onIsActiveChanged : { + if ( canRefresh ) { canRefresh = false; return } - didChange(tValue) + if ( isActive ) { didChange(_root.defaultValue) } } + function refresh() { canRefresh = true } + + function clear() { didActiveChange(false) } + Text { id: _text anchors.centerIn: parent text : _root.isActive ? _root.canOff ? _root.value === 0 ? @@ -194,11 +214,11 @@ leftMargin : Variables.defaultMargin } iconSize : Variables.circleButtonDefaultDiameter - enabled : _root.canDecrement + enabled : _private.canDecrement visible : _root.editable iconImageSource : enabled ? "qrc:/images/iArrowLeft" : "qrc:/images/iArrowLeftDisabled" - onClicked : decrement() + onClicked : _private.decrement() } IconButton { id: _rightArrow @@ -208,10 +228,10 @@ rightMargin : Variables.defaultMargin } iconSize : Variables.circleButtonDefaultDiameter - enabled : _root.canIncrement + enabled : _private.canIncrement visible : _root.editable iconImageSource : enabled ? "qrc:/images/iArrowRight" : "qrc:/images/iArrowRightDisabled" - onClicked : increment() + onClicked : _private.increment() } } Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r135c320c850b09365c04e03d95195412c12fba72 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 135c320c850b09365c04e03d95195412c12fba72) @@ -71,7 +71,7 @@ readonly property int fontPixelCirclProgressTimeSmall : 32 readonly property int fontPixelCirclProgressTimeNormal : 90 - readonly property int fontPixelUltrafiltrationAdjustmentMetrics : 32 + readonly property int fontPixelUltrafiltrationAdjustmentMetrics : 30 readonly property int fontPixelUltrafiltrationAdjustmentNotification : 32 readonly property int fontPixelUltrafiltrationAdjustmentConfirmation : 50 readonly property int fontPixelUltrafiltrationRangeMarker : 32 Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r135c320c850b09365c04e03d95195412c12fba72 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 135c320c850b09365c04e03d95195412c12fba72) @@ -127,18 +127,15 @@ readonly property int treatmentPressureTitleWidth : 125 readonly property int treatmentPressureValueWidth : 140 - readonly property int ultrafiltrationHeaderMargin : 50 - readonly property int ultrafiltrationProgressbarWidth : 880 + readonly property int ultrafiltrationProgressBarWidth : 769 + readonly property int ultraFiltrationProgressBarHeight : 25 + readonly property int ultrafiltrationProgressBarRadius : 3 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 - readonly property int ultraFiltrationProgressBarHeight : 25 - readonly property int ultraFiltrationEditSliderHeight : sliderDefaultBodyHeight // to be consistent with other sliders readonly property int ultrafiltrationButtonWidth : 300 readonly property int ultrafiltrationButtonHeight : 60 - readonly property int ultrafiltrationButtonBottomMargin : 60 - readonly property int ultrafiltrationRangeMarkerWidth : 4 - readonly property int ultrafiltrationRangeMarkerHandleWidth : 12 - readonly property int ultrafiltrationContentMargin : 200 + readonly property int ultrafiltrationRangeMarkerWidth : 3 + readonly property int ultrafiltrationRangeMarkerTextMargin : 5 readonly property int silenceIconMargin : 10 readonly property int notificationBarIconMargin : 10 @@ -204,10 +201,12 @@ readonly property int textBoxRadius : 5 readonly property int textBoxBorderWidth : 2 - readonly property int adjustmentDialogWidth : applicationWidth * 0.7 - readonly property int adjustmentDialogHeight : applicationHeight * 0.7 + readonly property int adjustmentDialogWidth : 1400 + readonly property int adjustmentDialogHeight : 814 + readonly property int adjustmentDialogRadius : 8 readonly property int adjustmentHeaderHeight : 120 readonly property int adjustmentButtonMargin : 30 + readonly property int adjustmentNotificationHeight : 77 readonly property int defaultButtonHeight : 60 readonly property int defaultButtonWidth : 244 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -r975e1964b60365b24c74be139c6b84369a7248ce -r135c320c850b09365c04e03d95195412c12fba72 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 975e1964b60365b24c74be139c6b84369a7248ce) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 135c320c850b09365c04e03d95195412c12fba72) @@ -44,8 +44,13 @@ width : Variables.adjustmentDialogWidth height : Variables.adjustmentDialogHeight y : Math.round((Variables.applicationHeight - height) / 2) - Variables.headerHeight - notification.height : Variables.notificationHeight + radius : Variables.adjustmentDialogRadius + notification { + height : Variables.adjustmentNotificationHeight + radius : _root.radius + } + onVisibleChanged: { notificationText = "" } @@ -107,12 +112,15 @@ // 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 - height : Variables.notificationHeight + height : notification.height visible : false + radius : notification.radius imageSource : "" imageDiameter : 26 imageVerticalCenter : true imageFillMode : Image.PreserveAspectFit + textfontSize : 30 + textfontWeight : Font.Medium text : "" } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml =================================================================== diff -u -rf2aa3ee850de1023cfc011b845ed0364d251b749 -r135c320c850b09365c04e03d95195412c12fba72 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml (.../TreatmentAdjustmentUltrafiltration.qml) (revision f2aa3ee850de1023cfc011b845ed0364d251b749) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltration.qml (.../TreatmentAdjustmentUltrafiltration.qml) (revision 135c320c850b09365c04e03d95195412c12fba72) @@ -29,12 +29,11 @@ objectName: "_TreatmentAdjustmentUltrafiltration" // ultrafiltration state information bar properties - readonly property bool isUFPaused : vTreatmentUltrafiltration.ufPaused + readonly property bool isUFPaused: vTreatmentUltrafiltration.ufPaused closeVisible : true confirmVisible : false backVisible : _ufStack.stackView.depth > 1 - titleText : qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume onAboutToShow : { _ufStack.reset() } onClosed : { _ufStack.reset() } @@ -71,13 +70,11 @@ TreatmentAdjustmentUltrafiltrationStart { id: _treatmentAdjustmentUltrafiltrationStart visible: false - StackView.onActivated : { + StackView.onActivating : { _root.titleText = Qt.binding( function() { return qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } ) - _root.notificationText = Qt.binding( - function() { return vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText } - ) + _root.notificationText = "" } onPauseClicked : { // send pause to TD and wait. @@ -100,13 +97,11 @@ TreatmentAdjustmentUltrafiltrationEdit { id: _treatmentAdjustmentUltrafiltrationEdit visible: false - StackView.onActivated : { + StackView.onActivating : { _root.titleText = Qt.binding( function() { return qsTr("Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } ) - _root.notificationText = Qt.binding( - function() { return vTreatmentAdjustmentUltrafiltrationEdit.adjustment_ReasonText } - ) + _root.notificationText = "" } onContinueClicked : function(vVolume) { // send Volume to TD and wait. @@ -117,19 +112,25 @@ TreatmentAdjustmentUltrafiltrationConfirm { id: _treatmentAdjustmentUltrafiltrationConfirm visible: false - StackView.onActivated : { + StackView.onActivating : { _root.titleText = Qt.binding( function() { return qsTr("Confirm Ultrafiltration Volume ") + Variables.unitTextUltrafiltrationVolume } ) - _root.notificationText = Qt.binding( - function() { return vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_ReasonText } - ) + _root.notificationText = "" } onConfirmVolumeClicked : { vTreatmentAdjustmentUltrafiltrationConfirm.doConfirm(vVolume) } } + Connections { target: vTreatmentAdjustmentUltrafiltrationState + function onAdjustmentTriggered ( vValue ) { + if (_treatmentAdjustmentUltrafiltrationStart.StackView.status === StackView.Active) { + notification.text = vTreatmentAdjustmentUltrafiltrationState.adjustment_ReasonText + } + } + } + Connections { target: vTreatmentAdjustmentUltrafiltrationEdit function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentUltrafiltrationEdit.adjustment_Accepted) { @@ -138,6 +139,11 @@ _ufStack.stackView.push(_treatmentAdjustmentUltrafiltrationConfirm) } + else { + if (_treatmentAdjustmentUltrafiltrationEdit.StackView.status === StackView.Active) { + notification.text = vTreatmentAdjustmentUltrafiltrationEdit.adjustment_ReasonText + } + } } } @@ -146,6 +152,11 @@ if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { close() } + else { + if (_treatmentAdjustmentUltrafiltrationConfirm.StackView.status === StackView.Active) { + notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_ReasonText + } + } } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -rf2aa3ee850de1023cfc011b845ed0364d251b749 -r135c320c850b09365c04e03d95195412c12fba72 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision f2aa3ee850de1023cfc011b845ed0364d251b749) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 135c320c850b09365c04e03d95195412c12fba72) @@ -39,8 +39,8 @@ property alias value : _value.text property color valueColor : _value.color - implicitWidth : 400 - implicitHeight : Variables.defaultButtonHeight + implicitWidth : 416 + implicitHeight : 78 textPixelSize : Fonts.fontPixelButton contentItem: Text { id: _value font { Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -rf2aa3ee850de1023cfc011b845ed0364d251b749 -r135c320c850b09365c04e03d95195412c12fba72 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision f2aa3ee850de1023cfc011b845ed0364d251b749) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 135c320c850b09365c04e03d95195412c12fba72) @@ -55,8 +55,9 @@ topMargin : Variables.defaultMargin horizontalCenter: parent.horizontalCenter } - setVolume : _volumeGoalAdjuster.value - volumeRemoved : _private.volumeRemoved + setVolume : _volumeGoalAdjuster.value + volumeRemoved : _private.volumeRemoved + volumeRemovedColor : Colors.ufVolumeGoalText } Item { id: _contentArea @@ -65,19 +66,14 @@ top : _ufMetrics.bottom bottom : _continueButton.top left : parent.left - leftMargin : parent.width * 0.1667 right : parent.right - rightMargin : anchors.leftMargin } Column { id: _contentColumn - objectName : "_contentColumn" - anchors { - left : parent.left - right : parent.right - verticalCenter : parent.verticalCenter - } - spacing : 80 + objectName : "_contentColumn" + anchors.centerIn : parent + width : Variables.ultrafiltrationProgressBarWidth + spacing : 80 ProgressBar { id: _maxVolumeBar objectName: "_maxVolumeBar" @@ -86,6 +82,7 @@ marker.visible : false bgColor : Colors.ufAdjustmentProgressBarBg color : Colors.ufAdjustmentDeltaFill + radius : Variables.ultrafiltrationProgressBarRadius minText { font { pixelSize : Fonts.fontPixelUltrafiltrationMinMaxLabel @@ -118,6 +115,7 @@ } z : parent.z + 1 color : Colors.ufProgressBarFill + radius : parent.radius } RangeMarker { id: _lowMarker @@ -130,9 +128,8 @@ valueOnTop : true decimal : Variables.ultrafiltrationPrecision value : Math.max(_private.volumeRemoved, _private.minimum) - handle.width : Variables.ultrafiltrationRangeMarkerHandleWidth text { - anchors.bottomMargin: _lowMarker.valueOnTop ? 15 : 0 + anchors.bottomMargin: Variables.ultrafiltrationRangeMarkerTextMargin font { pixelSize: Fonts.fontPixelUltrafiltrationRangeMarker weight: Font.DemiBold Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -r975e1964b60365b24c74be139c6b84369a7248ce -r135c320c850b09365c04e03d95195412c12fba72 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 975e1964b60365b24c74be139c6b84369a7248ce) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 135c320c850b09365c04e03d95195412c12fba72) @@ -57,17 +57,14 @@ top : _ufMetrics.bottom bottom : _buttonArea.top left : parent.left - leftMargin : 80 right : parent.right - rightMargin : anchors.leftMargin } - ProgressBarEx { id: _progressbarex + ProgressBarEx { id: _progressBarEx anchors { - left : parent.left - right : parent.right - verticalCenter : parent.verticalCenter + centerIn : parent } + width : Variables.ultrafiltrationProgressBarWidth height : Variables.ultraFiltrationProgressBarHeight decimal : Variables.ultrafiltrationPrecision minimum : _private.minimum @@ -76,6 +73,7 @@ valueEx : 0 color : Colors.ufProgressBarFill bgColor : Colors.ufAdjustmentDeltaFill + radius : Variables.ultrafiltrationProgressBarRadius minText { font { pixelSize : Fonts.fontPixelUltrafiltrationMinMaxLabel @@ -94,10 +92,10 @@ } marker { width : Variables.ultrafiltrationRangeMarkerWidth - handle.width : Variables.ultrafiltrationRangeMarkerHandleWidth + hasHandle : false valueOnTop : true text { - anchors.bottomMargin: marker.valueOnTop ? 13 : 0 + anchors.bottomMargin: Variables.ultrafiltrationRangeMarkerTextMargin font { pixelSize: Fonts.fontPixelUltrafiltrationRangeMarker weight : Font.DemiBold @@ -119,7 +117,7 @@ width : Variables.defaultButtonWidth height : Variables.defaultButtonHeight text { - text : isUFPaused ? qsTr("Resume Ultrafiltration") : qsTr("Pause Ultrafiltration") + text : isUFPaused ? qsTr("Resume UF") : qsTr("Pause UF") font.weight : Font.Medium } isDefault : true