Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb50340-notificationSystemApplicationName' into 'master'
[lipstick] Add LipstickApi::notificationSystemApplicationName(). JB#50340

See merge request mer-core/lipstick!145
  • Loading branch information
blam committed Jul 1, 2020
2 parents 82e7e76 + d916292 commit 64a3358
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/lipstickapi.cpp
Expand Up @@ -16,6 +16,7 @@

#include "homeapplication.h"
#include "compositor/lipstickcompositor.h"
#include "notifications/notificationmanager.h"

LipstickApi::LipstickApi(QObject *parent)
: QObject(parent)
Expand All @@ -40,3 +41,8 @@ ScreenshotResult *LipstickApi::takeScreenshot(const QString &path)
{
return ScreenshotService::saveScreenshot(path);
}

QString LipstickApi::notificationSystemApplicationName() const
{
return NotificationManager::instance(false)->systemApplicationName();
}
3 changes: 3 additions & 0 deletions src/lipstickapi.h
Expand Up @@ -23,6 +23,7 @@ class LIPSTICK_EXPORT LipstickApi : public QObject
Q_OBJECT
Q_PROPERTY(bool active READ active NOTIFY activeChanged)
Q_PROPERTY(QObject *compositor READ compositor CONSTANT)
Q_PROPERTY(QString notificationSystemApplicationName READ notificationSystemApplicationName CONSTANT)

public:
LipstickApi(QObject *parent = 0);
Expand All @@ -32,6 +33,8 @@ class LIPSTICK_EXPORT LipstickApi : public QObject

Q_INVOKABLE ScreenshotResult *takeScreenshot(const QString &path = QString());

QString notificationSystemApplicationName() const;

signals:
void activeChanged();
};
Expand Down

0 comments on commit 64a3358

Please sign in to comment.