Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r16a8f25568b4636ebc31e76c86a8031940cc4ad7 -r6e18f1d24b8cc3d84d26f46f36f73deb34e54371 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 16a8f25568b4636ebc31e76c86a8031940cc4ad7) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 6e18f1d24b8cc3d84d26f46f36f73deb34e54371) @@ -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 @@ -56,7 +57,15 @@ readonly property int fontPixelFluidUnit : 22 readonly property int fontPixelFluidVolume : 16 - readonly property int fontPixelConfirm : 19 + readonly property int fontHeaderbarUser : 18 + readonly property int fontHeaderbarTitle : 35 + readonly property int fontHeaderbarTime : 40 + readonly property int fontHeaderbarDate : 22 + readonly property int fontHeaderbarTimezone : 14 + + readonly property int fontUnit : 18 + + readonly property int fontPixelConfirm : 21 readonly property int fontPixelBack : 17 readonly property int fontPixelSliderMarker : 17 @@ -70,14 +79,11 @@ readonly property int fontPixelCirclProgressTimeSmall : 32 readonly property int fontPixelCirclProgressTimeNormal : 90 - readonly property int fontPixelUltrafiltrationAdjustmentButton : 26 - readonly property int fontPixelUltrafiltrationAdjustmentButtonL : 30 - readonly property int fontPixelUltrafiltrationAdjustmentPauseButton : fontPixelUltrafiltrationAdjustmentButton - readonly property int fontPixelUltrafiltrationAdjustmentResumeButton : fontPixelUltrafiltrationAdjustmentButtonL - readonly property int fontPixelUltrafiltrationAdjustmentEditButton : fontPixelUltrafiltrationAdjustmentButtonL - readonly property int fontPixelUltrafiltrationAdjustmentNextButton : fontPixelUltrafiltrationAdjustmentButton - readonly property int fontPixelUltrafiltrationAdjustmentConfirmButton : fontPixelUltrafiltrationAdjustmentButton - readonly property int fontPixelUltrafiltrationAdjustmentEditValue : 46 + readonly property int fontPixelUltrafiltrationAdjustmentMetrics : 32 + 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