projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #155 from TheOneRing/improve_connect
[quassel.git]
/
src
/
qtui
/
snorenotificationbackend.h
diff --git
a/src/qtui/snorenotificationbackend.h
b/src/qtui/snorenotificationbackend.h
index
bfdb25d
..
e0abdf7
100644
(file)
--- a/
src/qtui/snorenotificationbackend.h
+++ b/
src/qtui/snorenotificationbackend.h
@@
-27,13
+27,10
@@
#include "ui_snorentificationconfigwidget.h"
#include "ui_snorentificationconfigwidget.h"
-namespace Snore{
-class SnoreCore;
-class Icon;
-}
-class SystrayNotificationBackend;
+#include <libsnore/snore.h>
+#include <libsnore/notification/notification.h>
-#include <snore/core/notification/notification.h>
+class SystrayNotificationBackend;
class SnoreNotificationBackend : public AbstractNotificationBackend {
Q_OBJECT
class SnoreNotificationBackend : public AbstractNotificationBackend {
Q_OBJECT
@@
-44,51
+41,44
@@
public:
void notify(const Notification &);
void close(uint notificationId);
void notify(const Notification &);
void close(uint notificationId);
- virtual SettingsPage *createConfigWidget()const;
+ virtual SettingsPage *createConfigWidget()
const;
signals:
void activated(uint notificationId = 0);
public slots:
void actionInvoked(Snore::Notification);
signals:
void activated(uint notificationId = 0);
public slots:
void actionInvoked(Snore::Notification);
+
private slots:
private slots:
- void backendChanged(const QVariant &);
- void timeoutChanged(const QVariant &);
+ void setTraybackend(const QVariant &b);
private:
private:
- void setTraybackend();
- bool setSnoreBackend(const QString &backend);
class ConfigWidget;
class ConfigWidget;
- SystrayNotificationBackend * m_systrayBackend;
- Snore::SnoreCore *m_snore;
- QHash<uint,uint> m_notificationIds;
+#ifndef HAVE_KDE
+ SystrayNotificationBackend * m_systrayBackend = nullptr;
+#endif
+ QHash<uint, uint> m_notificationIds;
Snore::Icon m_icon;
Snore::Icon m_icon;
- int m_timeout;
+ Snore::Application m_application;
+ Snore::Alert m_alert;
};
class SnoreNotificationBackend::ConfigWidget : public SettingsPage {
Q_OBJECT
public:
};
class SnoreNotificationBackend::ConfigWidget : public SettingsPage {
Q_OBJECT
public:
- ConfigWidget(Snore::SnoreCore *snore,QWidget *parent = 0);
- void save();
- void load();
+ ConfigWidget(QWidget *parent = 0);
+
bool hasDefaults() const;
void defaults();
bool hasDefaults() const;
void defaults();
-
+ void load();
+ void save();
private slots:
private slots:
- void backendChanged(const QString&);
- void timeoutChanged(int);
+ void useSnnoreChanged(bool);
private:
Ui::SnoreNotificationConfigWidget ui;
private:
Ui::SnoreNotificationConfigWidget ui;
- Snore::SnoreCore *m_snore;
-
- // QSpinBox *timeoutBox;
-
- // bool enabled;
- // int timeout;
};
#endif
};
#endif