projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add MessageProcessor progress widget to MainWin's status bar
[quassel.git]
/
src
/
qtui
/
mainwin.h
diff --git
a/src/qtui/mainwin.h
b/src/qtui/mainwin.h
index
2e7bf64
..
8cffe8b
100644
(file)
--- a/
src/qtui/mainwin.h
+++ b/
src/qtui/mainwin.h
@@
-1,11
+1,11
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
7 by The Quassel Team
*
+ * Copyright (C) 2005-0
8 by the Quassel Project
*
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
- * (at your option)
any later version.
*
+ * (at your option)
version 3.
*
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
@@
-24,14
+24,26
@@
#include "ui_mainwin.h"
#include "qtui.h"
#include "ui_mainwin.h"
#include "qtui.h"
-#include "bufferviewfilter.h"
+#include "titlesetter.h"
+
+#include <QSystemTrayIcon>
+#include <QTimer>
class ServerListDlg;
class ServerListDlg;
+class ChannelListDlg;
class CoreConnectDlg;
class Buffer;
class CoreConnectDlg;
class Buffer;
+class BufferViewConfig;
+class MsgProcessorStatusWidget;
class SettingsDlg;
class QtUi;
class Message;
class SettingsDlg;
class QtUi;
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 {
//!\brief The main window of Quassel's QtUi.
class MainWin : public QMainWindow {
@@
-42,55
+54,119
@@
class MainWin : public QMainWindow {
virtual ~MainWin();
void init();
virtual ~MainWin();
void init();
- void addBufferView(
const QString &, QAbstractItemModel *, const BufferViewFilter::Modes &, const QStringList &
);
+ void addBufferView(
BufferViewConfig *config = 0
);
- AbstractUiMsg *layoutMsg(const Message &);
+ void displayTrayIconMessage(const QString &title, const QString &message);
+
+#ifdef HAVE_DBUS
+ void sendDesktopNotification(const QString &title, const QString &message);
+#endif
+
+ virtual bool event(QEvent *event);
+
+ public slots:
+ void setTrayIconActivity(bool active = false);
protected:
void closeEvent(QCloseEvent *event);
protected:
void closeEvent(QCloseEvent *event);
+ virtual void changeEvent(QEvent *event);
protected slots:
void connectedToCore();
protected slots:
void connectedToCore();
+ void setConnectedState();
+ void updateLagIndicator(int lag);
+ void securedConnection();
void disconnectedFromCore();
void disconnectedFromCore();
+ void setDisconnectedState();
+ void systrayActivated( QSystemTrayIcon::ActivationReason );
private slots:
private slots:
-
- void showServerList();
+ 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 on_actionEditNetworks_triggered();
+ void on_actionManageViews_triggered();
+ void on_actionLockDockPositions_toggled(bool lock);
+ void showAboutDlg();
+ void showDebugConsole();
+ void on_actionDebugNetworkModel_triggered(bool);
+
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();
- void importBacklog();
+ void changeTopic(const QString &topic);
+ 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();
void requestBacklog(BufferInfo, QVariant, QVariant);
signals:
void connectToCore(const QVariantMap &connInfo);
void disconnectFromCore();
void requestBacklog(BufferInfo, QVariant, QVariant);
- void importOldBacklog();
private:
Ui::MainWin ui;
QtUi *gui;
private:
Ui::MainWin ui;
QtUi *gui;
+ QMenu *systrayMenu;
+ QLabel *coreLagLabel;
+ QLabel *sslLabel;
+ MsgProcessorStatusWidget *msgProcessorStatusWidget;
+
+ TitleSetter _titleSetter;
+
void setupMenus();
void setupViews();
void setupMenus();
void setupViews();
+ void setupNickWidget();
+ void setupChatMonitor();
+ void setupInputWidget();
+ void setupTopicWidget();
+ void setupStatusBar();
+ void setupSystray();
+
void setupSettingsDlg();
void setupSettingsDlg();
+ void toggleVisibility();
+
void enableMenus();
QSystemTrayIcon *systray;
void enableMenus();
QSystemTrayIcon *systray;
+ QIcon activeTrayIcon;
+ QIcon onlineTrayIcon;
+ QIcon offlineTrayIcon;
+ bool trayIconActive;
+ QTimer *timer;
- ServerListDlg *serverListDlg;
CoreConnectDlg *coreConnectDlg;
CoreConnectDlg *coreConnectDlg;
+ ChannelListDlg *channelListDlg;
SettingsDlg *settingsDlg;
SettingsDlg *settingsDlg;
+ DebugConsole *debugConsole;
-
uint
currentBuffer;
+
BufferId
currentBuffer;
QString currentProfile;
QString currentProfile;
- QList<QDockWidget *> netViews;
+ QList<QDockWidget *> _netViews;
+ NickListWidget *nickListWidget;
+
+#ifdef HAVE_DBUS
+ org::freedesktop::Notifications *desktopNotifications;
+ quint32 notificationId;
+#endif
friend class QtUi;
};
friend class QtUi;
};