projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added colorsettingspage
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
5763809
..
40764f3
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-26,6
+26,8
@@
#include "qtui.h"
#include "bufferviewfilter.h"
#include "qtui.h"
#include "bufferviewfilter.h"
+#include <QSystemTrayIcon>
+
class ServerListDlg;
class CoreConnectDlg;
class Buffer;
class ServerListDlg;
class CoreConnectDlg;
class Buffer;
@@
-33,7
+35,6
@@
class SettingsDlg;
class QtUi;
class Message;
class NickListWidget;
class QtUi;
class Message;
class NickListWidget;
-
class DebugConsole;
//!\brief The main window of Quassel's QtUi.
class DebugConsole;
//!\brief The main window of Quassel's QtUi.
@@
-45,27
+46,32
@@
class MainWin : public QMainWindow {
virtual ~MainWin();
void init();
virtual ~MainWin();
void init();
-
void addBufferView(const QString &, QAbstractItemModel *, const BufferViewFilter::Modes &, const QList<uint
> &);
+
QDockWidget *addBufferView(const QString &, QAbstractItemModel *, const BufferViewFilter::Modes &, const QList<NetworkId
> &);
AbstractUiMsg *layoutMsg(const Message &);
protected:
void closeEvent(QCloseEvent *event);
AbstractUiMsg *layoutMsg(const Message &);
protected:
void closeEvent(QCloseEvent *event);
+ virtual void changeEvent(QEvent *event);
protected slots:
void connectedToCore();
void disconnectedFromCore();
protected slots:
void connectedToCore();
void disconnectedFromCore();
+ void systrayActivated( QSystemTrayIcon::ActivationReason );
private slots:
private slots:
-
- void showServerList();
void showSettingsDlg();
void showSettingsDlg();
+ void showNetworkDlg();
+ void showAboutDlg();
void showDebugConsole();
void showDebugConsole();
+
void showCoreConnectionDlg(bool autoConnect = false);
void coreConnectionDlgFinished(int result);
void showCoreConnectionDlg(bool autoConnect = false);
void coreConnectionDlgFinished(int result);
- void showBuffer(BufferInfo);
- void showBuffer(Buffer *);
+ void clientNetworkCreated(NetworkId);
+ void clientNetworkRemoved(NetworkId);
+ void clientNetworkUpdated();
+ void connectOrDisconnectFromNet();
signals:
void connectToCore(const QVariantMap &connInfo);
signals:
void connectToCore(const QVariantMap &connInfo);
@@
-76,26
+82,38
@@
class MainWin : public QMainWindow {
Ui::MainWin ui;
QtUi *gui;
Ui::MainWin ui;
QtUi *gui;
+ QMenu *systrayMenu;
+
void setupMenus();
void setupViews();
void setupMenus();
void setupViews();
+ void setupNickWidget();
+ void setupChatMonitor();
+ void setupInputWidget();
+ void setupTopicWidget();
+ void setupSystray();
+
void setupSettingsDlg();
void setupSettingsDlg();
+ void toggleVisibility();
+
void enableMenus();
QSystemTrayIcon *systray;
void enableMenus();
QSystemTrayIcon *systray;
- ServerListDlg *serverListDlg;
CoreConnectDlg *coreConnectDlg;
SettingsDlg *settingsDlg;
CoreConnectDlg *coreConnectDlg;
SettingsDlg *settingsDlg;
+ DebugConsole *debugConsole;
-
uint
currentBuffer;
+
BufferId
currentBuffer;
QString currentProfile;
QList<QDockWidget *> netViews;
QDockWidget *nickDock;
NickListWidget *nickListWidget;
QString currentProfile;
QList<QDockWidget *> netViews;
QDockWidget *nickDock;
NickListWidget *nickListWidget;
- DebugConsole *debugConsole;
+ QAction *actionEditNetworks;
+ QList<QAction *> networkActions;
+
friend class QtUi;
};
friend class QtUi;
};