Merge remote-tracking branch 'pr1/dbus-notif' into dev

.github/workflows/c-cpp.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Dependencies
       run: sudo apt-get install tree cmake qtbase5-dev libxss-dev libxrandr-dev
     - name: Build

src/powerkit.h

@@ -33,6 +33,9 @@
 #define LOGIND_MANAGER "org.freedesktop.login1.Manager"
 #define LOGIND_DOCKED "Docked"
 
+#define NOTIFY_SERVICE "org.freedesktop.Notifications"
+#define NOTIFY_PATH "/org/freedesktop/Notifications"
+
 #define UPOWER_PATH "/org/freedesktop/UPower"
 #define UPOWER_MANAGER "org.freedesktop.UPower"
 #define UPOWER_DEVICES "/org/freedesktop/UPower/devices/"
@@ -179,7 +182,7 @@ private slots:
                                          quint32 cookie);
     void handleDelInhibitScreenSaver(quint32 cookie);
     void handleDelInhibitPowerManagement(quint32 cookie);
-    
+
     bool registerSuspendLock();
     void setWakeAlarmFromSettings();
 

src/powerkit_notify.cpp

@@ -0,0 +1,47 @@
+/*
+# PowerKit <https://github.com/rodlie/powerkit>
+# Copyright (c) 2018-2022 Ole-André Rodlie <[email protected]> All rights reserved.
+#
+# Available under the 3-clause BSD license
+# See the LICENSE file for full details
+*/
+
+#include "powerkit_notify.h"
+#include "powerkit_def.h"
+#include "powerkit.h"
+
+SystemNotification::SystemNotification(QObject* parent)
+  : QObject(parent)
+{
+    dbus =
+      new QDBusInterface(NOTIFY_SERVICE,
+                         NOTIFY_PATH,
+                         NOTIFY_SERVICE,
+                         QDBusConnection::sessionBus(),
+                         this);
+    valid = dbus->isValid();
+}
+
+void SystemNotification::sendMessage(const QString& text,
+                                     const QString& title,
+                                     const bool critical)
+{
+    QList<QVariant> args;
+    QVariantMap hintsMap;
+    int timeout = 5000;
+
+    if (critical) {
+        hintsMap.insert("urgency", QVariant::fromValue(uchar(2)));
+        timeout = 0;
+    }
+
+    args << (qAppName())                 // appname
+         << static_cast<unsigned int>(0) // id
+         << DEFAULT_NOTIFY_ICON          // icon
+         << title                        // summary
+         << text                         // body
+         << QStringList()                // actions
+         << hintsMap                     // hints
+         << timeout;                     // timeout
+    dbus->callWithArgumentList( QDBus::AutoDetect, QString("Notify"), args);
+}

src/powerkit_notify.h

@@ -0,0 +1,36 @@
+/*
+# PowerKit <https://github.com/rodlie/powerkit>
+# Copyright (c) 2018-2022 Ole-André Rodlie <[email protected]> All rights reserved.
+#
+# Available under the 3-clause BSD license
+# See the LICENSE file for full details
+*/
+
+#ifndef NOTIFY_H
+#define NOTIFY_H
+
+#include <QObject>
+#include <QApplication>
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QVariant>
+
+class QDBusInterface;
+
+class SystemNotification : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit SystemNotification(QObject* parent = nullptr);
+    bool valid;
+
+    void sendMessage(const QString& text,
+                     const QString& title,
+                     const bool critical);
+
+private:
+    QDBusInterface *dbus;
+};
+
+#endif // NOTIFY_H

src/powerkit_systray.cpp

@@ -10,6 +10,7 @@
 #include "powerkit_systray.h"
 #include "powerkit_def.h"
 #include "powerkit_theme.h"
+#include "powerkit_notify.h"
 #include "powerkit_settings.h"
 #include "powerkit_backlight.h"
 #include "powerkit_cpu.h"
@@ -897,13 +898,18 @@ void SysTray::showMessage(const QString &title,
                           const QString &msg,
                           bool critical)
 {
-    if (tray->isVisible() && showNotifications) {
-        if (critical) {
-            tray->showMessage(title, msg,
-                              QSystemTrayIcon::Critical,
-                              900000);
-        } else {
-            tray->showMessage(title, msg);
+    if (showNotifications) {
+        SystemNotification notifier;
+        if (notifier.valid) {
+            notifier.sendMessage(title, msg, critical);
+        } else if (tray->isVisible()) {
+            if (critical) {
+                tray->showMessage(title, msg,
+                        QSystemTrayIcon::Critical,
+                        900000);
+            } else {
+                tray->showMessage(title, msg);
+            }
         }
     }
 }