projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unconfusinating the core edit dialog
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
12c639f
..
1c5521e
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-24,19
+24,24
@@
#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 <QSystemTrayIcon>
+#include <QTimer>
+
class ServerListDlg;
class ServerListDlg;
+class ChannelListDlg;
class CoreConnectDlg;
class Buffer;
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
@@
-46,23
+51,38
@@
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);
+
+ void displayTrayIconMessage(const QString &title, const QString &message);
- AbstractUiMsg *layoutMsg(const Message &);
+ virtual bool event(QEvent *event);
+
+ public slots:
+ void setTrayIconActivity(bool active = false);
protected:
void closeEvent(QCloseEvent *event);
protected:
void closeEvent(QCloseEvent *event);
- virtual void
keyPressEvent(QKey
Event *event);
+ virtual void
changeEvent(Q
Event *event);
protected slots:
void connectedToCore();
protected slots:
void connectedToCore();
+ void setConnectedState();
+ void securedConnection();
void disconnectedFromCore();
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 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 showDebugConsole();
void showCoreConnectionDlg(bool autoConnect = false);
void showDebugConsole();
void showCoreConnectionDlg(bool autoConnect = false);
@@
-73,6
+93,13
@@
class MainWin : public QMainWindow {
void clientNetworkUpdated();
void connectOrDisconnectFromNet();
void clientNetworkUpdated();
void connectOrDisconnectFromNet();
+ void changeTopic(const QString &topic);
+ 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();
@@
-83,6
+110,9
@@
class MainWin : public QMainWindow {
QtUi *gui;
QMenu *systrayMenu;
QtUi *gui;
QMenu *systrayMenu;
+ QLabel *sslLabel;
+
+ TitleSetter _titleSetter;
void setupMenus();
void setupViews();
void setupMenus();
void setupViews();
@@
-90,32
+120,33
@@
class MainWin : public QMainWindow {
void setupChatMonitor();
void setupInputWidget();
void setupTopicWidget();
void setupChatMonitor();
void setupInputWidget();
void setupTopicWidget();
+ void setupStatusBar();
void setupSystray();
void setupSettingsDlg();
void setupSystray();
void setupSettingsDlg();
- void
enableMenus
();
+ void
toggleVisibility
();
- void bindKey(int key);
- void jumpKey(int key);
+ void enableMenus();
- QHash<int, BufferId> _keyboardJump;
QSystemTrayIcon *systray;
QSystemTrayIcon *systray;
+ QIcon activeTrayIcon;
+ QIcon onlineTrayIcon;
+ QIcon offlineTrayIcon;
+ bool trayIconActive;
+ QTimer *timer;
CoreConnectDlg *coreConnectDlg;
CoreConnectDlg *coreConnectDlg;
+ ChannelListDlg *channelListDlg;
SettingsDlg *settingsDlg;
SettingsDlg *settingsDlg;
+ DebugConsole *debugConsole;
BufferId currentBuffer;
QString currentProfile;
BufferId currentBuffer;
QString currentProfile;
- QList<QDockWidget *> netViews;
- QDockWidget *nickDock;
+ QList<QDockWidget *> _netViews;
NickListWidget *nickListWidget;
NickListWidget *nickListWidget;
- QAction *actionEditNetworks;
- QList<QAction *> networkActions;
-
- DebugConsole *debugConsole;
friend class QtUi;
};
friend class QtUi;
};