projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing empty chatlines on mac os (hopefully on windows too). This looks very much...
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
31cffb3
..
6c8628a
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-32,6
+32,8
@@
#include "clientbacklogmanager.h"
#include "coreinfodlg.h"
#include "coreconnectdlg.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
+72,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"),
@@
-335,6
+338,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);
@@
-451,7
+458,7
@@
void MainWin::saveLayout() {
}
void MainWin::updateLagIndicator(int lag) {
}
void MainWin::updateLagIndicator(int lag) {
- coreLagLabel->setText(QString(
"Core Lag: %1 msec"
).arg(lag));
+ coreLagLabel->setText(QString(
tr("Core Lag: %1 msec")
).arg(lag));
}
}