X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectionstatuswidget.cpp;h=27236b3dbab1c22f76747e5350a769a6edf6d1ab;hp=11321b54674d3d5690e78f77310be10119008fd1;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=cba75e911d78fd3250b25c94e4ad1aa1c4207ecf

diff --git a/src/qtui/coreconnectionstatuswidget.cpp b/src/qtui/coreconnectionstatuswidget.cpp
index 11321b54..27236b3d 100644
--- a/src/qtui/coreconnectionstatuswidget.cpp
+++ b/src/qtui/coreconnectionstatuswidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2009 by the Quassel Project                             *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,43 +15,86 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "coreconnectionstatuswidget.h"
 
 #include "client.h"
-#include "coreconnection.h"
-#include "iconloader.h"
+#include "icon.h"
+#include "signalproxy.h"
 
 CoreConnectionStatusWidget::CoreConnectionStatusWidget(CoreConnection *connection, QWidget *parent)
-  : QWidget(parent),
-  _coreConnection(connection)
+    : QWidget(parent),
+    _coreConnection(connection)
 {
-  ui.setupUi(this);
-  update();
+    ui.setupUi(this);
+    ui.lagLabel->hide();
+    ui.sslLabel->hide();
+    update();
 
-  connect(coreConnection(), SIGNAL(progressTextChanged(QString)), ui.messageLabel, SLOT(setText(QString)));
-  connect(coreConnection(), SIGNAL(progressValueChanged(int)), ui.progressBar, SLOT(setValue(int)));
-  connect(coreConnection(), SIGNAL(progressRangeChanged(int, int)), ui.progressBar, SLOT(setRange(int, int)));
-  connect(coreConnection(), SIGNAL(progressRangeChanged(int, int)), this, SLOT(progressRangeChanged(int, int)));
+    connect(coreConnection(), &CoreConnection::progressTextChanged, ui.messageLabel, &QLabel::setText);
+    connect(coreConnection(), &CoreConnection::progressValueChanged, ui.progressBar, &QProgressBar::setValue);
+    connect(coreConnection(), &CoreConnection::progressRangeChanged, ui.progressBar, &QProgressBar::setRange);
+    connect(coreConnection(), &CoreConnection::progressRangeChanged, this, &CoreConnectionStatusWidget::progressRangeChanged);
+
+    connect(coreConnection(), &CoreConnection::stateChanged, this, &CoreConnectionStatusWidget::connectionStateChanged);
+    connect(coreConnection(), &CoreConnection::connectionError, ui.messageLabel, &QLabel::setText);
+    connect(coreConnection(), &CoreConnection::lagUpdated, this, &CoreConnectionStatusWidget::updateLag);
+}
+
+
+void CoreConnectionStatusWidget::update()
+{
+    CoreConnection *conn = coreConnection();
+    if (conn->progressMaximum() >= 0) {
+        ui.progressBar->setMinimum(conn->progressMinimum());
+        ui.progressBar->setMaximum(conn->progressMaximum());
+        ui.progressBar->setValue(conn->progressValue());
+        ui.progressBar->show();
+    }
+    else
+        ui.progressBar->hide();
+
+    ui.messageLabel->setText(conn->progressText());
 }
 
-void CoreConnectionStatusWidget::update() {
-  CoreConnection *conn = coreConnection();
-  if(conn->progressMaximum() >= 0) {
-    ui.progressBar->setMinimum(conn->progressMinimum());
-    ui.progressBar->setMaximum(conn->progressMaximum());
-    ui.progressBar->setValue(conn->progressValue());
-    ui.progressBar->show();
-  } else
-    ui.progressBar->hide();
 
-  ui.messageLabel->setText(conn->progressText());
+void CoreConnectionStatusWidget::updateLag(int msecs)
+{
+    if (msecs >= 0) {
+        QString unit = msecs >= 100 ? tr("s", "seconds") : tr("ms", "milliseconds");
+        ui.lagLabel->setText(tr("(Lag: %1 %2)").arg(msecs >= 100 ? msecs / 1000. : msecs, 0, 'f', (int)(msecs >= 100)).arg(unit));
+        if (!ui.lagLabel->isVisible())
+            ui.lagLabel->show();
+    }
+    else {
+        if (ui.lagLabel->isVisible())
+            ui.lagLabel->hide();
+    }
+}
+
 
+void CoreConnectionStatusWidget::connectionStateChanged(CoreConnection::ConnectionState state)
+{
+    if (state >= CoreConnection::Connected) {
+        if (coreConnection()->isEncrypted()) {
+            ui.sslLabel->setPixmap(icon::get("security-high").pixmap(16));
+            ui.sslLabel->setToolTip(tr("The connection to your core is encrypted with SSL."));
+        }
+        else {
+            ui.sslLabel->setPixmap(icon::get("security-low").pixmap(16));
+            ui.sslLabel->setToolTip(tr("The connection to your core is not encrypted."));
+        }
+        ui.sslLabel->show();
+    }
+    else
+        ui.sslLabel->hide();
 }
 
-void CoreConnectionStatusWidget::progressRangeChanged(int min, int max) {
-  Q_UNUSED(min)
-  ui.progressBar->setVisible(max >= 0);
+
+void CoreConnectionStatusWidget::progressRangeChanged(int min, int max)
+{
+    Q_UNUSED(min)
+    ui.progressBar->setVisible(max >= 0);
 }