projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finally sanitizificat0red the mess and #ifdef hell with main.cpp, Global:: and friends
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
c2cdfce
..
a055115
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-24,38
+24,44
@@
#include "ui_mainwin.h"
#include "qtui.h"
#include "ui_mainwin.h"
#include "qtui.h"
-#include "bufferviewfilter.h"
+#include "titlesetter.h"
+#include "sessionsettings.h"
#include <QSystemTrayIcon>
#include <QTimer>
#include <QSystemTrayIcon>
#include <QTimer>
-class ServerListDlg;
-class CoreConnectDlg;
class Buffer;
class Buffer;
-class
SettingsDl
g;
-class
QtUi
;
+class
BufferViewConfi
g;
+class
MsgProcessorStatusWidget
;
class Message;
class NickListWidget;
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 {
Q_OBJECT
public:
//!\brief The main window of Quassel's QtUi.
class MainWin : public QMainWindow {
Q_OBJECT
public:
- MainWin(Q
tUi *gui, Q
Widget *parent = 0);
+ MainWin(QWidget *parent = 0);
virtual ~MainWin();
void init();
virtual ~MainWin();
void init();
-
QDockWidget *addBufferView(const QString &, QAbstractItemModel *, const BufferViewFilter::Modes &, const QList<NetworkId> &
);
+
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);
- virtual bool event(QEvent *event);
+#ifdef HAVE_DBUS
+ void sendDesktopNotification(const QString &title, const QString &message);
+#endif
+ virtual bool event(QEvent *event);
public slots:
void setTrayIconActivity(bool active = false);
public slots:
void setTrayIconActivity(bool active = false);
+ void saveStateToSession(const QString &sessionId);
+ void saveStateToSessionSettings(SessionSettings &s);
protected:
void closeEvent(QCloseEvent *event);
protected:
void closeEvent(QCloseEvent *event);
@@
-63,40
+69,57
@@
class MainWin : public QMainWindow {
protected slots:
void connectedToCore();
protected slots:
void connectedToCore();
+ void setConnectedState();
+ void updateLagIndicator(int lag);
void securedConnection();
void disconnectedFromCore();
void securedConnection();
void disconnectedFromCore();
+ void setDisconnectedState();
void systrayActivated( QSystemTrayIcon::ActivationReason );
private slots:
void systrayActivated( QSystemTrayIcon::ActivationReason );
private slots:
- void receiveMessage(const Message &msg);
+ void addBufferView(int bufferViewConfigId);
+ void removeBufferView(int bufferViewConfigId);
+ void messagesInserted(const QModelIndex &parent, int start, int end);
+ void showChannelList(NetworkId netId = NetworkId());
+ void showCoreInfoDlg();
void showSettingsDlg();
void showSettingsDlg();
- void showNetworkDlg();
+ void on_actionEditNetworks_triggered();
+ void on_actionManageViews_triggered();
+ void on_actionLockDockPositions_toggled(bool lock);
void showAboutDlg();
void showAboutDlg();
- void
showDebugConsole(
);
+ void
on_actionDebugNetworkModel_triggered(bool
);
void showCoreConnectionDlg(bool autoConnect = false);
void showCoreConnectionDlg(bool autoConnect = false);
- void coreConnectionDlgFinished(int result);
void clientNetworkCreated(NetworkId);
void clientNetworkRemoved(NetworkId);
void clientNetworkUpdated();
void connectOrDisconnectFromNet();
void clientNetworkCreated(NetworkId);
void clientNetworkRemoved(NetworkId);
void clientNetworkUpdated();
void connectOrDisconnectFromNet();
- void changeTopic(const QString &topic);
void makeTrayIconBlink();
void saveStatusBarStatus(bool enabled);
void makeTrayIconBlink();
void saveStatusBarStatus(bool enabled);
+ 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();
- void requestBacklog(BufferInfo, QVariant, QVariant);
private:
Ui::MainWin ui;
private:
Ui::MainWin ui;
- QtUi *gui;
QMenu *systrayMenu;
QMenu *systrayMenu;
+ QLabel *coreLagLabel;
QLabel *sslLabel;
QLabel *sslLabel;
+ MsgProcessorStatusWidget *msgProcessorStatusWidget;
+
+ TitleSetter _titleSetter;
void setupMenus();
void setupViews();
void setupMenus();
void setupViews();
@@
-107,10
+130,7
@@
class MainWin : public QMainWindow {
void setupStatusBar();
void setupSystray();
void setupStatusBar();
void setupSystray();
- void setupSettingsDlg();
-
void toggleVisibility();
void toggleVisibility();
-
void enableMenus();
QSystemTrayIcon *systray;
void enableMenus();
QSystemTrayIcon *systray;
@@
-120,18
+140,16
@@
class MainWin : public QMainWindow {
bool trayIconActive;
QTimer *timer;
bool trayIconActive;
QTimer *timer;
- CoreConnectDlg *coreConnectDlg;
- SettingsDlg *settingsDlg;
- DebugConsole *debugConsole;
-
BufferId currentBuffer;
QString currentProfile;
BufferId currentBuffer;
QString currentProfile;
- QList<QDockWidget *> netViews;
+ QList<QDockWidget *>
_
netViews;
NickListWidget *nickListWidget;
NickListWidget *nickListWidget;
- QAction *actionEditNetworks;
- QList<QAction *> networkActions;
+#ifdef HAVE_DBUS
+ org::freedesktop::Notifications *desktopNotifications;
+ quint32 notificationId;
+#endif
friend class QtUi;
};
friend class QtUi;
};