/***************************************************************************
- * 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 "networkssettingspage.h"
#include "client.h"
+#include "icon.h"
#include "identity.h"
#include "network.h"
#include "presetnetworks.h"
NetworksSettingsPage::NetworksSettingsPage(QWidget *parent)
: SettingsPage(tr("IRC"), tr("Networks"), parent)
#ifdef HAVE_SSL
- , _cid(0)
+ , _cid(nullptr)
#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"));
+ 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"));
_ignoreWidgetChanges = false;
- connectedIcon = QIcon::fromTheme("network-connect");
- connectingIcon = QIcon::fromTheme("network-wired"); // FIXME network-connecting
- disconnectedIcon = QIcon::fromTheme("network-disconnect");
+ connectedIcon = icon::get("network-connect");
+ connectingIcon = icon::get("network-wired"); // FIXME network-connecting
+ disconnectedIcon = icon::get("network-disconnect");
// Status icons
- infoIcon = QIcon::fromTheme("dialog-information");
- warningIcon = QIcon::fromTheme("dialog-warning");
+ infoIcon = icon::get("dialog-information");
+ warningIcon = icon::get("dialog-warning");
foreach(int mib, QTextCodec::availableMibs()) {
QByteArray codec = QTextCodec::codecForMib(mib)->name();
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) {
+ 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.
QListWidgetItem *item = ui.networkList->item(i);
if (item->data(Qt::UserRole).value<NetworkId>() == id) return item;
}
- return 0;
+ return nullptr;
}
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()));
delete _cid;
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);
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);
}
}
NetworkAddDlg::NetworkAddDlg(const QStringList &exist, QWidget *parent) : QDialog(parent), existing(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)));
// 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.networkName, SIGNAL(textChanged(const QString &)), SLOT(setButtonStates()));
connect(ui.serverAddress, SIGNAL(textChanged(const QString &)), SLOT(setButtonStates()));
+ connect(ui.usePreset, SIGNAL(toggled(bool)), SLOT(setButtonStates()));
+ connect(ui.useManual, SIGNAL(toggled(bool)), SLOT(setButtonStates()));
setButtonStates();
}
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);
// 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)));