Index: sources/gui/qml/compounds/BPHREntry.qml =================================================================== diff -u -r41a604f3fe3a5bb40bddd8c06e5fe88df85e3997 -r2b0c62ca1a150e1a375ab388be076e17532cb20f --- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 41a604f3fe3a5bb40bddd8c06e5fe88df85e3997) +++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 2b0c62ca1a150e1a375ab388be076e17532cb20f) @@ -54,10 +54,12 @@ text : qsTr("Blood Pressure") unitText : Variables.unitTextBloodPressure width : Variables.adjustmentLabelUnitContainerWidth - height : Variables.adjustmentLabelUnitContainerHeight + height : Variables.popupAdjustmentContainerHeight + titlePixelSize : Fonts.fontPixelContainerTitleSmall + unitPixelSize : Fonts.fontPixelContainerUnitSmall + titleLeftMargin : Variables.defaultMargin * 2 contentItem : Row { - spacing : 10 anchors.centerIn: parent TextEntry { id : _bloodPressureSystolic @@ -105,7 +107,10 @@ text : qsTr("Heart Rate") unitText : Variables.unitTextHeartBeat width : Variables.adjustmentLabelUnitContainerWidth - height : Variables.adjustmentLabelUnitContainerHeight + height : Variables.popupAdjustmentContainerHeight + titlePixelSize : Fonts.fontPixelContainerTitleSmall + unitPixelSize : Fonts.fontPixelContainerUnitSmall + titleLeftMargin : Variables.defaultMargin * 2 contentItem : TextEntry { id: _heartRate text : Variables.notSetVariable(vTreatmentVitals.heartRate, 0) Index: sources/gui/qml/compounds/LabelUnitContainer.qml =================================================================== diff -u -rb395fdadb1ad460eba7e45eaca94c100a5d0c804 -r2b0c62ca1a150e1a375ab388be076e17532cb20f --- sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision b395fdadb1ad460eba7e45eaca94c100a5d0c804) +++ sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision 2b0c62ca1a150e1a375ab388be076e17532cb20f) @@ -30,6 +30,9 @@ property bool valid : true property bool showUnit : true property bool showEdit : false + property int titlePixelSize : Fonts.fontPixelContainerTitle + property int unitPixelSize : Fonts.fontPixelContainerUnit + property int titleLeftMargin: Variables.defaultMargin height : cellHeight width : cellWidth @@ -47,21 +50,21 @@ anchors { verticalCenter : parent.verticalCenter left : parent.left - leftMargin : Variables.defaultMargin + leftMargin : _root.titleLeftMargin } spacing : 10 Text { id: _title anchors.verticalCenter : _titleRow.verticalCenter color : Colors.offWhite - font.pixelSize : 28 + font.pixelSize : _root.titlePixelSize } Text { id: _unit anchors.bottom : _title.bottom text : ("(%1)").arg(_root.unitText) color : Colors.offWhite - font.pixelSize : 22 + font.pixelSize : _root.unitPixelSize font.weight : Font.Thin visible : _root.showUnit } Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r2b0c62ca1a150e1a375ab388be076e17532cb20f --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 2b0c62ca1a150e1a375ab388be076e17532cb20f) @@ -84,6 +84,11 @@ readonly property int fontPixelCircleButtonLabel: 50 + readonly property int fontPixelContainerTitle : 28 + readonly property int fontPixelContainerUnit : 22 + readonly property int fontPixelContainerTitleSmall : 22 + readonly property int fontPixelContainerUnitSmall : 15 + readonly property int fontPixelDebugTitle : 25 readonly property int fontPixelDebugText : 32 readonly property int fontPixelDebugLabel : 20 Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r2b0c62ca1a150e1a375ab388be076e17532cb20f --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 2b0c62ca1a150e1a375ab388be076e17532cb20f) @@ -194,6 +194,7 @@ readonly property int adjustmentLabelUnitContainerHeight : 75 readonly property int adjustmentLabelUnitContainerWidth : 720 + readonly property int popupAdjustmentContainerHeight : 65 readonly property real sliderDefaultRoundTickMarkDiameter : 5 readonly property int sliderDefaultBodyHeight : 15 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml =================================================================== diff -u -rb88eb4be4b18985df3d35f249ee3847250e63a91 -r2b0c62ca1a150e1a375ab388be076e17532cb20f --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision b88eb4be4b18985df3d35f249ee3847250e63a91) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision 2b0c62ca1a150e1a375ab388be076e17532cb20f) @@ -48,7 +48,10 @@ unitText : Variables.unitTextDuration valid : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason width : Variables.adjustmentLabelUnitContainerWidth - height : Variables.adjustmentLabelUnitContainerHeight + height : Variables.popupAdjustmentContainerHeight + titlePixelSize : Fonts.fontPixelContainerTitleSmall + unitPixelSize : Fonts.fontPixelContainerUnitSmall + titleLeftMargin : Variables.defaultMargin * 2 contentItem : ValueAdjuster { id: _bpMeasurementIntervalControl minimum : vTreatmentRanges.bloodPressureMeasureIntervalMin