From 391c0ef5f53c1e0fda3ae3e697a587f268c92792 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 3 Jun 2023 16:52:36 +0300 Subject: [PATCH] plasma: notification applet warnings fix requires 30ed152379f89649211ad4fcc349674d740dd60a from kdelibs Signed-off-by: Ivailo Monev --- plasma/applets/notifications/contents/ui/Jobs.qml | 3 +-- .../notifications/contents/ui/Notifications.qml | 28 +++++++++++++--------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/plasma/applets/notifications/contents/ui/Jobs.qml b/plasma/applets/notifications/contents/ui/Jobs.qml index 7e2f2a2e..73f1ef02 100644 --- a/plasma/applets/notifications/contents/ui/Jobs.qml +++ b/plasma/applets/notifications/contents/ui/Jobs.qml @@ -44,10 +44,9 @@ Column { return } var message = runningJobs[source]["label1"] ? runningJobs[source]["label1"] : runningJobs[source]["label0"] - notifications.addNotification( + notifications.addJobNotification( source, runningJobs[source]["appIconName"], - 0, runningJobs[source]["appName"], i18n("%1 [Finished]", runningJobs[source]["infoMessage"]), message, diff --git a/plasma/applets/notifications/contents/ui/Notifications.qml b/plasma/applets/notifications/contents/ui/Notifications.qml index ee9b1213..359dde48 100644 --- a/plasma/applets/notifications/contents/ui/Notifications.qml +++ b/plasma/applets/notifications/contents/ui/Notifications.qml @@ -51,17 +51,19 @@ Column { if (notificationsModel.count > 20) { notificationsModel.remove(notificationsModel.count-1) } - var notification = {"source" : source, - "appIcon" : appIcon, - "image" : image, - "appName" : appName, - "summary" : summary, - "body" : body, - "expireTimeout": expireTimeout, - "urgency" : urgency, - "configurable": configurable, - "appRealName": appRealName, - "actions" : actions} + var notification = { + "source" : source, + "appIcon" : appIcon, + "image" : image, + "appName" : appName, + "summary" : summary, + "body" : body, + "expireTimeout": expireTimeout, + "urgency" : urgency, + "configurable": configurable, + "appRealName": appRealName, + "actions" : actions + } notificationsModel.inserting = true; notificationsModel.insert(0, notification); notificationsModel.inserting = false; @@ -74,6 +76,10 @@ Column { lastNotificationPopup.popup(notification) } + function addJobNotification(source, appIcon, appName, summary, body, expireTimeout, urgency, actions) { + addNotification(source, appIcon, new QImage, appName, summary, body, expireTimeout, urgency, appName, false, actions) + } + function executeAction(source, id) { //try to use the service if (source.indexOf("notification") !== -1) { -- 2.11.0