Index: sources/gui/qml/components/NotificationBarSmall.qml =================================================================== diff -u -r923377d29fe730c0e2209386479a61b1e8ee1097 -r7208690c23bf7a801437b86902f2e04d173d659f --- sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision 923377d29fe730c0e2209386479a61b1e8ee1097) +++ sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision 7208690c23bf7a801437b86902f2e04d173d659f) @@ -25,6 +25,7 @@ Rectangle { id: _root objectName: "NotificationBar" // SquishQt + property alias image : _image property alias imageSource : _image.source property bool imageAutoSize : false property bool imageAnimated : false Index: sources/gui/qml/components/TouchRect.qml =================================================================== diff -u -rddd2197b24223c540a016e3256f97082f817c088 -r7208690c23bf7a801437b86902f2e04d173d659f --- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision ddd2197b24223c540a016e3256f97082f817c088) +++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 7208690c23bf7a801437b86902f2e04d173d659f) @@ -128,7 +128,7 @@ anchors.verticalCenter : parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter color: enabled ? _root.textColor : Colors.textDisableButton - font.pixelSize: Fonts.fontPixelButton + font.pixelSize: Fonts.fontPixelDefaultButton } MouseArea { id: _mouseArea Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r0022c3993c47e74c2d17c7f07f78fa1751a034f6 -r7208690c23bf7a801437b86902f2e04d173d659f --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 0022c3993c47e74c2d17c7f07f78fa1751a034f6) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 7208690c23bf7a801437b86902f2e04d173d659f) @@ -24,6 +24,7 @@ */ QtObject { readonly property int fontPixelButton : 24 + readonly property int fontPixelDefaultButton : 21 readonly property int fontPixelTitle : 40 // Changed to 40 to match with the Alarm messaging body font size readonly property int fontPixelSection : 36 readonly property int fontPixelDialogText : 22 @@ -71,10 +72,10 @@ readonly property int fontPixelCirclProgressTimeNormal : 90 readonly property int fontPixelUltrafiltrationAdjustmentMetrics : 32 - readonly property int fontPixelUltrafiltrationAdjustmentButton : 26 readonly property int fontPixelUltrafiltrationAdjustmentNotification : 32 readonly property int fontPixelUltrafiltrationAdjustmentConfirmation : 50 readonly property int fontPixelUltrafiltrationRangeMarker : 32 + readonly property int fontPixelUltrafiltrationMinMaxLabel : 24 readonly property int fontPixelUltrafiltrationRateUnit : 16 readonly property int fontPixelRinsebackAdjustmentButton : 26 Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rf8c80661c806c50047e81d581df0dd6e05f1c8ef -r7208690c23bf7a801437b86902f2e04d173d659f --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision f8c80661c806c50047e81d581df0dd6e05f1c8ef) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 7208690c23bf7a801437b86902f2e04d173d659f) @@ -63,7 +63,7 @@ readonly property int touchRectWidth : 512 //K:D //425 readonly property int touchRectHeight : 85 //K:D //70 - readonly property int touchRectRadius : 15 + readonly property int touchRectRadius : 10 readonly property int titleBottomPadding : 25 @@ -219,6 +219,9 @@ readonly property int adjustmentHeaderHeight : 120 readonly property int adjustmentButtonMargin : 30 + readonly property int defaultButtonHeight : 60 + readonly property int defaultButtonWidth : 244 + // ---------- < PRS > Related Section ---------- // blood flow rate readonly property int bloodFlowMin : 100 // PRS 30 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -raa03f07a386a12895435facfff9f4bff9f7a45f0 -r7208690c23bf7a801437b86902f2e04d173d659f --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 7208690c23bf7a801437b86902f2e04d173d659f) @@ -105,8 +105,13 @@ // 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 : "" + visible : false + imageSource : "" + imageDiameter : 26 + text : "" + image { + anchors.verticalCenter : image.parent.verticalCenter + fillMode : Image.PreserveAspectFit + } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -r2270e3265bcbe5465589eb235ebf98cd849abcbd -r7208690c23bf7a801437b86902f2e04d173d659f --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 2270e3265bcbe5465589eb235ebf98cd849abcbd) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 7208690c23bf7a801437b86902f2e04d173d659f) @@ -42,7 +42,6 @@ visible : true && information.text && ! notification.visible imageSource : ufInfoImageSource text : ufInfoText - radius : 0 color : Colors.ufNotificationBarBg textColor : Colors.ufVolumeGoalText textfontSize : Fonts.fontPixelUltrafiltrationAdjustmentNotification @@ -162,8 +161,7 @@ isDefault : true text { text : qsTr("Confirm") - font.weight : Font.DemiBold - font.pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton + font.weight : Font.Medium } onClicked: confirmVolumeClicked(_root.ultrafiltrationVolume) Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r8e18daa30708e1996f1931913b31ca741de4a1a3 -r7208690c23bf7a801437b86902f2e04d173d659f --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 8e18daa30708e1996f1931913b31ca741de4a1a3) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 7208690c23bf7a801437b86902f2e04d173d659f) @@ -51,7 +51,6 @@ visible : true && information.text && ! notification.visible imageSource : ufInfoImageSource text : ufInfoText - radius : 0 color : Colors.ufNotificationBarBg textColor : Colors.ufVolumeGoalText textfontSize : Fonts.fontPixelUltrafiltrationAdjustmentNotification @@ -107,10 +106,7 @@ height : Variables.ultrafiltrationButtonHeight text { text : qsTr("Continue") - font { - pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton - weight : Font.DemiBold - } + font.weight : Font.Medium } isDefault : true enabled : _setVolumeSlider.value.toFixed(_setVolumeSlider.decimal) !== Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -rf8c80661c806c50047e81d581df0dd6e05f1c8ef -r7208690c23bf7a801437b86902f2e04d173d659f --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision f8c80661c806c50047e81d581df0dd6e05f1c8ef) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 7208690c23bf7a801437b86902f2e04d173d659f) @@ -48,7 +48,6 @@ visible : true && information.text && ! notification.visible imageSource : ufInfoImageSource text : ufInfoText - radius : 0 color : Colors.ufNotificationBarBg textColor : Colors.ufVolumeGoalText textfontSize : Fonts.fontPixelUltrafiltrationAdjustmentNotification @@ -93,7 +92,7 @@ bgColor : Colors.ufAdjustmentDeltaFill minText { font { - pixelSize : Fonts.fontPixelButton + pixelSize : Fonts.fontPixelUltrafiltrationMinMaxLabel weight : Font.Normal } color : Colors.progressBarMinMax @@ -128,14 +127,11 @@ bottomMargin : Variables.ultrafiltrationButtonBottomMargin horizontalCenter: parent.horizontalCenter } - width : 360 - height : Variables.ultrafiltrationButtonHeight + width : Variables.defaultButtonWidth + height : Variables.defaultButtonHeight text { text : qsTr("Pause Ultrafiltration") - font { - pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton - weight : Font.DemiBold - } + font.weight : Font.Medium anchors { centerIn : null // disable the parent anchor verticalCenter : _pauseButton.verticalCenter @@ -168,42 +164,33 @@ visible : ! _pauseButton.visible TouchRect { id: _resumeButton - width : Variables.ultrafiltrationButtonWidth - height : Variables.ultrafiltrationButtonHeight + width : Variables.defaultButtonWidth + height : Variables.defaultButtonHeight text { - text : qsTr("Resume Ultrafiltration") - font { - pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton - weight : Font.DemiBold - } + text : qsTr("Resume Ultrafiltration") + font.weight : Font.Medium } isDefault : true onClicked : _root.resumeClicked() } TouchRect { id: _editButton - width : Variables.ultrafiltrationButtonWidth - height : Variables.ultrafiltrationButtonHeight + width : Variables.defaultButtonWidth + height : Variables.defaultButtonHeight text { text : qsTr("Edit UF") - font { - pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton - weight : Font.DemiBold - } + font.weight : Font.Medium } isDefault : true onClicked : _root.editClicked() } TouchRect { id: _isolatedUfButton - width : Variables.ultrafiltrationButtonWidth - height : Variables.ultrafiltrationButtonHeight + width : Variables.defaultButtonWidth + height : Variables.defaultButtonHeight text { text : qsTr("Isolated UF") - font { - pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton - weight : Font.DemiBold - } + font.weight : Font.Medium } isDefault : true onClicked : _root.isolatedUfClicked()