From 021349871bba78f30e07e34f75cbfdda414343bd Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Mon, 21 Jul 2008 14:28:04 +0200 Subject: [PATCH] Added a core lag indicator to the statusbar --- src/common/signalproxy.cpp | 1 - src/common/signalproxy.h | 2 +- src/qtui/mainwin.cpp | 12 ++++++++++++ src/qtui/mainwin.h | 2 ++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index 467041ee..1d9e4703 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -1084,7 +1084,6 @@ void SignalProxy::updateLag(QIODevice *dev, float lag) { Q_ASSERT(_peers.contains(dev)); _peers[dev].lag = lag; if(proxyMode() == Client) { - qDebug() << "LAG" << lag; emit lagUpdated(lag); } } diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index 1c2d1da8..eb57ad76 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -129,7 +129,7 @@ signals: void connected(); void disconnected(); void objectInitialized(SyncableObject *); - void lagUpdated(int lag); + void lagUpdated(float lag); private: void init(); diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index c1af8b0f..e92d9b84 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -68,6 +68,7 @@ MainWin::MainWin(QtUi *_gui, QWidget *parent) : QMainWindow(parent), gui(_gui), + coreLagLabel(new QLabel()), sslLabel(new QLabel()), _titleSetter(this), systray(new QSystemTrayIcon(this)), @@ -332,6 +333,12 @@ void MainWin::setupTopicWidget() { } void MainWin::setupStatusBar() { + // Core Lag: + updateLagIndicator(0); + statusBar()->addPermanentWidget(coreLagLabel); + connect(Client::signalProxy(), SIGNAL(lagUpdated(float)), this, SLOT(updateLagIndicator(float))); + + // SSL indicator connect(Client::instance(), SIGNAL(securedConnection()), this, SLOT(securedConnection())); sslLabel->setPixmap(QPixmap()); statusBar()->addPermanentWidget(sslLabel); @@ -440,6 +447,11 @@ void MainWin::saveLayout() { if(accountId > 0) s.setValue(QString("MainWinState-%1").arg(accountId) , saveState(accountId)); } +void MainWin::updateLagIndicator(float lag) { + coreLagLabel->setText(QString("Core Lag: %1 msec").arg(lag)); +} + + void MainWin::securedConnection() { // todo: make status bar entry sslLabel->setPixmap(QPixmap::fromImage(QImage(":/16x16/status/ssl"))); diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 1c5521e2..73d1fa93 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -67,6 +67,7 @@ class MainWin : public QMainWindow { protected slots: void connectedToCore(); void setConnectedState(); + void updateLagIndicator(float lag); void securedConnection(); void disconnectedFromCore(); void setDisconnectedState(); @@ -110,6 +111,7 @@ class MainWin : public QMainWindow { QtUi *gui; QMenu *systrayMenu; + QLabel *coreLagLabel; QLabel *sslLabel; TitleSetter _titleSetter; -- 2.20.1