diff --git a/.kde-ci.yml b/.kde-ci.yml index a61474b0..34e1655c 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -9,6 +9,7 @@ Dependencies: 'frameworks/kcoreaddons': '@latest-kf6' 'frameworks/ki18n': '@latest-kf6' 'frameworks/kio': '@latest-kf6' + 'frameworks/kitemmodels': '@latest-kf6' 'frameworks/knotifications': '@latest-kf6' 'frameworks/kpackage': '@latest-kf6' 'frameworks/kservice': '@latest-kf6' diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dbab250..f565d596 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,6 +60,7 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS DBusAddons Plasma PlasmaQuick + ItemModels Service Notifications Wayland diff --git a/components/mobileshell/qml/statusbar/StatusBar.qml b/components/mobileshell/qml/statusbar/StatusBar.qml index 8127e76e..5c80bab9 100644 --- a/components/mobileshell/qml/statusbar/StatusBar.qml +++ b/components/mobileshell/qml/statusbar/StatusBar.qml @@ -17,6 +17,7 @@ import org.kde.kirigami as Kirigami import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.plasma5support 2.0 as P5Support import org.kde.plasma.components 3.0 as PlasmaComponents +import org.kde.kitemmodels as KItemModels import "indicators" as Indicators import "../dataproviders" as DataProviders @@ -144,9 +145,9 @@ Item { // system tray Repeater { id: statusNotifierRepeater - model: PlasmaCore.SortFilterModel { + model: KItemModels.KSortFilterProxyModel { id: filteredStatusNotifiers - filterRole: "Title" + filterRoleName: "Title" sourceModel: P5Support.DataModel { dataSource: statusNotifierSource ? statusNotifierSource : null } diff --git a/components/windowplugin/qml/WindowMaximizedTracker.qml b/components/windowplugin/qml/WindowMaximizedTracker.qml index f26bcc4c..6b43fc7a 100644 --- a/components/windowplugin/qml/WindowMaximizedTracker.qml +++ b/components/windowplugin/qml/WindowMaximizedTracker.qml @@ -6,6 +6,7 @@ import QtQuick import org.kde.plasma.core as PlasmaCore import org.kde.taskmanager as TaskManager import org.kde.plasma.private.mobileshell.windowplugin as WindowPlugin +import org.kde.kitemmodels as KItemModels pragma Singleton @@ -14,10 +15,10 @@ pragma Singleton QtObject { readonly property bool showingWindow: __internal.count > 0 && !WindowPlugin.WindowUtil.isShowingDesktop - property var __internal: PlasmaCore.SortFilterModel { + property var __internal: KItemModels.KSortFilterProxyModel { id: visibleMaximizedWindowsModel - filterRole: 'IsMinimized' - filterRegExp: 'false' + filterRoleName: 'IsMinimized' + filterString: 'false' sourceModel: TaskManager.TasksModel { id: tasksModel filterByVirtualDesktop: true