Browse Source

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
Jaime van Kessel 3 years ago
parent
commit
f436c97abd

+ 0 - 1
plugins/SimulationView/SimulationViewMenuComponent.qml

@@ -4,7 +4,6 @@
 import QtQuick 2.4
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.1
 import QtQuick.Controls 2.1
-import Qt5Compat.GraphicalEffects
 
 
 import UM 1.5 as UM
 import UM 1.5 as UM
 import Cura 1.0 as Cura
 import Cura 1.0 as Cura

+ 0 - 11
plugins/UM3NetworkPrinting/resources/qml/GenericPopUp.qml

@@ -3,7 +3,6 @@
 
 
 import QtQuick 2.2
 import QtQuick 2.2
 import QtQuick.Controls 2.0
 import QtQuick.Controls 2.0
-import Qt5Compat.GraphicalEffects
 import UM 1.3 as UM
 import UM 1.3 as UM
 
 
 /**
 /**
@@ -60,16 +59,6 @@ Popup
     {
     {
         anchors.fill: parent
         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
         Item
         {
         {
             id: pointedRectangle
             id: pointedRectangle

+ 0 - 1
plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml

@@ -3,7 +3,6 @@
 
 
 import QtQuick 2.3
 import QtQuick 2.3
 import QtQuick.Controls 2.0
 import QtQuick.Controls 2.0
-import Qt5Compat.GraphicalEffects
 import UM 1.3 as UM
 import UM 1.3 as UM
 
 
 Item
 Item

+ 3 - 2
resources/qml/Account/AvatarImage.qml

@@ -3,7 +3,6 @@
 
 
 import QtQuick 2.10
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Controls 2.3
-import Qt5Compat.GraphicalEffects
 
 
 import UM 1.4 as UM
 import UM 1.4 as UM
 
 
@@ -35,6 +34,8 @@ Item
         color: hasAvatar ? "white" : "transparent"
         color: hasAvatar ? "white" : "transparent"
     }
     }
 
 
+    /*
+    TODO: Reimplement this without OpacityMask.
     OpacityMask
     OpacityMask
     {
     {
         anchors.fill: parent
         anchors.fill: parent
@@ -42,7 +43,7 @@ Item
         maskSource: profileImageMask
         maskSource: profileImageMask
         visible: hasAvatar
         visible: hasAvatar
         cached: true
         cached: true
-    }
+    }*/
 
 
     UM.RecolorImage
     UM.RecolorImage
     {
     {

+ 0 - 1
resources/qml/ActionButton.qml

@@ -3,7 +3,6 @@
 
 
 import QtQuick 2.7
 import QtQuick 2.7
 import QtQuick.Controls 2.1
 import QtQuick.Controls 2.1
-import Qt5Compat.GraphicalEffects // For the dropshadow
 
 
 import UM 1.5 as UM
 import UM 1.5 as UM
 import Cura 1.0 as Cura
 import Cura 1.0 as Cura

+ 0 - 1
resources/qml/Cura.qml

@@ -4,7 +4,6 @@
 import QtQuick 2.7
 import QtQuick 2.7
 import QtQuick.Controls 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Dialogs 1.2
 import QtQuick.Dialogs 1.2
-import Qt5Compat.GraphicalEffects
 import UM 1.5 as UM
 import UM 1.5 as UM
 import Cura 1.1 as Cura
 import Cura 1.1 as Cura
 
 

+ 4 - 2
resources/qml/EmptyViewMenuComponent.qml

@@ -3,7 +3,7 @@
 
 
 import QtQuick 2.10
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Controls 2.3
-import Qt5Compat.GraphicalEffects // For the dropshadow
+
 
 
 import UM 1.2 as UM
 import UM 1.2 as UM
 
 
@@ -12,6 +12,8 @@ Rectangle
 {
 {
     color: UM.Theme.getColor("disabled")
     color: UM.Theme.getColor("disabled")
 
 
+    /*
+    TODO: Reimplement later
     DropShadow
     DropShadow
     {
     {
         id: shadow
         id: shadow
@@ -24,5 +26,5 @@ Rectangle
         color: UM.Theme.getColor("action_button_shadow")
         color: UM.Theme.getColor("action_button_shadow")
         // Should always be drawn behind the background.
         // Should always be drawn behind the background.
         z: parent.z - 1
         z: parent.z - 1
-    }
+    }*/
 }
 }

+ 3 - 3
resources/qml/WelcomePages/WelcomeDialogItem.qml

@@ -4,7 +4,6 @@
 import QtQuick 2.10
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Controls 2.3
 import QtQuick.Window 2.2
 import QtQuick.Window 2.2
-import Qt5Compat.GraphicalEffects  // For the DropShadow
 
 
 import UM 1.3 as UM
 import UM 1.3 as UM
 import Cura 1.1 as Cura
 import Cura 1.1 as Cura
@@ -45,7 +44,8 @@ Item
     }
     }
 
 
     // Drop shadow around the panel
     // Drop shadow around the panel
-    DropShadow
+    // TODO: Maybe re-implement this some other way.
+    /*DropShadow
     {
     {
         id: shadow
         id: shadow
         radius: UM.Theme.getSize("first_run_shadow_radius").width
         radius: UM.Theme.getSize("first_run_shadow_radius").width
@@ -55,7 +55,7 @@ Item
         verticalOffset: shadowOffset
         verticalOffset: shadowOffset
         color: UM.Theme.getColor("first_run_shadow")
         color: UM.Theme.getColor("first_run_shadow")
         transparentBorder: true
         transparentBorder: true
-    }
+    }*/
 
 
     // Close this dialog when there's no more page to show
     // Close this dialog when there's no more page to show
     Connections
     Connections

+ 0 - 8
resources/qml/WelcomePages/WhatsNewContent.qml

@@ -4,7 +4,6 @@
 import QtQuick 2.10
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
 import QtQuick.Layouts 1.3
-import Qt5Compat.GraphicalEffects // For the DropShadow
 
 
 import UM 1.3 as UM
 import UM 1.3 as UM
 import Cura 1.1 as Cura
 import Cura 1.1 as Cura
@@ -92,13 +91,6 @@ Item
                         source: manager.getSubpageImageSource(index)
                         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
                     Cura.ScrollableTextArea
                     {
                     {
                         id: subpageText
                         id: subpageText