Index: sources/gui/qml/components/HeaderBarPopup.qml =================================================================== diff -u -r16a8f25568b4636ebc31e76c86a8031940cc4ad7 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/components/HeaderBarPopup.qml (.../HeaderBarPopup.qml) (revision 16a8f25568b4636ebc31e76c86a8031940cc4ad7) +++ sources/gui/qml/components/HeaderBarPopup.qml (.../HeaderBarPopup.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -32,7 +32,7 @@ closePolicy : Dialog.CloseOnPressOutside y : Variables.headerHeight + 5 backgroundColor : Colors.offWhite - showDropShadow : true + // showDropShadow : true onImplicitWidthChanged: Qt.callLater(function() { if (button) { adjustPosition(_root.button) } }) } Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -r7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 // Dialog -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 // Project // Qml imports @@ -36,7 +36,7 @@ property alias radius : _backgroundRect.radius property alias notificationText : _notification.text property alias notification : _notification - property bool showDropShadow : false + // property bool showDropShadow : false property alias backgroundItem : _backgroundItem.children property alias backgroundItemZ : _backgroundItem.z property bool closeOnStateChange : true @@ -66,17 +66,17 @@ color : Colors.backgroundDialog radius : Variables.dialogRadius - layer.enabled : showDropShadow - layer.effect: DropShadow { - id: _dropShadow - horizontalOffset: 4 - verticalOffset : 4 - radius : 12 - samples : 32 - color : Colors.dropShadowDialogColor - source : _backgroundRect - anchors.fill : _backgroundRect - } + // layer.enabled : showDropShadow + // layer.effect: DropShadow { + // id: _dropShadow + // horizontalOffset: 4 + // verticalOffset : 4 + // radius : 12 + // samples : 32 + // color : Colors.dropShadowDialogColor + // source : _backgroundRect + // anchors.fill : _backgroundRect + // } // 👇 Placeholder for an injected component. Ex. numpad Item { id: _backgroundItem } Index: sources/gui/qml/components/UltrafiltrationButton.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/components/UltrafiltrationButton.qml (.../UltrafiltrationButton.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/components/UltrafiltrationButton.qml (.../UltrafiltrationButton.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.0 +// import QtGraphicalEffects 1.0 // Project Index: sources/gui/qml/compounds/NumPad.qml =================================================================== diff -u -r4f856b4068a1a5a131a74b5bcece7b6212b5c8d9 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision 4f856b4068a1a5a131a74b5bcece7b6212b5c8d9) +++ sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -15,7 +15,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 import "qrc:/components" import "qrc:/globals" @@ -249,7 +249,7 @@ color : enabled ? Colors.offWhite : "dimgrey" } } - + onPressed: { if (modelData === backSpace ) { _numPadGrid.replaceValueText = false Index: sources/gui/qml/dialogs/AlarmDialog.qml =================================================================== diff -u -rfe26c932a53276a569d98cfcfbfc48b8a73af921 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision fe26c932a53276a569d98cfcfbfc48b8a73af921) +++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -1,6 +1,6 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 // Project // Qml imports @@ -160,16 +160,16 @@ font.weight : Font.Medium } - layer.enabled : true - layer.effect : DropShadow { id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 - radius : 3.0 - samples : 7 - color : "#50000000" - source : _stepRect - anchors.fill : _stepRect - } + // layer.enabled : true + // layer.effect : DropShadow { id: _dropShadow + // horizontalOffset: 0 + // verticalOffset : 3 + // radius : 3.0 + // samples : 7 + // color : "#50000000" + // source : _stepRect + // anchors.fill : _stepRect + // } } Text { id: _delegateText Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 // Project // Qml imports Index: sources/gui/qml/main.qml =================================================================== diff -u -rd82d6c9dbf4b10a90a1e5e742e9c31400c547358 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/main.qml (.../main.qml) (revision d82d6c9dbf4b10a90a1e5e742e9c31400c547358) +++ sources/gui/qml/main.qml (.../main.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -458,7 +458,7 @@ PowerItem { id: _powerItem ; z: 997 } ConfirmDialog { id: _confirmDialog ; z: 998 } DryDemoDialog { id: _dryDemoDialog ; z: 999 } - DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } + //DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem // then cannot be anchored. Index: sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml =================================================================== diff -u -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a) +++ sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 // Qml imports import "qrc:/globals" @@ -183,17 +183,17 @@ HeaderText { id: _default; title: qsTr("Default") } } - layer.enabled : true - layer.effect: DropShadow { - id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 - radius : 3.0 - samples : 7 - color : "#50000000" - source : _header - anchors.fill : _header - } + // layer.enabled : true + // layer.effect: DropShadow { + // id: _dropShadow + // horizontalOffset: 0 + // verticalOffset : 3 + // radius : 3.0 + // samples : 7 + // color : "#50000000" + // source : _header + // anchors.fill : _header + // } } ListView { id: _listView Index: sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml =================================================================== diff -u -rfd13750406289b7fd9d49c7827ad143fe246278f -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml (.../SettingsCalibrationSettings.qml) (revision fd13750406289b7fd9d49c7827ad143fe246278f) +++ sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml (.../SettingsCalibrationSettings.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -1,6 +1,6 @@ // Qt import QtQuick 2.15 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 // Qml imports import "qrc:/globals" @@ -93,17 +93,17 @@ } } - layer.enabled : true - layer.effect: DropShadow { - id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 - radius : 3.0 - samples : 7 - color : "#50000000" - source : _header - anchors.fill : _header - } + // layer.enabled : true + // layer.effect: DropShadow { + // id: _dropShadow + // horizontalOffset: 0 + // verticalOffset : 3 + // radius : 3.0 + // samples : 7 + // color : "#50000000" + // source : _header + // anchors.fill : _header + // } } ListView { id: _listView Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml =================================================================== diff -u -r81ce00a3b6eb8014fda6c811e1c80bd8bc8469b6 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 81ce00a3b6eb8014fda6c811e1c80bd8bc8469b6) +++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 // Qml imports import "qrc:/globals" @@ -190,17 +190,17 @@ HeaderText { id: _default; title: qsTr("Default") } } - layer.enabled : true - layer.effect: DropShadow { - id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 - radius : 3.0 - samples : 7 - color : "#50000000" - source : _header - anchors.fill : _header - } + // layer.enabled : true + // layer.effect: DropShadow { + // id: _dropShadow + // horizontalOffset: 0 + // verticalOffset : 3 + // radius : 3.0 + // samples : 7 + // color : "#50000000" + // source : _header + // anchors.fill : _header + // } } ListView { id: _listView Index: sources/gui/qml/pages/treatment/TreatmentHDF.qml =================================================================== diff -u -red4dbfb9ccc0d5cdf93a08a17807d2cbfcb29fc3 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision ed4dbfb9ccc0d5cdf93a08a17807d2cbfcb29fc3) +++ sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -85,7 +85,7 @@ color : Colors.panelBackgroundColor header.color : Colors.heparinSectionHeader - enableDropShadow: false + // enableDropShadow: false } BaseChart { id: _chart Index: sources/gui/qml/pages/treatment/TreatmentHeparin.qml =================================================================== diff -u -r320972a712c31e94413056591634859b4b3d564e -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/pages/treatment/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 320972a712c31e94413056591634859b4b3d564e) +++ sources/gui/qml/pages/treatment/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -77,7 +77,7 @@ component HeparinContainer: TreatmentSection { id: _heparinContainer color : Colors.panelBackgroundColor header.color : Colors.heparinSectionHeader - enableDropShadow: false + // enableDropShadow: false header { showEdit : false titleLeftMargin: Variables.defaultMargin * 3 Index: sources/gui/qml/pages/treatment/TreatmentSection.qml =================================================================== diff -u -r19acf57838bc97979052d626f3e05d46310b6335 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision 19acf57838bc97979052d626f3e05d46310b6335) +++ sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 import "qrc:/globals" import "qrc:/components" import "qrc:/pages/treatment" @@ -24,7 +24,7 @@ property Item contentItem : null property alias header : _header property alias contentArea : _contentArea - property bool enableDropShadow: true + // property bool enableDropShadow: true signal editClicked() signal lockClicked() @@ -57,15 +57,15 @@ contentItem: _root.contentItem } - layer.enabled: _root.enableDropShadow - layer.effect: DropShadow { - id: _dropShadow - horizontalOffset: 3 - verticalOffset: 5 - radius: 3.0 - samples: 7 - color: "#50000000" - source: _root - anchors.fill: _root - } + // layer.enabled: _root.enableDropShadow + // layer.effect: DropShadow { + // 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 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 // Project // Qml imports @@ -43,7 +43,7 @@ readonly property int labelWidth : 300 readonly property int scrollButtonWidth : 40 readonly property int paramAreaRightMargin : 5 - readonly property int paramWidth : + readonly property int paramWidth : (_root.width - Variables.defaultMargin - labelWidth - scrollButtonWidth - paramAreaRightMargin - _expandButton.width) / 7 readonly property int historyTimeWidth : 50 } @@ -55,18 +55,18 @@ height : _private.topHeaderHeight radius : 10 color : Colors.treatmentSectionHeader - layer { - enabled: true - effect: DropShadow { id: _topHeaderShadow - objectName : "_topHeaderShadow" - horizontalOffset: 2 - verticalOffset : 2 - radius : 12 - samples : 32 - color : "#50000000" - source : _header - } - } + // layer { + // enabled: true + // effect: DropShadow { id: _topHeaderShadow + // objectName : "_topHeaderShadow" + // horizontalOffset: 2 + // verticalOffset : 2 + // radius : 12 + // samples : 32 + // color : "#50000000" + // source : _header + // } + // } Text { id: _text objectName : "_text" @@ -175,7 +175,7 @@ width : _private.paramWidth height : _private.cellHeight enabled : true - + Text { id: _valueText objectName : "_valueText" anchors.centerIn : parent @@ -348,7 +348,7 @@ objectName: "_paramList" readonly property int visibleParamCount: _paramArea.isExpanded ? 7 : 5 readonly property int modelCount: _paramList.count ?? 0 - + anchors { fill : parent rightMargin : (Math.max(0, visibleParamCount - _paramList.count) * _private.paramWidth) Index: sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml =================================================================== diff -u -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml (.../TreatmentFlows.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -105,7 +105,7 @@ value : vDDConductivity.acidBicarbCondutivity1 // D27 unitText : Variables.unitTextDialCond showButtons : false - dropShadowEnabled : false + // dropShadowEnabled : false } } } Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml =================================================================== diff -u -r200b0481616ac03872ad09baa168e0ae1ce6a2ee -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 200b0481616ac03872ad09baa168e0ae1ce6a2ee) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -1,7 +1,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +// import QtGraphicalEffects 1.12 // Project @@ -23,7 +23,7 @@ property alias precision : _rangedValue.precision property bool showButtons : true property bool buttonsEnabled : true - property bool dropShadowEnabled : true + // property bool dropShadowEnabled : true property bool canOff : false property bool runAnimation : false property real pulseAlpha : 1 @@ -145,14 +145,14 @@ } } - layer.enabled : _root.dropShadowEnabled && _root.showButtons - layer.effect : DropShadow { id: _dropShadow - horizontalOffset: 3 - verticalOffset : 3 - radius : 3.0 - samples : 7 - color : "#50000000" - source : _root - anchors.fill : _root - } + // layer.enabled : _root.dropShadowEnabled && _root.showButtons + // layer.effect : DropShadow { id: _dropShadow + // horizontalOffset: 3 + // verticalOffset : 3 + // radius : 3.0 + // samples : 7 + // color : "#50000000" + // source : _root + // anchors.fill : _root + // } } Index: sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml =================================================================== diff -u -r61a9a75c5b5ed003dc326ec3cc138a8f0e78c1e0 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml (.../TreatmentHDFComponent.qml) (revision 61a9a75c5b5ed003dc326ec3cc138a8f0e78c1e0) +++ sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml (.../TreatmentHDFComponent.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -23,7 +23,7 @@ TreatmentSection { id: _root color : Colors.panelBackgroundColor header.color : Colors.heparinSectionHeader - enableDropShadow: false + // enableDropShadow: false header { title : qsTr("Hemodiafiltration") + " (" + qsTr("HDF") + ")" showPauseResume : true Index: sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/symbols.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r56d6ed00b13ebfeba45c999e73d0198e702e1961 --- sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/symbols.qml (.../symbols.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/symbols.qml (.../symbols.qml) (revision 56d6ed00b13ebfeba45c999e73d0198e702e1961) @@ -28,7 +28,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Layouts 1.0 +// import QtQuick.Layouts 1.0 import QtQuick.VirtualKeyboard 2.1 KeyboardLayoutLoader {