projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed a newly introduced crash on user mode changes
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
f572e1d
..
495a123
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-24,11
+24,13
@@
#include "ui_mainwin.h"
#include "qtui.h"
#include "ui_mainwin.h"
#include "qtui.h"
+#include "titlesetter.h"
#include <QSystemTrayIcon>
#include <QTimer>
class ServerListDlg;
#include <QSystemTrayIcon>
#include <QTimer>
class ServerListDlg;
+class ChannelListDlg;
class CoreConnectDlg;
class Buffer;
class BufferViewConfig;
class CoreConnectDlg;
class Buffer;
class BufferViewConfig;
@@
-38,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 {
@@
-50,9
+55,12
@@
class MainWin : public QMainWindow {
void init();
void addBufferView(BufferViewConfig *config = 0);
void init();
void addBufferView(BufferViewConfig *config = 0);
- AbstractUiMsg *layoutMsg(const Message &);
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:
@@
-65,6
+73,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();
@@
-74,11
+83,15
@@
class MainWin : public QMainWindow {
void addBufferView(int bufferViewConfigId);
void removeBufferView(int bufferViewConfigId);
void receiveMessage(const Message &msg);
void addBufferView(int bufferViewConfigId);
void removeBufferView(int bufferViewConfigId);
void receiveMessage(const Message &msg);
+ void showChannelList(NetworkId netId = NetworkId());
+ void showCoreInfoDlg();
void showSettingsDlg();
void showSettingsDlg();
- void showNetworkDlg();
- void showManageViewsDlg();
+ void on_actionEditNetworks_triggered();
+ void on_actionManageViews_triggered();
+ void on_actionLockDockPositions_toggled(bool lock);
void showAboutDlg();
void showDebugConsole();
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);
@@
-94,7
+107,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();
@@
-105,8
+123,11
@@
class MainWin : public QMainWindow {
QtUi *gui;
QMenu *systrayMenu;
QtUi *gui;
QMenu *systrayMenu;
+ QLabel *coreLagLabel;
QLabel *sslLabel;
QLabel *sslLabel;
+ TitleSetter _titleSetter;
+
void setupMenus();
void setupViews();
void setupNickWidget();
void setupMenus();
void setupViews();
void setupNickWidget();
@@
-130,6
+151,7
@@
class MainWin : public QMainWindow {
QTimer *timer;
CoreConnectDlg *coreConnectDlg;
QTimer *timer;
CoreConnectDlg *coreConnectDlg;
+ ChannelListDlg *channelListDlg;
SettingsDlg *settingsDlg;
DebugConsole *debugConsole;
SettingsDlg *settingsDlg;
DebugConsole *debugConsole;
@@
-139,8
+161,10
@@
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;
};