Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r018005dc067da01f25899ce83e4ce8f14e5013ae -r0022c3993c47e74c2d17c7f07f78fa1751a034f6 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 018005dc067da01f25899ce83e4ce8f14e5013ae) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 0022c3993c47e74c2d17c7f07f78fa1751a034f6) @@ -41,6 +41,7 @@ readonly property int contentHeight : 50 readonly property int mainMenuHeight : 80 //// ----- @LEAHIZED + readonly property int alarmDialogHeaderHeight : 100 readonly property int minVGap : 15 readonly property int minVGap2 : 30 @@ -73,6 +74,7 @@ readonly property int dialogWidth : applicationWidth - dialogMargin readonly property int dialogHeight : applicationHeight - dialogMargin readonly property int dialogRadius : 10 + readonly property int alarmDialogRadius : 30 readonly property int rangeRectMargin : 1 readonly property int rangeRectRadius : 2 @@ -111,12 +113,13 @@ readonly property int pauseIconDiameter : 60 readonly property int arrowIconDiameter : 35 + readonly property int muteIconDiameter : 38 readonly property int headerIconDiameter : 40 readonly property int topBarMenuHeight : 80 //// ----- @LEAHIZED readonly property int sliderCircleDiameter : 30 readonly property int pressuresProgressbarWidth : 725 - + readonly property int gridSelectionButtonHeight : 100 readonly property int gridSelectionButtonWidth : 375 @@ -209,7 +212,6 @@ readonly property int noRejectReason : 0 readonly property int textBoxRadius : 5 - readonly property int textBoxBorderWidth : 2 readonly property int adjustmentDialogWidth : applicationWidth * 0.7 readonly property int adjustmentDialogHeight : applicationHeight * 0.7 readonly property int adjustmentHeaderHeight : 120 @@ -246,6 +248,12 @@ // Dialysate Conductivity readonly property int dialysateCondPrecision : 1 + // Potassium + readonly property int potassiumPrecision : 1 + + // Calcium + readonly property int calciumPrecision : 2 + function sizeConverted(vSize, vSizePowers, vRound = 2) { return ( vSize / vSizePowers // convert from byte to Giga byte @@ -270,12 +278,16 @@ readonly property var regExp_PatientID: /[A-Za-z0-9_\-\.]{1,64}/ + readonly property string emptyEntry : "-- --" + readonly property string preTreatmentStepLabelCreate : qsTr("CREATE" ) readonly property string preTreatmentStepLabelConfirm : qsTr("CONFIRM" ) readonly property string preTreatmentStepLabelPriming : qsTr("PRIME" ) readonly property string preTreatmentStepLabelUltrafiltration : qsTr("BEGIN" ) // Units + readonly property string unitTextPotassium : qsTr("K") + readonly property string unitTextCalcium : qsTr("Ca") // - Ultrafiltration readonly property string unitTextUltrafiltrationRate : unitTextFlowRate readonly property string unitTextUltrafiltrationVolume : unitTextVolume