Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r7710fea4486a639caaa3c510add0eac0bcd4ddcc --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 7710fea4486a639caaa3c510add0eac0bcd4ddcc) @@ -48,14 +48,15 @@ readonly property int touchRectHeight : 85 //K:D //70 readonly property int touchRectRadius : 45 - readonly property int titleBottomPadding : 25 + readonly property int titleBottomPadding : 25 readonly property int columnSpacing : 25 //K:D //20 readonly property int dialogMargin : mainMenuHeight * 2 readonly property int dialogWidth : applicationWidth - dialogMargin readonly property int dialogHeight : applicationHeight - dialogMargin readonly property int dialogRadius : 10 + readonly property int dialogRadiusHalf : 5 readonly property int rangeRectMargin : 1 readonly property int rangeRectRadius : 2 @@ -77,7 +78,7 @@ readonly property int sliderTextMargin : 20 readonly property int treatmentSpacing : 60 - readonly property int notificationHeight : 50 + readonly property int notificationHeight : 60 readonly property int notificationIconSize : 36 readonly property int backIconDiameter : 17 @@ -107,7 +108,7 @@ readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 - readonly property int silenceIconMargin : 20 + readonly property int silenceIconMargin : 10 readonly property int notificationBarIconMargin : 10 readonly property int notificationBarIconHeight : 30 readonly property int notificationBarIconWidth : 30 @@ -123,6 +124,8 @@ readonly property int bloodFlowResolution : 25 readonly property int dialysateFlowResolution : 50 readonly property int durationResolution : 15 // PRS346 + // Precision + readonly property int ultrafiltrationPrecision : 3 // Inline Blood Pressures // - Artrial @@ -159,20 +162,25 @@ readonly property string notSetVariableText : "__" + 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 // - Ultrafiltration - readonly property string unitTextUltrafiltrationVolume : qsTr("(L)") - readonly property string unitTextUltrafiltrationRate : qsTr("mL/min") - readonly property string unitTextTreatmentDuration : qsTr("min") + readonly property string unitTextUltrafiltrationRate : qsTr("mL/min") + readonly property string unitTextUltrafiltrationVolume : qsTr("(L)") + readonly property string unitTextTreatmentDuration : qsTr("min") // - Flows - readonly property string unitTextFlowRate : qsTr("mL/min") + readonly property string unitTextFlowRate : qsTr("mL/min") // - Vitals - readonly property string unitTextBloodPressure : qsTr("mmHg") - readonly property string unitTextHeartBeat : qsTr("BPM" ) + readonly property string unitTextBloodPressure : qsTr("mmHg") + readonly property string unitTextHeartBeat : qsTr("BPM" ) // - Fluid - readonly property string unitTextFluid : qsTr("mL") - readonly property string unitTextSaline : unitTextFluid - readonly property string unitTextHeparin : unitTextFluid + readonly property string unitTextFluid : qsTr("mL") + readonly property string unitTextSaline : unitTextFluid + readonly property string unitTextHeparin : unitTextFluid // - Create Treatment - readonly property string unitTextBPMeasurementInterval : qsTr("min") + readonly property string unitTextBPMeasurementInterval : qsTr("min") }