From 662586b2febb26f72794fc9a4493186bf05968ae Mon Sep 17 00:00:00 2001 From: zhaoyingzhen Date: Sat, 23 Nov 2024 09:52:59 +0800 Subject: [PATCH] chore: dde notification dbus adaptor export standard interface as title Log: as title --- panels/notification/server/dbusadaptor.cpp | 22 ++++++++++++++++++++++ panels/notification/server/dbusadaptor.h | 14 ++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/panels/notification/server/dbusadaptor.cpp b/panels/notification/server/dbusadaptor.cpp index 52eb40c4d..9adb6d652 100644 --- a/panels/notification/server/dbusadaptor.cpp +++ b/panels/notification/server/dbusadaptor.cpp @@ -53,6 +53,28 @@ DDENotificationDbusAdaptor::DDENotificationDbusAdaptor(QObject *parent) setAutoRelaySignals(true); } +QStringList DDENotificationDbusAdaptor::GetCapabilities() +{ + return manager()->GetCapabilities(); +} + +uint DDENotificationDbusAdaptor::Notify(const QString &appName, uint replacesId, const QString &appIcon, + const QString &summary, const QString &body, const QStringList &actions, const QVariantMap &hints, + int expireTimeout) +{ + return manager()->Notify(appName, replacesId, appIcon, summary, body, actions, hints, expireTimeout); +} + +void DDENotificationDbusAdaptor::CloseNotification(uint id) +{ + manager()->CloseNotification(id); +} + +void DDENotificationDbusAdaptor::GetServerInformation(QString &name, QString &vendor, QString &version, QString &specVersion) +{ + manager()->GetServerInformation(name, vendor, version, specVersion); +} + NotificationManager *DDENotificationDbusAdaptor::manager() const { return qobject_cast(parent()); diff --git a/panels/notification/server/dbusadaptor.h b/panels/notification/server/dbusadaptor.h index 41b6df3c8..243921756 100644 --- a/panels/notification/server/dbusadaptor.h +++ b/panels/notification/server/dbusadaptor.h @@ -4,8 +4,6 @@ #pragma once -#include "dsglobal.h" - #include #include @@ -46,6 +44,18 @@ class DDENotificationDbusAdaptor : public QDBusAbstractAdaptor public: explicit DDENotificationDbusAdaptor(QObject *parent = nullptr); +public Q_SLOTS: // methods + QStringList GetCapabilities(); + uint Notify(const QString &appName, uint replacesId, const QString &appIcon, const QString &summary, + const QString &body, const QStringList &actions, const QVariantMap &hints, int expireTimeout); + void CloseNotification(uint id); + void GetServerInformation(QString &name, QString &vendor, QString &version, QString &specVersion); + +Q_SIGNALS: + void ActionInvoked(uint id, const QString &actionKey); + void NotificationClosed(uint id, uint reason); + // todo void ActivationToken(uint id, const QString &activationToken) + public Q_SLOTS: // methods uint recordCount() const;