Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -re7adb742d7dd362b2deb795259694b223eea3bc0 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 40ddf63592b60608ae34aeb3099fe4e62ae45054) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision e7adb742d7dd362b2deb795259694b223eea3bc0) @@ -1,5 +1,4 @@ -/*! - * +/*! * * Copyright (c) 2019-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN @@ -64,7 +63,7 @@ readonly property int touchRectWidth : 512 //K:D //425 readonly property int touchRectHeight : 85 //K:D //70 - readonly property int touchRectRadius : 15 + readonly property int touchRectRadius : 10 readonly property int titleBottomPadding : 25 @@ -76,6 +75,8 @@ readonly property int dialogRadius : 10 readonly property int alarmDialogRadius : 30 + readonly property int panelBorderWidth : 1 + readonly property int rangeRectMargin : 1 readonly property int rangeRectRadius : 2 readonly property int rangeRectTextMargin : 10 @@ -84,10 +85,11 @@ readonly property int rangeMarkerHeightMidle : 40 readonly property int rangeMarkerHeightShort : 30 readonly property int rangeMarkerWidth : 2 + readonly property int rangeMarkerWidthMidle : 3 readonly property int progressbarHeight : 30 - readonly property int progressbarHandler : 30 - readonly property int progressbarHandlerBorderWidth : 4 + readonly property int progressbarHandler : 40 + readonly property int progressbarHandlerBorderWidth : 3 readonly property int progressbarRectMargin : 0 // default as 0 to avoid progressRect having a thicker border than slider body readonly property int progressbarFluidHeight : 5 @@ -118,16 +120,25 @@ readonly property int sliderCircleDiameter : 30 readonly property int pressuresProgressbarWidth : 725 + readonly property int numPadHeight : 675 + readonly property int numPadWidth : 525 readonly property int treatmentFlowsComponentWidth : 150 readonly property int treatmentPressureTitleWidth : 125 readonly property int treatmentPressureValueWidth : 140 + readonly property int ultrafiltrationHeaderMargin : 50 readonly property int ultrafiltrationProgressbarWidth : 880 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 readonly property int ultraFiltrationProgressBarHeight : 25 readonly property int ultraFiltrationEditSliderHeight : sliderDefaultBodyHeight // to be consistent with other sliders + readonly property int ultrafiltrationButtonWidth : 300 + readonly property int ultrafiltrationButtonHeight : 60 + readonly property int ultrafiltrationButtonBottomMargin : 60 + readonly property int ultrafiltrationRangeMarkerWidth : 4 + readonly property int ultrafiltrationRangeMarkerHandleWidth : 12 + readonly property int ultrafiltrationContentMargin : 200 readonly property int silenceIconMargin : 10 readonly property int notificationBarIconMargin : 10 @@ -146,7 +157,6 @@ readonly property int settingsInputWidth : 225 readonly property int settingsNotificationMargin : 10 - readonly property int settingsContentSidesMargin : headerButtonsMargin readonly property int settingsContentBottomMargin : mainMenuHeight + // Alarm Bar height notificationHeight + // notification Bar height minVGap // Min Gap to give content the min border @@ -181,13 +191,29 @@ readonly property int sliderAdjustButtonRightMargin : 50 readonly property int sliderAdjustPressAndHoldRefreshRate : 250 + readonly property int adjustmentLabelUnitContainerHeight : 75 + readonly property int adjustmentLabelUnitContainerWidth : 720 + readonly property real sliderDefaultRoundTickMarkDiameter : 5 readonly property int sliderDefaultBodyHeight : 15 readonly property int circleButtonDefaultDiameter : 45 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 + readonly property int adjustmentButtonMargin : 30 + + readonly property int defaultButtonHeight : 60 + readonly property int defaultButtonWidth : 244 + + readonly property int smallDialogHeight : numPadHeight + readonly property int smallDialogWidth : 1000 + // ---------- < PRS > Related Section ---------- // blood flow rate readonly property int bloodFlowMin : 100 // PRS 30 @@ -248,7 +274,6 @@ // otherwise an extra RegExpValidator object will always created here. readonly property var regExp_PatientID: /[A-Za-z0-9_\-\.]{1,64}/ - readonly property string emptyEntry : "-- --" readonly property string preTreatmentStepLabelCreate : qsTr("CREATE" )