configuration: port desktop stuff away from PlasmaCore

GIT_SILENT

desktoppackage/contents/configuration/AppletConfiguration.qml

@@ -18,11 +18,11 @@ import org.kde.plasma.configuration 2.0
 Rectangle {
     id: root
 
-    implicitWidth: PlasmaCore.Units.gridUnit * 40
-    implicitHeight: PlasmaCore.Units.gridUnit * 30
+    implicitWidth: Kirigami.Units.gridUnit * 40
+    implicitHeight: Kirigami.Units.gridUnit * 30
 
-    Layout.minimumWidth: PlasmaCore.Units.gridUnit * 30
-    Layout.minimumHeight: PlasmaCore.Units.gridUnit * 21
+    Layout.minimumWidth: Kirigami.Units.gridUnit * 30
+    Layout.minimumHeight: Kirigami.Units.gridUnit * 21
 
     LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
@@ -42,6 +42,7 @@ Rectangle {
         }
     }
 
+    // TODO: port to KItemModels.KSortFilterProxyModel
     PlasmaCore.SortFilterModel {
         id: configDialogFilterModel
         sourceModel: configDialog.configModel

desktoppackage/contents/configuration/ConfigCategoryDelegate.qml

@@ -9,7 +9,6 @@ import QtQuick 2.0
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.3 as QQC2
 import QtQuick.Window 2.2
-import org.kde.plasma.core 2.0 as PlasmaCore
 
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.kirigami 2.5 as Kirigami
@@ -44,12 +43,12 @@ QQC2.ItemDelegate {
 //BEGIN UI components
     contentItem: ColumnLayout {
         id: delegateContents
-        spacing: PlasmaCore.Units.smallSpacing
+        spacing: Kirigami.Units.smallSpacing
 
         QIconItem {
             id: iconItem
             Layout.alignment: Qt.AlignHCenter
-            width: PlasmaCore.Units.iconSizes.medium
+            width: Kirigami.Units.iconSizes.medium
             height: width
             icon: model.icon
             state: highlighted && Window.active ? QIconItem.SelectedState : QIconItem.DefaultState
@@ -58,8 +57,8 @@ QQC2.ItemDelegate {
         QQC2.Label {
             id: nameLabel
             Layout.fillWidth: true
-            Layout.leftMargin: PlasmaCore.Units.smallSpacing
-            Layout.rightMargin: PlasmaCore.Units.smallSpacing
+            Layout.leftMargin: Kirigami.Units.smallSpacing
+            Layout.rightMargin: Kirigami.Units.smallSpacing
             text: model.name
             wrapMode: Text.Wrap
             horizontalAlignment: Text.AlignHCenter

desktoppackage/contents/configuration/ConfigurationContainmentAppearance.qml

@@ -11,7 +11,6 @@ import QtQuick.Layouts 1.1
 import QtQml 2.15
 
 import org.kde.newstuff 1.62 as NewStuff
-import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.kirigami 2.5 as Kirigami
 import org.kde.kcm 1.4
 
@@ -19,7 +18,7 @@ AbstractKCM {
     id: root
     signal settingValueChanged
 
-    property int formAlignment: wallpaperComboBox.Kirigami.ScenePosition.x - root.Kirigami.ScenePosition.x + (PlasmaCore.Units.largeSpacing/2)
+    property int formAlignment: wallpaperComboBox.Kirigami.ScenePosition.x - root.Kirigami.ScenePosition.x + (Kirigami.Units.largeSpacing/2)
     property string currentWallpaper: ""
     property string containmentPlugin: ""
 
@@ -83,7 +82,6 @@ AbstractKCM {
                 Kirigami.FormData.label: i18nd("plasma_shell_org.kde.plasma.desktop", "Layout:")
                 enabled: !plasmoid.immutable
                 model: configDialog.containmentPluginsConfigModel
-                implicitWidth: PlasmaCore.Theme.mSize(PlasmaCore.Theme.defaultFont).width * 24
                 textRole: "name"
                 onActivated: {
                     var model = configDialog.containmentPluginsConfigModel.get(currentIndex)
@@ -100,7 +98,6 @@ AbstractKCM {
                     id: wallpaperComboBox
                     Layout.preferredWidth: Math.max(implicitWidth, pluginComboBox.implicitWidth)
                     model: configDialog.wallpaperConfigModel
-                    implicitWidth: PlasmaCore.Theme.mSize(PlasmaCore.Theme.defaultFont).width * 24
                     textRole: "name"
                     onActivated: {
                         var model = configDialog.wallpaperConfigModel.get(currentIndex)

desktoppackage/contents/configuration/ContainmentConfiguration.qml

@@ -6,17 +6,16 @@
 
 import QtQuick 2.0
 import QtQuick.Layouts 1.0
-import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.configuration 2.0
 
 
 AppletConfiguration {
     id: root
     isContainment: true
-    Layout.minimumWidth: PlasmaCore.Units.gridUnit * 30
-    Layout.minimumHeight: PlasmaCore.Units.gridUnit * 20
-    Layout.preferredWidth: PlasmaCore.Units.gridUnit * 32
-    Layout.preferredHeight: PlasmaCore.Units.gridUnit * 36
+    Layout.minimumWidth: Kirigami.Units.gridUnit * 30
+    Layout.minimumHeight: Kirigami.Units.gridUnit * 20
+    Layout.preferredWidth: Kirigami.Units.gridUnit * 32
+    Layout.preferredHeight: Kirigami.Units.gridUnit * 36
     Layout.maximumWidth: plasmoid.availableScreenRect.width
     Layout.maximumHeight: plasmoid.availableScreenRect.height