Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r9f70ae0e4a2a053486198c4a505575044a7ab3be -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 9f70ae0e4a2a053486198c4a505575044a7ab3be) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) @@ -34,8 +34,11 @@ readonly property int headerHeight : 100 readonly property int headerButtonsMargin : 35 readonly property int confirmButtonWidth : 155 + readonly property int headerBarDateTimeWidth : 200 + readonly property int defaultMargin : 20 + readonly property int contentHeight : 50 - readonly property int mainMenuHeight : 100 //// ----- @LEAHIZED + readonly property int mainMenuHeight : 80 //// ----- @LEAHIZED readonly property int minVGap : 15 readonly property int minVGap2 : 30 @@ -52,6 +55,7 @@ readonly property int arrowHeight : 16 readonly property int alarmListIconDiameter : 45 + readonly property int iconButtonSize : 35 readonly property int borderWidth : 2 @@ -74,7 +78,7 @@ readonly property int rangeRectBorderWidth : 2 readonly property int rangeMarkerHeight : 60 readonly property int rangeMarkerHeightMidle : 40 - readonly property int rangeMarkerHeightShort : 20 + readonly property int rangeMarkerHeightShort : 30 readonly property int rangeMarkerWidth : 2 readonly property int progressbarHeight : 30 @@ -88,22 +92,24 @@ readonly property int progressbarRectHeight : 50 readonly property int progressbarRectWidth : 620 - readonly property int circleNormalDiameter : 350 + readonly property int circleNormalDiameter : 418 readonly property int progressCircleDiameterNormal : circleNormalDiameter readonly property int progressCircleDiameterSmall : 150 readonly property int opacityAnimationDuration : 1200 readonly property int sliderTextMargin : 20 readonly property int treatmentSpacing : 80 // 60 - readonly property int notificationHeight : 100 //// ----- @LEAHIZED + readonly property int notificationHeight : 80 //// ----- @LEAHIZED readonly property int notificationIconDiameter : 36 readonly property int checkListViewItemWidth : 350 readonly property int checkListViewItemHeight : 60 readonly property int pauseIconDiameter : 60 - readonly property int topBarMenuHeight : 100 //// ----- @LEAHIZED + readonly property int arrowIconDiameter : 35 + readonly property int headerIconDiameter : 40 + readonly property int topBarMenuHeight : 80 //// ----- @LEAHIZED readonly property int sliderCircleDiameter : 30 readonly property int pressuresProgressbarWidth : 725 @@ -124,10 +130,12 @@ readonly property int createTreatmentSliderWidth : 750 readonly property int createTreatmentSwitchYDisplacement : 15 + readonly property int treatmentFlowsComponentWidth : 150 + readonly property int ultrafiltrationProgressbarWidth : 880 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 - readonly property int ultraFiltrationProgressBarHeight : 30 + readonly property int ultraFiltrationProgressBarHeight : 25 readonly property int ultraFiltrationEditSliderHeight : sliderDefaultBodyHeight // to be consistent with other sliders readonly property int silenceIconMargin : 10 @@ -205,7 +213,7 @@ // Ultrafiltration readonly property real ultrafiltrationMinDef : 0.000 readonly property real ultrafiltrationMaxDef : 8.000 - readonly property int ultrafiltrationPrecision : 3 + readonly property int ultrafiltrationPrecision : 2 // Heparin readonly property int heparinPrecision : 1 @@ -254,11 +262,14 @@ // - Flows readonly property string unitTextFlowRate : qsTr("mL/min") readonly property string unitTextDispensingRate : qsTr("mL/hr") + readonly property string unitTextRate : qsTr("L/h") + readonly property string unitTextDialCond : qsTr("mS/cm") // - Vitals readonly property string unitTextBloodPressure : qsTr("mmHg") readonly property string unitTextHeartBeat : qsTr("BPM" ) // - Fluid readonly property string unitTextVolume : qsTr("(L)") + readonly property string unitVolume : qsTr("L") readonly property string unitTextFluid : qsTr("mL") readonly property string unitTextSaline : unitTextFluid readonly property string unitTextHeparin : unitTextFluid