From f436c97abd93e39727ae20379a363f064a5ffd58 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 28 Mar 2022 16:11:28 +0200 Subject: [PATCH] Roughly strip out the GraphicalEffects For some reason qt6 that we built still didn't like it. Since we wanna know if the rest works, yeeting that stuff out for now --- .../SimulationView/SimulationViewMenuComponent.qml | 1 - .../UM3NetworkPrinting/resources/qml/GenericPopUp.qml | 11 ----------- .../resources/qml/MonitorCarousel.qml | 1 - resources/qml/Account/AvatarImage.qml | 5 +++-- resources/qml/ActionButton.qml | 1 - resources/qml/Cura.qml | 1 - resources/qml/EmptyViewMenuComponent.qml | 6 ++++-- resources/qml/WelcomePages/WelcomeDialogItem.qml | 6 +++--- resources/qml/WelcomePages/WhatsNewContent.qml | 8 -------- 9 files changed, 10 insertions(+), 30 deletions(-) diff --git a/plugins/SimulationView/SimulationViewMenuComponent.qml b/plugins/SimulationView/SimulationViewMenuComponent.qml index 98efbb0115..43fd86d9d3 100644 --- a/plugins/SimulationView/SimulationViewMenuComponent.qml +++ b/plugins/SimulationView/SimulationViewMenuComponent.qml @@ -4,7 +4,6 @@ import QtQuick 2.4 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 -import Qt5Compat.GraphicalEffects import UM 1.5 as UM import Cura 1.0 as Cura diff --git a/plugins/UM3NetworkPrinting/resources/qml/GenericPopUp.qml b/plugins/UM3NetworkPrinting/resources/qml/GenericPopUp.qml index ba26f36091..47660fc7f3 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/GenericPopUp.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/GenericPopUp.qml @@ -3,7 +3,6 @@ import QtQuick 2.2 import QtQuick.Controls 2.0 -import Qt5Compat.GraphicalEffects import UM 1.3 as UM /** @@ -60,16 +59,6 @@ Popup { anchors.fill: parent - DropShadow - { - anchors.fill: pointedRectangle - color: UM.Theme.getColor("monitor_shadow") - radius: UM.Theme.getSize("monitor_shadow_radius").width - source: pointedRectangle - transparentBorder: true - verticalOffset: 2 * screenScaleFactor - } - Item { id: pointedRectangle diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml index 503e66bd62..e604b7af1c 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml @@ -3,7 +3,6 @@ import QtQuick 2.3 import QtQuick.Controls 2.0 -import Qt5Compat.GraphicalEffects import UM 1.3 as UM Item diff --git a/resources/qml/Account/AvatarImage.qml b/resources/qml/Account/AvatarImage.qml index af448c3e17..6df592ba33 100644 --- a/resources/qml/Account/AvatarImage.qml +++ b/resources/qml/Account/AvatarImage.qml @@ -3,7 +3,6 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 -import Qt5Compat.GraphicalEffects import UM 1.4 as UM @@ -35,6 +34,8 @@ Item color: hasAvatar ? "white" : "transparent" } + /* + TODO: Reimplement this without OpacityMask. OpacityMask { anchors.fill: parent @@ -42,7 +43,7 @@ Item maskSource: profileImageMask visible: hasAvatar cached: true - } + }*/ UM.RecolorImage { diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml index 58f3705f2c..348d731a06 100644 --- a/resources/qml/ActionButton.qml +++ b/resources/qml/ActionButton.qml @@ -3,7 +3,6 @@ import QtQuick 2.7 import QtQuick.Controls 2.1 -import Qt5Compat.GraphicalEffects // For the dropshadow import UM 1.5 as UM import Cura 1.0 as Cura diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index ad5fb5587e..f765b5e79a 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -4,7 +4,6 @@ import QtQuick 2.7 import QtQuick.Controls 2.15 import QtQuick.Dialogs 1.2 -import Qt5Compat.GraphicalEffects import UM 1.5 as UM import Cura 1.1 as Cura diff --git a/resources/qml/EmptyViewMenuComponent.qml b/resources/qml/EmptyViewMenuComponent.qml index 8a1d83659a..61d821ccb6 100644 --- a/resources/qml/EmptyViewMenuComponent.qml +++ b/resources/qml/EmptyViewMenuComponent.qml @@ -3,7 +3,7 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 -import Qt5Compat.GraphicalEffects // For the dropshadow + import UM 1.2 as UM @@ -12,6 +12,8 @@ Rectangle { color: UM.Theme.getColor("disabled") + /* + TODO: Reimplement later DropShadow { id: shadow @@ -24,5 +26,5 @@ Rectangle color: UM.Theme.getColor("action_button_shadow") // Should always be drawn behind the background. z: parent.z - 1 - } + }*/ } diff --git a/resources/qml/WelcomePages/WelcomeDialogItem.qml b/resources/qml/WelcomePages/WelcomeDialogItem.qml index 6410d11cb0..d98610d7d8 100644 --- a/resources/qml/WelcomePages/WelcomeDialogItem.qml +++ b/resources/qml/WelcomePages/WelcomeDialogItem.qml @@ -4,7 +4,6 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 import QtQuick.Window 2.2 -import Qt5Compat.GraphicalEffects // For the DropShadow import UM 1.3 as UM import Cura 1.1 as Cura @@ -45,7 +44,8 @@ Item } // Drop shadow around the panel - DropShadow + // TODO: Maybe re-implement this some other way. + /*DropShadow { id: shadow radius: UM.Theme.getSize("first_run_shadow_radius").width @@ -55,7 +55,7 @@ Item verticalOffset: shadowOffset color: UM.Theme.getColor("first_run_shadow") transparentBorder: true - } + }*/ // Close this dialog when there's no more page to show Connections diff --git a/resources/qml/WelcomePages/WhatsNewContent.qml b/resources/qml/WelcomePages/WhatsNewContent.qml index 6d04d830c2..2ac3935ece 100644 --- a/resources/qml/WelcomePages/WhatsNewContent.qml +++ b/resources/qml/WelcomePages/WhatsNewContent.qml @@ -4,7 +4,6 @@ import QtQuick 2.10 import QtQuick.Controls 2.3 import QtQuick.Layouts 1.3 -import Qt5Compat.GraphicalEffects // For the DropShadow import UM 1.3 as UM import Cura 1.1 as Cura @@ -92,13 +91,6 @@ Item source: manager.getSubpageImageSource(index) } - DropShadow { - anchors.fill: subpageImage - radius: UM.Theme.getSize("monitor_shadow_radius").width - color: UM.Theme.getColor("first_run_shadow") - source: subpageImage - } - Cura.ScrollableTextArea { id: subpageText