From b0aa4db8360bdd360f8a37f20a00727509106dc4 Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Tue, 26 Sep 2023 21:08:49 -0700 Subject: [PATCH] widgets/notifications: Fix notificationmanager import --- .../qml/widgets/notifications/BaseNotificationItem.qml | 2 +- .../qml/widgets/notifications/NotificationGroupHeader.qml | 2 +- .../qml/widgets/notifications/NotificationItem.qml | 2 +- .../qml/widgets/notifications/NotificationTimeText.qml | 2 +- .../qml/widgets/notifications/NotificationsWidget.qml | 2 +- components/mobileshell/qml/widgets/notifications/util.js | 4 ++-- .../halcyon/package/contents/ui/GridAppDelegate.qml | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/mobileshell/qml/widgets/notifications/BaseNotificationItem.qml b/components/mobileshell/qml/widgets/notifications/BaseNotificationItem.qml index e9f857ed..46373215 100644 --- a/components/mobileshell/qml/widgets/notifications/BaseNotificationItem.qml +++ b/components/mobileshell/qml/widgets/notifications/BaseNotificationItem.qml @@ -12,7 +12,7 @@ import QtQuick.Window import org.kde.plasma.plasma5support 2.0 as P5Support import org.kde.plasma.components 3.0 as PlasmaComponents3 -import org.kde.notificationmanager 1.0 as NotificationManager +import org.kde.notificationmanager as NotificationManager import org.kde.coreaddons 1.0 as KCoreAddons diff --git a/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml b/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml index 440d8607..9022995b 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationGroupHeader.qml @@ -15,7 +15,7 @@ import org.kde.plasma.core as PlasmaCore import org.kde.plasma.plasma5support 2.0 as P5Support import org.kde.plasma.components 3.0 as PlasmaComponents -import org.kde.notificationmanager 1.0 as NotificationManager +import org.kde.notificationmanager as NotificationManager import org.kde.coreaddons 1.0 as KCoreAddons diff --git a/components/mobileshell/qml/widgets/notifications/NotificationItem.qml b/components/mobileshell/qml/widgets/notifications/NotificationItem.qml index 3d4864bd..0f5d58d9 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationItem.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationItem.qml @@ -12,7 +12,7 @@ import QtQuick.Window 2.2 import org.kde.plasma.core as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents -import org.kde.notificationmanager 1.0 as NotificationManager +import org.kde.notificationmanager as NotificationManager import org.kde.kirigami 2.12 as Kirigami diff --git a/components/mobileshell/qml/widgets/notifications/NotificationTimeText.qml b/components/mobileshell/qml/widgets/notifications/NotificationTimeText.qml index e672f19b..0c85e8f2 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationTimeText.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationTimeText.qml @@ -12,7 +12,7 @@ import QtQuick.Window 2.2 import org.kde.plasma.plasma5support 2.0 as P5Support import org.kde.plasma.components 3.0 as PlasmaComponents -import org.kde.notificationmanager 1.0 as NotificationManager +import org.kde.notificationmanager as NotificationManager import org.kde.coreaddons 1.0 as KCoreAddons diff --git a/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml b/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml index 658d43ed..53b50c0f 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml @@ -18,7 +18,7 @@ import org.kde.plasma.private.mobileshell.shellsettingsplugin as ShellSettings import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.components 3.0 as PlasmaComponents3 -import org.kde.notificationmanager 1.0 as NotificationManager +import org.kde.notificationmanager as NotificationManager /** * Embeddable notification list widget optimized for mobile and touch. diff --git a/components/mobileshell/qml/widgets/notifications/util.js b/components/mobileshell/qml/widgets/notifications/util.js index b9394518..acdc6d04 100644 --- a/components/mobileshell/qml/widgets/notifications/util.js +++ b/components/mobileshell/qml/widgets/notifications/util.js @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -.import org.kde.notificationmanager 1.0 as NotificationManager -.import QtQml 2.15 as QtQml +.import org.kde.notificationmanager as NotificationManager +.import QtQml as QtQml function determineNotificationHeadingText(notificationItem) { if (notificationItem.notificationType === NotificationManager.Notifications.JobType) { diff --git a/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml b/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml index 4a0612af..478bc3dc 100644 --- a/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml +++ b/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml @@ -156,7 +156,7 @@ MouseArea { radius: width width: Kirigami.Units.smallSpacing height: width - color: theme.highlightColor + color: Kirigami.Theme.highlightColor } // darken effect when hovered/pressed @@ -192,7 +192,7 @@ MouseArea { text: application.name - font.pointSize: theme.defaultFont.pointSize * 0.85 + font.pointSize: Kirigami.Theme.defaultFont.pointSize * 0.85 font.weight: Font.Bold color: "white" }