/***************************************************************************
- * Copyright (C) 2005-2016 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 *
***************************************************************************/
#include <QHeaderView>
-#include <QIcon>
#include <QMessageBox>
#include <QTextCodec>
+#include <utility>
#include "networkssettingspage.h"
#include "client.h"
+#include "icon.h"
#include "identity.h"
#include "network.h"
#include "presetnetworks.h"
#include "settingspagedlg.h"
#include "util.h"
+#include "widgethelpers.h"
// IRCv3 capabilities
#include "irccap.h"
NetworksSettingsPage::NetworksSettingsPage(QWidget *parent)
: SettingsPage(tr("IRC"), tr("Networks"), parent)
-#ifdef HAVE_SSL
- , _cid(0)
-#endif
{
ui.setupUi(this);
// hide SASL options for older cores
- if (!(Client::coreFeatures() & Quassel::SaslAuthentication))
+ if (!Client::isCoreFeatureEnabled(Quassel::Feature::SaslAuthentication))
ui.sasl->hide();
- if (!(Client::coreFeatures() & Quassel::SaslExternal))
+ if (!Client::isCoreFeatureEnabled(Quassel::Feature::SaslExternal))
ui.saslExtInfo->hide();
#ifndef HAVE_SSL
ui.saslExtInfo->hide();
#endif
// set up icons
- ui.renameNetwork->setIcon(QIcon::fromTheme("edit-rename"));
- ui.addNetwork->setIcon(QIcon::fromTheme("list-add"));
- ui.deleteNetwork->setIcon(QIcon::fromTheme("edit-delete"));
- ui.addServer->setIcon(QIcon::fromTheme("list-add"));
- ui.deleteServer->setIcon(QIcon::fromTheme("edit-delete"));
- ui.editServer->setIcon(QIcon::fromTheme("configure"));
- ui.upServer->setIcon(QIcon::fromTheme("go-up"));
- ui.downServer->setIcon(QIcon::fromTheme("go-down"));
- ui.editIdentities->setIcon(QIcon::fromTheme("configure"));
-
- _ignoreWidgetChanges = false;
-
- connectedIcon = QIcon::fromTheme("network-connect");
- connectingIcon = QIcon::fromTheme("network-wired"); // FIXME network-connecting
- disconnectedIcon = QIcon::fromTheme("network-disconnect");
+ ui.renameNetwork->setIcon(icon::get("edit-rename"));
+ ui.addNetwork->setIcon(icon::get("list-add"));
+ ui.deleteNetwork->setIcon(icon::get("edit-delete"));
+ ui.addServer->setIcon(icon::get("list-add"));
+ ui.deleteServer->setIcon(icon::get("edit-delete"));
+ ui.editServer->setIcon(icon::get("configure"));
+ ui.upServer->setIcon(icon::get("go-up"));
+ ui.downServer->setIcon(icon::get("go-down"));
+ ui.editIdentities->setIcon(icon::get("configure"));
+
+ connectedIcon = icon::get("network-connect");
+ connectingIcon = icon::get("network-wired"); // FIXME network-connecting
+ disconnectedIcon = icon::get("network-disconnect");
+
+ // Status icons
+ infoIcon = icon::get("dialog-information");
+ warningIcon = icon::get("dialog-warning");
foreach(int mib, QTextCodec::availableMibs()) {
QByteArray codec = QTextCodec::codecForMib(mib)->name();
currentId = 0;
setEnabled(Client::isConnected()); // need a core connection!
setWidgetStates();
- connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool)));
- connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientNetworkAdded(NetworkId)));
- connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientNetworkRemoved(NetworkId)));
- connect(Client::instance(), SIGNAL(identityCreated(IdentityId)), this, SLOT(clientIdentityAdded(IdentityId)));
- connect(Client::instance(), SIGNAL(identityRemoved(IdentityId)), this, SLOT(clientIdentityRemoved(IdentityId)));
-
- connect(ui.identityList, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetHasChanged()));
- //connect(ui.randomServer, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.performEdit, SIGNAL(textChanged()), this, SLOT(widgetHasChanged()));
- connect(ui.sasl, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.saslAccount, SIGNAL(textEdited(QString)), this, SLOT(widgetHasChanged()));
- connect(ui.saslPassword, SIGNAL(textEdited(QString)), this, SLOT(widgetHasChanged()));
- connect(ui.autoIdentify, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.autoIdentifyService, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
- connect(ui.autoIdentifyPassword, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
- connect(ui.useCustomEncodings, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.sendEncoding, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetHasChanged()));
- connect(ui.recvEncoding, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetHasChanged()));
- connect(ui.serverEncoding, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetHasChanged()));
- connect(ui.autoReconnect, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.reconnectInterval, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged()));
- connect(ui.reconnectRetries, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged()));
- connect(ui.unlimitedRetries, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.rejoinOnReconnect, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
-
- // Core features can change during a reconnect. Always connect these here, delaying testing for
- // the core feature flag in load().
- connect(ui.useCustomMessageRate, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.messageRateBurstSize, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged()));
- connect(ui.messageRateDelay, SIGNAL(valueChanged(double)), this, SLOT(widgetHasChanged()));
- connect(ui.unlimitedMessageRate, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
-
- // Add additional widgets here
- //connect(ui., SIGNAL(), this, SLOT(widgetHasChanged()));
- //connect(ui., SIGNAL(), this, SLOT(widgetHasChanged()));
+
+ connectToWidgetsChangedSignals({
+ ui.identityList,
+ ui.performEdit,
+ ui.sasl,
+ ui.saslAccount,
+ ui.saslPassword,
+ ui.autoIdentify,
+ ui.autoIdentifyService,
+ ui.autoIdentifyPassword,
+ ui.useCustomEncodings,
+ ui.sendEncoding,
+ ui.recvEncoding,
+ ui.serverEncoding,
+ ui.autoReconnect,
+ ui.reconnectInterval,
+ ui.reconnectRetries,
+ ui.unlimitedRetries,
+ ui.rejoinOnReconnect,
+ ui.useCustomMessageRate,
+ ui.messageRateBurstSize,
+ ui.messageRateDelay,
+ ui.unlimitedMessageRate
+ }, this, &NetworksSettingsPage::widgetHasChanged);
+
+ connect(Client::instance(), &Client::coreConnectionStateChanged, this, &NetworksSettingsPage::coreConnectionStateChanged);
+ connect(Client::instance(), &Client::networkCreated, this, &NetworksSettingsPage::clientNetworkAdded);
+ connect(Client::instance(), &Client::networkRemoved, this, &NetworksSettingsPage::clientNetworkRemoved);
+ connect(Client::instance(), &Client::identityCreated, this, &NetworksSettingsPage::clientIdentityAdded);
+ connect(Client::instance(), &Client::identityRemoved, this, &NetworksSettingsPage::clientIdentityRemoved);
foreach(IdentityId id, Client::identityIds()) {
clientIdentityAdded(id);
reset();
// Handle UI dependent on core feature flags here
- if (Client::coreFeatures() & Quassel::CustomRateLimits) {
+ if (Client::isCoreFeatureEnabled(Quassel::Feature::CustomRateLimits)) {
// Custom rate limiting supported, allow toggling
ui.useCustomMessageRate->setEnabled(true);
// Reset tooltip to default.
sslUpdated();
#endif
+ // Reset network capability status in case no valid networks get selected (a rare situation)
+ resetNetworkCapStates();
+
foreach(NetworkId netid, Client::networkIds()) {
clientNetworkAdded(netid);
}
}
+void NetworksSettingsPage::resetNetworkCapStates()
+{
+ // Set the status to a blank (invalid) network ID, reseting all UI
+ setNetworkCapStates(NetworkId());
+}
+
+
void NetworksSettingsPage::setNetworkCapStates(NetworkId id)
{
const Network *net = Client::network(id);
- if ((Client::coreFeatures() & Quassel::CapNegotiation)
- && net && net->connectionState() != Network::Disconnected) {
- // If Capability Negotiation isn't supported by the core, no capabilities are active.
- // If we're here, the network exists and is connected, check available capabilities...
- // Don't use net->isConnected() as that won't be true during capability negotiation when
- // capabilities are added and removed.
+ if (net && Client::isCoreFeatureEnabled(Quassel::Feature::CapNegotiation)) {
+ // Capability negotiation is supported, network exists.
+ // Check if the network is connected. Don't use net->isConnected() as that won't be true
+ // during capability negotiation when capabilities are added and removed.
+ if (net->connectionState() != Network::Disconnected) {
+ // Network exists and is connected, check available capabilities...
+ // [SASL]
+ if (net->saslMaybeSupports(IrcCap::SaslMech::PLAIN)) {
+ setSASLStatus(CapSupportStatus::MaybeSupported);
+ } else {
+ setSASLStatus(CapSupportStatus::MaybeUnsupported);
+ }
- // [SASL]
- if (net->saslMaybeSupports(IrcCap::SaslMech::PLAIN)) {
- // The network advertises support for SASL PLAIN. Encourage using it! Unfortunately we
- // don't know for sure if it's desired or functional.
- ui.sasl->setTitle(QString("%1 (%2)").arg(tr("Use SASL Authentication"),
- tr("preferred")));
+ // Add additional capability-dependent interface updates here
} else {
- // The network doesn't advertise support for SASL PLAIN. Here be dragons.
- ui.sasl->setTitle(QString("%1 (%2)").arg(tr("Use SASL Authentication"),
- tr("might not work")));
- }
- // Split up the messages to ease translation and re-use existing "Use SASL Authentication"
- // translations. If some languages rearrange phrases such that this would not make sense,
- // these strings can be merged into one.
+ // Network is disconnected
+ // [SASL]
+ setSASLStatus(CapSupportStatus::Disconnected);
- // Add additional capability-dependent interface updates here
+ // Add additional capability-dependent interface updates here
+ }
} else {
- // We're not connected or the network doesn't yet exist. Don't assume anything and reset
- // all capability-dependent interface elements to neutral.
+ // Capability negotiation is not supported and/or network doesn't exist.
+ // Don't assume anything and reset all capability-dependent interface elements to neutral.
// [SASL]
- ui.sasl->setTitle(tr("Use SASL Authentication"));
+ setSASLStatus(CapSupportStatus::Unknown);
// Add additional capability-dependent interface updates here
}
void NetworksSettingsPage::clientIdentityAdded(IdentityId id)
{
const Identity *identity = Client::identity(id);
- connect(identity, SIGNAL(updatedRemotely()), this, SLOT(clientIdentityUpdated()));
+ connect(identity, &SyncableObject::updatedRemotely, this, &NetworksSettingsPage::clientIdentityUpdated);
QString name = identity->identityName();
for (int j = 0; j < ui.identityList->count(); j++) {
void NetworksSettingsPage::clientIdentityUpdated()
{
- const Identity *identity = qobject_cast<const Identity *>(sender());
+ const auto *identity = qobject_cast<const Identity *>(sender());
if (!identity) {
qWarning() << "NetworksSettingsPage: Invalid identity to update!";
return;
QListWidgetItem *item = ui.networkList->item(i);
if (item->data(Qt::UserRole).value<NetworkId>() == id) return item;
}
- return 0;
+ return nullptr;
}
void NetworksSettingsPage::clientNetworkAdded(NetworkId id)
{
insertNetwork(id);
- //connect(Client::network(id), SIGNAL(updatedRemotely()), this, SLOT(clientNetworkUpdated()));
- connect(Client::network(id), SIGNAL(configChanged()), this, SLOT(clientNetworkUpdated()));
+ //connect(Client::network(id), &Network::updatedRemotely, this, &NetworksSettingsPage::clientNetworkUpdated);
+ connect(Client::network(id), &Network::configChanged, this, &NetworksSettingsPage::clientNetworkUpdated);
- connect(Client::network(id), SIGNAL(connectionStateSet(Network::ConnectionState)), this, SLOT(networkConnectionStateChanged(Network::ConnectionState)));
- connect(Client::network(id), SIGNAL(connectionError(const QString &)), this, SLOT(networkConnectionError(const QString &)));
+ connect(Client::network(id), &Network::connectionStateSet, this, &NetworksSettingsPage::networkConnectionStateChanged);
+ connect(Client::network(id), &Network::connectionError, this, &NetworksSettingsPage::networkConnectionError);
// Handle capability changes in case a server dis/connects with the settings window open.
- connect(Client::network(id), SIGNAL(capAdded(const QString &)), this, SLOT(clientNetworkCapsUpdated()));
- connect(Client::network(id), SIGNAL(capRemoved(const QString &)), this, SLOT(clientNetworkCapsUpdated()));
+ connect(Client::network(id), &Network::capAdded, this, &NetworksSettingsPage::clientNetworkCapsUpdated);
+ connect(Client::network(id), &Network::capRemoved, this, &NetworksSettingsPage::clientNetworkCapsUpdated);
}
void NetworksSettingsPage::clientNetworkUpdated()
{
- const Network *net = qobject_cast<const Network *>(sender());
+ const auto *net = qobject_cast<const Network *>(sender());
if (!net) {
qWarning() << "Update request for unknown network received!";
return;
void NetworksSettingsPage::networkConnectionStateChanged(Network::ConnectionState state)
{
Q_UNUSED(state);
- const Network *net = qobject_cast<const Network *>(sender());
+ const auto *net = qobject_cast<const Network *>(sender());
if (!net) return;
/*
if(net->networkId() == currentId) {
QListWidgetItem *NetworksSettingsPage::insertNetwork(const NetworkInfo &info)
{
- QListWidgetItem *item = 0;
+ QListWidgetItem *item = nullptr;
QList<QListWidgetItem *> items = ui.networkList->findItems(info.networkName, Qt::MatchExactly);
if (!items.count()) item = new QListWidgetItem(disconnectedIcon, info.networkName, ui.networkList);
else {
}
+// Called when selecting 'Configure' from the buffer list
+void NetworksSettingsPage::bufferList_Open(NetworkId netId)
+{
+ QListWidgetItem *item = networkItem(netId);
+ ui.networkList->setCurrentItem(item, QItemSelectionModel::SelectCurrent);
+}
+
+
void NetworksSettingsPage::displayNetwork(NetworkId id)
{
_ignoreWidgetChanges = true;
#ifdef HAVE_SSL
// this is only needed when the core supports SASL EXTERNAL
- if (Client::coreFeatures() & Quassel::SaslExternal) {
+ if (Client::isCoreFeatureEnabled(Quassel::Feature::SaslExternal)) {
if (_cid) {
- disconnect(_cid, SIGNAL(sslSettingsUpdated()), this, SLOT(sslUpdated()));
+ disconnect(_cid, &CertIdentity::sslSettingsUpdated, this, &NetworksSettingsPage::sslUpdated);
delete _cid;
}
_cid = new CertIdentity(*Client::identity(info.identity), this);
_cid->enableEditSsl(true);
- connect(_cid, SIGNAL(sslSettingsUpdated()), this, SLOT(sslUpdated()));
+ connect(_cid, &CertIdentity::sslSettingsUpdated, this, &NetworksSettingsPage::sslUpdated);
}
#endif
foreach(Network::Server server, info.serverList) {
QListWidgetItem *item = new QListWidgetItem(QString("%1:%2").arg(server.host).arg(server.port));
if (server.useSsl)
- item->setIcon(QIcon::fromTheme("document-encrypt"));
+ item->setIcon(icon::get("document-encrypt"));
ui.serverList->addItem(item);
}
//setItemState(id);
// just clear widgets
#ifdef HAVE_SSL
if (_cid) {
- disconnect(_cid, SIGNAL(sslSettingsUpdated()), this, SLOT(sslUpdated()));
+ disconnect(_cid, &CertIdentity::sslSettingsUpdated, this, &NetworksSettingsPage::sslUpdated);
delete _cid;
}
#endif
void NetworksSettingsPage::clientNetworkCapsUpdated()
{
// Grab the updated network
- const Network *net = qobject_cast<const Network *>(sender());
+ const auto *net = qobject_cast<const Network *>(sender());
if (!net) {
qWarning() << "Update request for unknown network received!";
return;
}
+void NetworksSettingsPage::setSASLStatus(const CapSupportStatus saslStatus)
+{
+ if (_saslStatusSelected != saslStatus) {
+ // Update the cached copy of SASL status used with the Details dialog
+ _saslStatusSelected = saslStatus;
+
+ // Update the user interface
+ switch (saslStatus) {
+ case CapSupportStatus::Unknown:
+ // There's no capability negotiation or network doesn't exist. Don't assume
+ // anything.
+ ui.saslStatusLabel->setText(QString("<i>%1</i>").arg(
+ tr("Could not check if supported by network")));
+ ui.saslStatusIcon->setPixmap(infoIcon.pixmap(16));
+ break;
+ case CapSupportStatus::Disconnected:
+ // Disconnected from network, no way to check.
+ ui.saslStatusLabel->setText(QString("<i>%1</i>").arg(
+ tr("Cannot check if supported when disconnected")));
+ ui.saslStatusIcon->setPixmap(infoIcon.pixmap(16));
+ break;
+ case CapSupportStatus::MaybeUnsupported:
+ // The network doesn't advertise support for SASL PLAIN. Here be dragons.
+ ui.saslStatusLabel->setText(QString("<i>%1</i>").arg(
+ tr("Not currently supported by network")));
+ ui.saslStatusIcon->setPixmap(warningIcon.pixmap(16));
+ break;
+ case CapSupportStatus::MaybeSupported:
+ // The network advertises support for SASL PLAIN. Encourage using it!
+ // Unfortunately we don't know for sure if it's desired or functional.
+ ui.saslStatusLabel->setText(QString("<i>%1</i>").arg(tr("Supported by network")));
+ ui.saslStatusIcon->setPixmap(infoIcon.pixmap(16));
+ break;
+ }
+ }
+}
+
+
#ifdef HAVE_SSL
void NetworksSettingsPage::sslUpdated()
{
if (_cid && !_cid->sslKey().isNull()) {
- ui.saslAccount->setDisabled(true);
- ui.saslAccountLabel->setDisabled(true);
- ui.saslPassword->setDisabled(true);
- ui.saslPasswordLabel->setDisabled(true);
+ ui.saslContents->setDisabled(true);
ui.saslExtInfo->setHidden(false);
} else {
- ui.saslAccount->setDisabled(false);
- ui.saslAccountLabel->setDisabled(false);
- ui.saslPassword->setDisabled(false);
- ui.saslPasswordLabel->setDisabled(false);
+ ui.saslContents->setDisabled(false);
+ // Directly re-enabling causes the widgets to ignore the parent "Use SASL Authentication"
+ // state to indicate whether or not it's disabled. To workaround this, keep track of
+ // whether or not "Use SASL Authentication" is enabled, then quickly uncheck/recheck the
+ // group box.
+ if (!ui.sasl->isChecked()) {
+ // SASL is not enabled, uncheck/recheck the group box to re-disable saslContents.
+ // Leaving saslContents disabled doesn't work as that prevents it from re-enabling if
+ // sasl is later checked.
+ ui.sasl->setChecked(true);
+ ui.sasl->setChecked(false);
+ }
ui.saslExtInfo->setHidden(true);
}
}
}
+void NetworksSettingsPage::on_saslStatusDetails_clicked()
+{
+ if (ui.networkList->selectedItems().count()) {
+ NetworkId netid = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value<NetworkId>();
+ QString &netName = networkInfos[netid].networkName;
+
+ // If these strings are visible, one of the status messages wasn't detected below.
+ QString saslStatusHeader = "[header unintentionally left blank]";
+ QString saslStatusExplanation = "[explanation unintentionally left blank]";
+
+ // If true, show a warning icon instead of an information icon
+ bool useWarningIcon = false;
+
+ // Determine which explanation to show
+ switch (_saslStatusSelected) {
+ case CapSupportStatus::Unknown:
+ saslStatusHeader = tr("Could not check if SASL supported by network");
+ saslStatusExplanation = tr("Quassel could not check if \"%1\" supports SASL. This may "
+ "be due to unsaved changes or an older Quassel core. You "
+ "can still try using SASL.").arg(netName);
+ break;
+ case CapSupportStatus::Disconnected:
+ saslStatusHeader = tr("Cannot check if SASL supported when disconnected");
+ saslStatusExplanation = tr("Quassel cannot check if \"%1\" supports SASL when "
+ "disconnected. Connect to the network, or try using SASL "
+ "anyways.").arg(netName);
+ break;
+ case CapSupportStatus::MaybeUnsupported:
+ saslStatusHeader = tr("SASL not currently supported by network");
+ saslStatusExplanation = tr("The network \"%1\" does not currently support SASL. "
+ "However, support might be added later on.").arg(netName);
+ useWarningIcon = true;
+ break;
+ case CapSupportStatus::MaybeSupported:
+ saslStatusHeader = tr("SASL supported by network");
+ saslStatusExplanation = tr("The network \"%1\" supports SASL. In most cases, you "
+ "should use SASL instead of NickServ identification."
+ ).arg(netName);
+ break;
+ }
+
+ // Process this in advance for reusability below
+ const QString saslStatusMsgTitle = tr("SASL support for \"%1\"").arg(netName);
+ const QString saslStatusMsgText =
+ QString("<p><b>%1</b></p></br><p>%2</p></br><p><i>%3</i></p>"
+ ).arg(saslStatusHeader,
+ saslStatusExplanation,
+ tr("SASL is a standardized way to log in and identify yourself to "
+ "IRC servers."));
+
+ if (useWarningIcon) {
+ // Show as a warning dialog box
+ QMessageBox::warning(this, saslStatusMsgTitle, saslStatusMsgText);
+ } else {
+ // Show as an information dialog box
+ QMessageBox::information(this, saslStatusMsgTitle, saslStatusMsgText);
+ }
+ }
+}
+
+
IdentityId NetworksSettingsPage::defaultIdentity() const
{
IdentityId defaultId = 0;
* NetworkAddDlg
*************************************************************************/
-NetworkAddDlg::NetworkAddDlg(const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist)
+NetworkAddDlg::NetworkAddDlg(QStringList exist, QWidget *parent) : QDialog(parent), existing(std::move(exist))
{
ui.setupUi(this);
- ui.useSSL->setIcon(QIcon::fromTheme("document-encrypt"));
+ ui.useSSL->setIcon(icon::get("document-encrypt"));
// Whenever useSSL is toggled, update the port number if not changed from the default
- connect(ui.useSSL, SIGNAL(toggled(bool)), SLOT(updateSslPort(bool)));
+ connect(ui.useSSL, &QAbstractButton::toggled, this, &NetworkAddDlg::updateSslPort);
// Do NOT call updateSslPort when loading settings, otherwise port settings may be overriden.
// If useSSL is later changed to be checked by default, change port's default value, too.
- if (Client::coreFeatures() & Quassel::VerifyServerSSL) {
+ if (Client::isCoreFeatureEnabled(Quassel::Feature::VerifyServerSSL)) {
// Synchronize requiring SSL with the use SSL checkbox
ui.sslVerify->setEnabled(ui.useSSL->isChecked());
- connect(ui.useSSL, SIGNAL(toggled(bool)), ui.sslVerify, SLOT(setEnabled(bool)));
+ connect(ui.useSSL, &QAbstractButton::toggled, ui.sslVerify, &QWidget::setEnabled);
} else {
// Core isn't new enough to allow requiring SSL; disable checkbox and uncheck
ui.sslVerify->setEnabled(false);
ui.useManual->setChecked(true);
ui.usePreset->setEnabled(false);
}
- connect(ui.networkName, SIGNAL(textChanged(const QString &)), SLOT(setButtonStates()));
- connect(ui.serverAddress, SIGNAL(textChanged(const QString &)), SLOT(setButtonStates()));
+ connect(ui.networkName, &QLineEdit::textChanged, this, &NetworkAddDlg::setButtonStates);
+ connect(ui.serverAddress, &QLineEdit::textChanged, this, &NetworkAddDlg::setButtonStates);
+ connect(ui.usePreset, &QRadioButton::toggled, this, &NetworkAddDlg::setButtonStates);
+ connect(ui.useManual, &QRadioButton::toggled, this, &NetworkAddDlg::setButtonStates);
setButtonStates();
}
* NetworkEditDlg
*************************************************************************/
-NetworkEditDlg::NetworkEditDlg(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist)
+NetworkEditDlg::NetworkEditDlg(const QString &old, QStringList exist, QWidget *parent) : QDialog(parent), existing(std::move(exist))
{
ui.setupUi(this);
ServerEditDlg::ServerEditDlg(const Network::Server &server, QWidget *parent) : QDialog(parent)
{
ui.setupUi(this);
- ui.useSSL->setIcon(QIcon::fromTheme("document-encrypt"));
+ ui.useSSL->setIcon(icon::get("document-encrypt"));
ui.host->setText(server.host);
ui.host->setFocus();
ui.port->setValue(server.port);
}
// Whenever useSSL is toggled, update the port number if not changed from the default
- connect(ui.useSSL, SIGNAL(toggled(bool)), SLOT(updateSslPort(bool)));
+ connect(ui.useSSL, &QAbstractButton::toggled, this, &ServerEditDlg::updateSslPort);
// Do NOT call updateSslPort when loading settings, otherwise port settings may be overriden.
// If useSSL is later changed to be checked by default, change port's default value, too.
- if (Client::coreFeatures() & Quassel::VerifyServerSSL) {
+ if (Client::isCoreFeatureEnabled(Quassel::Feature::VerifyServerSSL)) {
// Synchronize requiring SSL with the use SSL checkbox
ui.sslVerify->setEnabled(ui.useSSL->isChecked());
- connect(ui.useSSL, SIGNAL(toggled(bool)), ui.sslVerify, SLOT(setEnabled(bool)));
+ connect(ui.useSSL, &QAbstractButton::toggled, ui.sslVerify, &QWidget::setEnabled);
} else {
// Core isn't new enough to allow requiring SSL; disable checkbox and uncheck
ui.sslVerify->setEnabled(false);
ui.progressBar->setMaximum(numevents);
ui.progressBar->setValue(0);
- connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientEvent()));
- connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientEvent()));
+ connect(Client::instance(), &Client::networkCreated, this, &SaveNetworksDlg::clientEvent);
+ connect(Client::instance(), &Client::networkRemoved, this, &SaveNetworksDlg::clientEvent);
foreach(NetworkId id, toRemove) {
Client::removeNetwork(id);
continue;
}
// FIXME this only checks for one changed item rather than all!
- connect(net, SIGNAL(updatedRemotely()), this, SLOT(clientEvent()));
+ connect(net, &SyncableObject::updatedRemotely, this, &SaveNetworksDlg::clientEvent);
Client::updateNetwork(info);
}
}