diff --git a/containment/package/contents/ui/Upgrader.qml b/containment/package/contents/ui/Upgrader.qml index 51b4ea2c6..bf9172547 100644 --- a/containment/package/contents/ui/Upgrader.qml +++ b/containment/package/contents/ui/Upgrader.qml @@ -8,7 +8,7 @@ import QtQuick 2.1 import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents Item{ Component.onCompleted: { diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml index aa4c255c9..7a2befc50 100644 --- a/containment/package/contents/ui/applet/AppletItem.qml +++ b/containment/package/contents/ui/applet/AppletItem.qml @@ -6,11 +6,11 @@ import QtQuick 2.7 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 import org.kde.latte.core 0.2 as LatteCore diff --git a/containment/package/contents/ui/applet/ItemWrapper.qml b/containment/package/contents/ui/applet/ItemWrapper.qml index 0f89af5ab..25b624d06 100644 --- a/containment/package/contents/ui/applet/ItemWrapper.qml +++ b/containment/package/contents/ui/applet/ItemWrapper.qml @@ -6,11 +6,11 @@ import QtQuick 2.1 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.latte.core 0.2 as LatteCore import org.kde.latte.components 1.0 as LatteComponents diff --git a/containment/package/contents/ui/applet/ShortcutBadge.qml b/containment/package/contents/ui/applet/ShortcutBadge.qml index 690fab9bc..8a77f8d7f 100644 --- a/containment/package/contents/ui/applet/ShortcutBadge.qml +++ b/containment/package/contents/ui/applet/ShortcutBadge.qml @@ -4,7 +4,7 @@ */ import QtQuick 2.1 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.latte.components 1.0 as LatteComponents diff --git a/containment/package/contents/ui/applet/colorizer/Applet.qml b/containment/package/contents/ui/applet/colorizer/Applet.qml index 2534cd4e8..6dfa1844b 100644 --- a/containment/package/contents/ui/applet/colorizer/Applet.qml +++ b/containment/package/contents/ui/applet/colorizer/Applet.qml @@ -4,12 +4,12 @@ */ import QtQuick 2.7 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -Item { +PlasmoidItem { ColorOverlay { id: colorizer anchors.fill: parent diff --git a/containment/package/contents/ui/background/MultiLayered.qml b/containment/package/contents/ui/background/MultiLayered.qml index 1b6b1d9de..9f8e61ae9 100644 --- a/containment/package/contents/ui/background/MultiLayered.qml +++ b/containment/package/contents/ui/background/MultiLayered.qml @@ -7,12 +7,12 @@ import QtQuick 2.1 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 import org.kde.latte.core 0.2 as LatteCore diff --git a/containment/package/contents/ui/editmode/ConfigOverlay.qml b/containment/package/contents/ui/editmode/ConfigOverlay.qml index 40d35c794..9137fc41d 100644 --- a/containment/package/contents/ui/editmode/ConfigOverlay.qml +++ b/containment/package/contents/ui/editmode/ConfigOverlay.qml @@ -6,11 +6,11 @@ import QtQuick 2.7 import QtQuick.Layouts 1.0 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 import org.kde.latte.core 0.2 as LatteCore diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml index 856a2bf32..3b6d232b3 100644 --- a/containment/package/contents/ui/main.qml +++ b/containment/package/contents/ui/main.qml @@ -7,10 +7,10 @@ import QtQuick 2.8 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.plasmoid 2.0 diff --git a/declarativeimports/abilities/client/indicators/LatteIndicator.qml b/declarativeimports/abilities/client/indicators/LatteIndicator.qml index 69408c210..4f26a4c20 100644 --- a/declarativeimports/abilities/client/indicators/LatteIndicator.qml +++ b/declarativeimports/abilities/client/indicators/LatteIndicator.qml @@ -5,11 +5,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.latte.core 0.2 as LatteCore import org.kde.latte.components 1.0 as LatteComponents diff --git a/declarativeimports/abilities/host/ThinTooltip.qml b/declarativeimports/abilities/host/ThinTooltip.qml index bd54f0328..7274315fb 100644 --- a/declarativeimports/abilities/host/ThinTooltip.qml +++ b/declarativeimports/abilities/host/ThinTooltip.qml @@ -8,7 +8,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 import org.kde.plasma.plasmoid 2.0 -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.latte.core 0.2 as LatteCore diff --git a/declarativeimports/abilities/items/BasicItem.qml b/declarativeimports/abilities/items/BasicItem.qml index 96cbc9127..1e84833d8 100644 --- a/declarativeimports/abilities/items/BasicItem.qml +++ b/declarativeimports/abilities/items/BasicItem.qml @@ -4,11 +4,11 @@ */ import QtQuick 2.8 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.latte.core 0.2 as LatteCore diff --git a/declarativeimports/abilities/items/basicitem/ParabolicItem.qml b/declarativeimports/abilities/items/basicitem/ParabolicItem.qml index 1fb765709..b7971ee13 100644 --- a/declarativeimports/abilities/items/basicitem/ParabolicItem.qml +++ b/declarativeimports/abilities/items/basicitem/ParabolicItem.qml @@ -5,7 +5,7 @@ */ import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/declarativeimports/abilities/items/basicitem/SeparatorItem.qml b/declarativeimports/abilities/items/basicitem/SeparatorItem.qml index 1cf0d03e0..41085f885 100644 --- a/declarativeimports/abilities/items/basicitem/SeparatorItem.qml +++ b/declarativeimports/abilities/items/basicitem/SeparatorItem.qml @@ -4,7 +4,7 @@ */ import QtQuick 2.8 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/declarativeimports/abilities/items/basicitem/ShortcutBadge.qml b/declarativeimports/abilities/items/basicitem/ShortcutBadge.qml index 7fa694031..f3a8a3241 100644 --- a/declarativeimports/abilities/items/basicitem/ShortcutBadge.qml +++ b/declarativeimports/abilities/items/basicitem/ShortcutBadge.qml @@ -4,7 +4,7 @@ */ import QtQuick 2.7 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.latte.components 1.0 as LatteComponents diff --git a/declarativeimports/components/AddingArea.qml b/declarativeimports/components/AddingArea.qml index 816cb8f40..b34726644 100644 --- a/declarativeimports/components/AddingArea.qml +++ b/declarativeimports/components/AddingArea.qml @@ -4,7 +4,7 @@ */ import QtQuick 2.7 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/declarativeimports/components/BadgeText.qml b/declarativeimports/components/BadgeText.qml index 9991f10a2..6f1e1a6a2 100644 --- a/declarativeimports/components/BadgeText.qml +++ b/declarativeimports/components/BadgeText.qml @@ -4,7 +4,7 @@ */ import QtQuick 2.2 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 diff --git a/declarativeimports/components/CheckBox.qml b/declarativeimports/components/CheckBox.qml index 3067bee2f..2e82199ec 100644 --- a/declarativeimports/components/CheckBox.qml +++ b/declarativeimports/components/CheckBox.qml @@ -3,7 +3,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import "private" as Private PlasmaComponents.CheckBox { diff --git a/declarativeimports/components/ComboBox.qml b/declarativeimports/components/ComboBox.qml index 0861570e2..38a3d1f5a 100644 --- a/declarativeimports/components/ComboBox.qml +++ b/declarativeimports/components/ComboBox.qml @@ -9,9 +9,9 @@ import QtQuick.Window 2.2 import QtQuick.Templates 2.2 as T import QtQuick.Controls 2.2 as Controls import QtQuick.Layouts 1.3 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.kirigami 2.2 as Kirigami import "private" as Private diff --git a/declarativeimports/components/ComboBoxButton.qml b/declarativeimports/components/ComboBoxButton.qml index 836e6bda1..34f9be4ac 100644 --- a/declarativeimports/components/ComboBoxButton.qml +++ b/declarativeimports/components/ComboBoxButton.qml @@ -7,7 +7,7 @@ import QtQuick.Controls 1.4 import QtQuick 2.2 import QtQuick.Layouts 1.3 -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.latte.components 1.0 as LatteComponents diff --git a/declarativeimports/components/ExternalShadow.qml b/declarativeimports/components/ExternalShadow.qml index 7b194cca9..9e1964689 100644 --- a/declarativeimports/components/ExternalShadow.qml +++ b/declarativeimports/components/ExternalShadow.qml @@ -6,7 +6,7 @@ import QtQuick 2.1 import org.kde.plasma.core 2.0 as PlasmaCore -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects Item{ id: shadowRoot diff --git a/declarativeimports/components/GlowPoint.qml b/declarativeimports/components/GlowPoint.qml index 811851baa..6b27e658d 100644 --- a/declarativeimports/components/GlowPoint.qml +++ b/declarativeimports/components/GlowPoint.qml @@ -4,9 +4,9 @@ */ import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects -import org.kde.plasma.components 2.0 as Components +import org.kde.plasma.components 3.0 as Components import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.plasmoid 2.0 diff --git a/declarativeimports/components/HeaderSwitch.qml b/declarativeimports/components/HeaderSwitch.qml index 625dbb974..b26112c75 100644 --- a/declarativeimports/components/HeaderSwitch.qml +++ b/declarativeimports/components/HeaderSwitch.qml @@ -4,12 +4,12 @@ */ import QtQuick 2.7 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.plasmoid 2.0 @@ -17,7 +17,7 @@ import "." as LatteExtraControls import "private" as Private -Item { +PlasmoidItem { id: item Layout.rightMargin: { diff --git a/declarativeimports/components/SubHeader.qml b/declarativeimports/components/SubHeader.qml index 98265b5f0..5d65c3acb 100644 --- a/declarativeimports/components/SubHeader.qml +++ b/declarativeimports/components/SubHeader.qml @@ -6,7 +6,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.3 -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents PlasmaComponents.Label { Layout.fillWidth: true diff --git a/declarativeimports/components/TextField.qml b/declarativeimports/components/TextField.qml index 5c9d5aca9..daa8a83da 100644 --- a/declarativeimports/components/TextField.qml +++ b/declarativeimports/components/TextField.qml @@ -6,7 +6,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.3 import QtQuick.Controls 1.4 -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents PlasmaComponents.TextField { id: textField diff --git a/declarativeimports/components/private/CheckBoxStyle.qml b/declarativeimports/components/private/CheckBoxStyle.qml index 8ae4df723..82cf458b8 100644 --- a/declarativeimports/components/private/CheckBoxStyle.qml +++ b/declarativeimports/components/private/CheckBoxStyle.qml @@ -6,12 +6,12 @@ import QtQuick 2.0 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import QtQuick.Controls.Styles.Plasma 2.0 as PlasmaStyles import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents PlasmaStyles.CheckBoxStyle{ id: checkboxStyle diff --git a/indicators/default/package/config/config.qml b/indicators/default/package/config/config.qml index 234b188d4..ec15ae7ba 100644 --- a/indicators/default/package/config/config.qml +++ b/indicators/default/package/config/config.qml @@ -6,10 +6,10 @@ import QtQuick 2.7 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.plasma.plasmoid 2.0 diff --git a/indicators/default/package/ui/main.qml b/indicators/default/package/ui/main.qml index b7c6dc6e6..bdafeb60e 100644 --- a/indicators/default/package/ui/main.qml +++ b/indicators/default/package/ui/main.qml @@ -5,11 +5,11 @@ import QtQuick 2.0 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.latte.core 0.2 as LatteCore import org.kde.latte.components 1.0 as LatteComponents diff --git a/indicators/org.kde.latte.plasma/package/config/config.qml b/indicators/org.kde.latte.plasma/package/config/config.qml index 4cd065926..5c4fa1f7f 100644 --- a/indicators/org.kde.latte.plasma/package/config/config.qml +++ b/indicators/org.kde.latte.plasma/package/config/config.qml @@ -9,7 +9,7 @@ import QtQuick.Layouts 1.3 import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.latte.components 1.0 as LatteComponents diff --git a/plasmoid/package/contents/ui/ContextMenu.qml b/plasmoid/package/contents/ui/ContextMenu.qml index b0c581683..5bd1e2eee 100644 --- a/plasmoid/package/contents/ui/ContextMenu.qml +++ b/plasmoid/package/contents/ui/ContextMenu.qml @@ -9,7 +9,7 @@ import QtQuick 2.0 import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.activities 0.1 as Activities import org.kde.taskmanager 0.1 as TaskManager @@ -84,14 +84,14 @@ PlasmaComponents.ContextMenu { function newMenuItem(parent) { return Qt.createQmlObject( - "import org.kde.plasma.components 2.0 as PlasmaComponents;" + + "import org.kde.plasma.components 3.0 as PlasmaComponents;" + "PlasmaComponents.MenuItem {}", parent); } function newSeparator(parent) { return Qt.createQmlObject( - "import org.kde.plasma.components 2.0 as PlasmaComponents;" + + "import org.kde.plasma.components 3.0 as PlasmaComponents;" + "PlasmaComponents.MenuItem { separator: true }", parent); } diff --git a/plasmoid/package/contents/ui/config/ConfigAppearance.qml b/plasmoid/package/contents/ui/config/ConfigAppearance.qml index 3c7bd4019..5e3e66eaa 100644 --- a/plasmoid/package/contents/ui/config/ConfigAppearance.qml +++ b/plasmoid/package/contents/ui/config/ConfigAppearance.qml @@ -7,12 +7,12 @@ import QtQuick 2.0 import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents -Item { +PlasmoidItem { id: mainItem width: childrenRect.width diff --git a/plasmoid/package/contents/ui/config/ConfigInteraction.qml b/plasmoid/package/contents/ui/config/ConfigInteraction.qml index 0bdb72380..44ff365eb 100644 --- a/plasmoid/package/contents/ui/config/ConfigInteraction.qml +++ b/plasmoid/package/contents/ui/config/ConfigInteraction.qml @@ -9,11 +9,11 @@ import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.latte.private.tasks 0.1 as LatteTasks -Item { +PlasmoidItem { width: childrenRect.width height: childrenRect.height diff --git a/plasmoid/package/contents/ui/config/ConfigPanel.qml b/plasmoid/package/contents/ui/config/ConfigPanel.qml index f9d000cc6..4b8e182b2 100644 --- a/plasmoid/package/contents/ui/config/ConfigPanel.qml +++ b/plasmoid/package/contents/ui/config/ConfigPanel.qml @@ -7,12 +7,12 @@ import QtQuick 2.0 import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents -Item { +PlasmoidItem { id: mainItem width: childrenRect.width diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index bac170931..e9201ed4c 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -5,12 +5,12 @@ */ import QtQuick 2.8 -import QtQuick.Layouts 1.1 +import QtQuick.Layouts -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.plasmoid 2.0 import org.kde.taskmanager 0.1 as TaskManager @@ -31,7 +31,7 @@ import "../code/tools.js" as TaskTools import "../code/activitiesTools.js" as ActivitiesTools import "../code/ColorizerTools.js" as ColorizerTools -Item { +PlasmoidItem { id:root Layout.fillWidth: scrollingEnabled && !root.vertical Layout.fillHeight: scrollingEnabled && root.vertical @@ -46,13 +46,7 @@ Item { LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft && !root.vertical LayoutMirroring.childrenInherit: true - property bool plasma515: LatteCore.Environment.plasmaDesktopVersion >= LatteCore.Environment.makeVersion(5,15,0) - property bool plasma518: LatteCore.Environment.plasmaDesktopVersion >= LatteCore.Environment.makeVersion(5,18,0) - property bool plasma520: LatteCore.Environment.plasmaDesktopVersion >= LatteCore.Environment.makeVersion(5,20,0) - property bool plasmaGreaterThan522: LatteCore.Environment.plasmaDesktopVersion >= LatteCore.Environment.makeVersion(5,21,75) - property bool plasmaAtLeast524: LatteCore.Environment.plasmaDesktopVersion >= LatteCore.Environment.makeVersion(5,24,0) - property bool plasmaAtLeast525: LatteCore.Environment.plasmaDesktopVersion >= LatteCore.Environment.makeVersion(5,24,75) - property bool plasmaAtLeast526: LatteCore.Environment.plasmaDesktopVersion >= LatteCore.Environment.makeVersion(5,25,75) + property bool plasmaAtLeast600: LatteCore.Environment.plasmaDesktopVersion >= LatteCore.Environment.makeVersion(6,0,0) property bool disableRestoreZoom: false //blocks restore animation in rightClick property bool disableAllWindowsFunctionality: plasmoid.configuration.hideAllTasks diff --git a/plasmoid/package/contents/ui/previews/ToolTipDelegate2.qml b/plasmoid/package/contents/ui/previews/ToolTipDelegate2.qml index 51baddcca..b4bbe2d90 100644 --- a/plasmoid/package/contents/ui/previews/ToolTipDelegate2.qml +++ b/plasmoid/package/contents/ui/previews/ToolTipDelegate2.qml @@ -9,13 +9,13 @@ import QtQuick 2.6 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import QtQml.Models 2.2 import org.kde.draganddrop 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons diff --git a/plasmoid/package/contents/ui/previews/ToolTipInstance.qml b/plasmoid/package/contents/ui/previews/ToolTipInstance.qml index 14582599d..91e12349d 100644 --- a/plasmoid/package/contents/ui/previews/ToolTipInstance.qml +++ b/plasmoid/package/contents/ui/previews/ToolTipInstance.qml @@ -9,11 +9,11 @@ import QtQuick 2.6 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import QtQml.Models 2.2 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons diff --git a/plasmoid/package/contents/ui/previews/ToolTipWindowMouseArea.qml b/plasmoid/package/contents/ui/previews/ToolTipWindowMouseArea.qml index 810175640..7671decab 100644 --- a/plasmoid/package/contents/ui/previews/ToolTipWindowMouseArea.qml +++ b/plasmoid/package/contents/ui/previews/ToolTipWindowMouseArea.qml @@ -6,7 +6,7 @@ import QtQuick 2.0 -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.latte.core 0.2 as LatteCore diff --git a/plasmoid/package/contents/ui/task/TaskIcon.qml b/plasmoid/package/contents/ui/task/TaskIcon.qml index 45450116c..543b33528 100644 --- a/plasmoid/package/contents/ui/task/TaskIcon.qml +++ b/plasmoid/package/contents/ui/task/TaskIcon.qml @@ -4,10 +4,10 @@ */ import QtQuick 2.7 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.private.taskmanager 0.1 as TaskManagerApplet diff --git a/plasmoid/package/contents/ui/task/TaskItem.qml b/plasmoid/package/contents/ui/task/TaskItem.qml index 8c6bfb374..d6a8ce4f6 100644 --- a/plasmoid/package/contents/ui/task/TaskItem.qml +++ b/plasmoid/package/contents/ui/task/TaskItem.qml @@ -6,10 +6,10 @@ import QtQuick 2.0 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.private.taskmanager 0.1 as TaskManagerApplet diff --git a/plasmoid/package/contents/ui/task/animations/RemoveWindowFromGroupAnimation.qml b/plasmoid/package/contents/ui/task/animations/RemoveWindowFromGroupAnimation.qml index 0beadf1ce..b4a769a85 100644 --- a/plasmoid/package/contents/ui/task/animations/RemoveWindowFromGroupAnimation.qml +++ b/plasmoid/package/contents/ui/task/animations/RemoveWindowFromGroupAnimation.qml @@ -5,7 +5,7 @@ */ import QtQuick 2.0 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/plasmoid/package/contents/ui/taskslayout/ScrollEdgeShadows.qml b/plasmoid/package/contents/ui/taskslayout/ScrollEdgeShadows.qml index 9bf147ca4..e166b6471 100644 --- a/plasmoid/package/contents/ui/taskslayout/ScrollEdgeShadows.qml +++ b/plasmoid/package/contents/ui/taskslayout/ScrollEdgeShadows.qml @@ -6,12 +6,12 @@ import QtQuick 2.7 import QtQuick.Controls 1.4 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -Item { +PlasmoidItem { id: shadowsContainer opacity: 0.4 diff --git a/plasmoid/package/contents/ui/taskslayout/ScrollOpacityMask.qml b/plasmoid/package/contents/ui/taskslayout/ScrollOpacityMask.qml index ee354e6bc..77feefc80 100644 --- a/plasmoid/package/contents/ui/taskslayout/ScrollOpacityMask.qml +++ b/plasmoid/package/contents/ui/taskslayout/ScrollOpacityMask.qml @@ -6,12 +6,12 @@ import QtQuick 2.7 import QtQuick.Controls 1.4 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore -Item { +PlasmoidItem { readonly property int gradientLength: appletAbilities.metrics.iconSize / 3 diff --git a/shell/package/contents/applet/CompactApplet.qml b/shell/package/contents/applet/CompactApplet.qml index 05fc965fc..40eaa2c11 100644 --- a/shell/package/contents/applet/CompactApplet.qml +++ b/shell/package/contents/applet/CompactApplet.qml @@ -6,10 +6,10 @@ import QtQuick 2.0 import QtQuick.Layouts 1.1 import QtQuick.Window 2.0 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.kquickcontrolsaddons 2.0 import org.kde.latte.core 0.2 as LatteCore diff --git a/shell/package/contents/configuration/CanvasConfiguration.qml b/shell/package/contents/configuration/CanvasConfiguration.qml index 3e37a5ab8..3ccc51198 100644 --- a/shell/package/contents/configuration/CanvasConfiguration.qml +++ b/shell/package/contents/configuration/CanvasConfiguration.qml @@ -4,10 +4,10 @@ */ import QtQuick 2.8 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.latte.private.app 0.1 as LatteApp import org.kde.latte.core 0.2 as LatteCore diff --git a/shell/package/contents/configuration/LatteDockConfiguration.qml b/shell/package/contents/configuration/LatteDockConfiguration.qml index 7c24b661f..3d104c79c 100644 --- a/shell/package/contents/configuration/LatteDockConfiguration.qml +++ b/shell/package/contents/configuration/LatteDockConfiguration.qml @@ -8,11 +8,11 @@ import QtQuick 2.7 import QtQuick.Controls 1.4 import QtQuick.Controls 2.12 as QtQuickControls212 import QtQuick.Layouts 1.3 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import QtQuick.Window 2.2 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.plasma.extras 2.0 as PlasmaExtras import QtQuick.Controls.Styles.Plasma 2.0 as Styles diff --git a/shell/package/contents/configuration/LatteDockSecondaryConfiguration.qml b/shell/package/contents/configuration/LatteDockSecondaryConfiguration.qml index 00784c356..48402ccec 100644 --- a/shell/package/contents/configuration/LatteDockSecondaryConfiguration.qml +++ b/shell/package/contents/configuration/LatteDockSecondaryConfiguration.qml @@ -7,11 +7,11 @@ import QtQuick 2.7 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import QtQuick.Window 2.2 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.extras 2.0 as PlasmaExtras import QtQuick.Controls.Styles.Plasma 2.0 as Styles diff --git a/shell/package/contents/configuration/canvas/HeaderSettings.qml b/shell/package/contents/configuration/canvas/HeaderSettings.qml index 44296d2e7..5822e087f 100644 --- a/shell/package/contents/configuration/canvas/HeaderSettings.qml +++ b/shell/package/contents/configuration/canvas/HeaderSettings.qml @@ -7,13 +7,13 @@ import QtQuick 2.7 import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.latte.core 0.2 as LatteCore import "controls" as SettingsControls -Item { +PlasmoidItem { id: headerSettings width: plasmoid.formFactor === PlasmaCore.Types.Horizontal ? parent.width : parent.height height: thickness diff --git a/shell/package/contents/configuration/canvas/SettingsOverlay.qml b/shell/package/contents/configuration/canvas/SettingsOverlay.qml index effb63198..17aef5e43 100644 --- a/shell/package/contents/configuration/canvas/SettingsOverlay.qml +++ b/shell/package/contents/configuration/canvas/SettingsOverlay.qml @@ -4,11 +4,11 @@ */ import QtQuick 2.7 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.latte.core 0.2 as LatteCore diff --git a/shell/package/contents/configuration/canvas/controls/Button.qml b/shell/package/contents/configuration/canvas/controls/Button.qml index 878500391..2ffe8dd28 100644 --- a/shell/package/contents/configuration/canvas/controls/Button.qml +++ b/shell/package/contents/configuration/canvas/controls/Button.qml @@ -7,7 +7,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents Item{ id: button diff --git a/shell/package/contents/configuration/canvas/maxlength/Ruler.qml b/shell/package/contents/configuration/canvas/maxlength/Ruler.qml index e823b6806..10b9774a8 100644 --- a/shell/package/contents/configuration/canvas/maxlength/Ruler.qml +++ b/shell/package/contents/configuration/canvas/maxlength/Ruler.qml @@ -8,7 +8,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.0 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.latte.core 0.2 as LatteCore diff --git a/shell/package/contents/configuration/canvas/maxlength/RulerMouseArea.qml b/shell/package/contents/configuration/canvas/maxlength/RulerMouseArea.qml index 1e01feb8a..0b28cf487 100644 --- a/shell/package/contents/configuration/canvas/maxlength/RulerMouseArea.qml +++ b/shell/package/contents/configuration/canvas/maxlength/RulerMouseArea.qml @@ -6,7 +6,7 @@ import QtQuick 2.7 import org.kde.plasma.plasmoid 2.0 -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.latte.core 0.2 as LatteCore diff --git a/shell/package/contents/configuration/pages/AppearanceConfig.qml b/shell/package/contents/configuration/pages/AppearanceConfig.qml index a27b56447..07e4a052a 100644 --- a/shell/package/contents/configuration/pages/AppearanceConfig.qml +++ b/shell/package/contents/configuration/pages/AppearanceConfig.qml @@ -7,11 +7,11 @@ import QtQuick 2.0 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import QtQuick.Dialogs 1.2 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.latte.core 0.2 as LatteCore diff --git a/shell/package/contents/configuration/pages/BehaviorConfig.qml b/shell/package/contents/configuration/pages/BehaviorConfig.qml index 2a77280cc..1b8c23fb4 100644 --- a/shell/package/contents/configuration/pages/BehaviorConfig.qml +++ b/shell/package/contents/configuration/pages/BehaviorConfig.qml @@ -7,10 +7,10 @@ import QtQuick 2.0 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.latte.core 0.2 as LatteCore diff --git a/shell/package/contents/configuration/pages/EffectsConfig.qml b/shell/package/contents/configuration/pages/EffectsConfig.qml index 25b7360c7..3d3d7a52f 100644 --- a/shell/package/contents/configuration/pages/EffectsConfig.qml +++ b/shell/package/contents/configuration/pages/EffectsConfig.qml @@ -6,12 +6,12 @@ import QtQuick 2.7 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import QtQuick.Dialogs 1.2 import QtQuick.Controls 2.12 as QtQuickControls212 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.plasma.extras 2.0 as PlasmaExtras diff --git a/shell/package/contents/configuration/pages/TasksConfig.qml b/shell/package/contents/configuration/pages/TasksConfig.qml index 49f6f7e63..1cb1cc795 100644 --- a/shell/package/contents/configuration/pages/TasksConfig.qml +++ b/shell/package/contents/configuration/pages/TasksConfig.qml @@ -6,10 +6,10 @@ import QtQuick 2.7 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.latte.core 0.2 as LatteCore diff --git a/shell/package/contents/controls/TypeSelection.qml b/shell/package/contents/controls/TypeSelection.qml index 6eab842fa..0080386f9 100644 --- a/shell/package/contents/controls/TypeSelection.qml +++ b/shell/package/contents/controls/TypeSelection.qml @@ -5,12 +5,12 @@ */ import QtQuick 2.7 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import QtQuick.Controls 1.4 import QtQuick.Layouts 1.3 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.plasmoid 2.0 diff --git a/shell/package/contents/views/AppletDelegate.qml b/shell/package/contents/views/AppletDelegate.qml index 02d33cdcb..592328508 100644 --- a/shell/package/contents/views/AppletDelegate.qml +++ b/shell/package/contents/views/AppletDelegate.qml @@ -9,12 +9,12 @@ import QtQuick 2.4 import QtQuick.Layouts 1.1 -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.draganddrop 2.0 -Item { +PlasmoidItem { id: delegate readonly property string pluginName: model.pluginName diff --git a/shell/package/contents/views/InfoView.qml b/shell/package/contents/views/InfoView.qml index de42212bd..da28d95cb 100644 --- a/shell/package/contents/views/InfoView.qml +++ b/shell/package/contents/views/InfoView.qml @@ -8,7 +8,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.1 import QtQuick.Window 2.1 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.latte.core 0.2 as LatteCore diff --git a/shell/package/contents/views/WidgetExplorer.qml b/shell/package/contents/views/WidgetExplorer.qml index e41a79a68..7f95e7dcc 100644 --- a/shell/package/contents/views/WidgetExplorer.qml +++ b/shell/package/contents/views/WidgetExplorer.qml @@ -8,7 +8,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.5 as QQC2 -import org.kde.plasma.components 2.0 as PC2 // for DialogStatus, ModelCOntextMenu, and Highlight +import org.kde.plasma.components 3.0 as PC2 // for DialogStatus, ModelCOntextMenu, and Highlight import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras