Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -25,8 +25,8 @@ 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 @@ -35,7 +35,7 @@ readonly property int headerButtonsMargin : 35 readonly property int confirmButtonWidth : 155 - readonly property int mainMenuHeight : 70 + readonly property int mainMenuHeight : 85 readonly property int minVGap : 15 readonly property int minVGap2 : 30 @@ -48,8 +48,8 @@ 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 : 20 readonly property int alarmListIconDiameter : 45 @@ -78,7 +78,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 @@ -92,19 +92,22 @@ readonly property int progressCircleDiameterNormal : circleNormalDiameter readonly property int progressCircleDiameterSmall : 150 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 checkListViewItemHeight : 60 readonly property int pauseIconDiameter : 60 readonly property int topBarMenuHeight : 100 - readonly property int sliderCircleDiameter : 30 + readonly property int sliderCircleDiameter : 40 readonly property int pressuresProgressbarWidth : 725 @@ -120,9 +123,9 @@ readonly property int createTreatmentSubTableHeight : 50 readonly property int createTreatmentSubTableWidth : 500 readonly property int createTreatmentSliderMargin : sliderDefaultBodyHeight - readonly property int createTreatmentSliderHeight : 65 + readonly property int createTreatmentSliderHeight : 100 readonly property int createTreatmentSliderWidth : 750 - readonly property int createTreatmentSwitchYDisplacement : 15 + readonly property int createTreatmentSwitchYDisplacement : 40 readonly property int ultrafiltrationProgressbarWidth : 880 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 @@ -147,7 +150,7 @@ 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 @@ -157,19 +160,19 @@ readonly property int settingsExportLogsScrollBarWidth : 5 - readonly property int screenGridAreaWidth : 400 + readonly property int screenGridAreaWidth : 490 readonly property int screenGridAreaHeightRow1 : 170 readonly property int screenGridAreaHeightRow2 : 225 readonly property int screenGridAreaHeightRow3 : 200 readonly property int screenGridLeftColumnX : 40 readonly property int screenGridRightColumnX : applicationWidth - screenGridLeftColumnX - screenGridAreaWidth - readonly property int screenGridRow1Y : 100 + readonly property int screenGridRow1Y : 130 readonly property int screenGridRow2Y : 290 // 320 readonly property int screenGridRow3Y : 540 // 570 - readonly property int screenGridLineLength : 450 + readonly property int screenGridLineLength : 530 readonly property int screenGridLeftLinesX : 0 readonly property int screenGridRightLinesX : applicationWidth - screenGridLineLength readonly property int screenGridRow1LineY : 275 @@ -183,7 +186,7 @@ readonly property int sliderAdjustPressAndHoldRefreshRate : 250 readonly property real sliderDefaultRoundTickMarkDiameter : 5 - readonly property int sliderDefaultBodyHeight : 15 + readonly property int sliderDefaultBodyHeight : 25 readonly property int circleButtonDefaultDiameter : 45