diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/BrightnessItem.qml b/components/mobileshell/qml/actiondrawer/quicksettings/BrightnessItem.qml index b803d354..b9e96840 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/BrightnessItem.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/BrightnessItem.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 -import org.kde.kirigami 2.12 as Kirigami +import org.kde.kirigami 2.20 as Kirigami import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.plasma5support 2.0 as P5Support @@ -89,7 +89,7 @@ Item { anchors.right: parent.right anchors.top: parent.top - PlasmaCore.IconItem { + Kirigami.Icon { Layout.alignment: Qt.AlignVCenter Layout.leftMargin: Kirigami.Units.smallSpacing Layout.preferredWidth: Kirigami.Units.iconSizes.smallMedium @@ -121,7 +121,7 @@ Item { } } - PlasmaCore.IconItem { + Kirigami.Icon { Layout.alignment: Qt.AlignVCenter Layout.rightMargin: Kirigami.Units.smallSpacing Layout.preferredWidth: Kirigami.Units.iconSizes.smallMedium diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml index 9b076ab6..7eb4cece 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml @@ -70,7 +70,7 @@ QuickSettingsDelegate { cursorShape: Qt.PointingHandCursor - PlasmaCore.IconItem { + Kirigami.Icon { id: icon anchors.top: parent.top anchors.left: parent.left diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml index 29728b88..6103ecca 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml @@ -68,7 +68,7 @@ QuickSettingsDelegate { cursorShape: Qt.PointingHandCursor - PlasmaCore.IconItem { + Kirigami.Icon { id: icon anchors.centerIn: parent implicitWidth: Kirigami.Units.iconSizes.smallMedium diff --git a/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml b/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml index db15328f..22415f4f 100644 --- a/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml +++ b/components/mobileshell/qml/navigationpanel/NavigationPanelButton.qml @@ -63,7 +63,7 @@ Controls.AbstractButton { } } - PlasmaCore.IconItem { + Kirigami.Icon { id: icon readonly property real side: Math.min(button.width, button.height) anchors { diff --git a/components/mobileshell/qml/volumeosd/ListItemBase.qml b/components/mobileshell/qml/volumeosd/ListItemBase.qml index ae4d64f2..4919733d 100644 --- a/components/mobileshell/qml/volumeosd/ListItemBase.qml +++ b/components/mobileshell/qml/volumeosd/ListItemBase.qml @@ -26,7 +26,6 @@ Controls.ItemDelegate { property string label property alias listIcon: clientIcon.source - property alias iconUsesPlasmaTheme: clientIcon.usesPlasmaTheme property string type // sink, source, source-output onClicked: { @@ -49,7 +48,7 @@ Controls.ItemDelegate { } // application icon - PlasmaCore.IconItem { + Kirigami.Icon { id: clientIcon Layout.alignment: Qt.AlignVCenter Layout.rightMargin: Kirigami.Units.smallSpacing diff --git a/components/mobileshell/qml/volumeosd/StreamListItem.qml b/components/mobileshell/qml/volumeosd/StreamListItem.qml index 1df9585b..f066e6c4 100644 --- a/components/mobileshell/qml/volumeosd/StreamListItem.qml +++ b/components/mobileshell/qml/volumeosd/StreamListItem.qml @@ -40,5 +40,4 @@ ListItemBase { return "audio-volume-high" } - iconUsesPlasmaTheme: false } diff --git a/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml b/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml index 15ae42b6..141282e5 100644 --- a/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml +++ b/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml @@ -171,7 +171,7 @@ Item { Item { implicitHeight: queryField.height implicitWidth: height - PlasmaCore.IconItem { + Kirigami.Icon { anchors.fill: parent anchors.margins: Math.round(Kirigami.Units.smallSpacing) source: "start-here-symbolic" diff --git a/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml b/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml index 82c8c381..e6139770 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml @@ -41,14 +41,13 @@ RowLayout { spacing: Kirigami.Units.smallSpacing Layout.preferredHeight: Math.max(applicationNameLabel.implicitHeight, Kirigami.Units.iconSizes.small) - PlasmaCore.IconItem { + Kirigami.Icon { id: applicationIconItem Layout.topMargin: Kirigami.Units.smallSpacing Layout.bottomMargin: Kirigami.Units.smallSpacing Layout.preferredWidth: Kirigami.Units.iconSizes.small Layout.preferredHeight: Kirigami.Units.iconSizes.small source: notificationHeading.applicationIconSource - usesPlasmaTheme: false visible: valid } diff --git a/components/mobileshell/qml/widgets/notifications/NotificationItem.qml b/components/mobileshell/qml/widgets/notifications/NotificationItem.qml index 43f287b9..cb888be5 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationItem.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationItem.qml @@ -127,12 +127,11 @@ BaseNotificationItem { visible: iconItem.active - PlasmaCore.IconItem { + Kirigami.Icon { id: iconItem // don't show two identical icons readonly property bool active: valid && source != notificationItem.applicationIconSource anchors.fill: parent - usesPlasmaTheme: false smooth: true // don't show a generic "info" icon since this is a notification already source: notificationItem.icon !== "dialog-information" ? notificationItem.icon : "" diff --git a/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml b/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml index f58f1a37..cbd19364 100644 --- a/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml +++ b/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml @@ -92,11 +92,10 @@ MouseArea { fillMode: Image.PreserveAspectFit } - PlasmaCore.IconItem { + Kirigami.Icon { anchors.centerIn: parent width: height height: Kirigami.Units.iconSizes.roundedIconSize(parent.height) - usesPlasmaTheme: false source: !thumbnailer.busy && !thumbnailer.hasPreview ? thumbnailer.iconName : "" } diff --git a/containments/homescreens/folio/package/contents/ui/HomeDelegate.qml b/containments/homescreens/folio/package/contents/ui/HomeDelegate.qml index 76ccf2b4..80300720 100644 --- a/containments/homescreens/folio/package/contents/ui/HomeDelegate.qml +++ b/containments/homescreens/folio/package/contents/ui/HomeDelegate.qml @@ -157,7 +157,7 @@ ContainmentLayoutManager.ItemContainer { } spacing: 0 - PlasmaCore.IconItem { + Kirigami.Icon { id: icon Layout.alignment: Qt.AlignHCenter | Qt.AlignTop @@ -165,7 +165,6 @@ ContainmentLayoutManager.ItemContainer { Layout.minimumHeight: Math.min(Kirigami.Units.iconSizes.large, parent.height - delegate.reservedSpaceForLabel) Layout.preferredHeight: Layout.minimumHeight - usesPlasmaTheme: false source: modelData ? modelData.applicationIcon : "" Rectangle { diff --git a/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerGridDelegate.qml b/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerGridDelegate.qml index d54b94f0..3a3f77f5 100644 --- a/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerGridDelegate.qml +++ b/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerGridDelegate.qml @@ -108,7 +108,7 @@ MouseArea { } spacing: 0 - PlasmaCore.IconItem { + Kirigami.Icon { id: icon Layout.alignment: Qt.AlignHCenter | Qt.AlignTop @@ -116,7 +116,6 @@ MouseArea { Layout.minimumHeight: Math.floor(parent.height - delegate.reservedSpaceForLabel) Layout.preferredHeight: Layout.minimumHeight - usesPlasmaTheme: false source: model.applicationIcon Rectangle { diff --git a/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerListDelegate.qml b/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerListDelegate.qml index f6dbbd0f..b76057df 100644 --- a/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerListDelegate.qml +++ b/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerListDelegate.qml @@ -62,7 +62,7 @@ MouseArea { } spacing: 0 - PlasmaCore.IconItem { + Kirigami.Icon { id: icon Layout.alignment: Qt.AlignLeft @@ -71,7 +71,6 @@ MouseArea { Layout.minimumHeight: parent.height Layout.preferredHeight: Layout.minimumHeight - usesPlasmaTheme: false source: model.applicationIcon Rectangle { diff --git a/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml b/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml index 502d7c35..3224e7c5 100644 --- a/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml +++ b/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml @@ -270,10 +270,9 @@ Item { opacity: delegate.dragFolderAnimationProgress } - PlasmaCore.IconItem { + Kirigami.Icon { id: icon anchors.fill: parent - usesPlasmaTheme: false source: delegate.isFolder ? 'document-open-folder' : delegate.applicationIcon transform: Scale { diff --git a/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml b/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml index e7861bf8..4a0612af 100644 --- a/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml +++ b/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml @@ -133,7 +133,7 @@ MouseArea { } spacing: 0 - PlasmaCore.IconItem { + Kirigami.Icon { id: icon Kirigami.Theme.inherit: false diff --git a/kwin/mobiletaskswitcher/qml/Task.qml b/kwin/mobiletaskswitcher/qml/Task.qml index 6e642131..1172a236 100644 --- a/kwin/mobiletaskswitcher/qml/Task.qml +++ b/kwin/mobiletaskswitcher/qml/Task.qml @@ -165,11 +165,10 @@ Item { NumberAnimation { duration: Kirigami.Units.shortDuration } } - PlasmaCore.IconItem { + Kirigami.Icon { Layout.preferredHeight: Kirigami.Units.iconSizes.smallMedium Layout.preferredWidth: Kirigami.Units.iconSizes.smallMedium Layout.alignment: Qt.AlignVCenter - usesPlasmaTheme: false source: delegate.window.icon } diff --git a/kwin/mobiletaskswitcher/qml/TaskSwitcher.qml b/kwin/mobiletaskswitcher/qml/TaskSwitcher.qml index 6e63483d..f4c33b19 100644 --- a/kwin/mobiletaskswitcher/qml/TaskSwitcher.qml +++ b/kwin/mobiletaskswitcher/qml/TaskSwitcher.qml @@ -271,7 +271,7 @@ FocusScope { anchors.centerIn: parent - PlasmaCore.IconItem { + Kirigami.Icon { id: icon Layout.alignment: Qt.AlignHCenter implicitWidth: Kirigami.Units.iconSizes.large diff --git a/lookandfeel/contents/lockscreen/Keypad.qml b/lookandfeel/contents/lockscreen/Keypad.qml index d9e707fa..d3efc825 100644 --- a/lookandfeel/contents/lockscreen/Keypad.qml +++ b/lookandfeel/contents/lockscreen/Keypad.qml @@ -174,13 +174,13 @@ Rectangle { color: keypadRoot.buttonTextColor } - PlasmaCore.IconItem { + Kirigami.Icon { visible: modelData === "R" anchors.centerIn: parent source: "edit-clear" } - PlasmaCore.IconItem { + Kirigami.Icon { visible: modelData === "E" anchors.centerIn: parent source: "go-next" diff --git a/lookandfeel/contents/lockscreen/LockScreen.qml b/lookandfeel/contents/lockscreen/LockScreen.qml index 3929b3ee..4986857d 100644 --- a/lookandfeel/contents/lockscreen/LockScreen.qml +++ b/lookandfeel/contents/lockscreen/LockScreen.qml @@ -169,13 +169,13 @@ Item { anchors.bottomMargin: Kirigami.Units.gridUnit + flickable.position * 0.5 anchors.horizontalCenter: parent.horizontalCenter - sourceComponent: PlasmaCore.IconItem { + sourceComponent: Kirigami.Icon { id: scrollUpIcon implicitWidth: Kirigami.Units.iconSizes.smallMedium implicitHeight: Kirigami.Units.iconSizes.smallMedium opacity: 1 - flickable.openFactor - colorGroup: Kirigami.Theme.ComplementaryColorGroup + Kirigami.Theme.colorSet: Kirigami.Theme.ComplementaryColorGroup source: "arrow-up" } } @@ -215,12 +215,12 @@ Item { } // scroll down icon - PlasmaCore.IconItem { + Kirigami.Icon { Layout.alignment: Qt.AlignHCenter Layout.bottomMargin: Kirigami.Units.gridUnit implicitWidth: Kirigami.Units.iconSizes.smallMedium implicitHeight: Kirigami.Units.iconSizes.smallMedium - colorGroup: Kirigami.Theme.ComplementaryColorGroup + Kirigami.Theme.colorSet: Kirigami.Theme.ComplementaryColorGroup source: "arrow-down" opacity: Math.sin((Math.PI / 2) * flickable.openFactor + 1.5 * Math.PI) + 1 } diff --git a/lookandfeel/contents/logout/ActionButton.qml b/lookandfeel/contents/logout/ActionButton.qml index 97b23020..f201ba51 100644 --- a/lookandfeel/contents/logout/ActionButton.qml +++ b/lookandfeel/contents/logout/ActionButton.qml @@ -44,7 +44,7 @@ Item { } } - PlasmaCore.IconItem { + Kirigami.Icon { id: icon anchors { verticalCenter: buttonRect.verticalCenter @@ -53,8 +53,6 @@ Item { } width: iconSize height: iconSize - - colorSet: Kirigami.Theme.colorSet } PlasmaComponents3.Label { diff --git a/shell/contents/configuration/WallpaperSelector.qml b/shell/contents/configuration/WallpaperSelector.qml index 9accbf67..039163e8 100644 --- a/shell/contents/configuration/WallpaperSelector.qml +++ b/shell/contents/configuration/WallpaperSelector.qml @@ -73,7 +73,7 @@ Controls.Drawer { z: wallpapersView.currentIndex === index ? 2 : 0 contentItem: Item { - PlasmaCore.IconItem { + Kirigami.Icon { anchors.centerIn: parent width: Kirigami.Units.iconSizes.large height: width