Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -25,41 +25,50 @@ QtObject { readonly property int keybardAnimationDuration : 200 - readonly property int applicationWidth : 1280 - readonly property int applicationHeight : 800 + readonly property int applicationWidth : 1920 // 1280 + readonly property int applicationHeight : 1080 // 800 readonly property int buttonSpacing : 150 readonly property int dialogIconHeight : 50 readonly property int dialogIconWidth : 50 - readonly property int dialogIconHorizontalOffset : 25 + readonly property int dialogIconHorizontalOffset : 35 readonly property int headerHeight : 100 readonly property int headerButtonsMargin : 35 - readonly property int confirmButtonWidth : 155 + readonly property int confirmButtonWidth : 175 + readonly property int confirmButtonHeight : 60 + readonly property int backButtonWidth : 175 + readonly property int backButtonHeight : 60 + readonly property int footerChildButtonWidth : 400 + readonly property int buttonWidth : 530 + readonly property int buttonHeight : 95 - readonly property int mainMenuHeight : 70 + readonly property int mainMenuHeight : 80 readonly property int minVGap : 15 readonly property int minVGap2 : 30 readonly property int logoDiameter : 50 readonly property int denaliDeviceDiameter : 350 // 475 - readonly property int iconsDiameter : 25 + readonly property int iconsDiameter : 50 readonly property int largeArrowWidth : 24 readonly property int largeArrowHeight : 32 - readonly property int arrowWidth : 12 - readonly property int arrowHeight : 16 + readonly property int arrowWidth : 18 + readonly property int arrowHeight : 25 - readonly property int alarmListIconDiameter : 45 + readonly property int alarmListIconDiameter : 60 + readonly property int alarmListIconDiameterSmall : 35 readonly property int borderWidth : 2 readonly property int touchRectWidth : 512 //K:D //425 readonly property int touchRectHeight : 85 //K:D //70 readonly property int touchRectRadius : 45 + readonly property int touchRectWidthSmall : 175 //K:D //425 + readonly property int touchRectHeightSmall : 65 //K:D //70 - readonly property int titleBottomPadding : 25 + readonly property int bottomPaddingTitle : 10 readonly property int columnSpacing : 25 //K:D //20 @@ -78,7 +87,7 @@ readonly property int rangeMarkerWidth : 2 readonly property int progressbarHeight : 30 - readonly property int progressbarHandler : 30 + readonly property int progressbarHandler : 40 readonly property int progressbarHandlerBorderWidth : 4 readonly property int progressbarRectMargin : 0 // default as 0 to avoid progressRect having a thicker border than slider body @@ -88,43 +97,47 @@ readonly property int progressbarRectHeight : 50 readonly property int progressbarRectWidth : 620 - readonly property int circleNormalDiameter : 350 + readonly property int circleNormalDiameter : 450 readonly property int progressCircleDiameterNormal : circleNormalDiameter - readonly property int progressCircleDiameterSmall : 150 + readonly property int progressCircleDiameterSmall : 200 readonly property int opacityAnimationDuration : 1200 + + readonly property int switchWidth : 85 + readonly property int switchHeight : 130 readonly property int sliderTextMargin : 20 - readonly property int treatmentSpacing : 80 // 60 + readonly property int treatmentSpacing : 90 // 60 - readonly property int notificationHeight : 60 + readonly property int notificationHeight : 80 readonly property int notificationIconDiameter : 36 - readonly property int checkListViewItemWidth : 350 + readonly property int checkListViewItemWidth : 500 readonly property int checkListViewItemHeight : 60 readonly property int pauseIconDiameter : 60 readonly property int topBarMenuHeight : 100 - readonly property int sliderCircleDiameter : 30 - - readonly property int pressuresProgressbarWidth : 725 readonly property int gridSelectionButtonHeight : 100 - readonly property int gridSelectionButtonWidth : 375 + readonly property int gridSelectionButtonWidth : 450 + readonly property int gridSelectionColSpace : 60 + readonly property int gridSelectionRowSpace : 30 + readonly property int spaceBetweenLineAndText : 5 readonly property int createTreatmentFlickableDeceleration : 4500 readonly property int createTreatmentTableHeight : 800 readonly property int createTreatmentTableWidth : applicationWidth - 50 readonly property int createTreatmentMargin : 45 readonly property int createTreatmentHeaderHeight : 130 readonly property int createTreatmentTableMargin : 20 - readonly property int createTreatmentSubTableHeight : 50 - readonly property int createTreatmentSubTableWidth : 500 + readonly property int createTreatmentSubTableHeight : 70 + readonly property int createTreatmentSubTableWidth : 800 readonly property int createTreatmentSliderMargin : sliderDefaultBodyHeight - readonly property int createTreatmentSliderHeight : 65 - readonly property int createTreatmentSliderWidth : 750 - readonly property int createTreatmentSwitchYDisplacement : 15 + readonly property int createTreatmentSliderHeight : 100 + readonly property int createTreatmentSliderWidth : 1200 + readonly property int createTreatmentSwitchYDisplacement : 38 + readonly property int createTreatmentSwitchWidth : 85 - readonly property int ultrafiltrationProgressbarWidth : 880 + readonly property int ultrafiltrationProgressbarWidth : 1100 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 readonly property int ultrafiltrationAdjustmtenOptionHeight : 275 readonly property int ultraFiltrationProgressBarHeight : 30 @@ -147,48 +160,57 @@ readonly property int settingsInputWidth : 225 readonly property int settingsNotificationMargin : 10 - readonly property int settingsContentSidesMargin : headerButtonsMargin + readonly property int settingsContentSidesMargin : 45 //headerButtonsMargin readonly property int settingsContentBottomMargin : mainMenuHeight + // Alarm Bar height notificationHeight + // notification Bar height minVGap // Min Gap to give content the min border - readonly property int settingsOptionWidth : 550 + readonly property int settingsOptionWidth : 560 readonly property int settingsOptionHeight : 50 readonly property int settingsExportLogsScrollBarWidth : 5 - readonly property int screenGridAreaWidth : 400 - readonly property int screenGridAreaHeightRow1 : 170 - readonly property int screenGridAreaHeightRow2 : 225 - readonly property int screenGridAreaHeightRow3 : 200 + readonly property int screenGridAreaWidth : 510 + readonly property int screenGridAreaHeightRow1 : 180 + readonly property int screenGridAreaHeightRow2 : 260 + readonly property int screenGridAreaHeightRow3 : 180 readonly property int screenGridLeftColumnX : 40 readonly property int screenGridRightColumnX : applicationWidth - screenGridLeftColumnX - screenGridAreaWidth - readonly property int screenGridRow1Y : 100 - readonly property int screenGridRow2Y : 290 // 320 - readonly property int screenGridRow3Y : 540 // 570 + readonly property int screenGridRow1Y : 200 + readonly property int screenGridRow2Y : 430 + readonly property int screenGridRow3Y : 760 - readonly property int screenGridLineLength : 450 + readonly property int screenGridLineLength : 560 readonly property int screenGridLeftLinesX : 0 readonly property int screenGridRightLinesX : applicationWidth - screenGridLineLength - readonly property int screenGridRow1LineY : 275 - readonly property int screenGridRow2LineY : 525 + readonly property int screenGridRow1LineY : 330 + readonly property int screenGridRow2LineY : 600 + readonly property int sliderWidth : 900 + readonly property int sliderCircleDiameter : 40 + readonly property int sliderAdjustButtonBorderWidth : 2 - readonly property int sliderAdjustButtonSpacing : 20 - readonly property int sliderAdjustButtonDiameter : 50 - readonly property int sliderAdjustButtonLeftMargin : 30 + readonly property int sliderAdjustButtonSpacing : 25 + readonly property int sliderAdjustButtonDiameter : 60 + readonly property int sliderAdjustButtonLeftMargin : 40 readonly property int sliderAdjustButtonRightMargin : 50 + + readonly property int sliderAdjustLeftPadding : -50 + readonly property int sliderAdjustPressAndHoldRefreshRate : 250 readonly property real sliderDefaultRoundTickMarkDiameter : 5 - readonly property int sliderDefaultBodyHeight : 15 + readonly property int sliderDefaultBodyHeight : 25 + readonly property int pressuresProgressbarWidth : 725 readonly property int circleButtonDefaultDiameter : 45 readonly property int noRejectReason : 0 + readonly property int disinfectionItemWidth : 550 + // ---------- < PRS > Related Section ---------- // blood flow rate readonly property int bloodFlowMin : 100 // PRS 30