projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing BR #261 (making fields removable from the chatmonitor). Changes effect current...
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
1c5521e
..
8cffe8b
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-29,18
+29,21
@@
#include <QSystemTrayIcon>
#include <QTimer>
#include <QSystemTrayIcon>
#include <QTimer>
-
class ServerListDlg;
class ChannelListDlg;
class CoreConnectDlg;
class Buffer;
class BufferViewConfig;
class ServerListDlg;
class ChannelListDlg;
class CoreConnectDlg;
class Buffer;
class BufferViewConfig;
+class MsgProcessorStatusWidget;
class SettingsDlg;
class QtUi;
class Message;
class NickListWidget;
class DebugConsole;
class SettingsDlg;
class QtUi;
class Message;
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
+58,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,6
+74,7
@@
class MainWin : public QMainWindow {
protected slots:
void connectedToCore();
void setConnectedState();
protected slots:
void connectedToCore();
void setConnectedState();
+ void updateLagIndicator(int lag);
void securedConnection();
void disconnectedFromCore();
void setDisconnectedState();
void securedConnection();
void disconnectedFromCore();
void setDisconnectedState();
@@
-75,7
+83,7
@@
class MainWin : public QMainWindow {
private slots:
void addBufferView(int bufferViewConfigId);
void removeBufferView(int bufferViewConfigId);
private slots:
void addBufferView(int bufferViewConfigId);
void removeBufferView(int bufferViewConfigId);
- void
receiveMessage(const Message &msg
);
+ void
messagesInserted(const QModelIndex &parent, int start, int end
);
void showChannelList(NetworkId netId = NetworkId());
void showCoreInfoDlg();
void showSettingsDlg();
void showChannelList(NetworkId netId = NetworkId());
void showCoreInfoDlg();
void showSettingsDlg();
@@
-84,6
+92,7
@@
class MainWin : public QMainWindow {
void on_actionLockDockPositions_toggled(bool lock);
void showAboutDlg();
void showDebugConsole();
void on_actionLockDockPositions_toggled(bool lock);
void showAboutDlg();
void showDebugConsole();
+ void on_actionDebugNetworkModel_triggered(bool);
void showCoreConnectionDlg(bool autoConnect = false);
void coreConnectionDlgFinished(int result);
void showCoreConnectionDlg(bool autoConnect = false);
void coreConnectionDlgFinished(int result);
@@
-99,7
+108,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();
@@
-110,7
+124,9
@@
class MainWin : public QMainWindow {
QtUi *gui;
QMenu *systrayMenu;
QtUi *gui;
QMenu *systrayMenu;
+ QLabel *coreLagLabel;
QLabel *sslLabel;
QLabel *sslLabel;
+ MsgProcessorStatusWidget *msgProcessorStatusWidget;
TitleSetter _titleSetter;
TitleSetter _titleSetter;
@@
-147,6
+163,11
@@
class MainWin : public QMainWindow {
QList<QDockWidget *> _netViews;
NickListWidget *nickListWidget;
QList<QDockWidget *> _netViews;
NickListWidget *nickListWidget;
+#ifdef HAVE_DBUS
+ org::freedesktop::Notifications *desktopNotifications;
+ quint32 notificationId;
+#endif
+
friend class QtUi;
};
friend class QtUi;
};