Index: sources/gui/qml/components/BackButton.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/components/BackButton.qml (.../BackButton.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/components/BackButton.qml (.../BackButton.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -25,8 +25,8 @@ */ TouchRect { id : _root readonly property int margin: (_root.height - Variables.iconsDiameter) / 2 - width : 120 - height : 50 + width : Variables.backButtonWidth + height : Variables.backButtonHeight anchors { top : parent.top left : parent.left @@ -53,7 +53,7 @@ centerIn: null // disable the parent anchor verticalCenter: _root.verticalCenter left: _image.right - leftMargin: _root.margin + leftMargin: 15 } } } Index: sources/gui/qml/components/ConfirmButton.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/components/ConfirmButton.qml (.../ConfirmButton.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/components/ConfirmButton.qml (.../ConfirmButton.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -21,7 +21,7 @@ TouchRect { id : _root width : Variables.confirmButtonWidth - height : 50 + height : Variables.confirmButtonHeight text { text: qsTr("CONFIRM") font.bold : true Index: sources/gui/qml/components/ConfirmTreatmentTableEntry.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/components/ConfirmTreatmentTableEntry.qml (.../ConfirmTreatmentTableEntry.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/components/ConfirmTreatmentTableEntry.qml (.../ConfirmTreatmentTableEntry.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -51,8 +51,12 @@ objectName: key + index color: Colors.textMain text: key - anchors.left: parent.left - anchors.verticalCenter: _root.verticalCenter + anchors { + left: _line.left + leftMargin: 15 + bottom: _line.top + bottomMargin: Variables.spaceBetweenLineAndText + } font.pixelSize: Fonts.fontPixelCreateTreatmentTable } @@ -61,9 +65,13 @@ objectName: value + index color: Colors.textMain text: value - anchors.left: _line.horizontalCenter - anchors.verticalCenter: _root.verticalCenter - anchors.leftMargin: 3*Variables.createTreatmentMargin + anchors { + right: _line.right + rightMargin: 15 + bottom: _line.top + bottomMargin: Variables.spaceBetweenLineAndText + } + font.pixelSize: Fonts.fontPixelCreateTreatmentTable } } Index: sources/gui/qml/components/ExportButton.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/components/ExportButton.qml (.../ExportButton.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/components/ExportButton.qml (.../ExportButton.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -26,8 +26,8 @@ property bool disabled : false - width : isSmall ? 155 : Variables.touchRectWidth - height : isSmall ? 50 : Variables.touchRectHeight + width : isSmall ? Variables.touchRectWidthSmall : Variables.touchRectWidth + height : isSmall ? Variables.touchRectHeightSmall : Variables.touchRectHeight anchors.margins: 35 text { Index: sources/gui/qml/components/GridSelection.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -66,7 +66,9 @@ } Grid { id : _grid - spacing : 5 + columnSpacing: Variables.gridSelectionColSpace + rowSpacing : Variables.gridSelectionRowSpace + anchors { top : _title.bottom topMargin : Variables.sliderTextMargin Index: sources/gui/qml/components/MuteButton.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/components/MuteButton.qml (.../MuteButton.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/components/MuteButton.qml (.../MuteButton.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -23,15 +23,15 @@ property int timeout : 0 property bool isSilenced : false - height: 45 + height: 60 width : isSilenced ? 120 : height backgroundColor: Colors.transparent borderColor: Colors.white touchExpanding: 25 Row { anchors.fill: _root - leftPadding: 10 + leftPadding: 5 spacing: 5 Image { id: _image anchors.verticalCenter: parent.verticalCenter Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -110,11 +110,11 @@ TouchRect { id: _alarmsList visible: _root.iconVisible - height: 45 + height: 60 width : height - backgroundColor: _root.color - borderColor : Colors.white + backgroundColor : _root.color + borderColor : Colors.white anchors { verticalCenter : _root.verticalCenter @@ -124,8 +124,8 @@ Image { id: _alarmListImage anchors.centerIn: parent - height : Variables.iconsDiameter - width : Variables.iconsDiameter + height : Variables.alarmListIconDiameterSmall + width : Variables.alarmListIconDiameterSmall source : "qrc:/images/iList" } @@ -136,7 +136,7 @@ anchors { right : parent.right top : parent.top - rightMargin : 130 + rightMargin : 180 } color : Colors.textMain font.pixelSize : Fonts.fontPixelDialogText Index: sources/gui/qml/components/USBButton.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/components/USBButton.qml (.../USBButton.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/components/USBButton.qml (.../USBButton.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -24,9 +24,10 @@ property bool disabled : false - width: 50 - height: width - x: width - 10 + width : Variables.notificationHeight - 10 + height : width + x : width - 10 + Image { id: _image width : Variables.iconsDiameter height : Variables.iconsDiameter Index: sources/gui/qml/components/UpDownButton.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/components/UpDownButton.qml (.../UpDownButton.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/components/UpDownButton.qml (.../UpDownButton.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -23,8 +23,9 @@ property bool isUp : false property bool isList: false - height: 45 + height: 60 width : height + anchors.bottomMargin: 14 backgroundColor: Colors.transparent borderColor : Colors.white Index: sources/gui/qml/compounds/BPHREntry.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -69,21 +69,22 @@ Row { id: _container spacing: 50 anchors.centerIn: parent - Column { spacing : 25 - leftPadding : _root.titleIndent - Row { spacing : 10 + Column { spacing : 30 + leftPadding : _root.titleIndent + Row { spacing : 20 TextEntry { id : _bloodPressureSystolic text : Variables.notSetVariable(vTreatmentVitals.systolic, 0) label.text : qsTr("Blood Pressure") - label.width : _root.labelWidth + label.width : _root.labelWidth + 40 validator : IntValidator { bottom: vTreatmentVitals.systolicMin; top : vTreatmentVitals.systolicMax } onClicked : _root.clicked() nextInput : _bloodPressureDiastolic textInput.color: (textInput.acceptableInput && _private.isBloodPressureCompareValid) ? Colors.textMain : Colors.red + // line.anchors.leftMargin : 25 } Label { - text : "/" - width : 10 + text : "/" + width : 10 } TextEntry { id : _bloodPressureDiastolic text : Variables.notSetVariable(vTreatmentVitals.diastolic, 0) @@ -98,11 +99,11 @@ width : unitWidth } } - Row { spacing : 10 + Row { spacing : 20 TextEntry { id : _heartRate text : Variables.notSetVariable(vTreatmentVitals.heartRate, 0) label.text : qsTr("Heart Rate") - label.width : _root.labelWidth + label.width : _root.labelWidth + 40 onClicked : _root.clicked() validator : IntValidator { bottom: vTreatmentVitals.heartRateMin; top : vTreatmentVitals.heartRateMax } } Index: sources/gui/qml/compounds/CheckListView.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/compounds/CheckListView.qml (.../CheckListView.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/compounds/CheckListView.qml (.../CheckListView.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -29,7 +29,7 @@ Item { id: _root property var stepNames : [] - property int completeMargin : 50 + property int completeMargin : 80 property alias completeVisible : _completeText.visible property alias completeText : _completeText.text property int delegateWidth : Variables.checkListViewItemWidth @@ -126,6 +126,7 @@ Column { anchors.centerIn: _root + spacing: 40 Repeater { id: _listView model : _root.stepNames delegate: Item { id: _delegate Index: sources/gui/qml/compounds/TouchGrid.qml =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/compounds/TouchGrid.qml (.../TouchGrid.qml) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/gui/qml/compounds/TouchGrid.qml (.../TouchGrid.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -38,7 +38,7 @@ property var itemsTouchable : [] property bool touchable : true - property int itemWidth : 350 + property int itemWidth : 400 property int itemHeight : 50 property alias layoutOrder : _grid.flow property alias rowSpacing : _grid.rowSpacing @@ -82,6 +82,18 @@ return vValue } + function getFontSizeForTitle(indentMargin, index, txt) { + + if (_root.itemsHasLine !== undefined && + _root.itemsHasLine[index] === 0 && + indentMargin === 0) { + return Fonts.fontPixelButton + 4 + } + + return Fonts.fontPixelButton + } + + // DEBUG: Rectangle { anchors.fill: _grid } Grid { id: _grid flow: Grid.TopToBottom @@ -94,12 +106,14 @@ Repeater { model : _root.itemsText TouchRect { id: _touchItem + readonly property int indentMargin : (undef( _root.itemsHasIndent[index], false ) ? 20 : 0) clip : true touchable : undef( _root.itemsTouchable[index], _root.touchable ) text.anchors.horizontalCenter: undefined text.leftPadding : Variables.minVGap + indentMargin text.text : modelData + pixelSize : getFontSizeForTitle(indentMargin, index, text.text) border.width : 0 height : _root.itemHeight width : _root.itemWidth @@ -144,7 +158,7 @@ color : _touchItem.enabled ? _root.lineColor : Colors.borderDisableButton anchors.left : _touchItem.left anchors.right : _touchItem.right - anchors.bottom : _touchItem.bottom + anchors.bottom : _itemsValue.bottom } } } Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -60,16 +60,17 @@ id: _icon source: "qrc:/images/iList" anchors.horizontalCenter: _title.horizontalCenter - anchors.verticalCenter: _title.verticalCenter - anchors.horizontalCenterOffset: -_title.width + Variables.dialogIconHorizontalOffset; + anchors.verticalCenter : _title.verticalCenter + anchors.horizontalCenterOffset: - ((_title.width / 2) + Variables.dialogIconHorizontalOffset) + anchors.verticalCenterOffset : 2 height : Variables.alarmListIconDiameter width : Variables.alarmListIconDiameter } Text { id: _title color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle - text: qsTr("Alarm list") + text: qsTr("Alarm List") anchors.centerIn: _titleBar; } Index: sources/gui/qml/dialogs/ConfirmDialog.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/dialogs/ConfirmDialog.qml (.../ConfirmDialog.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/dialogs/ConfirmDialog.qml (.../ConfirmDialog.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -56,7 +56,7 @@ } Footer { id: _footer - childrenWidth: 350 + childrenWidth: Variables.footerChildButtonWidth children: [ TouchRect { id : _cancelTouch textString : qsTr("CANCEL") Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -23,7 +23,7 @@ * which is going to be used in the project */ QtObject { - readonly property int fontPixelButton : 26 + readonly property int fontPixelButton : 34 readonly property int fontPixelTitle : 48 // Changed to 40 to match with the Alarm messaging body font size readonly property int fontPixelSection : 40 readonly property int fontPixelDialogText : 26 @@ -36,7 +36,7 @@ readonly property int fontPixelTextRectTitle : 29 readonly property int fontPixelTextRectLabel : 50 - readonly property int fontPixelTextRectExtra : 32 + readonly property int fontPixelTextRectExtra : 34 readonly property int fontPixelVitals : 72 @@ -49,13 +49,13 @@ readonly property int fontPixelPresseuresText : 26 readonly property int fontPixelPresseuresLabel : 32 - readonly property int fontPixelFluidText : 26 + readonly property int fontPixelFluidText : 30 readonly property int fontPixelFluidValue : 36 - readonly property int fontPixelFluidUnit : 26 + readonly property int fontPixelFluidUnit : 30 readonly property int fontPixelFluidVolume : 20 - readonly property int fontPixelConfirm : 23 - readonly property int fontPixelBack : 21 + readonly property int fontPixelConfirm : 26 + readonly property int fontPixelBack : 26 readonly property int fontPixelSliderMarker : 21 @@ -64,7 +64,7 @@ readonly property int fontPixelDurationCurTime : 93 readonly property int fontPixelDurationAdjTime : 32 - readonly property int fontPixelStateListText : 24 + readonly property int fontPixelStateListText : 30 readonly property int fontPixelCirclProgressTimeSmall : 36 readonly property int fontPixelCirclProgressTimeNormal : 94 @@ -73,15 +73,16 @@ readonly property int fontPixelUltrafiltrationAdjustmentPauseButton : fontPixelUltrafiltrationAdjustmentButton readonly property int fontPixelUltrafiltrationAdjustmentResumeButton : fontPixelUltrafiltrationAdjustmentButtonL readonly property int fontPixelUltrafiltrationAdjustmentEditButton : fontPixelUltrafiltrationAdjustmentButtonL - readonly property int fontPixelUltrafiltrationAdjustmentNextButton : fontPixelUltrafiltrationAdjustmentButton + readonly property int fontPixelUltrafiltrationAdjustmentNextButton : fontPixelUltrafiltrationAdjustmentButtonL readonly property int fontPixelUltrafiltrationAdjustmentConfirmButton : fontPixelUltrafiltrationAdjustmentButton readonly property int fontPixelUltrafiltrationAdjustmentEditValue : 50 readonly property int fontPixelUltrafiltrationRateUnit : 20 - readonly property int fontPixelRinsebackAdjustmentButton : 30 + readonly property int fontPixelRinsebackAdjustmentButton: 30 readonly property int fontPixelCreateTreatment : 34 readonly property int fontPixelCreateTreatmentTable : 28 + readonly property int fontPixelSwitchOnOff : 24 readonly property int fontPixelCircleButtonLabel: 54 @@ -90,4 +91,5 @@ readonly property int fontPixelDebugLabel : 19 readonly property string fontFamilyFixed : "Noto Sans CJK SC" + readonly property int fontPixelSettingLog : 28 } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -30,34 +30,43 @@ 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 : 100 + 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 : 18 - readonly property int arrowHeight : 20 + 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 bottomPaddingTitle : 10 @@ -88,9 +97,9 @@ 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 @@ -102,32 +111,33 @@ 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 : 40 - - 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 : 100 - readonly property int createTreatmentSliderWidth : 750 - readonly property int createTreatmentSwitchYDisplacement : 40 + 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 @@ -155,43 +165,52 @@ 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 : 490 - 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 : 130 - readonly property int screenGridRow2Y : 340 - readonly property int screenGridRow3Y : 610 + readonly property int screenGridRow1Y : 200 + readonly property int screenGridRow2Y : 430 + readonly property int screenGridRow3Y : 760 - readonly property int screenGridLineLength : 530 + readonly property int screenGridLineLength : 560 readonly property int screenGridLeftLinesX : 0 readonly property int screenGridRightLinesX : applicationWidth - screenGridLineLength 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 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 : 25 + 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 Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r5687815256ae070a9a207107088e3f72dd464da0 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 5687815256ae070a9a207107088e3f72dd464da0) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -70,14 +70,16 @@ opacity : _postModeScreen.visible ? 1 : 0 anchors.centerIn: parent source : "qrc:/images/iLogoDiality" + width : sourceSize.width * 1.2 + height : sourceSize.height * 1.2 } ProgressBar { minimum : 0 maximum : vHDPOSTData.itemCount value : vHDPOSTData.itemIndex - width : _dialityLogo.width + 50 - height : 3 + width : _dialityLogo.width + 70 + height : 4 progress.border.width: 0 border.width: 0 minText .visible: false @@ -91,10 +93,10 @@ } WaitDone { id: _hdWaitdone - diameter: 100 + diameter: 200 anchors { top: _dialityLogo.bottom - topMargin: 100 + topMargin: 160 horizontalCenter: parent.horizontalCenter } visible : true Index: sources/gui/qml/pages/TreatmentFlowBase.qml =================================================================== diff -u -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) +++ sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -130,7 +130,7 @@ active : _root.hasTimeCircle anchors.top : _root.hasCheckList ? title.bottom : undefined - anchors.topMargin : _root.hasCheckList ? 25 : 0 + anchors.topMargin : _root.hasCheckList ? 50 : 0 anchors.horizontalCenter: _root.horizontalCenter anchors.centerIn : ! _root.hasCheckList ? parent : undefined sourceComponent : TimeCircle { id: _timeCircle @@ -148,7 +148,7 @@ Loader { id: _checkListLoader active : _root.hasCheckList anchors.top : _root.hasTimeCircle ? _timeCircleLoader.bottom : undefined - anchors.topMargin : _root.hasTimeCircle ? 25 : 0 + anchors.topMargin : _root.hasTimeCircle ? 100 : 0 anchors.horizontalCenter: _root.horizontalCenter anchors.centerIn : ! _root.hasTimeCircle ? parent : undefined width : Variables.checkListViewItemWidth Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -rb41595237e9943f367b58b79e3304e5879719abf -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision b41595237e9943f367b58b79e3304e5879719abf) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -64,7 +64,7 @@ TouchGrid { property bool isVisible: vAdjustmentInstitutionalRecord.enableChemicalDisinfect width : parent.width / 2 - itemWidth : 400 + itemWidth : Variables.disinfectionItemWidth colCount : 1 colSpacing : 0 itemsText : [ _root.flushTitle , _root.heatActiveTitle , _root.chemicalTitle , _root.chemFlushTitle , _root.roPermeateTitle , _root.heatPassiveTitle ] Index: sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml (.../EndTreatmentEndStack.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml (.../EndTreatmentEndStack.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -39,7 +39,7 @@ title.text : qsTr("Treatment Complete") instructionBased : true footer { - childrenWidth : 300 + childrenWidth : Variables.footerChildButtonWidth children: TouchRect { enabled : _endTreatmentEnd.instructionIsLast text.text : qsTr("START RINSEBACK") Index: sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml (.../EndTreatmentRecirculateStack.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -79,7 +79,7 @@ } FooterStatic { id: _footer - childrenWidth : 300 + childrenWidth : Variables.footerChildButtonWidth anchors.fill : parent.footer } } Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -36,7 +36,7 @@ // timeoutValue: vTreatmentRinseback.timeoutCountDown * 60 ProgressCircle { id: _circle - diameter: 335 + diameter: Variables.progressCircleDiameterNormal anchors.centerIn: parent minimum : 0 Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml =================================================================== diff -u -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -73,13 +73,10 @@ Line { x: 0; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength } ProgressCircle { id: _circle - diameter: 335 + diameter: Variables.circleNormalDiameter anchors { horizontalCenter: parent.horizontalCenter - top : parent.top - topMargin : vHDTreatmentStates.rbAdditional ? - _root.height/2 - height/2 : // move the progress circle in the center of the screen - Variables.screenGridRow1LineY + verticalCenter : parent.verticalCenter } minimum : 0 Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml =================================================================== diff -u -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml (.../EndTreatmentRinsebackComplete.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -48,7 +48,7 @@ } FooterStatic { - childrenWidth : 300 + childrenWidth : Variables.footerChildButtonWidth anchors.fill : footer children : [ @@ -73,8 +73,9 @@ Text { id: _salineVolumeLabel anchors.left : _beginRinsebackTouchRect.text.right + anchors.leftMargin : 15 anchors.bottom : _beginRinsebackTouchRect.text.top - anchors.leftMargin : 0 + anchors.bottomMargin: -15 text : qsTr("(50mL)") font.pixelSize : Fonts.fontPixelFluidVolume * 0.7 color : _beginRinsebackTouchRect.text.color Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml =================================================================== diff -u -r83b9d737cd495b34a7b42f5409962a9442f3b8f4 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision 83b9d737cd495b34a7b42f5409962a9442f3b8f4) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -46,7 +46,7 @@ height : Variables.touchRectHeight } FooterStatic { - childrenWidth : 300 + childrenWidth : Variables.footerChildButtonWidth anchors.fill : footer children : [ TouchRect { id : _endTreatmentTouchRect Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml (.../EndTreatmentRinsebackReconnect.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml (.../EndTreatmentRinsebackReconnect.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -49,7 +49,7 @@ } FooterStatic { - childrenWidth : 300 + childrenWidth : Variables.footerChildButtonWidth anchors.fill : footer children : [ TouchRect { id : _endTreatmentTouchRect Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml =================================================================== diff -u -r5687815256ae070a9a207107088e3f72dd464da0 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 5687815256ae070a9a207107088e3f72dd464da0) +++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -112,15 +112,16 @@ width : parent.width colCount : _colCount rowCount : _rowCount - itemWidth : 575 - rowSpacing : 0 - colSpacing : 50 + itemWidth : 780 + rowSpacing : 15 + colSpacing : 150 lineColor : Colors.backgroundMain itemsText : vPostTreatmentAdjustmentTreatmentLog.parametersTitle itemsValue : vPostTreatmentAdjustmentTreatmentLog.parametersText itemsUnit : vPostTreatmentAdjustmentTreatmentLog.parametersUnit - itemsValueLeftMargin : 350 // if decreased may be covered by title - itemsUnitLeftMargin : 470 // if increased will be covered by chevron if touchable + itemsValueLeftMargin : 510 // if decreased may be covered by title + itemsUnitLeftMargin : 640 // if increased will be covered by chevron if touchable + // Note: to make the item touchable // set the touchable: true // and set the index ot the touchable item in the itemsTouchable: [] list to 1 Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -30,7 +30,7 @@ stackView.initialItem : null - property int stackStepIndex : 4 + property int stackStepIndex : 5 //AMIR: TODO: 5???? signal startPrimeClicked() Index: sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml (.../PreTreatmentWaterSampleStack.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml (.../PreTreatmentWaterSampleStack.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -66,7 +66,7 @@ header.backVisible : true title.text : qsTr("Water Sample Result") instructionBased : true - footer.childrenWidth : 300 + footer.childrenWidth : Variables.footerChildButtonWidth footer.children: [ TouchRect { text.text: qsTr("FAIL") Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -150,9 +150,9 @@ flickDeceleration: Variables.createTreatmentFlickableDeceleration Column { id: _column - spacing: Variables.treatmentSpacing anchors.horizontalCenter: parent.horizontalCenter anchors.fill: parent + spacing: Variables.treatmentSpacing Text { id: _titleTextPrescription anchors.horizontalCenter: parent.horizontalCenter @@ -270,6 +270,7 @@ // ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property // This is a full implementation of a Switch toggleSwich: _heparinDispensingRateSwitch + Switch { id: _heparinDispensingRateSwitch property bool active: false onCheckedChanged: { @@ -283,13 +284,14 @@ _heparinDispensingRate.active = ! checked } - x : width * -1.5 - y : Variables.createTreatmentSwitchYDisplacement // these values are set to align the switch with slider - width : 75 // these values are set to align the switch with slider - height : 95 // these values are set to align the switch with slider - // DEBUG: background : Rectangle { color : "white" } + anchors { + right: parent.left + rightMargin: Variables.sliderAdjustButtonRightMargin + 10 + verticalCenter: parent.verticalCenter + verticalCenterOffset: Variables.createTreatmentSwitchYDisplacement + } - indicator: Rectangle { + indicator: Rectangle { id: _heparinDispensingIndicator implicitWidth : Variables.sliderCircleDiameter * 2 implicitHeight : Variables.sliderCircleDiameter - ( Variables.progressbarHandlerBorderWidth * 2 ) radius : implicitHeight @@ -313,12 +315,14 @@ } contentItem: Text { - text : _heparinDispensingRateSwitch.checked ? qsTr("ON") : qsTr("OFF") - font : _heparinDispensingRateSwitch.font - color : _heparinDispensingRateSwitch.active ? Colors.textMain : Colors.textDisableButton - verticalAlignment: Text.AlignTop - horizontalAlignment: Text.AlignHCenter - anchors.centerIn: parent + text : _heparinDispensingRateSwitch.checked ? qsTr("ON") : qsTr("OFF") + font.pixelSize : Fonts.fontPixelSwitchOnOff + color : _heparinDispensingRateSwitch.active ? Colors.textMain : Colors.textDisableButton + verticalAlignment : Text.AlignTop + horizontalAlignment : Text.AlignHCenter + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom : _heparinDispensingIndicator.top + anchors.bottomMargin : 10 } } } @@ -350,6 +354,7 @@ // ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property // This is a full implementation of a CheckBox toggleSwich: _heparinBolusVolumeSwitch + Switch { id: _heparinBolusVolumeSwitch property bool active: false onCheckedChanged: { @@ -363,13 +368,14 @@ _heparinBolusVolume.active = ! checked } - x : width * -1.5 - y : Variables.createTreatmentSwitchYDisplacement // these values are set to align the switch with slider - width : 75 // these values are set to align the switch with slider - height : 95 // these values are set to align the switch with slider - // DEBUG: background : Rectangle { color : "white" } + anchors { + right: parent.left + rightMargin: Variables.sliderAdjustButtonRightMargin + 10 + verticalCenter: parent.verticalCenter + verticalCenterOffset: Variables.createTreatmentSwitchYDisplacement + } - indicator: Rectangle { + indicator: Rectangle { id: _heparinBolusVolumeIndicator implicitWidth : Variables.sliderCircleDiameter * 2 implicitHeight : Variables.sliderCircleDiameter - ( Variables.progressbarHandlerBorderWidth * 2 ) radius : implicitHeight @@ -393,12 +399,14 @@ } contentItem: Text { - text : _heparinBolusVolumeSwitch.checked ? qsTr("ON") : qsTr("OFF") - font : _heparinBolusVolumeSwitch.font - color : _heparinBolusVolumeSwitch.active ? Colors.textMain : Colors.textDisableButton - verticalAlignment: Text.AlignTop - horizontalAlignment: Text.AlignHCenter - anchors.centerIn: parent + text : _heparinBolusVolumeSwitch.checked ? qsTr("ON") : qsTr("OFF") + font.pixelSize : Fonts.fontPixelSwitchOnOff + color : _heparinBolusVolumeSwitch.active ? Colors.textMain : Colors.textDisableButton + verticalAlignment : Text.AlignTop + horizontalAlignment : Text.AlignHCenter + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom : _heparinBolusVolumeIndicator.top + anchors.bottomMargin : 10 } } } @@ -805,6 +813,7 @@ // ToDo: Consider putting the new CheckBox component into the SliderCreateTreatment component and set via boolean property // This is a full implementation of a CheckBox toggleSwich: _bloodPressureIntervalSwitch + Switch { id: _bloodPressureIntervalSwitch property bool active: false onCheckedChanged: { @@ -818,13 +827,14 @@ } - x : width * -1.5 - y : Variables.createTreatmentSwitchYDisplacement // these values are set to align the switch with slider - width : 75 // these values are set to align the switch with slider - height : 95 // these values are set to align the switch with slider - // DEBUG: background : Rectangle { color : "white" } + anchors { + right: parent.left + rightMargin: Variables.sliderAdjustButtonRightMargin + 10 + verticalCenter: parent.verticalCenter + verticalCenterOffset: Variables.createTreatmentSwitchYDisplacement + } - indicator: Rectangle { + indicator: Rectangle { id: _bloodPressureIntervalIndicator implicitWidth : Variables.sliderCircleDiameter * 2 implicitHeight : Variables.sliderCircleDiameter - ( Variables.progressbarHandlerBorderWidth * 2 ) radius : implicitHeight @@ -848,12 +858,14 @@ } contentItem: Text { - text : _bloodPressureIntervalSwitch.checked ? qsTr("ON") : qsTr("OFF") - font : _bloodPressureIntervalSwitch.font - color : _bloodPressureIntervalSwitch.active ? Colors.textMain : Colors.textDisableButton - verticalAlignment: Text.AlignTop - horizontalAlignment: Text.AlignHCenter - anchors.centerIn: parent + text : _bloodPressureIntervalSwitch.checked ? qsTr("ON") : qsTr("OFF") + font.pixelSize : Fonts.fontPixelSwitchOnOff + color : _bloodPressureIntervalSwitch.active ? Colors.textMain : Colors.textDisableButton + verticalAlignment : Text.AlignTop + horizontalAlignment : Text.AlignHCenter + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom : _bloodPressureIntervalIndicator.top + anchors.bottomMargin : 10 } } } Index: sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml =================================================================== diff -u -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml (.../SettingsBluetoothCuff.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) +++ sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml (.../SettingsBluetoothCuff.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -112,7 +112,7 @@ anchors.left : parent.left anchors.leftMargin : 100 text.text : qsTr("SCAN") - width : 350 + width : Variables.footerChildButtonWidth isDefault : false enabled : vBluetooth.scanEnabled && vBluetooth.isInvalid onClicked : { Index: sources/gui/qml/pages/settings/SettingsDGCleaning.qml =================================================================== diff -u -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/settings/SettingsDGCleaning.qml (.../SettingsDGCleaning.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) +++ sources/gui/qml/pages/settings/SettingsDGCleaning.qml (.../SettingsDGCleaning.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -38,15 +38,15 @@ colSpacing : 0 rowCount : 6 rowSpacing : 0 - itemHeight : 50 - itemWidth : 1000 + itemHeight : 80 + itemWidth : 1200 touchable : false itemsHasLine: [ 0, // title 1,1,1,1,1, ] - itemsValueLeftMargin: 500 - itemsUnitLeftMargin : 700 + itemsValueLeftMargin: 400 + itemsUnitLeftMargin : 800 itemsText : [ qsTr("Cleaning Last Status" ), // title qsTr("Last Basic Flush Complete" ), Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -84,7 +84,7 @@ readonly property bool horizontalLayout : _GuiView.useLogLongName confirmVisible : false - notificationMargin : Variables.notificationHeight + notificationMargin : _root.horizontalLayout ? 0 : Variables.notificationHeight bottomMarginContent : Variables.settingsContentBottomMargin - Variables.minVGap function refreshModels() { @@ -160,30 +160,30 @@ } USBButton { id: _usbEjectButton - width : 155 - height : 50 + width : Variables.backButtonWidth + height : Variables.backButtonHeight anchors.right : _root.right anchors.top : _root.top anchors.margins : Variables.headerButtonsMargin enabled : _GuiView.usbIsReady && !_GuiView.exportRunning && ! isUpdatePanels } Row { id : _contentRect - spacing : 60 //Variables.minVGap2 + spacing : Variables.minVGap2 * 2 anchors.fill : parent anchors.topMargin : parent. topMarginContent - 25 // move 25 up anchors.bottomMargin : parent.bottomMarginContent anchors.rightMargin : parent. sidesMarginContent anchors.leftMargin : parent. sidesMarginContent anchors.horizontalCenter : parent.horizontalCenter - readonly property int columnWidthProgress : 350 + readonly property int columnWidthProgress : 370 readonly property int columnWidthFolder : _root.horizontalLayout ? 1400 : 700 readonly property int columnWidthFileName : _root.horizontalLayout ? 1150 : 500 // best combination readonly property int columnWidthFileSize : _root.horizontalLayout ? 110 : 110 // best combination Column { id : _progressColumn - property int progressWidth : 125 + property int progressWidth : 160 property int progressHeight : height - _logTypeCombo.height - _logTypeExportButton.height spacing : 30 @@ -193,7 +193,7 @@ Row { id : _logTypeRow anchors.left : parent.left width : parent.width - height : _root.headetRowHight + height : 70 // _root.headetRowHight spacing : _logTypeCombo.width - _logTypeExportButton.width // FIXME: This combobox needs to be a global Component @@ -275,12 +275,14 @@ anchors.left : _SDC_progressItem.right anchors.leftMargin : _progressColumn.spacing anchors.verticalCenter : parent.verticalCenter + font.pixelSize : Fonts.fontPixelSettingLog text : _root.sdcLabel + _root.devUnitLabel + ("Free : %1\nTotal: %2").arg( Variables.sizeConverted( _GuiView.sdAvail, 1000, 3) ).arg( Variables.sizeConverted( _GuiView.sdTotal, 1000, 3) ) } Label { anchors.fill : parent verticalAlignment : Text.AlignVCenter horizontalAlignment : Text.AlignHCenter + font.pixelSize : Fonts.fontPixelSettingLog text : _SDC_progressItem.percent } } @@ -297,12 +299,14 @@ anchors.left : _USB_progressItem.right anchors.leftMargin : _progressColumn.spacing anchors.verticalCenter : parent.verticalCenter + font.pixelSize : Fonts.fontPixelSettingLog text : _root.usbLabel + _root.devUnitLabel + ("Free : %1\nTotal: %2").arg( Variables.sizeConverted( _GuiView.usbAvail, 1000, 3) ).arg( Variables.sizeConverted( _GuiView.usbTotal, 1000, 3) ) } Label { anchors.fill : parent verticalAlignment : Text.AlignVCenter horizontalAlignment : Text.AlignHCenter + font.pixelSize : Fonts.fontPixelSettingLog text : _USB_progressItem.percent } } @@ -318,7 +322,7 @@ } Grid { columns : _root.horizontalLayout ? 1 : 2 - spacing : 30 + spacing : 40 width : _contentRect.columnWidthFolder height : parent.height Column { id : _sdcFolderColumn @@ -439,7 +443,7 @@ } Text { id : _sdcFileSizeText clip : true - width : isShownInList ? _contentRect.columnWidthFileSize : 0 + width : isShownInList ? _contentRect.columnWidthFileSize : 0 text : Variables.sizeConverted( fileSize, 1000, 3) color : Colors.textMain font.pixelSize : Fonts.fontPixelTextRectExtra Index: sources/gui/qml/pages/settings/SettingsHome.qml =================================================================== diff -u -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) +++ sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -42,7 +42,8 @@ onItemClicked : _root.itemClicked(vIndex) rowCount : _root.rowCount colCount : _root.colCount - itemWidth : 360 + colSpacing : 100 + itemWidth : 500 itemHeight : 70 } Index: sources/gui/qml/pages/settings/SettingsInformation.qml =================================================================== diff -u -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) +++ sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -33,15 +33,15 @@ TouchGrid { anchors.top : parent.top - anchors.topMargin : 50 + anchors.topMargin : 170 anchors.horizontalCenter: parent.horizontalCenter colCount : 2 - colSpacing : 50 + colSpacing : 100 rowCount : 12 // this number indicates when to move to the next column rowSpacing : 0 - itemHeight : 50 - itemWidth : 800 + itemHeight : 70 + itemWidth : 700 touchable : false itemsHasLine: [ 0, // title C1 Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml =================================================================== diff -u -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) +++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -33,19 +33,19 @@ confirmVisible : false TouchGrid { anchors.top : parent.top - anchors.topMargin : 50 + anchors.topMargin : -15 anchors.horizontalCenter: parent.horizontalCenter colCount : 2 - colSpacing : 50 + colSpacing : 100 rowCount : 7 // this number indicates when to move to the next column rowSpacing : 0 - itemHeight : 50 + itemHeight : 75 itemWidth : 700 touchable : false itemsValueLeftMargin: 325 - itemsUnitLeftMargin : 465 + itemsUnitLeftMargin : 560 itemsValue : vAdjustmentInstitutionalRecord.parametersText itemsUnit : vAdjustmentInstitutionalRecord.parametersUnit itemsText : vAdjustmentInstitutionalRecord.parametersTitle Index: sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml =================================================================== diff -u -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) +++ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -50,7 +50,7 @@ } Slider { id : _brightness anchors.verticalCenter: parent.verticalCenter - width : 800 + width : Variables.sliderWidth height : 25 step : 1 // no zero minimum : 1 @@ -82,7 +82,7 @@ } Slider { id : _alarmVolume anchors.verticalCenter: parent.verticalCenter - width : 800 + width : Variables.sliderWidth height : 25 step : 1 // no zero minimum : 1 @@ -124,7 +124,7 @@ } Slider { id : _systemVolume anchors.verticalCenter: parent.verticalCenter - width : 800 + width : Variables.sliderWidth height : 25 step : 20 // no zero minimum : 20 // 1 Index: sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml =================================================================== diff -u -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) +++ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -40,7 +40,7 @@ } ProgressCircle { id: _circle - diameter: 335 + diameter: Variables.progressCircleDiameterNormal anchors.centerIn: parent minimum : 0 maximum : vTreatmentBloodPrime.target Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -40,16 +40,22 @@ signal sectionUltrafiltrationClicked() // ---------- COLUMN LEFT - TreatmentFlows { id: _flowsTouchArea - x : Variables.screenGridLeftColumnX - y : Variables.screenGridRow3Y - width : Variables.screenGridAreaWidth - height : Variables.screenGridAreaHeightRow3 + + TreatmentPressures { id: _pressuresTouchArea + x : Variables.screenGridLeftColumnX + y : Variables.screenGridRow1Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow1 onClicked: { - sectionFlowClicked() + sectionPressuresClicked() } } - Line { x: 0; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength } + Line { + anchors.top : _pressuresTouchArea.bottom + length: Variables.screenGridLineLength + } + + TreatmentVitals { id: _vitalsTouchArea x : Variables.screenGridLeftColumnX y : Variables.screenGridRow2Y @@ -78,19 +84,27 @@ font.pixelSize: 16 } } + Line { + anchors.top : _vitalsTouchArea.bottom + anchors.topMargin: 10 + length: Variables.screenGridLineLength + } - Line { x: 0; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength } - - TreatmentPressures { id: _pressuresTouchArea - x : Variables.screenGridLeftColumnX - y : Variables.screenGridRow1Y - width : Variables.screenGridAreaWidth - height : Variables.screenGridAreaHeightRow1 + TreatmentFlows { id: _flowsTouchArea + x : Variables.screenGridLeftColumnX + y : Variables.screenGridRow3Y + width : Variables.screenGridAreaWidth + height : Variables.screenGridAreaHeightRow3 onClicked: { - sectionPressuresClicked() + sectionFlowClicked() } } + Line { + anchors.top : _flowsTouchArea.bottom + length: Variables.screenGridLineLength + } + // ---------- COLUMN RIGHT TreatmentUltrafiltration { id: _ultrafiltrationTouchArea; x : Variables.screenGridRightColumnX @@ -101,20 +115,37 @@ sectionUltrafiltrationClicked() } } - Line { x: Variables.screenGridRightLinesX; y: Variables.screenGridRow1LineY; length: Variables.screenGridLineLength } + Line { + anchors.right: _root.right + anchors.top : _ultrafiltrationTouchArea.bottom + length: Variables.screenGridLineLength + } + + TreatmentSaline { id: _salineTouchArea x : Variables.screenGridRightColumnX y : Variables.screenGridRow2Y width : Variables.screenGridAreaWidth height : Variables.screenGridAreaHeightRow2 } - Line { x: Variables.screenGridRightLinesX; y: Variables.screenGridRow2LineY; length: Variables.screenGridLineLength; } + Line { + anchors.right: _root.right + anchors.top : _salineTouchArea.bottom + anchors.topMargin: 10 + length: Variables.screenGridLineLength + } + TreatmentHeparin { id: _heparinTouchArea x : Variables.screenGridRightColumnX y : Variables.screenGridRow3Y width : Variables.screenGridAreaWidth height : Variables.screenGridAreaHeightRow3 } + Line { + anchors.right: _root.right + anchors.top : _heparinTouchArea.bottom + length: Variables.screenGridLineLength + } // ---------- Center TreatmentTime { id: _treatmentTime Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -63,7 +63,7 @@ titles : [ qsTr("Treatment") , qsTr("Trending") , qsTr("Settings") ] visibleItems : [ true , false , false ] spacing : 20 - leftPdding : 20 + leftPdding : 60 rightPdding : 50 partitionWidth : 100 // Todo Important : max width should be the width for all bottons hasRightText : true Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -51,15 +51,15 @@ width : _root.width height : 200 anchors.centerIn: parent - + TimeText { id: _currentTimeText seconds: vTreatmentTime.time_Elapsed secondsVisible: true textPixelSize: Fonts.fontPixelDurationCurTime anchors.horizontalCenter: parent.horizontalCenter anchors.top: _container.top anchors.bottom: _durationSlider.top - anchors.bottomMargin: 65 + anchors.bottomMargin: 15 } Slider { id : _durationSlider // The distance from parent's right side to the rightmost of slider - with slider arrows and spacings considered @@ -94,7 +94,7 @@ visible : true anchors.verticalCenter : _durationSlider.verticalCenter anchors.right : _container.right - anchors.rightMargin : _container.sideMarginSize + anchors.rightMargin : Variables.sliderAdjustButtonRightMargin onIncrementValue : _durationSlider.incrementValue(true) onDecrementValue : _durationSlider.decrementValue(true) Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -95,7 +95,7 @@ } Slider { id : _bloodFlowSlider anchors.verticalCenter: parent.verticalCenter - width : 600 + width : Variables.sliderWidth minimum : Variables.bloodFlowMin maximum : Variables.bloodFlowMax decimal : Variables.bloodFlowPrecision @@ -107,7 +107,7 @@ anchors.verticalCenter : _bloodFlowSlider.verticalCenter onIncrementValue : _bloodFlowSlider.incrementValue(true) onDecrementValue : _bloodFlowSlider.decrementValue(true) - leftPadding: -50 + leftPadding : Variables.sliderAdjustLeftPadding } } Line { @@ -129,7 +129,7 @@ } Slider { id : _dialysateFlowSlider anchors.verticalCenter: parent.verticalCenter - width : 600 + width : Variables.sliderWidth minimum : vTreatmentRanges.treatmentRanges_Dialysate_Flow_Min maximum : vTreatmentRanges.treatmentRanges_Dialysate_Flow_Max unit : Variables.unitTextFlowRate @@ -140,7 +140,7 @@ anchors.verticalCenter : _dialysateFlowSlider.verticalCenter onIncrementValue : _dialysateFlowSlider.incrementValue(true) onDecrementValue : _dialysateFlowSlider.decrementValue(true) - leftPadding: -50 + leftPadding : Variables.sliderAdjustLeftPadding } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -89,7 +89,7 @@ _slider.reset(vValue) } - height : 150 + height : 180 width : parent.width - hPadding * 2 Text { id: _title @@ -106,6 +106,7 @@ width : 120 anchors.baseline : _title.baseline anchors.right : parent.right + anchors.rightMargin : 20 font.pixelSize : Fonts.fontPixelFluidUnit color : Colors.textMain text : _slider.value.toFixed(0) + " " + Variables.unitTextBloodPressure @@ -116,7 +117,7 @@ anchors.top : _title.bottom anchors.topMargin : 15 anchors.horizontalCenter: parent.horizontalCenter - width : 700 + width : Variables.sliderWidth height : Variables.sliderDefaultBodyHeight diameter : Variables.progressbarHandler touchMargin : Variables.createTreatmentSliderMargin @@ -126,7 +127,7 @@ SliderArrows{ id : _sliderArrows anchors.left : _slider.right - anchors.leftMargin : 50 + anchors.leftMargin : Variables.sliderAdjustButtonRightMargin anchors.verticalCenter : _slider.verticalCenter onIncrementValue : _slider.incrementValue(true) onDecrementValue : _slider.decrementValue(true) @@ -137,7 +138,7 @@ objectName : "_arterialWindow" anchors { top : parent.top - topMargin : 125 + topMargin : 250 horizontalCenter: parent.horizontalCenter } title : qsTr("Arterial Window") Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -68,18 +68,18 @@ color: Colors.textMain height: Variables.mainMenuHeight anchors { - top: parent.top - topMargin: 100 + top : parent.top + topMargin : 100 horizontalCenter: parent.horizontalCenter } } TouchRect { id: _confirmButton - width : 530 - height : 70 + width : Variables.buttonWidth + height : Variables.buttonHeigth anchors { - bottom: parent.bottom - bottomMargin: 85 + bottom : parent.bottom + bottomMargin : 85 horizontalCenter: parent.horizontalCenter } isDefault : true @@ -105,8 +105,8 @@ Row { spacing: 20 anchors { - top: parent.top - topMargin: 205 + top : parent.top + topMargin : 205 horizontalCenter: parent.horizontalCenter } UltrafiltrationButton { id: _rateAdjustmentButton Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -rb7a14cbdf626800fd54ec71cfed9b2f31dbf0654 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision b7a14cbdf626800fd54ec71cfed9b2f31dbf0654) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -61,9 +61,8 @@ width : Variables.ultrafiltrationProgressbarWidth height : Variables.ultraFiltrationProgressBarHeight anchors { - top : parent.top - topMargin : 250 horizontalCenter: parent.horizontalCenter + verticalCenter : parent.verticalCenter } decimal : _private.decimal minimum : _private.min // suppose to be always 0 // DEN-6022 // _private.maxAdjust => _private.min @@ -104,7 +103,7 @@ visible : true anchors.verticalCenter : _volumeSlider.verticalCenter anchors.left : _volumeSlider.right - anchors.leftMargin : 50 + anchors.leftMargin : Variables.sliderAdjustButtonRightMargin onIncrementValue : _volumeSlider.incrementValue(true) onDecrementValue : _volumeSlider.decrementValue(true) @@ -118,18 +117,18 @@ pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentEditValue } anchors { - horizontalCenter: parent.horizontalCenter - top : parent.top - topMargin : 150 + horizontalCenter: _rangeProgressBar.horizontalCenter + bottom : _rangeProgressBar.top + bottomMargin : 80 } } TouchRect { id: _nextButton - width : 530 - height : 95 + width : Variables.buttonWidth + height : Variables.buttonHeight anchors { - top: parent.top - topMargin: 460 + top: _volumeSlider.bottom + topMargin: 50 horizontalCenter: parent.horizontalCenter } isDefault: true Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -51,9 +51,8 @@ width : Variables.ultrafiltrationProgressbarWidth height : Variables.ultraFiltrationProgressBarHeight anchors { - top: parent.top - topMargin: 250 horizontalCenter: parent.horizontalCenter + verticalCenter : parent.verticalCenter } decimal : Variables.ultrafiltrationPrecision minimum : _private.minimum @@ -63,29 +62,29 @@ } TouchRect { id: _editButton - width: 530 - height: 95 + width: Variables.buttonWidth + height: Variables.buttonHeight anchors { - top: parent.top - topMargin: 350 + top : _progressbarex.bottom + topMargin : 50 horizontalCenter: parent.horizontalCenter } isDefault: true text { - text: qsTr("EDIT ULTRAFILTRATION VOLUME") - font.weight: Font.DemiBold - font.pixelSize: 26 //Fonts.fontPixelBack + text : qsTr("EDIT ULTRAFILTRATION VOLUME") + font.weight : Font.DemiBold + font.pixelSize : Fonts.fontPixelBack } onClicked: editClicked() } TouchRect { id: _resumeButton visible: isUFPaused - width: 530 - height: 95 + width: Variables.buttonWidth + height: Variables.buttonHeight anchors { - top: _editButton.bottom - topMargin: 20 + top : _editButton.bottom + topMargin : 20 horizontalCenter: parent.horizontalCenter } @@ -102,14 +101,14 @@ } text { - text: qsTr("RESUME ULTRAFILTRATION") - font.weight: Font.DemiBold - font.pixelSize: 26 //Fonts.fontPixelBack + text : qsTr("RESUME ULTRAFILTRATION") + font.weight : Font.DemiBold + font.pixelSize : Fonts.fontPixelBack anchors { - centerIn: null // disable the parent anchor - verticalCenter: _resumeButton.verticalCenter - left: _image.right - leftMargin: 25 + centerIn : null // disable the parent anchor + verticalCenter : _resumeButton.verticalCenter + left : _image.right + leftMargin : 25 } } onClicked: resumeClicked() Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -51,9 +51,8 @@ width : Variables.ultrafiltrationProgressbarWidth height : Variables.ultraFiltrationProgressBarHeight anchors { - top: parent.top - topMargin: 250 horizontalCenter: parent.horizontalCenter + verticalCenter : parent.verticalCenter } decimal : Variables.ultrafiltrationPrecision minimum : _private.minimum @@ -65,11 +64,11 @@ TouchRect { id: _pauseButton onClicked: _root.pauseClicked() - width: 530 - height: 95 + width: Variables.buttonWidth + height: Variables.buttonHeight anchors { - top: parent.top - topMargin: 400 + top : _progressbarex.bottom + topMargin : 50 horizontalCenter: parent.horizontalCenter } isDefault: true @@ -86,27 +85,27 @@ } text { - text: qsTr("PAUSE ULTRAFILTRATION") - font.weight: Font.DemiBold - font.pixelSize: 26 //Fonts.fontPixelBack + text : qsTr("PAUSE ULTRAFILTRATION") + font.weight : Font.DemiBold + font.pixelSize : Fonts.fontPixelBack anchors { - centerIn: null // disable the parent anchor - verticalCenter: _pauseButton.verticalCenter - left: _image.right - leftMargin: 15 + centerIn : null // disable the parent anchor + verticalCenter : _pauseButton.verticalCenter + left : _image.right + leftMargin : 15 } } } Text { id: _informationText - text: qsTr("Note: Ultrafiltration needs to be paused to edit the volume.") - color: "#a3b7c9" + text : qsTr("Note: Ultrafiltration needs to be paused to edit the volume.") + color : "#a3b7c9" font { pixelSize: 25 } anchors { - top: _pauseButton.bottom - topMargin: 35 + top : _pauseButton.bottom + topMargin : 35 horizontalCenter: parent.horizontalCenter } } Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -52,8 +52,8 @@ RangeBar { id: _arterialRangeBar x: 0 y: 80 - width : 175 - height : 15 + width : 200 + height : 20 rangebar.color: Colors.pressuresArterialBar markerOutRangeNotify: _root.valueOutRangeNotify @@ -78,10 +78,10 @@ } RangeBar { id: _venousRangeBar - x: 210 + x: 250 y: 80 - width : 175 - height : 15 + width : 200 + height : 20 rangebar.color: Colors.pressuresVenousBar markerOutRangeNotify: _root.valueOutRangeNotify Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -re568c0be76dcf80834f68b30d7291f45172b6f69 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision e568c0be76dcf80834f68b30d7291f45172b6f69) @@ -58,8 +58,9 @@ Rectangle { id: _timeTitleRect color: "Transparent" - anchors.horizontalCenter: _timeText.horizontalCenter - anchors.bottom: _timeText.top + anchors.horizontalCenter : _timeText.horizontalCenter + anchors.horizontalCenterOffset : (_root.isRunning) ? 0 : _arrowImage.width + anchors.bottom : _timeText.top width : _timeTitle.width + _arrowImage.width + _arrowImage.anchors.leftMargin height : _timeTitle.height @@ -69,13 +70,14 @@ font.pixelSize: 26 color: Colors.textMain - anchors.left: parent.left + Image { id: _arrowImage visible: _root.isRunning anchors.left : parent.right - anchors.bottom: parent.baseline anchors.leftMargin: 10 + anchors.bottom: parent.bottom + width : Variables.arrowWidth height: Variables.arrowHeight source: "qrc:/images/iArrowRight" @@ -90,8 +92,12 @@ imageAnimated: true color: "transparent" anchors { - leftMargin : 80 - bottomMargin: 80 + right : undefined + bottom : undefined + left : _timeText.left + leftMargin : 40 + top : _timeText.bottom + topMargin : 80 } imageSource : "qrc:/images/iPauseGray"