Port away from PlasmaComponents 2.0 on most places

2026-04-26 14:23:09 +00:00 · 2021-09-13 19:33:57 +02:00 · 2021-09-13 19:33:57 +02:00 · 0cd4f91ec4
commit 0cd4f91ec4
parent b091ce2ac3
32 changed files with 15 additions and 38 deletions
--- a/applets/activities/contents/ui/main.qml
+++ b/applets/activities/contents/ui/main.qml
@ -7,11 +7,12 @@
 import QtQuick 2.5
 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 2.0 as PlasmaComponents //Needed for Highlight
+import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.activities 0.1 as Activities

 ColumnLayout {
-    PlasmaComponents.ToolButton {
+    PlasmaComponents3.ToolButton {
        id: newButton
        Layout.fillWidth: true
        text: i18n("New Activity...")
@ -19,7 +20,7 @@ ColumnLayout {
            newEdit.visible = true;
            newEdit.forceActiveFocus();
        }
-        PlasmaComponents.TextField {
+        PlasmaComponents3.TextField {
            id: newEdit
            visible: false
            width: parent.width
@ -122,13 +123,13 @@ ColumnLayout {

                        positionAnim.running = true;
                    }
-                PlasmaComponents.Label {
+                PlasmaComponents3.Label {
                    id: label
                    text: model.name
                    anchors.verticalCenter: parent.verticalCenter
                    x: PlasmaCore.Units.smallSpacing
                }
-                PlasmaComponents.TextField {
+                PlasmaComponents3.TextField {
                    id: edit
                    visible: false
                    text: model.name
--- a/components/mobilehomescreencomponents/qml/DrawerDelegate.qml
+++ b/components/mobilehomescreencomponents/qml/DrawerDelegate.qml
@ -11,7 +11,7 @@ import QtGraphicalEffects 1.6

 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.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager 
--- a/components/mobilehomescreencomponents/qml/FavoriteStrip.qml
+++ b/components/mobilehomescreencomponents/qml/FavoriteStrip.qml
@ -10,7 +10,6 @@ import QtQuick.Controls 2.3 as Controls

 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.kquickcontrolsaddons 2.0


--- a/components/mobilehomescreencomponents/qml/LauncherContainer.qml
+++ b/components/mobilehomescreencomponents/qml/LauncherContainer.qml
@ -10,7 +10,6 @@ import QtQuick.Controls 2.3 as Controls

 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.kquickcontrolsaddons 2.0

 import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager 
--- a/components/mobilehomescreencomponents/qml/LauncherGrid.qml
+++ b/components/mobilehomescreencomponents/qml/LauncherGrid.qml
@ -10,7 +10,6 @@ import QtQuick.Controls 2.3 as Controls

 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.kquickcontrolsaddons 2.0
 import org.kde.kirigami 2.10 as Kirigami
 import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager 
--- a/components/mobilehomescreencomponents/qml/LauncherRepeater.qml
+++ b/components/mobilehomescreencomponents/qml/LauncherRepeater.qml
@ -11,7 +11,6 @@ import QtGraphicalEffects 1.6

 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.kquickcontrolsaddons 2.0

 import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager 
--- a/components/mobilehomescreencomponents/qml/private/ActionButton.qml
+++ b/components/mobilehomescreencomponents/qml/private/ActionButton.qml
@ -7,7 +7,6 @@

 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents

 PlasmaCore.ToolTipArea {
    id: button
--- a/containments/panel/package/contents/ui/indicators/Bluetooth.qml
+++ b/containments/panel/package/contents/ui/indicators/Bluetooth.qml
@ -9,7 +9,6 @@
 import QtQuick 2.2
 import QtQuick.Layouts 1.4
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.bluezqt 1.0 as BluezQt

 import "providers"
--- a/containments/panel/package/contents/ui/indicators/SignalStrength.qml
+++ b/containments/panel/package/contents/ui/indicators/SignalStrength.qml
@ -10,7 +10,7 @@ import QtQuick.Layouts 1.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

 import "providers"

--- a/containments/panel/package/contents/ui/indicators/Volume.qml
+++ b/containments/panel/package/contents/ui/indicators/Volume.qml
@ -9,7 +9,6 @@
 import QtQuick 2.2
 import QtQuick.Layouts 1.4
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.private.volume 0.1

 import "providers"
--- a/containments/panel/package/contents/ui/indicators/Wifi.qml
+++ b/containments/panel/package/contents/ui/indicators/Wifi.qml
@ -9,7 +9,7 @@
 import QtQuick 2.2
 import QtQuick.Layouts 1.4
 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.networkmanagement 0.2 as PlasmaNM

 import "providers"
--- a/containments/panel/package/contents/ui/indicators/providers/BluetoothProvider.qml
+++ b/containments/panel/package/contents/ui/indicators/providers/BluetoothProvider.qml
@ -9,7 +9,6 @@
 import QtQuick 2.2
 import QtQuick.Layouts 1.4
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.bluezqt 1.0 as BluezQt

 QtObject {
--- a/containments/panel/package/contents/ui/indicators/providers/SignalStrengthProvider.qml
+++ b/containments/panel/package/contents/ui/indicators/providers/SignalStrengthProvider.qml
@ -7,7 +7,6 @@
 */

 import QtQuick 2.1
-
 import org.kde.plasma.mm 1.0

 QtObject {
--- a/containments/panel/package/contents/ui/indicators/providers/VolumeProvider.qml
+++ b/containments/panel/package/contents/ui/indicators/providers/VolumeProvider.qml
@ -9,7 +9,6 @@
 import QtQuick 2.2
 import QtQuick.Layouts 1.4
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.private.volume 0.1

 import "../../volumeosd"
--- a/containments/panel/package/contents/ui/indicators/providers/WifiProvider.qml
+++ b/containments/panel/package/contents/ui/indicators/providers/WifiProvider.qml
@ -9,7 +9,6 @@
 import QtQuick 2.2
 import QtQuick.Layouts 1.4
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.networkmanagement 0.2 as PlasmaNM

 Item {
--- a/containments/panel/package/contents/ui/quicksettings/QuickSettingsPanel.qml
+++ b/containments/panel/package/contents/ui/quicksettings/QuickSettingsPanel.qml
@ -11,7 +11,6 @@ import QtQuick.Window 2.2
 import QtGraphicalEffects 1.12
 import org.kde.kirigami 2.12 as Kirigami
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.networkmanagement 0.2 as PlasmaNM
 import org.kde.bluezqt 1.0 as BluezQt
 import org.kde.colorcorrect 0.1 as CC
--- a/containments/panel/package/contents/ui/quicksettings/SettingsModel.qml
+++ b/containments/panel/package/contents/ui/quicksettings/SettingsModel.qml
@ -10,7 +10,6 @@ import QtQuick 2.14
 import QtQuick.Layouts 1.1
 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.networkmanagement 0.2 as PlasmaNM
 import org.kde.bluezqt 1.0 as BluezQt
 import org.kde.plasma.private.nanoshell 2.0 as NanoShell
--- a/containments/taskpanel/package/contents/ui/Button.qml
+++ b/containments/taskpanel/package/contents/ui/Button.qml
@ -9,7 +9,6 @@ import QtQuick.Layouts 1.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.kquickcontrolsaddons 2.0

 Item {
--- a/containments/taskpanel/package/contents/ui/main.qml
+++ b/containments/taskpanel/package/contents/ui/main.qml
@ -12,7 +12,6 @@ import QtGraphicalEffects 1.12
 import org.kde.taskmanager 0.1 as TaskManager
 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.kquickcontrolsaddons 2.0

 import org.kde.plasma.private.nanoshell 2.0 as NanoShell
--- a/look-and-feel/contents/components/DialerButton.qml
+++ b/look-and-feel/contents/components/DialerButton.qml
@ -7,7 +7,7 @@
 import QtQuick 2.0
 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

 PlasmaComponents.Label {
    horizontalAlignment: Qt.AlignHCenter
--- a/look-and-feel/contents/components/UserDelegate.qml
+++ b/look-and-feel/contents/components/UserDelegate.qml
@ -8,7 +8,7 @@
 import QtQuick 2.8
 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

 Item {
    id: wrapper
--- a/look-and-feel/contents/lockscreen/Keypad.qml
+++ b/look-and-feel/contents/lockscreen/Keypad.qml
@ -8,7 +8,7 @@ import QtQuick 2.12
 import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.12
-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.plasma.workspace.keyboardlayout 1.0
 import org.kde.kirigami 2.12 as Kirigami
--- a/look-and-feel/contents/lockscreen/LockScreen.qml
+++ b/look-and-feel/contents/lockscreen/LockScreen.qml
@ -9,7 +9,6 @@ import QtQuick 2.12
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.12
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.workspace.keyboardlayout 1.0
 import org.kde.notificationmanager 1.1 as Notifications
--- a/look-and-feel/contents/lockscreen/NotificationsList.qml
+++ b/look-and-feel/contents/lockscreen/NotificationsList.qml
@ -8,7 +8,6 @@ import QtQuick 2.15
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.12
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.notificationmanager 1.1 as Notifications
 import org.kde.kirigami 2.13 as Kirigami
--- a/look-and-feel/contents/lockscreen/PasswordBar.qml
+++ b/look-and-feel/contents/lockscreen/PasswordBar.qml
@ -8,7 +8,6 @@ import QtQuick 2.12
 import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.12
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.workspace.keyboardlayout 1.0
 import org.kde.kirigami 2.12 as Kirigami
--- a/look-and-feel/contents/lockscreen/SimpleNotification.qml
+++ b/look-and-feel/contents/lockscreen/SimpleNotification.qml
@ -9,7 +9,6 @@ import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.12

-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.extras 2.0 as PlasmaExtras
--- a/look-and-feel/contents/lockscreen/indicators/Bluetooth.qml
+++ b/look-and-feel/contents/lockscreen/indicators/Bluetooth.qml
@ -8,7 +8,6 @@
 import QtQuick 2.2
 import QtQuick.Layouts 1.4
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.bluezqt 1.0 as BluezQt

 PlasmaCore.IconItem {
--- a/look-and-feel/contents/lockscreen/indicators/SignalStrength.qml
+++ b/look-and-feel/contents/lockscreen/indicators/SignalStrength.qml
@ -9,9 +9,7 @@ import QtQuick 2.1
 import QtQuick.Layouts 1.1

 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
-
-import "providers"
+import org.kde.plasma.components 3.0 as PlasmaComponents

 Item {
    required property QtObject provider
--- a/look-and-feel/contents/lockscreen/indicators/Volume.qml
+++ b/look-and-feel/contents/lockscreen/indicators/Volume.qml
@ -8,7 +8,6 @@
 import QtQuick 2.2
 import QtQuick.Layouts 1.4
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.private.volume 0.1

 PlasmaCore.IconItem {
--- a/look-and-feel/contents/lockscreen/indicators/Wifi.qml
+++ b/look-and-feel/contents/lockscreen/indicators/Wifi.qml
@ -8,7 +8,7 @@
 import QtQuick 2.2
 import QtQuick.Layouts 1.4
 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.networkmanagement 0.2 as PlasmaNM

 PlasmaCore.IconItem {
--- a/shell/contents/views/Desktop.qml
+++ b/shell/contents/views/Desktop.qml
@ -10,7 +10,6 @@ import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.3
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.shell 2.0 as Shell
-import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.workspace.components 2.0 as PlasmaWorkspace
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.activities 0.1 as Activities
--- a/shell/contents/views/Pin.qml
+++ b/shell/contents/views/Pin.qml
@ -10,7 +10,7 @@ import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.5
 import org.kde.plasma.core 2.0 as PlasmaCore
 import QtGraphicalEffects 1.12
-import org.kde.plasma.components 2.0 as PlasmaComponents
+import org.kde.plasma.components 3.0 as PlasmaComponents
 import MeeGo.QOfono 0.2
 import "../components"