Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rc1e50347c78096b626b2cd1ef32a33b439e88bdd -r2283d645185c14bf358aff5ea59bed5087692146 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision c1e50347c78096b626b2cd1ef32a33b439e88bdd) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 2283d645185c14bf358aff5ea59bed5087692146) @@ -42,7 +42,7 @@ readonly property int mainMenuHeight : 80 //// ----- @LEAHIZED readonly property int alarmDialogHeaderHeight : 100 - readonly property int instructionHeight : 73 + readonly property int instructionHeight : 77 readonly property int minVGap : 15 readonly property int minVGap2 : 30 @@ -83,7 +83,7 @@ readonly property int rangeRectRadius : 2 readonly property int rangeRectTextMargin : 10 readonly property int rangeRectBorderWidth : 2 - readonly property int rangeMarkerHeight : 60 + readonly property int rangeMarkerHeight : 48 readonly property int rangeMarkerHeightMidle : 40 readonly property int rangeMarkerHeightShort : 30 readonly property int rangeMarkerWidth : 2 @@ -102,7 +102,7 @@ readonly property int circleNormalDiameter : 418 readonly property int progressCircleDiameterNormal : circleNormalDiameter - readonly property int progressCircleDiameterSmall : 150 + readonly property int progressCircleDiameterSmall : 250 readonly property int opacityAnimationDuration : 1200 readonly property int sliderTextMargin : 20 @@ -111,7 +111,7 @@ readonly property int notificationHeight : 80 //// ----- @LEAHIZED readonly property int notificationIconDiameter : 36 - readonly property int checkListViewItemWidth : 350 + readonly property int checkListViewItemWidth : 400 readonly property int checkListViewItemHeight : 60 readonly property int pauseIconDiameter : 60 @@ -138,7 +138,7 @@ readonly property int ultrafiltrationButtonWidth : 300 readonly property int ultrafiltrationButtonHeight : 60 readonly property int ultrafiltrationRangeMarkerWidth : 3 - readonly property int ultrafiltrationRangeMarkerTextMargin : 5 + readonly property int ultrafiltrationRangeMarkerTextMargin : 10 readonly property int silenceIconMargin : 10 readonly property int notificationBarIconMargin : 10 @@ -257,6 +257,9 @@ // Calcium readonly property int substitutionPrecision : 1 + // conductivity + readonly property int conductivityPrecision : 1 + function sizeConverted(vSize, vSizePowers, vRound = 2) { return ( vSize / vSizePowers // convert from byte to Giga byte @@ -287,6 +290,9 @@ readonly property string preTreatmentStepLabelPriming : qsTr("PRIME" ) readonly property string preTreatmentStepLabelUltrafiltration : qsTr("BEGIN" ) + readonly property string unitTextChlorine : qsTr("mg/L") + readonly property real chlorineLevel : 0.1 + // Heparin readonly property string unitHeparinType : qsTr("IU/mL") // Units