From 231ee324889211a5b4790e9e21754d6e1c339208 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Sat, 18 Feb 2023 14:10:08 +0100 Subject: [PATCH] Replace old Qt5Compat with build in Rectangle --- ScreenPlay/qml/Community/Community.qml | 4 +--- ScreenPlay/qml/Community/XMLNewsfeed.qml | 5 +---- ScreenPlay/qml/Create/StartInfoLinkImage.qml | 11 ++++------- .../CreateWallpaperVideoImportConvert.qml | 12 +++--------- .../Wizards/ImportWebm/ImportWebmConvert.qml | 13 +++---------- .../Wizards/Importh264/Importh264Convert.qml | 12 +++--------- ScreenPlay/qml/Installed/Sidebar.qml | 17 +++++------------ ScreenPlayWorkshop/qml/Background.qml | 2 +- ScreenPlayWorkshop/qml/Sidebar.qml | 9 +++------ ScreenPlayWorkshop/qml/WorkshopItem.qml | 9 +++------ .../qml/upload/UploadProjectItem.qml | 5 +---- 11 files changed, 28 insertions(+), 71 deletions(-) diff --git a/ScreenPlay/qml/Community/Community.qml b/ScreenPlay/qml/Community/Community.qml index 08db5845..b921f8ac 100644 --- a/ScreenPlay/qml/Community/Community.qml +++ b/ScreenPlay/qml/Community/Community.qml @@ -112,11 +112,9 @@ Item { } } - LinearGradient { + Rectangle { height: 6 z: 99 - start: Qt.point(0, 0) - end: Qt.point(0, 6) anchors { top: navWrapper.bottom diff --git a/ScreenPlay/qml/Community/XMLNewsfeed.qml b/ScreenPlay/qml/Community/XMLNewsfeed.qml index f7cf7a08..dcbd43fc 100644 --- a/ScreenPlay/qml/Community/XMLNewsfeed.qml +++ b/ScreenPlay/qml/Community/XMLNewsfeed.qml @@ -112,11 +112,8 @@ Item { } } - LinearGradient { + Rectangle { anchors.fill: parent - start: Qt.point(0, 0) - end: Qt.point(0, parent.height) - gradient: Gradient { GradientStop { position: 1 diff --git a/ScreenPlay/qml/Create/StartInfoLinkImage.qml b/ScreenPlay/qml/Create/StartInfoLinkImage.qml index 25f1cc23..0a1d230b 100644 --- a/ScreenPlay/qml/Create/StartInfoLinkImage.qml +++ b/ScreenPlay/qml/Create/StartInfoLinkImage.qml @@ -33,20 +33,17 @@ Item { fillMode: Image.PreserveAspectCrop } - LinearGradient { + Rectangle { anchors.fill: parent - end: Qt.point(0, 0) - start: Qt.point(0, parent.height * 0.66) - gradient: Gradient { GradientStop { - position: 0 + position: 0.66 color: "#DD000000" } GradientStop { - position: 1 - color: "#00000000" + position: 0 + color: "transparent" } } } diff --git a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml index d4cc8e97..160ce497 100644 --- a/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml +++ b/ScreenPlay/qml/Create/Wizards/ImportVideoAndConvert/CreateWallpaperVideoImportConvert.qml @@ -164,26 +164,20 @@ Item { anchors.fill: parent } - LinearGradient { + Rectangle { id: shadow - - cached: true anchors.fill: parent - start: Qt.point(0, height) - end: Qt.point(0, 0) gradient: Gradient { GradientStop { id: gradientStop0 - - position: 0 + position: 1 color: "#DD000000" } GradientStop { id: gradientStop1 - - position: 1 + position: 0 color: "#00000000" } } diff --git a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml index 9a29f17c..9b275ed9 100644 --- a/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml +++ b/ScreenPlay/qml/Create/Wizards/ImportWebm/ImportWebmConvert.qml @@ -157,26 +157,19 @@ Item { anchors.fill: parent } - LinearGradient { + Rectangle { id: shadow - - cached: true anchors.fill: parent - start: Qt.point(0, height) - end: Qt.point(0, 0) - gradient: Gradient { GradientStop { id: gradientStop0 - - position: 0 + position: 1 color: "#DD000000" } GradientStop { id: gradientStop1 - - position: 1 + position: 0 color: "#00000000" } } diff --git a/ScreenPlay/qml/Create/Wizards/Importh264/Importh264Convert.qml b/ScreenPlay/qml/Create/Wizards/Importh264/Importh264Convert.qml index b60b7934..6e467d85 100644 --- a/ScreenPlay/qml/Create/Wizards/Importh264/Importh264Convert.qml +++ b/ScreenPlay/qml/Create/Wizards/Importh264/Importh264Convert.qml @@ -157,26 +157,20 @@ Item { anchors.fill: parent } - LinearGradient { + Rectangle { id: shadow - - cached: true anchors.fill: parent - start: Qt.point(0, height) - end: Qt.point(0, 0) gradient: Gradient { GradientStop { id: gradientStop0 - - position: 0 + position: 1 color: "#DD000000" } GradientStop { id: gradientStop1 - - position: 1 + position: 0 color: "#00000000" } } diff --git a/ScreenPlay/qml/Installed/Sidebar.qml b/ScreenPlay/qml/Installed/Sidebar.qml index f88d8322..9636b463 100644 --- a/ScreenPlay/qml/Installed/Sidebar.qml +++ b/ScreenPlay/qml/Installed/Sidebar.qml @@ -112,17 +112,14 @@ Item { left: parent.left } - LinearGradient { + Rectangle { anchors.fill: parent - start: Qt.point(0, 0) - end: Qt.point(400, 0) gradient: Gradient { GradientStop { position: 0 color: "transparent" } - GradientStop { position: 0.1 color: "#AAffffff" @@ -179,13 +176,9 @@ Item { visible: enabled } - LinearGradient { + Rectangle { id: tabShadow - - height: 50 - cached: true - start: Qt.point(0, 50) - end: Qt.point(0, 0) + height: 70 anchors { bottom: parent.bottom @@ -195,12 +188,12 @@ Item { gradient: Gradient { GradientStop { - position: 0 + position: 1 color: "#EE000000" } GradientStop { - position: 1 + position: 0 color: "#00000000" } } diff --git a/ScreenPlayWorkshop/qml/Background.qml b/ScreenPlayWorkshop/qml/Background.qml index fa30a38f..aaff3425 100644 --- a/ScreenPlayWorkshop/qml/Background.qml +++ b/ScreenPlayWorkshop/qml/Background.qml @@ -55,7 +55,7 @@ Rectangle { left: parent.left } - LinearGradient { + Rectangle { id: gradient anchors.fill: parent diff --git a/ScreenPlayWorkshop/qml/Sidebar.qml b/ScreenPlayWorkshop/qml/Sidebar.qml index 447d3009..1ac5bd75 100644 --- a/ScreenPlayWorkshop/qml/Sidebar.qml +++ b/ScreenPlayWorkshop/qml/Sidebar.qml @@ -90,11 +90,8 @@ Drawer { anchors.fill: parent } - LinearGradient { + Rectangle { height: 50 - cached: true - start: Qt.point(0, 50) - end: Qt.point(0, 0) anchors { bottom: parent.bottom @@ -104,12 +101,12 @@ Drawer { gradient: Gradient { GradientStop { - position: 0 + position: 1 color: "#EE000000" } GradientStop { - position: 1 + position: 0 color: "#00000000" } } diff --git a/ScreenPlayWorkshop/qml/WorkshopItem.qml b/ScreenPlayWorkshop/qml/WorkshopItem.qml index 8b2f1338..749149df 100644 --- a/ScreenPlayWorkshop/qml/WorkshopItem.qml +++ b/ScreenPlayWorkshop/qml/WorkshopItem.qml @@ -149,14 +149,11 @@ Item { sourceImageGIF: root.additionalPreviewUrl } - LinearGradient { + Rectangle { id: shadow height: 80 opacity: 0 - cached: true - start: Qt.point(0, 80) - end: Qt.point(0, 0) anchors { bottom: parent.bottom @@ -166,12 +163,12 @@ Item { gradient: Gradient { GradientStop { - position: 0 + position: 1 color: "#CC000000" } GradientStop { - position: 1 + position: 0 color: "#00000000" } } diff --git a/ScreenPlayWorkshop/qml/upload/UploadProjectItem.qml b/ScreenPlayWorkshop/qml/upload/UploadProjectItem.qml index 29d66446..124ada92 100644 --- a/ScreenPlayWorkshop/qml/upload/UploadProjectItem.qml +++ b/ScreenPlayWorkshop/qml/upload/UploadProjectItem.qml @@ -403,15 +403,12 @@ Page { bottom: parent.bottom } - LinearGradient { + Rectangle { id: gradient height: parent.height - cached: true opacity: 0 anchors.fill: parent - start: Qt.point(0, height) - end: Qt.point(0, 0) gradient: Gradient { GradientStop {