projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing the dock icon in mac os... (fixing doesn't mean prettificatingsvn stat 11)
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
57c8bb3
..
96e0c71
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-24,19
+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 <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
@@
-46,9
+50,15
@@
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 &);
AbstractUiMsg *layoutMsg(const Message &);
+ void displayTrayIconMessage(const QString &title, const QString &message);
+
+ virtual bool event(QEvent *event);
+
+ public slots:
+ void setTrayIconActivity(bool active = false);
protected:
void closeEvent(QCloseEvent *event);
protected:
void closeEvent(QCloseEvent *event);
@@
-56,12
+66,19
@@
class MainWin : public QMainWindow {
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 showSettingsDlg();
void showNetworkDlg();
void showSettingsDlg();
void showNetworkDlg();
+ void showManageViewsDlg();
void showAboutDlg();
void showDebugConsole();
void showAboutDlg();
void showDebugConsole();
@@
-74,7
+91,12
@@
class MainWin : public QMainWindow {
void connectOrDisconnectFromNet();
void changeTopic(const QString &topic);
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();
@@
-85,6
+107,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();
@@
-92,6
+117,7
@@
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();
@@
-101,6
+127,11
@@
class MainWin : public QMainWindow {
void enableMenus();
QSystemTrayIcon *systray;
void enableMenus();
QSystemTrayIcon *systray;
+ QIcon activeTrayIcon;
+ QIcon onlineTrayIcon;
+ QIcon offlineTrayIcon;
+ bool trayIconActive;
+ QTimer *timer;
CoreConnectDlg *coreConnectDlg;
SettingsDlg *settingsDlg;
CoreConnectDlg *coreConnectDlg;
SettingsDlg *settingsDlg;
@@
-109,8
+140,7
@@
class MainWin : public QMainWindow {
BufferId currentBuffer;
QString currentProfile;
BufferId currentBuffer;
QString currentProfile;
- QList<QDockWidget *> netViews;
- QDockWidget *nickDock;
+ QList<QDockWidget *> _netViews;
NickListWidget *nickListWidget;
QAction *actionEditNetworks;
NickListWidget *nickListWidget;
QAction *actionEditNetworks;