projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some clarifications in the terminology of the core config wizard.
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
c2cdfce
..
e2e703f
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-24,20
+24,23
@@
#include "ui_mainwin.h"
#include "qtui.h"
#include "ui_mainwin.h"
#include "qtui.h"
-#include "
bufferviewfil
ter.h"
+#include "
titleset
ter.h"
#include <QSystemTrayIcon>
#include <QTimer>
#include <QSystemTrayIcon>
#include <QTimer>
+
class ServerListDlg;
class CoreConnectDlg;
class Buffer;
class ServerListDlg;
class CoreConnectDlg;
class Buffer;
+class BufferViewConfig;
class SettingsDlg;
class QtUi;
class Message;
class NickListWidget;
class DebugConsole;
class SettingsDlg;
class QtUi;
class Message;
class NickListWidget;
class DebugConsole;
+
//!\brief The main window of Quassel's QtUi.
class MainWin : public QMainWindow {
Q_OBJECT
//!\brief The main window of Quassel's QtUi.
class MainWin : public QMainWindow {
Q_OBJECT
@@
-47,9
+50,8
@@
class MainWin : public QMainWindow {
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);
virtual bool event(QEvent *event);
void displayTrayIconMessage(const QString &title, const QString &message);
virtual bool event(QEvent *event);
@@
-63,14
+65,19
@@
class MainWin : public QMainWindow {
protected slots:
void connectedToCore();
protected slots:
void connectedToCore();
+ void setConnectedState();
void securedConnection();
void disconnectedFromCore();
void securedConnection();
void disconnectedFromCore();
+ void setDisconnectedState();
void systrayActivated( QSystemTrayIcon::ActivationReason );
private slots:
void systrayActivated( QSystemTrayIcon::ActivationReason );
private slots:
+ void addBufferView(int bufferViewConfigId);
+ void removeBufferView(int bufferViewConfigId);
void receiveMessage(const Message &msg);
void showSettingsDlg();
void showNetworkDlg();
void receiveMessage(const Message &msg);
void showSettingsDlg();
void showNetworkDlg();
+ void showManageViewsDlg();
void showAboutDlg();
void showDebugConsole();
void showAboutDlg();
void showDebugConsole();
@@
-86,6
+93,9
@@
class MainWin : public QMainWindow {
void makeTrayIconBlink();
void saveStatusBarStatus(bool enabled);
void makeTrayIconBlink();
void saveStatusBarStatus(bool enabled);
+ void loadLayout();
+ void saveLayout();
+
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
@@
-98,6
+108,8
@@
class MainWin : public QMainWindow {
QMenu *systrayMenu;
QLabel *sslLabel;
QMenu *systrayMenu;
QLabel *sslLabel;
+ TitleSetter _titleSetter;
+
void setupMenus();
void setupViews();
void setupNickWidget();
void setupMenus();
void setupViews();
void setupNickWidget();
@@
-127,7
+139,7
@@
class MainWin : public QMainWindow {
BufferId currentBuffer;
QString currentProfile;
BufferId currentBuffer;
QString currentProfile;
- QList<QDockWidget *> netViews;
+ QList<QDockWidget *>
_
netViews;
NickListWidget *nickListWidget;
QAction *actionEditNetworks;
NickListWidget *nickListWidget;
QAction *actionEditNetworks;