Index: leahi.pro =================================================================== diff -u -re07cde120d7476c4add90c4f86cf55af9ea830de -ra926324fec65c7f3cede4c746352af173f787458 --- leahi.pro (.../leahi.pro) (revision e07cde120d7476c4add90c4f86cf55af9ea830de) +++ leahi.pro (.../leahi.pro) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -1,4 +1,4 @@ -QT += qml quick serialbus concurrent charts bluetooth +QT += qml quick serialbus concurrent bluetooth widgets CONFIG += c++17 warn_on # CONFIG += disable-desktop # QMAKE_CXX = clazy Index: sources/gui/qml/components/BaseChart.qml =================================================================== diff -u -rba86bcba8047d424b5b0f617d7297f2349b0d975 -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/components/BaseChart.qml (.../BaseChart.qml) (revision ba86bcba8047d424b5b0f617d7297f2349b0d975) +++ sources/gui/qml/components/BaseChart.qml (.../BaseChart.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -14,7 +14,6 @@ */ import QtQuick 2.15 -import QtCharts 2.15 import QtQuick.Shapes 1.15 // Import the Shapes module import "qrc:/globals" @@ -30,9 +29,11 @@ property int lineSeries1Value : 0 property int lineSeries2Value : 0 property int lineSeries3Value : 0 +/* TODO: Qt6 Port property alias lineSeries1Color : _line1.color property alias lineSeries2Color : _line2.color property alias lineSeries3Color : _line3.color +*/ readonly property int minY : -700 readonly property int maxY : 600 @@ -114,6 +115,7 @@ onTriggered : plotGraph() } +/* TODO: Qt6 Port DateTimeAxis { id: _xAxis format : "H:mm" tickCount : 13 @@ -286,4 +288,5 @@ } } } +*/ } Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 // Dialog -import Qt5Compat.GraphicalEffects +import QtQuick.Effects // Project // Qml imports @@ -67,14 +67,10 @@ radius : Variables.dialogRadius layer.enabled : showDropShadow - layer.effect: DropShadow { + layer.effect: RectangularShadow { id: _dropShadow - horizontalOffset: 4 - verticalOffset : 4 radius : 12 - samples : 32 color : Colors.dropShadowDialogColor - source : _backgroundRect anchors.fill : _backgroundRect } Index: sources/gui/qml/compounds/NumPad.qml =================================================================== diff -u -rfd09b0ee6e41d75755e0572008d4f932b0bddf2b -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision fd09b0ee6e41d75755e0572008d4f932b0bddf2b) +++ sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -15,7 +15,6 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 import "qrc:/components" import "qrc:/globals" Index: sources/gui/qml/dialogs/AlarmDialog.qml =================================================================== diff -u -r8f6ecb60abf6d47d4554cfd3019ca496d79b6f69 -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 8f6ecb60abf6d47d4554cfd3019ca496d79b6f69) +++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -1,6 +1,6 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import QtQuick.Effects // Project // Qml imports @@ -155,13 +155,9 @@ } layer.enabled : true - layer.effect : DropShadow { id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 + layer.effect : RectangularShadow { id: _dropShadow radius : 3.0 - samples : 7 color : "#50000000" - source : _stepRect anchors.fill : _stepRect } } Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -15,7 +15,6 @@ // Qt import QtQuick 2.12 -import Qt5Compat.GraphicalEffects // Project // Qml imports Index: sources/gui/qml/dialogs/PatientIdEntry.qml =================================================================== diff -u -r1eedad37ea1cad5c9aa41ac082614d082f525a7f -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/dialogs/PatientIdEntry.qml (.../PatientIdEntry.qml) (revision 1eedad37ea1cad5c9aa41ac082614d082f525a7f) +++ sources/gui/qml/dialogs/PatientIdEntry.qml (.../PatientIdEntry.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -51,7 +51,7 @@ textInput.leftPadding : Variables.defaultMargin * 14 textInput.inputMethodHints : Qt.ImhPreferLowercase textInput.echoMode : TextInput.Normal - textInput.validator : RegExpValidator { regExp: Variables.regExp_PatientID } + textInput.validator : RegularExpressionValidator { regularExpression: Variables.regExp_PatientID } line.visible : false enabled : _root.editingEnabled @@ -82,7 +82,7 @@ textInput.leftPadding : Variables.defaultMargin * 14 textInput.inputMethodHints : Qt.ImhPreferLowercase textInput.echoMode : TextInput.Normal - textInput.validator : RegExpValidator { regExp: Variables.regExp_PatientID } + textInput.validator : RegularExpressionValidator { regularExpression: Variables.regExp_PatientID } line.visible : false enabled : _root.editingEnabled Index: sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml =================================================================== diff -u -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a) +++ sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +import QtQuick.Effects // Qml imports import "qrc:/globals" @@ -184,14 +184,10 @@ } layer.enabled : true - layer.effect: DropShadow { + layer.effect: RectangularShadow { id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 radius : 3.0 - samples : 7 color : "#50000000" - source : _header anchors.fill : _header } } Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml =================================================================== diff -u -r81ce00a3b6eb8014fda6c811e1c80bd8bc8469b6 -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 81ce00a3b6eb8014fda6c811e1c80bd8bc8469b6) +++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +import QtQuick.Effects // Qml imports import "qrc:/globals" @@ -191,14 +191,10 @@ } layer.enabled : true - layer.effect: DropShadow { + layer.effect: RectangularShadow { id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 radius : 3.0 - samples : 7 color : "#50000000" - source : _header anchors.fill : _header } } Index: sources/gui/qml/pages/treatment/TreatmentHDF.qml =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -75,13 +75,13 @@ width : _column.cellWidth height : _column.cellHeight lineSeries1Value : vTreatmentPressureOcclusion.arterialPressure - lineSeries1Color : Colors.pressuresArterialBar + // TODO: Qt6 Port: lineSeries1Color : Colors.pressuresArterialBar lineSeries2Value : vTreatmentPressureOcclusion.venousPressure - lineSeries2Color : Colors.pressuresVenousBar + // TODO: Qt6 Port: lineSeries2Color : Colors.pressuresVenousBar lineSeries3Value : vTreatmentPressureOcclusion.tmpPressure - lineSeries3Color : Colors.pressuresTmpBar + // TODO: Qt6 Port: lineSeries3Color : Colors.pressuresTmpBar } } Index: sources/gui/qml/pages/treatment/TreatmentSection.qml =================================================================== diff -u -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd) +++ sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -15,7 +15,8 @@ // Qt import QtQuick 2.12 -import Qt5Compat.GraphicalEffects +import QtQuick.Effects + import "qrc:/globals" import "qrc:/components" import "qrc:/pages/treatment" @@ -58,14 +59,10 @@ } layer.enabled: _root.enableDropShadow - layer.effect: DropShadow { + layer.effect: RectangularShadow { id: _dropShadow - horizontalOffset: 3 - verticalOffset: 5 radius: 3.0 - samples: 7 color: "#50000000" - source: _root anchors.fill: _root } } Index: sources/gui/qml/pages/treatment/TreatmentTrends.qml =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import QtQuick.Effects // Project // Qml imports @@ -57,14 +57,10 @@ color : Colors.treatmentSectionHeader layer { enabled: true - effect: DropShadow { id: _topHeaderShadow + effect: RectangularShadow { id: _topHeaderShadow objectName : "_topHeaderShadow" - horizontalOffset: 2 - verticalOffset : 2 radius : 12 - samples : 32 color : "#50000000" - source : _header } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -57,9 +57,11 @@ topMargin : Variables.defaultMargin horizontalCenter: parent.horizontalCenter } +/* TODO: Qt6 Port setVolume : _volumeGoalAdjuster.value volumeRemoved : _private.volumeRemoved volumeRemovedColor : Colors.ufVolumeGoalText +*/ } Item { id: _contentArea @@ -128,7 +130,6 @@ z : _removedFill.z + 1 width : Variables.ultrafiltrationRangeMarkerWidth height : Variables.rangeMarkerHeight - hasHandle : false valueOnTop : true decimal : Variables.ultrafiltrationPrecision value : Math.max(_private.volumeRemoved, _private.minimum) Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml =================================================================== diff -u -r200b0481616ac03872ad09baa168e0ae1ce6a2ee -ra926324fec65c7f3cede4c746352af173f787458 --- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 200b0481616ac03872ad09baa168e0ae1ce6a2ee) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision a926324fec65c7f3cede4c746352af173f787458) @@ -1,7 +1,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import QtQuick.Effects // Project @@ -146,13 +146,9 @@ } layer.enabled : _root.dropShadowEnabled && _root.showButtons - layer.effect : DropShadow { id: _dropShadow - horizontalOffset: 3 - verticalOffset : 3 + layer.effect : RectangularShadow { id: _dropShadow radius : 3.0 - samples : 7 color : "#50000000" - source : _root anchors.fill : _root } }