/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2020 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#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();
- 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(coreConnection(), 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();
+ CoreConnection* conn = coreConnection();
if (conn->progressMaximum() >= 0) {
ui.progressBar->setMinimum(conn->progressMinimum());
ui.progressBar->setMaximum(conn->progressMaximum());
ui.messageLabel->setText(conn->progressText());
}
-
void CoreConnectionStatusWidget::updateLag(int msecs)
{
if (msecs >= 0) {
}
}
-
void CoreConnectionStatusWidget::connectionStateChanged(CoreConnection::ConnectionState state)
{
if (state >= CoreConnection::Connected) {
if (coreConnection()->isEncrypted()) {
- ui.sslLabel->setPixmap(SmallIcon("security-high"));
+ 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(SmallIcon("security-low"));
+ 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->hide();
}
-
void CoreConnectionStatusWidget::progressRangeChanged(int min, int max)
{
Q_UNUSED(min)