Index: AlarmMapping.csv =================================================================== diff -u -r9891a1deb940324058d295bcd3ff5e55c47701c2 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 9891a1deb940324058d295bcd3ff5e55c47701c2) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -191,7 +191,7 @@ 190,"DG drain pump off fault." 191,"DG flow rate out of upper range." 192,"DG flow rate out of lower range." - 193,"HD dialysate temperature out of low safety range." + 193,"HD blood pump partial occlusion detected." 194,"DG RO pump duty cycle out of range." 195,"DG RO pump pressure out of range." 196,"DG CPi/CPo sensors FPGA fault." @@ -255,7 +255,7 @@ 254,"DG invalid service record." 255,"HD and UI software builds are not compatible." 256,"HD processor is in Disinfect Chemical Flush mode." - 257,"Alarm ID available for use." + 257,"HD invalid institutional record." 258,"HD UI POST OS version compatibility failure." 259,"HD temperatures out of range." 260,"HD UI POST Application Integrity (Sha256Sum) failure." @@ -304,7 +304,7 @@ 303,"DG drain pump direction FPGA fault." 304,"HD invalid usage record." 305,"HD processor RAM error." - 306,"Alarm ID available." + 306,"DG turn off inlet water valves." 307,"HD AC power lost second alarm." 308,"DG CPi conductivity sensor invalid character received." 309,"DG CPo conductivity sensor invalid character received." @@ -314,9 +314,9 @@ 313,"DG cleaning mode inlet water temperature too low." 314,"DG cleaning mode inlet water pressure too high." 315,"DG cleaning mode inlet water pressure too low." - 316,"DG acid concentrate pump park fault." - 317,"DG bicarb concentrate pump part fault." - 318,"HD Air Pump timeout alarm." + 316,"Alarm available." + 317,"Alarm available." + 318,"Alarm available for use." 319,"DG chemical disinfect flush flush sample." 320,"DG chemical disinfect flush sample timeout." 321,"DG outlet UV reactor not healthy." Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -39,14 +39,15 @@ VAlarmStatus { id: vAlarmStatus } VAlarmActiveList { id: vAlarmActiveList } - readonly property alias backgroundColor: _alarmDialog.backgroundColor - readonly property alias textColor : _alarmDialog.textColor - readonly property string title : vAlarmStatus.title - readonly property string message : vAlarmStatus.message - readonly property alias isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced - readonly property alias timeout : vAlarmStatus.alarm_MuteTimeout - readonly property alias alarm_AlarmID : vAlarmStatus.alarm_AlarmID - readonly property alias hasAlarm : vAlarmStatus.hasAlarm + readonly property alias backgroundColor : _alarmDialog.backgroundColor + readonly property alias textColor : _alarmDialog.textColor + readonly property string title : vAlarmStatus.title + readonly property string message : vAlarmStatus.message + readonly property alias isSilenced : vAlarmStatus.alarm_Flag_alarmsSilenced + readonly property alias timeout : vAlarmStatus.alarm_MuteTimeout + readonly property alias alarm_AlarmID : vAlarmStatus.alarm_AlarmID + readonly property alias hasAlarm : vAlarmStatus.hasAlarm + readonly property bool isAlarmMinimized : _alarmBar.visible function clearAlarm() { vAlarmStatus.doClearCondition() Index: sources/gui/qml/KeyboardItem.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/KeyboardItem.qml (.../KeyboardItem.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/KeyboardItem.qml (.../KeyboardItem.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -23,38 +23,66 @@ // Qml imports import "qrc:/globals" +import "qrc:/dialogs" +import VAlarmStatus 0.1 /*! * \brief Keyboard is the single keyboard in the entire applicaiton. */ + + +// Issues: +// Reduce the keyboard buttons size +// Show the notification-bar at the bottom with the keyboard +// +// 1. A background is added +// 2. The keyboard is ancherd to the background with the 20% reduced ratio +// 3. The function determineYPos() is used to calculate the height for the keyboard with notification-bar at the bottom +// InputPanel { id : _root + + VAlarmStatus { id: vAlarmStatus } + function setVisible(vVisible) { - Qt.inputMethod.show() visible = vVisible + + if(visible) { + Qt.inputMethod.show() + } } + function determineYPos() { + let ySize = parent.height - _root.height + + if (vAlarmStatus.hasAlarm && _alarmBar.visible) + ySize -= Variables.notificationHeight / 2 + + return ySize + } + + active : false // if active set to true then in the TextInput section handlers will show up, which is not nice. externalLanguageSwitchEnabled: true - active : false // if active set to true then in the TextInput section handlers will show up, which is not nice. - y : Qt.inputMethod.visible ? parent.height - _root.height - _bottomFiller.height : parent.height - anchors.left : parent.left - anchors.right : parent.right + + anchors.horizontalCenter : parent.horizontalCenter + y : Qt.inputMethod.visible ? determineYPos() : parent.height + width : (parent.width * 0.8) Behavior on y { NumberAnimation { duration: Variables.keybardAnimationDuration } } - // when an alarm is active then alarm covers the keyboard - // to avoid that keyboard moved a little higher - // because the keyboard height is calculated by InputPanel itself and can not be set, - // a gap beetween the bottom of the keyboard and the screen. - // the rectangle _bottomFiller is to fill that gap - Rectangle { id: _bottomFiller - height: Variables.minVGap - color: "black" // InputPanel background color. - anchors.left: _root.left - anchors.right: _root.right - anchors.top: _root.bottom + + Rectangle { id: _background + visible : Qt.inputMethod.visible + y : 0 + z : -1 + width : Variables.applicationWidth + height : _root.height + anchors.horizontalCenter: _root.horizontalCenter + color : "black" } + Component.onCompleted: { VirtualKeyboardSettings.locale = "en_US"; console.log("Default keyboard locale set to : " + VirtualKeyboardSettings.locale) } } + Index: sources/gui/qml/SDCProgressItem.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/SDCProgressItem.qml (.../SDCProgressItem.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/SDCProgressItem.qml (.../SDCProgressItem.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -50,15 +50,15 @@ topMargin : 5 rightMargin : 5 } - width : 30 + width : 40 height: width radius: width Text { id: _percent visible : displayInformation anchors.centerIn: parent color: ! _GuiView.sdIsReady ? Colors.red : _GuiView.sdIsReadOnly ? "gray" : Colors.white text : ! _GuiView.sdIsReady ? qsTr("SD") : _GuiView.sdPercent - font.pixelSize: 12 + font.pixelSize: 18 font.bold: true } ProgressCircle { id: _progressCircle @@ -75,7 +75,7 @@ anchors.horizontalCenter: parent.horizontalCenter color : Colors.white text : Variables.sizeConverted( _GuiView.sdTotal, _root.sizePowers ) - font.pixelSize: 12 + font.pixelSize: 18 font.bold: true } Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r83b9d737cd495b34a7b42f5409962a9442f3b8f4 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 83b9d737cd495b34a7b42f5409962a9442f3b8f4) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -48,7 +48,7 @@ property alias progressRectMargin : _progressRect.margin - property int tickMarksThickness : 2 + property int tickMarksThickness : 3 property bool isRoundedEnds : true property bool hasBorder : true Index: sources/gui/qml/compounds/StepNavigationTitleBar.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/compounds/StepNavigationTitleBar.qml (.../StepNavigationTitleBar.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/compounds/StepNavigationTitleBar.qml (.../StepNavigationTitleBar.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -26,7 +26,7 @@ */ Rectangle { id: _root property int stepIndex : 0 - property int stepLineLength : 75 + property int stepLineLength : 150 property var stepNames : [] property alias backVisible : _backButton .visible property alias backEnabled : _backButton .enabled Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -23,71 +23,71 @@ * which is going to be used in the project */ QtObject { - readonly property int fontPixelButton : 24 - readonly property int fontPixelTitle : 40 // Changed to 40 to match with the Alarm messaging body font size - readonly property int fontPixelSection : 36 - readonly property int fontPixelDialogText : 22 + readonly property int fontPixelButton : 26 + 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 - readonly property int fontPixelAlarmTitle : 48 - readonly property int fontPixelAlarmBarTitle : 40 - readonly property int fontPixelAlarmMessage : 40 + readonly property int fontPixelAlarmTitle : 52 + readonly property int fontPixelAlarmBarTitle : 44 + readonly property int fontPixelAlarmMessage : 44 - readonly property int fontPixelTouchAreaTitle : 16 + readonly property int fontPixelTouchAreaTitle : 20 - readonly property int fontPixelTextRectTitle : 25 - readonly property int fontPixelTextRectLabel : 46 - readonly property int fontPixelTextRectExtra : 28 + readonly property int fontPixelTextRectTitle : 29 + readonly property int fontPixelTextRectLabel : 50 + readonly property int fontPixelTextRectExtra : 32 - readonly property int fontPixelVitals : 68 + readonly property int fontPixelVitals : 72 - readonly property int fontPixelRangeMarker : 16 - readonly property int fontPixelRangeRectText : 14 + readonly property int fontPixelRangeMarker : 20 + readonly property int fontPixelRangeRectText : 18 - readonly property int fontPixelStepCurrent : 18 - readonly property int fontPixelStepNormal : 14 + readonly property int fontPixelStepCurrent : 22 + readonly property int fontPixelStepNormal : 18 - readonly property int fontPixelPresseuresText : 22 - readonly property int fontPixelPresseuresLabel : 28 + readonly property int fontPixelPresseuresText : 26 + readonly property int fontPixelPresseuresLabel : 32 - readonly property int fontPixelFluidText : 22 - readonly property int fontPixelFluidValue : 32 - readonly property int fontPixelFluidUnit : 22 - readonly property int fontPixelFluidVolume : 16 + readonly property int fontPixelFluidText : 26 + readonly property int fontPixelFluidValue : 36 + readonly property int fontPixelFluidUnit : 26 + readonly property int fontPixelFluidVolume : 20 - readonly property int fontPixelConfirm : 19 - readonly property int fontPixelBack : 17 + readonly property int fontPixelConfirm : 23 + readonly property int fontPixelBack : 21 - readonly property int fontPixelSliderMarker : 17 + readonly property int fontPixelSliderMarker : 21 - readonly property int fontPixelNotification : 24 + readonly property int fontPixelNotification : 28 - readonly property int fontPixelDurationCurTime : 89 - readonly property int fontPixelDurationAdjTime : 28 + readonly property int fontPixelDurationCurTime : 93 + readonly property int fontPixelDurationAdjTime : 32 - readonly property int fontPixelStateListText : 20 - readonly property int fontPixelCirclProgressTimeSmall : 32 - readonly property int fontPixelCirclProgressTimeNormal : 90 + readonly property int fontPixelStateListText : 24 + readonly property int fontPixelCirclProgressTimeSmall : 36 + readonly property int fontPixelCirclProgressTimeNormal : 94 - readonly property int fontPixelUltrafiltrationAdjustmentButton : 26 - readonly property int fontPixelUltrafiltrationAdjustmentButtonL : 30 + readonly property int fontPixelUltrafiltrationAdjustmentButton : 30 + readonly property int fontPixelUltrafiltrationAdjustmentButtonL : 34 readonly property int fontPixelUltrafiltrationAdjustmentPauseButton : fontPixelUltrafiltrationAdjustmentButton readonly property int fontPixelUltrafiltrationAdjustmentResumeButton : fontPixelUltrafiltrationAdjustmentButtonL readonly property int fontPixelUltrafiltrationAdjustmentEditButton : fontPixelUltrafiltrationAdjustmentButtonL readonly property int fontPixelUltrafiltrationAdjustmentNextButton : fontPixelUltrafiltrationAdjustmentButton readonly property int fontPixelUltrafiltrationAdjustmentConfirmButton : fontPixelUltrafiltrationAdjustmentButton - readonly property int fontPixelUltrafiltrationAdjustmentEditValue : 46 - readonly property int fontPixelUltrafiltrationRateUnit : 16 + readonly property int fontPixelUltrafiltrationAdjustmentEditValue : 50 + readonly property int fontPixelUltrafiltrationRateUnit : 20 - readonly property int fontPixelRinsebackAdjustmentButton : 26 + readonly property int fontPixelRinsebackAdjustmentButton : 30 - readonly property int fontPixelCreateTreatment : 30 - readonly property int fontPixelCreateTreatmentTable : 24 + readonly property int fontPixelCreateTreatment : 34 + readonly property int fontPixelCreateTreatmentTable : 28 - readonly property int fontPixelCircleButtonLabel: 50 + readonly property int fontPixelCircleButtonLabel: 54 - readonly property int fontPixelDebugTitle : 25 - readonly property int fontPixelDebugText : 28 - readonly property int fontPixelDebugLabel : 15 + readonly property int fontPixelDebugTitle : 29 + readonly property int fontPixelDebugText : 32 + readonly property int fontPixelDebugLabel : 19 readonly property string fontFamilyFixed : "Noto Sans CJK SC" } 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 Index: sources/gui/qml/main.qml =================================================================== diff -u -r5687815256ae070a9a207107088e3f72dd464da0 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/main.qml (.../main.qml) (revision 5687815256ae070a9a207107088e3f72dd464da0) +++ sources/gui/qml/main.qml (.../main.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -295,9 +295,9 @@ horizontalAlignment : Text.AlignRight verticalAlignment : Text.AlignBottom - height : 15 + height : 20 text : Qt.application.version //DEBUG: + "[" + _GuiView.platform + "]" - font.pixelSize: 14 + font.pixelSize: 20 } Text { // TEST : Wireless IP @@ -310,84 +310,84 @@ horizontalAlignment : Text.Alignleft verticalAlignment : Text.AlignBottom - height : 15 + height : 20 text : "W:" + vNetwork.wirelessIP - font.pixelSize: 15 + font.pixelSize: 20 } Text { // TEST : Ethernet IP color : Colors.textMain anchors { top : parent.top left : parent.left - leftMargin : 475 + leftMargin : 500 } horizontalAlignment : Text.Alignleft verticalAlignment : Text.AlignBottom - height : 15 + height : 20 text : "E:" + vNetwork.ethernetIP - font.pixelSize: 15 + font.pixelSize: 20 } Text { // TEST : BluetoothStatus color : Colors.textMain anchors { top : parent.top left : parent.left - leftMargin : 615 + leftMargin : 700 } horizontalAlignment : Text.Alignleft verticalAlignment : Text.AlignBottom - height : 15 + height : 20 text : "B:" + vBluetooth.pairedAddr - font.pixelSize: 14 + font.pixelSize: 20 } Text { // TEST : The treatment vital dialog countdown time color : Colors.textMain anchors { top : parent.top left : parent.left - leftMargin : 900 + leftMargin : 1025 } horizontalAlignment : Text.Alignleft verticalAlignment : Text.AlignBottom - height : 15 + height : 20 //DEBUG text : "Vital Timer: " + vTreatmentVitals.min_left + " : " + vTreatmentVitals.sec_left - font.pixelSize: 14 + font.pixelSize: 20 } Text { // TEST : Current Date/Time color : Colors.textMain anchors { top : parent.top left : parent.left - leftMargin : 1080 + leftMargin : 1205 } horizontalAlignment : Text.Alignleft verticalAlignment : Text.AlignBottom - height : 15 + height : 20 text : vDateTime.current - font.pixelSize: 14 + font.pixelSize: 20 } Text { // TEST : Current timezone color : Colors.textMain anchors { top : parent.top left : parent.left - leftMargin : 1220 + leftMargin : 1450 } horizontalAlignment : Text.Alignleft verticalAlignment : Text.AlignBottom - height : 15 + height : 20 text : vDateTime.timezone - font.pixelSize: 14 + font.pixelSize: 20 } SDCProgressItem { id: _sdcProgressItem Index: sources/gui/qml/pages/TreatmentFlowBase.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -61,7 +61,7 @@ property bool isComplete : false - readonly property int titleTopMargin: 110 + readonly property int titleTopMargin: 150 signal backClicked() signal confirmClicked() Index: sources/gui/qml/pages/disinfect/DisinfectBase.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/disinfect/DisinfectBase.qml (.../DisinfectBase.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/disinfect/DisinfectBase.qml (.../DisinfectBase.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -27,5 +27,5 @@ */ TreatmentFlowBase { id: _root objectName: "_DisinfectBase" - header.stepLineLength: 100 + header.stepLineLength: 150 } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r83b9d737cd495b34a7b42f5409962a9442f3b8f4 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 83b9d737cd495b34a7b42f5409962a9442f3b8f4) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -286,11 +286,11 @@ 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 : 85 // 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" } indicator: Rectangle { - implicitWidth : Variables.sliderCircleDiameter * 1.7 + implicitWidth : Variables.sliderCircleDiameter * 2 implicitHeight : Variables.sliderCircleDiameter - ( Variables.progressbarHandlerBorderWidth * 2 ) radius : implicitHeight anchors.centerIn: parent @@ -316,9 +316,9 @@ 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 + verticalAlignment: Text.AlignTop + horizontalAlignment: Text.AlignHCenter + anchors.centerIn: parent } } } @@ -366,11 +366,11 @@ 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 : 85 // 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" } indicator: Rectangle { - implicitWidth : Variables.sliderCircleDiameter * 1.7 + implicitWidth : Variables.sliderCircleDiameter * 2 implicitHeight : Variables.sliderCircleDiameter - ( Variables.progressbarHandlerBorderWidth * 2 ) radius : implicitHeight anchors.centerIn: parent @@ -821,11 +821,11 @@ 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 : 85 // 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" } indicator: Rectangle { - implicitWidth : Variables.sliderCircleDiameter * 1.7 + implicitWidth : Variables.sliderCircleDiameter * 2 implicitHeight : Variables.sliderCircleDiameter - ( Variables.progressbarHandlerBorderWidth * 2 ) radius : implicitHeight anchors.centerIn: parent Index: sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml (.../SettingsBluetoothCuff.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml (.../SettingsBluetoothCuff.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -32,14 +32,15 @@ confirmVisible : false Image { id: _image - width : 640 - height : 480 + width : 800 + height : 600 + source: "qrc:/images/iCuff-Omron-BP7000" anchors { top : parent.top topMargin : _root.topMarginContent right : parent.right - rightMargin : 0 // the image itself has some margins // kept to make sure it was intentional. + rightMargin : 400 } } Column { id : _deviceColumn @@ -60,7 +61,7 @@ clip : true spacing : 5 width : 500 - height : 300 + height : 550 model : vBluetooth delegate: TouchRect { id: _deviceTouchrect readonly property color selectedColor: Colors.borderButtonSelected @@ -111,7 +112,7 @@ anchors.left : parent.left anchors.leftMargin : 100 text.text : qsTr("SCAN") - width : 300 + width : 350 isDefault : false enabled : vBluetooth.scanEnabled && vBluetooth.isInvalid onClicked : { Index: sources/gui/qml/pages/settings/SettingsDGCleaning.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/settings/SettingsDGCleaning.qml (.../SettingsDGCleaning.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/settings/SettingsDGCleaning.qml (.../SettingsDGCleaning.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -39,7 +39,7 @@ rowCount : 6 rowSpacing : 0 itemHeight : 50 - itemWidth : 800 + itemWidth : 1000 touchable : false itemsHasLine: [ 0, // title @@ -48,7 +48,7 @@ itemsValueLeftMargin: 500 itemsUnitLeftMargin : 700 itemsText : [ - "Cleaning Last Status" , // title + qsTr("Cleaning Last Status" ), // title qsTr("Last Basic Flush Complete" ), qsTr("Last Chemical Disinfect Start" ), qsTr("Last Chemical Disinfect Complete" ), Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -r5687815256ae070a9a207107088e3f72dd464da0 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 5687815256ae070a9a207107088e3f72dd464da0) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -169,7 +169,7 @@ } Row { id : _contentRect - spacing : Variables.minVGap + spacing : 60 //Variables.minVGap2 anchors.fill : parent anchors.topMargin : parent. topMarginContent - 25 // move 25 up anchors.bottomMargin : parent.bottomMarginContent @@ -178,15 +178,15 @@ anchors.horizontalCenter : parent.horizontalCenter readonly property int columnWidthProgress : 350 - readonly property int columnWidthFolder : _root.horizontalLayout ? 840 : 420 - readonly property int columnWidthFileName : _root.horizontalLayout ? 685 : 285 // best combination - readonly property int columnWidthFileSize : _root.horizontalLayout ? 105 : 105 // best combination + 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 progressHeight : height - _logTypeCombo.height - _logTypeExportButton.height - spacing : 10 + spacing : 30 width : _contentRect.columnWidthProgress height : parent.height @@ -318,7 +318,7 @@ } Grid { columns : _root.horizontalLayout ? 1 : 2 - spacing : 5 + spacing : 30 width : _contentRect.columnWidthFolder height : parent.height Column { id : _sdcFolderColumn @@ -334,7 +334,7 @@ _sdcFolderModel.nameFilters = _root.typeFilterClr } - spacing : 5 + spacing : 15 width : _contentRect.columnWidthFolder height : _root.horizontalLayout ? parent.height / 2 : parent.height Label { id : _sdcLabel @@ -487,7 +487,7 @@ } } - spacing : 5 + spacing : 15 width : _contentRect.columnWidthFolder height : _root.horizontalLayout ? parent.height / 2 : parent.height Label { id : _usbLabel Index: sources/gui/qml/pages/settings/SettingsHome.qml =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -42,7 +42,8 @@ onItemClicked : _root.itemClicked(vIndex) rowCount : _root.rowCount colCount : _root.colCount - itemWidth : 325 + itemWidth : 360 + itemHeight : 70 } // Test Codes Index: sources/gui/qml/pages/settings/SettingsInformation.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -41,7 +41,7 @@ rowCount : 12 // this number indicates when to move to the next column rowSpacing : 0 itemHeight : 50 - itemWidth : 575 + itemWidth : 800 touchable : false itemsHasLine: [ 0, // title C1 Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml =================================================================== diff -u -r31f8f296fb58f57c121a39dfd7e78b11723479c6 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 31f8f296fb58f57c121a39dfd7e78b11723479c6) +++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -41,7 +41,7 @@ rowCount : 7 // this number indicates when to move to the next column rowSpacing : 0 itemHeight : 50 - itemWidth : 550 + itemWidth : 700 touchable : false itemsValueLeftMargin: 325 Index: sources/gui/qml/pages/settings/SettingsROInput.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/settings/SettingsROInput.qml (.../SettingsROInput.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/settings/SettingsROInput.qml (.../SettingsROInput.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -48,11 +48,11 @@ checked : vDuetRoWaterDG.status - width : 85 - height : 85 + width : Variables.switchWidth + height : Variables.switchHeight indicator: Rectangle { - implicitWidth : Variables.sliderCircleDiameter * 1.7 + implicitWidth : Variables.sliderCircleDiameter * 2 implicitHeight : Variables.sliderCircleDiameter - ( Variables.progressbarHandlerBorderWidth * 2 ) radius : implicitHeight anchors.centerIn: parent @@ -75,7 +75,7 @@ contentItem: Text { width : parent.width - height : parent.height + height : parent.height + Variables.sliderTextMargin text : _settingsRoInputSwitch.checked ? qsTr("ON") : qsTr("OFF") font.pixelSize: Fonts.fontPixelButton color : _settingsRoInputSwitch.active ? Colors.textMain : Colors.textDisableButton Index: sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml (.../SettingsRootSSHAccess.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml (.../SettingsRootSSHAccess.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -28,7 +28,8 @@ SettingsBase { id: _root itemIndex : SettingsStack.RootSSHAccess - readonly property int diameter : 85 + readonly property int diameter : 85 + readonly property int rowWidth : 300 confirmVisible : false @@ -37,7 +38,7 @@ Row { id: _settingsRootSSHAccess_SSHDRow Text { id: _settingsRootSSHAccess_SSHDLabel text : qsTr("Enable SSH Login") - width : 300 + width : _root.rowWidth height : _settingsRootSSHAccess_SSHDSwitch.height color : Colors.white font.pixelSize : Fonts.fontPixelButton @@ -48,46 +49,45 @@ Switch { id: _settingsRootSSHAccess_SSHDSwitch property bool active : true - width : _root.diameter - height : _root.diameter - + width : Variables.switchWidth + height : Variables.switchHeight + indicator : Rectangle { - implicitWidth : Variables.sliderCircleDiameter * 1.7 + implicitWidth : Variables.sliderCircleDiameter * 2 implicitHeight : Variables.sliderCircleDiameter - ( Variables.progressbarHandlerBorderWidth * 2 ) radius : implicitHeight anchors.centerIn : parent color : _settingsRootSSHAccess_SSHDSwitch.checked ? Colors.backgroundButtonSelect : Colors.createTreatmentInactive border.color : _settingsRootSSHAccess_SSHDSwitch.checked ? Colors.borderButton : Colors.createTreatmentInactive Rectangle { - property real diameter : Variables.sliderCircleDiameter x : _settingsRootSSHAccess_SSHDSwitch.checked ? parent.width - width : 0 anchors.verticalCenter : parent.verticalCenter - width : diameter - height : diameter - radius : diameter + width : Variables.sliderCircleDiameter + height : Variables.sliderCircleDiameter + radius : Variables.sliderCircleDiameter color : _settingsRootSSHAccess_SSHDSwitch.active ? Colors.highlightProgressBar : Colors.createTreatmentInactive border { width : Variables.progressbarHandlerBorderWidth color : Colors.textMain } } } - contentItem : Text { width : parent.width height : parent.height font.pixelSize : Fonts.fontPixelButton color : _settingsRootSSHAccess_SSHDSwitch.active ? Colors.textMain : Colors.textDisableButton verticalAlignment : Text.AlignTop horizontalAlignment : Text.AlignHCenter + bottomPadding : 10 } } } Row { id: _settingsRootSSHAccess_RootRow Text { id: _settingsRootSSHAccess_RootLabel text : qsTr("Enable Root Login") - width : 300 + width : _root.rowWidth height : _settingsRootSSHAccess_RootSwitch.height color : Colors.white font.pixelSize : Fonts.fontPixelButton @@ -98,23 +98,23 @@ Switch { id: _settingsRootSSHAccess_RootSwitch property bool active : _settingsRootSSHAccess_SSHDSwitch.checked enabled : _settingsRootSSHAccess_RootSwitch.active - width : _root.diameter - height : _root.diameter + width : Variables.switchWidth + height : Variables.switchHeight + indicator : Rectangle { - implicitWidth : Variables.sliderCircleDiameter * 1.7 + implicitWidth : Variables.sliderCircleDiameter * 2 implicitHeight : Variables.sliderCircleDiameter - ( Variables.progressbarHandlerBorderWidth * 2 ) radius : implicitHeight anchors.centerIn : parent color : _settingsRootSSHAccess_RootSwitch.checked ? Colors.backgroundButtonSelect : Colors.createTreatmentInactive border.color : _settingsRootSSHAccess_RootSwitch.checked ? Colors.borderButton : Colors.createTreatmentInactive Rectangle { - property real diameter : Variables.sliderCircleDiameter x : _settingsRootSSHAccess_RootSwitch.checked ? parent.width - width : 0 anchors.verticalCenter : parent.verticalCenter - width : diameter - height : diameter - radius : diameter + width : Variables.sliderCircleDiameter + height : Variables.sliderCircleDiameter + radius : Variables.sliderCircleDiameter color : _settingsRootSSHAccess_RootSwitch.active ? Colors.highlightProgressBar : Colors.createTreatmentInactive border { width : Variables.progressbarHandlerBorderWidth @@ -130,6 +130,7 @@ color : _settingsRootSSHAccess_RootSwitch.active ? Colors.textMain : Colors.textDisableButton verticalAlignment : Text.AlignTop horizontalAlignment : Text.AlignHCenter + bottomPadding : 10 } } } Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -96,7 +96,7 @@ } property var itemsText : [ qsTr("Information" ), // Information - qsTr("Volume And Brightness" ), // VolumeBrightness + qsTr("Volume and Brightness" ), // VolumeBrightness qsTr("Wi-Fi" ), // WiFi qsTr("Bluetooth Cuff" ), // Bluetooth qsTr("DG Cleaning" ), // DGCleaning Index: sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml (.../SettingsVolumeBrightness.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -38,7 +38,7 @@ Column { - spacing : _root.spacing + spacing : (_root.spacing * 3) anchors.centerIn: parent Row { spacing : _root.spacing @@ -50,7 +50,8 @@ } Slider { id : _brightness anchors.verticalCenter: parent.verticalCenter - width : 500 + width : 800 + height : 25 step : 1 // no zero minimum : 1 maximum : 5 @@ -81,7 +82,8 @@ } Slider { id : _alarmVolume anchors.verticalCenter: parent.verticalCenter - width : 500 + width : 800 + height : 25 step : 1 // no zero minimum : 1 maximum : 5 @@ -122,7 +124,8 @@ } Slider { id : _systemVolume anchors.verticalCenter: parent.verticalCenter - width : 500 + width : 800 + height : 25 step : 20 // no zero minimum : 20 // 1 maximum : 100 // 5 Index: sources/gui/qml/pages/settings/SettingsWiFi.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -35,8 +35,8 @@ regExp:/^(([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))\.){3}([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))$/ } - labelWidth : 200 - entryWidth : 175 + labelWidth : 250 + entryWidth : 300 readonly property int spacing : 20 readonly property int leftMargin : 50 @@ -147,7 +147,7 @@ anchors.left : parent.left anchors.leftMargin : _root.leftMargin text.text : qsTr("SCAN") - width : 350 + width : 400 isDefault : true enabled :!vNetwork.scanInProgress onClicked : vNetwork.doScan() @@ -161,7 +161,7 @@ clip : true spacing : 7 y : _root.topMargin - width : 450 + width : 700 anchors.top : _ipColumn.top anchors.bottom : _scanButton.bottom anchors.right : _root.right @@ -178,7 +178,7 @@ text.elide : Text.ElideLeft text.color : _delegate.networkDelegateTextColor width : _networkList.width - Variables.minVGap - height : 75 + height : 100 radius : Variables.dialogRadius text.anchors.horizontalCenter : undefined Index: sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml (.../TreatmentBloodPrime.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -31,7 +31,7 @@ Text { id: _title anchors { top: parent.top - topMargin: 65 + topMargin: 80 horizontalCenter: parent.horizontalCenter } color: Colors.textMain Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -82,7 +82,7 @@ spacing: 100 anchors.centerIn: parent Row { id : _bloodFlowRow - spacing: 50 + spacing: 100 anchors.horizontalCenter: parent.horizontalCenter TextRect { id: _bloodFlowTextRect anchors.top: parent.top @@ -115,7 +115,7 @@ color : Colors.separatorLine } Row { id : _dialysateInletFlowRow - spacing: 50 + spacing: 100 anchors.horizontalCenter: parent.horizontalCenter TextRect { id: _dialysateInletFlowTextRect anchors.top: parent.top Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -34,7 +34,7 @@ x : 0 y : 0 - width : 200 + width : 350 height : 200 isTouchable : ! isSBInProgress Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -rf724589acaa51725f5e5f8a746404d01804efbcf -r5b9ff6266f7ca8ae9bbd5eace92d6454359791db --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision f724589acaa51725f5e5f8a746404d01804efbcf) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 5b9ff6266f7ca8ae9bbd5eace92d6454359791db) @@ -94,7 +94,7 @@ #endif const char *Settings_Category_Instructions = "Instructions/Instructions"; const char *Settings_Category_InstructionsImagesLoc = "%1/Instructions/"; - const char *Settings_Category_ConfigurationsDataList = "Configurations/DataList" ; + const char *Settings_Category_ConfigurationsDataList = "Parameters/DataList" ; const char *Settings_Category_Alarms = "Alarms/Alarms" ; const char *Settings_Category_Events = "Alarms/Events" ; const char *Settings_Category_MessagesUnhandled = "Messages/Unhandled" ;