X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreconnectionstatuswidget.cpp;h=cce95520c9c53969c989c94c70990e21ae9a769d;hp=34cdc667628ccad772ef5a3a8a841e8bceaebf4b;hb=HEAD;hpb=8386eed0a503bd2683b908bc05d682231331894b

diff --git a/src/qtui/coreconnectionstatuswidget.cpp b/src/qtui/coreconnectionstatuswidget.cpp
index 34cdc667..2617c8c1 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-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,73 +15,82 @@
  *   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 "iconloader.h"
+#include "icon.h"
 #include "signalproxy.h"
 
-CoreConnectionStatusWidget::CoreConnectionStatusWidget(CoreConnection *connection, QWidget *parent)
-  : QWidget(parent),
-  _coreConnection(connection)
+CoreConnectionStatusWidget::CoreConnectionStatusWidget(CoreConnection* connection, QWidget* parent)
+    : QWidget(parent)
+    , _coreConnection(connection)
 {
-  ui.setupUi(this);
-  ui.lagLabel->hide();
-  ui.sslLabel->hide();
-  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(), SIGNAL(stateChanged(CoreConnection::ConnectionState)), SLOT(connectionStateChanged(CoreConnection::ConnectionState)));
-  connect(coreConnection(), SIGNAL(connectionError(QString)), ui.messageLabel, SLOT(setText(QString)));
-  connect(Client::signalProxy(), SIGNAL(lagUpdated(int)), SLOT(updateLag(int)));
+    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();
+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());
+    ui.messageLabel->setText(conn->progressText());
 }
 
-void CoreConnectionStatusWidget::updateLag(int msecs) {
-  if(msecs >= 0) {
-    ui.lagLabel->setText(tr("(Lag: %1 ms)").arg(msecs));
-    if(!ui.lagLabel->isVisible())
-      ui.lagLabel->show();
-  } else {
-    if(ui.lagLabel->isVisible())
-      ui.lagLabel->hide();
-  }
+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(SmallIcon("security-high"));
-      ui.sslLabel->setToolTip(tr("The connection to your core is encrypted with SSL."));
-    } else {
-      ui.sslLabel->setPixmap(SmallIcon("security-low"));
-      ui.sslLabel->setToolTip(tr("The connection to your core is not encrypted."));
+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();
     }
-    ui.sslLabel->show();
-  } else
-    ui.sslLabel->hide();
+    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);
 }