projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Work around MOC ignoring -D options by having dummy stubs"
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
73d1fa9
..
b2ea75a
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-29,7
+29,6
@@
#include <QSystemTrayIcon>
#include <QTimer>
#include <QSystemTrayIcon>
#include <QTimer>
-
class ServerListDlg;
class ChannelListDlg;
class CoreConnectDlg;
class ServerListDlg;
class ChannelListDlg;
class CoreConnectDlg;
@@
-41,6
+40,9
@@
class Message;
class NickListWidget;
class DebugConsole;
class NickListWidget;
class DebugConsole;
+#ifdef HAVE_DBUS
+# include "desktopnotifications.h"
+#endif
//!\brief The main window of Quassel's QtUi.
class MainWin : public QMainWindow {
//!\brief The main window of Quassel's QtUi.
class MainWin : public QMainWindow {
@@
-55,6
+57,10
@@
class MainWin : public QMainWindow {
void displayTrayIconMessage(const QString &title, const QString &message);
void displayTrayIconMessage(const QString &title, const QString &message);
+#ifdef HAVE_DBUS
+ void sendDesktopNotification(const QString &title, const QString &message);
+#endif
+
virtual bool event(QEvent *event);
public slots:
virtual bool event(QEvent *event);
public slots:
@@
-67,7
+73,7
@@
class MainWin : public QMainWindow {
protected slots:
void connectedToCore();
void setConnectedState();
protected slots:
void connectedToCore();
void setConnectedState();
- void updateLagIndicator(
floa
t lag);
+ void updateLagIndicator(
in
t lag);
void securedConnection();
void disconnectedFromCore();
void setDisconnectedState();
void securedConnection();
void disconnectedFromCore();
void setDisconnectedState();
@@
-100,7
+106,12
@@
class MainWin : public QMainWindow {
void loadLayout();
void saveLayout();
void loadLayout();
void saveLayout();
-
+
+#ifdef HAVE_DBUS
+ void desktopNotificationClosed(uint id, uint reason);
+ void desktopNotificationInvoked(uint id, const QString & action);
+#endif
+
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
@@
-149,6
+160,14
@@
class MainWin : public QMainWindow {
QList<QDockWidget *> _netViews;
NickListWidget *nickListWidget;
QList<QDockWidget *> _netViews;
NickListWidget *nickListWidget;
+ QAction *actionEditNetworks;
+ QList<QAction *> networkActions;
+
+#ifdef HAVE_DBUS
+ org::freedesktop::Notifications *desktopNotifications;
+ quint32 notificationId;
+#endif
+
friend class QtUi;
};
friend class QtUi;
};