projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only show dbus settings if dbus is available
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
b2a8b47
..
9d0de30
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-27,11
+27,14
@@
#include "channellistdlg.h"
#include "chatlinemodel.h"
#include "chatmonitorfilter.h"
#include "channellistdlg.h"
#include "chatlinemodel.h"
#include "chatmonitorfilter.h"
+#include "chatmonitorview.h"
#include "chatview.h"
#include "client.h"
#include "clientbacklogmanager.h"
#include "coreinfodlg.h"
#include "coreconnectdlg.h"
#include "chatview.h"
#include "client.h"
#include "clientbacklogmanager.h"
#include "coreinfodlg.h"
#include "coreconnectdlg.h"
+#include "msgprocessorstatuswidget.h"
+#include "qtuimessageprocessor.h"
#include "networkmodel.h"
#include "buffermodel.h"
#include "nicklistwidget.h"
#include "networkmodel.h"
#include "buffermodel.h"
#include "nicklistwidget.h"
@@
-70,6
+73,7
@@
MainWin::MainWin(QtUi *_gui, QWidget *parent)
gui(_gui),
coreLagLabel(new QLabel()),
sslLabel(new QLabel()),
gui(_gui),
coreLagLabel(new QLabel()),
sslLabel(new QLabel()),
+ msgProcessorStatusWidget(new MsgProcessorStatusWidget()),
_titleSetter(this),
systray(new QSystemTrayIcon(this)),
activeTrayIcon(":/icons/quassel-icon-active.png"),
_titleSetter(this),
systray(new QSystemTrayIcon(this)),
activeTrayIcon(":/icons/quassel-icon-active.png"),
@@
-292,7
+296,7
@@
void MainWin::setupChatMonitor() {
dock->setObjectName("ChatMonitorDock");
ChatMonitorFilter *filter = new ChatMonitorFilter(Client::messageModel(), this);
dock->setObjectName("ChatMonitorDock");
ChatMonitorFilter *filter = new ChatMonitorFilter(Client::messageModel(), this);
- Chat
View *chatView = new Chat
View(filter, this);
+ Chat
MonitorView *chatView = new ChatMonitor
View(filter, this);
chatView->show();
dock->setWidget(chatView);
dock->show();
chatView->show();
dock->setWidget(chatView);
dock->show();
@@
-335,6
+339,10
@@
void MainWin::setupTopicWidget() {
}
void MainWin::setupStatusBar() {
}
void MainWin::setupStatusBar() {
+ // MessageProcessor progress
+ statusBar()->addPermanentWidget(msgProcessorStatusWidget);
+ connect(Client::messageProcessor(), SIGNAL(progressUpdated(int, int)), msgProcessorStatusWidget, SLOT(setProgress(int, int)));
+
// Core Lag:
updateLagIndicator(0);
statusBar()->addPermanentWidget(coreLagLabel);
// Core Lag:
updateLagIndicator(0);
statusBar()->addPermanentWidget(coreLagLabel);