X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.cpp;h=afc4698ece57519ea228233a9a2044fa49b85094;hp=0857a4e378416934e5c0baf08ba274e535c86538;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=5c6804f291a63f978e328aeddcc8448e3443b45e diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp index 0857a4e3..afc4698e 100644 --- a/src/qtui/settingspages/networkssettingspage.cpp +++ b/src/qtui/settingspages/networkssettingspage.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel IRC Team * + * 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,548 +15,859 @@ * 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 #include #include +#include #include "networkssettingspage.h" #include "client.h" +#include "icon.h" #include "identity.h" #include "network.h" +#include "presetnetworks.h" +#include "settingspagedlg.h" +#include "util.h" +// IRCv3 capabilities +#include "irccap.h" -NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) : SettingsPage(tr("General"), tr("Networks"), parent) { - ui.setupUi(this); - _ignoreWidgetChanges = false; - - connectedIcon = QIcon(":/22x22/actions/network-connect"); - connectingIcon = QIcon(":/22x22/actions/gear"); - disconnectedIcon = QIcon(":/22x22/actions/network-disconnect"); - - foreach(int mib, QTextCodec::availableMibs()) { - QByteArray codec = QTextCodec::codecForMib(mib)->name(); - ui.sendEncoding->addItem(codec); - ui.recvEncoding->addItem(codec); - ui.serverEncoding->addItem(codec); - } - ui.sendEncoding->model()->sort(0); - ui.recvEncoding->model()->sort(0); - ui.serverEncoding->model()->sort(0); - 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.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.useDefaultEncodings, 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())); - //connect(ui., SIGNAL(), this, SLOT(widgetHasChanged())); - //connect(ui., SIGNAL(), this, SLOT(widgetHasChanged())); - - foreach(IdentityId id, Client::identityIds()) { - clientIdentityAdded(id); - } -} - -void NetworksSettingsPage::save() { - setEnabled(false); - if(currentId != 0) saveToNetworkInfo(networkInfos[currentId]); - - QList toCreate, toUpdate; - QList toRemove; - QHash::iterator i = networkInfos.begin(); - while(i != networkInfos.end()) { - NetworkId id = (*i).networkId; - if(id < 0) { - toCreate.append(*i); - //if(id == currentId) currentId = 0; - //QList items = ui.networkList->findItems((*i).networkName, Qt::MatchExactly); - //if(items.count()) { - // Q_ASSERT(items[0]->data(Qt::UserRole).value() == id); - // delete items[0]; - //} - //i = networkInfos.erase(i); - ++i; - } else { - if((*i) != Client::network((*i).networkId)->networkInfo()) { - toUpdate.append(*i); - } - ++i; - } - } - foreach(NetworkId id, Client::networkIds()) { - if(!networkInfos.contains(id)) toRemove.append(id); - } - SaveNetworksDlg dlg(toCreate, toUpdate, toRemove, this); - int ret = dlg.exec(); - if(ret == QDialog::Rejected) { - // canceled -> reload everything to be safe - load(); - } - setChangedState(false); - setEnabled(true); -} - -void NetworksSettingsPage::load() { - reset(); - foreach(NetworkId netid, Client::networkIds()) { - clientNetworkAdded(netid); - } - ui.networkList->setCurrentRow(0); - setChangedState(false); -} - -void NetworksSettingsPage::reset() { - currentId = 0; - ui.networkList->clear(); - networkInfos.clear(); - -} - -bool NetworksSettingsPage::aboutToSave() { - if(currentId != 0) saveToNetworkInfo(networkInfos[currentId]); - QList errors; - foreach(NetworkInfo info, networkInfos.values()) { - if(!info.serverList.count()) errors.append(1); - } - if(!errors.count()) return true; - QString error(tr("The following problems need to be corrected before your changes can be applied:
    ")); - if(errors.contains(1)) error += tr("
  • All networks need at least one server defined
    • "); - error += tr("
"); - QMessageBox::warning(this, tr("Invalid Network Settings"), error); - return false; -} - -void NetworksSettingsPage::widgetHasChanged() { - if(_ignoreWidgetChanges) return; - bool changed = testHasChanged(); - if(changed != hasChanged()) setChangedState(changed); -} - -bool NetworksSettingsPage::testHasChanged() { - if(currentId != 0) { - saveToNetworkInfo(networkInfos[currentId]); - } - if(Client::networkIds().count() != networkInfos.count()) return true; - foreach(NetworkId id, networkInfos.keys()) { - if(id < 0) return true; - if(Client::network(id)->networkInfo() != networkInfos[id]) return true; - } - return false; -} - -void NetworksSettingsPage::setWidgetStates() { - // network list - if(ui.networkList->selectedItems().count()) { - NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); - const Network *net = 0; - if(id > 0) net = Client::network(id); - ui.detailsBox->setEnabled(true); - ui.renameNetwork->setEnabled(true); - ui.deleteNetwork->setEnabled(true); - ui.connectNow->setEnabled(net); - // && (Client::network(id)->connectionState() == Network::Initialized - // || Client::network(id)->connectionState() == Network::Disconnected)); - if(net) { - if(net->connectionState() == Network::Disconnected) { - ui.connectNow->setIcon(connectedIcon); - ui.connectNow->setText(tr("Connect")); - } else { - ui.connectNow->setIcon(disconnectedIcon); - ui.connectNow->setText(tr("Disconnect")); - } +#include "settingspages/identitiessettingspage.h" + +NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) + : SettingsPage(tr("IRC"), tr("Networks"), parent) +#ifdef HAVE_SSL + , _cid(nullptr) +#endif +{ + ui.setupUi(this); + + // hide SASL options for older cores + if (!Client::isCoreFeatureEnabled(Quassel::Feature::SaslAuthentication)) + ui.sasl->hide(); + if (!Client::isCoreFeatureEnabled(Quassel::Feature::SaslExternal)) + ui.saslExtInfo->hide(); +#ifndef HAVE_SSL + ui.saslExtInfo->hide(); +#endif + + // set up icons + 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 = 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(); + ui.sendEncoding->addItem(codec); + ui.recvEncoding->addItem(codec); + ui.serverEncoding->addItem(codec); + } + ui.sendEncoding->model()->sort(0); + ui.recvEncoding->model()->sort(0); + ui.serverEncoding->model()->sort(0); + 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())); + + foreach(IdentityId id, Client::identityIds()) { + clientIdentityAdded(id); + } +} + + +void NetworksSettingsPage::save() +{ + setEnabled(false); + if (currentId != 0) saveToNetworkInfo(networkInfos[currentId]); + + QList toCreate, toUpdate; + QList toRemove; + QHash::iterator i = networkInfos.begin(); + while (i != networkInfos.end()) { + NetworkId id = (*i).networkId; + if (id < 0) { + toCreate.append(*i); + //if(id == currentId) currentId = 0; + //QList items = ui.networkList->findItems((*i).networkName, Qt::MatchExactly); + //if(items.count()) { + // Q_ASSERT(items[0]->data(Qt::UserRole).value() == id); + // delete items[0]; + //} + //i = networkInfos.erase(i); + ++i; + } + else { + if ((*i) != Client::network((*i).networkId)->networkInfo()) { + toUpdate.append(*i); + } + ++i; + } + } + foreach(NetworkId id, Client::networkIds()) { + if (!networkInfos.contains(id)) toRemove.append(id); + } + SaveNetworksDlg dlg(toCreate, toUpdate, toRemove, this); + int ret = dlg.exec(); + if (ret == QDialog::Rejected) { + // canceled -> reload everything to be safe + load(); + } + setChangedState(false); + setEnabled(true); +} + + +void NetworksSettingsPage::load() +{ + reset(); + + // Handle UI dependent on core feature flags here + if (Client::isCoreFeatureEnabled(Quassel::Feature::CustomRateLimits)) { + // Custom rate limiting supported, allow toggling + ui.useCustomMessageRate->setEnabled(true); + // Reset tooltip to default. + ui.useCustomMessageRate->setToolTip(QString("%1").arg( + tr("

Override default message rate limiting.

" + "

Setting limits too low may get you disconnected" + " from the server!

"))); + // If changed, update the message below! } else { - ui.connectNow->setIcon(QIcon()); - ui.connectNow->setText(tr("Apply first!")); - } - } else { - ui.renameNetwork->setEnabled(false); - ui.deleteNetwork->setEnabled(false); - ui.connectNow->setEnabled(false); - ui.detailsBox->setEnabled(false); - } - // network details - if(ui.serverList->selectedItems().count()) { - ui.editServer->setEnabled(true); - ui.deleteServer->setEnabled(true); - ui.upServer->setEnabled(ui.serverList->currentRow() > 0); - ui.downServer->setEnabled(ui.serverList->currentRow() < ui.serverList->count() - 1); - } else { - ui.editServer->setEnabled(false); - ui.deleteServer->setEnabled(false); - ui.upServer->setEnabled(false); - ui.downServer->setEnabled(false); - } -} - -void NetworksSettingsPage::setItemState(NetworkId id, QListWidgetItem *item) { - if(!item && !(item = networkItem(id))) return; - const Network *net = Client::network(id); - if(!net || net->isInitialized()) item->setFlags(item->flags() | Qt::ItemIsEnabled); - else item->setFlags(item->flags() & ~Qt::ItemIsEnabled); - if(net && net->connectionState() == Network::Initialized) { - item->setIcon(connectedIcon); - } else if(net && net->connectionState() != Network::Disconnected) { - item->setIcon(connectingIcon); - } else { - item->setIcon(disconnectedIcon); - } - if(net) { - bool select = false; - // check if we already have another net of this name in the list, and replace it - QList items = ui.networkList->findItems(net->networkName(), Qt::MatchExactly); - if(items.count()) { - foreach(QListWidgetItem *i, items) { - NetworkId oldid = i->data(Qt::UserRole).value(); - if(oldid > 0) continue; // only locally created nets should be replaced - if(oldid == currentId) { - select = true; - currentId = 0; - ui.networkList->clearSelection(); + // Custom rate limiting not supported, disallow toggling + ui.useCustomMessageRate->setEnabled(false); + // Split up the message to allow re-using translations: + // [Original tool-tip] + // [Bold 'does not support feature' message] + // [Specific version needed and feature details] + ui.useCustomMessageRate->setToolTip(QString("%1
%2
%3").arg( + tr("

Override default message rate limiting.

" + "

Setting limits too low may get you disconnected" + " from the server!

"), + tr("Your Quassel core does not support this feature"), + tr("You need a Quassel core v0.13.0 or newer in order to " + "modify message rate limits."))); + } + +#ifdef HAVE_SSL + // Hide the SASL EXTERNAL notice until a network's shown. Stops it from showing while loading + // backlog from the core. + sslUpdated(); +#endif + + // Reset network capability status in case no valid networks get selected (a rare situation) + resetNetworkCapStates(); + + foreach(NetworkId netid, Client::networkIds()) { + clientNetworkAdded(netid); + } + ui.networkList->setCurrentRow(0); + + setChangedState(false); +} + + +void NetworksSettingsPage::reset() +{ + currentId = 0; + ui.networkList->clear(); + networkInfos.clear(); +} + + +bool NetworksSettingsPage::aboutToSave() +{ + if (currentId != 0) saveToNetworkInfo(networkInfos[currentId]); + QList errors; + foreach(NetworkInfo info, networkInfos.values()) { + if (!info.serverList.count()) errors.append(1); + } + if (!errors.count()) return true; + QString error(tr("The following problems need to be corrected before your changes can be applied:
    ")); + if (errors.contains(1)) error += tr("
  • All networks need at least one server defined
    • "); + error += tr("
"); + QMessageBox::warning(this, tr("Invalid Network Settings"), error); + return false; +} + + +void NetworksSettingsPage::widgetHasChanged() +{ + if (_ignoreWidgetChanges) return; + bool changed = testHasChanged(); + if (changed != hasChanged()) setChangedState(changed); +} + + +bool NetworksSettingsPage::testHasChanged() +{ + if (currentId != 0) { + saveToNetworkInfo(networkInfos[currentId]); + } + if (Client::networkIds().count() != networkInfos.count()) return true; + foreach(NetworkId id, networkInfos.keys()) { + if (id < 0) return true; + if (Client::network(id)->networkInfo() != networkInfos[id]) return true; + } + return false; +} + + +void NetworksSettingsPage::setWidgetStates() +{ + // network list + if (ui.networkList->selectedItems().count()) { + ui.detailsBox->setEnabled(true); + ui.renameNetwork->setEnabled(true); + ui.deleteNetwork->setEnabled(true); + + /* button disabled for now + NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); + const Network *net = id > 0 ? Client::network(id) : 0; + ui.connectNow->setEnabled(net); + // && (Client::network(id)->connectionState() == Network::Initialized + // || Client::network(id)->connectionState() == Network::Disconnected)); + if(net) { + if(net->connectionState() == Network::Disconnected) { + ui.connectNow->setIcon(connectedIcon); + ui.connectNow->setText(tr("Connect")); + } else { + ui.connectNow->setIcon(disconnectedIcon); + ui.connectNow->setText(tr("Disconnect")); + } + } else { + ui.connectNow->setIcon(QIcon()); + ui.connectNow->setText(tr("Apply first!")); + } */ + } + else { + ui.renameNetwork->setEnabled(false); + ui.deleteNetwork->setEnabled(false); + //ui.connectNow->setEnabled(false); + ui.detailsBox->setEnabled(false); + } + // network details + if (ui.serverList->selectedItems().count()) { + ui.editServer->setEnabled(true); + ui.deleteServer->setEnabled(true); + ui.upServer->setEnabled(ui.serverList->currentRow() > 0); + ui.downServer->setEnabled(ui.serverList->currentRow() < ui.serverList->count() - 1); + } + else { + ui.editServer->setEnabled(false); + ui.deleteServer->setEnabled(false); + ui.upServer->setEnabled(false); + ui.downServer->setEnabled(false); + } +} + + +void NetworksSettingsPage::setItemState(NetworkId id, QListWidgetItem *item) +{ + if (!item && !(item = networkItem(id))) return; + const Network *net = Client::network(id); + if (!net || net->isInitialized()) item->setFlags(item->flags() | Qt::ItemIsEnabled); + else item->setFlags(item->flags() & ~Qt::ItemIsEnabled); + if (net && net->connectionState() == Network::Initialized) { + item->setIcon(connectedIcon); + } + else if (net && net->connectionState() != Network::Disconnected) { + item->setIcon(connectingIcon); + } + else { + item->setIcon(disconnectedIcon); + } + if (net) { + bool select = false; + // check if we already have another net of this name in the list, and replace it + QList items = ui.networkList->findItems(net->networkName(), Qt::MatchExactly); + if (items.count()) { + foreach(QListWidgetItem *i, items) { + NetworkId oldid = i->data(Qt::UserRole).value(); + if (oldid > 0) continue; // only locally created nets should be replaced + if (oldid == currentId) { + select = true; + currentId = 0; + ui.networkList->clearSelection(); + } + int row = ui.networkList->row(i); + if (row >= 0) { + QListWidgetItem *olditem = ui.networkList->takeItem(row); + Q_ASSERT(olditem); + delete olditem; + } + networkInfos.remove(oldid); + break; + } } - int row = ui.networkList->row(i); - if(row >= 0) { - QListWidgetItem *olditem = ui.networkList->takeItem(row); - Q_ASSERT(olditem); - delete olditem; + item->setText(net->networkName()); + if (select) item->setSelected(true); + } +} + + +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 (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); + } + + // Add additional capability-dependent interface updates here + } else { + // Network is disconnected + // [SASL] + setSASLStatus(CapSupportStatus::Disconnected); + + // Add additional capability-dependent interface updates here } - networkInfos.remove(oldid); - break; - } + } else { + // 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] + setSASLStatus(CapSupportStatus::Unknown); + + // Add additional capability-dependent interface updates here } - item->setText(net->networkName()); - if(select) item->setSelected(true); - } } -void NetworksSettingsPage::coreConnectionStateChanged(bool state) { - this->setEnabled(state); - if(state) { - load(); - } else { - // reset - //currentId = 0; - } + +void NetworksSettingsPage::coreConnectionStateChanged(bool state) +{ + this->setEnabled(state); + if (state) { + load(); + } + else { + // reset + //currentId = 0; + } } -void NetworksSettingsPage::clientIdentityAdded(IdentityId id) { - const Identity * identity = Client::identity(id); - connect(identity, SIGNAL(updatedRemotely()), this, SLOT(clientIdentityUpdated())); - if(id == 1) { - // default identity is always the first one! - ui.identityList->insertItem(0, identity->identityName(), id.toInt()); - } else { +void NetworksSettingsPage::clientIdentityAdded(IdentityId id) +{ + const Identity *identity = Client::identity(id); + connect(identity, SIGNAL(updatedRemotely()), this, SLOT(clientIdentityUpdated())); + QString name = identity->identityName(); - for(int j = 0; j < ui.identityList->count(); j++) { - if((j>0 || ui.identityList->itemData(0).toInt() != 1) && name.localeAwareCompare(ui.identityList->itemText(j)) < 0) { - ui.identityList->insertItem(j, name, id.toInt()); - widgetHasChanged(); - return; - } + for (int j = 0; j < ui.identityList->count(); j++) { + if ((j > 0 || ui.identityList->itemData(0).toInt() != 1) && name.localeAwareCompare(ui.identityList->itemText(j)) < 0) { + ui.identityList->insertItem(j, name, id.toInt()); + widgetHasChanged(); + return; + } } // append ui.identityList->insertItem(ui.identityList->count(), name, id.toInt()); widgetHasChanged(); - } -} - -void NetworksSettingsPage::clientIdentityUpdated() { - const Identity *identity = qobject_cast(sender()); - if(!identity) { - qWarning() << "NetworksSettingsPage: Invalid identity to update!"; - return; - } - int row = ui.identityList->findData(identity->id().toInt()); - if(row < 0) { - qWarning() << "NetworksSettingsPage: Invalid identity to update!"; - return; - } - if(ui.identityList->itemText(row) != identity->identityName()) { - ui.identityList->setItemText(row, identity->identityName()); - } -} - -void NetworksSettingsPage::clientIdentityRemoved(IdentityId id) { - if(currentId != 0) saveToNetworkInfo(networkInfos[currentId]); - //ui.identityList->removeItem(ui.identityList->findData(id.toInt())); - foreach(NetworkInfo info, networkInfos.values()) { - //qDebug() << info.networkName << info.networkId << info.identity; - if(info.identity == id) { - if(info.networkId == currentId) ui.identityList->setCurrentIndex(0); - info.identity = 1; // set to default - networkInfos[info.networkId] = info; - if(info.networkId > 0) Client::updateNetwork(info); - } - } - ui.identityList->removeItem(ui.identityList->findData(id.toInt())); - widgetHasChanged(); -} - -QListWidgetItem *NetworksSettingsPage::networkItem(NetworkId id) const { - for(int i = 0; i < ui.networkList->count(); i++) { - QListWidgetItem *item = ui.networkList->item(i); - if(item->data(Qt::UserRole).value() == id) return item; - } - return 0; -} - -void NetworksSettingsPage::clientNetworkAdded(NetworkId id) { - insertNetwork(id); - //connect(Client::network(id), SIGNAL(updatedRemotely()), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(identitySet(IdentityId)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(networkNameSet(const QString &)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(serverListSet(QVariantList)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(useRandomServerSet(bool)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(performSet(const QStringList &)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(useAutoIdentifySet(bool)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(autoIdentifyServiceSet(const QString &)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(autoIdentifyPasswordSet(const QString &)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(useAutoReconnectSet(bool)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(autoReconnectIntervalSet(quint32)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(autoReconnectRetriesSet(quint16)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(unlimitedReconnectRetriesSet(bool)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(rejoinChannelsSet(bool)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(codecForServerSet(const QByteArray &)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(codecForEncodingSet(const QByteArray &)), this, SLOT(clientNetworkUpdated())); - connect(Client::network(id), SIGNAL(codecForDecodingSet(const QByteArray &)), this, SLOT(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 &))); -} - -void NetworksSettingsPage::clientNetworkUpdated() { - const Network *net = qobject_cast(sender()); - if(!net) { - qWarning() << "Update request for unknown network received!"; - return; - } - networkInfos[net->networkId()] = net->networkInfo(); - setItemState(net->networkId()); - if(net->networkId() == currentId) displayNetwork(net->networkId()); - setWidgetStates(); - widgetHasChanged(); -} - -void NetworksSettingsPage::clientNetworkRemoved(NetworkId id) { - if(!networkInfos.contains(id)) return; - if(id == currentId) displayNetwork(0); - NetworkInfo info = networkInfos.take(id); - QList items = ui.networkList->findItems(info.networkName, Qt::MatchExactly); - foreach(QListWidgetItem *item, items) { - if(item->data(Qt::UserRole).value() == id) - delete ui.networkList->takeItem(ui.networkList->row(item)); - } - setWidgetStates(); - widgetHasChanged(); -} - -void NetworksSettingsPage::networkConnectionStateChanged(Network::ConnectionState state) { - const Network *net = qobject_cast(sender()); - if(!net) return; - if(net->networkId() == currentId) { - ui.connectNow->setEnabled(state == Network::Initialized || state == Network::Disconnected); - } - setItemState(net->networkId()); - setWidgetStates(); -} - -void NetworksSettingsPage::networkConnectionError(const QString &) { - -} - -QListWidgetItem *NetworksSettingsPage::insertNetwork(NetworkId id) { - NetworkInfo info = Client::network(id)->networkInfo(); - networkInfos[id] = info; - return insertNetwork(info); -} - -QListWidgetItem *NetworksSettingsPage::insertNetwork(const NetworkInfo &info) { - QListWidgetItem *item = 0; - QList items = ui.networkList->findItems(info.networkName, Qt::MatchExactly); - if(!items.count()) item = new QListWidgetItem(disconnectedIcon, info.networkName, ui.networkList); - else { - // we overwrite an existing net if it a) has the same name and b) has a negative ID meaning we created it locally before - // -> then we can be sure that this is the core-side replacement for the net we created - foreach(QListWidgetItem *i, items) { - NetworkId id = i->data(Qt::UserRole).value(); - if(id < 0) { item = i; break; } - } - if(!item) item = new QListWidgetItem(disconnectedIcon, info.networkName, ui.networkList); - } - item->setData(Qt::UserRole, QVariant::fromValue(info.networkId)); - setItemState(info.networkId, item); - widgetHasChanged(); - return item; -} - -void NetworksSettingsPage::displayNetwork(NetworkId id) { - _ignoreWidgetChanges = true; - if(id != 0) { - NetworkInfo info = networkInfos[id]; - ui.identityList->setCurrentIndex(ui.identityList->findData(info.identity.toInt())); - ui.serverList->clear(); - foreach(QVariant v, info.serverList) { - ui.serverList->addItem(QString("%1:%2").arg(v.toMap()["Host"].toString()).arg(v.toMap()["Port"].toUInt())); - } - //setItemState(id); - ui.randomServer->setChecked(info.useRandomServer); - ui.performEdit->setPlainText(info.perform.join("\n")); - ui.autoIdentify->setChecked(info.useAutoIdentify); - ui.autoIdentifyService->setText(info.autoIdentifyService); - ui.autoIdentifyPassword->setText(info.autoIdentifyPassword); - if(info.codecForEncoding.isEmpty()) { - ui.sendEncoding->setCurrentIndex(ui.sendEncoding->findText(Network::defaultCodecForEncoding())); - ui.recvEncoding->setCurrentIndex(ui.recvEncoding->findText(Network::defaultCodecForDecoding())); - ui.serverEncoding->setCurrentIndex(ui.serverEncoding->findText(Network::defaultCodecForServer())); - ui.useDefaultEncodings->setChecked(true); - } else { - ui.sendEncoding->setCurrentIndex(ui.sendEncoding->findText(info.codecForEncoding)); - ui.recvEncoding->setCurrentIndex(ui.recvEncoding->findText(info.codecForDecoding)); - ui.serverEncoding->setCurrentIndex(ui.serverEncoding->findText(info.codecForServer)); - ui.useDefaultEncodings->setChecked(false); - } - ui.autoReconnect->setChecked(info.useAutoReconnect); - ui.reconnectInterval->setValue(info.autoReconnectInterval); - ui.reconnectRetries->setValue(info.autoReconnectRetries); - ui.unlimitedRetries->setChecked(info.unlimitedReconnectRetries); - ui.rejoinOnReconnect->setChecked(info.rejoinChannels); - } else { - // just clear widgets - ui.identityList->setCurrentIndex(-1); - ui.serverList->clear(); - ui.performEdit->clear(); - ui.autoIdentifyService->clear(); - ui.autoIdentifyPassword->clear(); +} + + +void NetworksSettingsPage::clientIdentityUpdated() +{ + const Identity *identity = qobject_cast(sender()); + if (!identity) { + qWarning() << "NetworksSettingsPage: Invalid identity to update!"; + return; + } + int row = ui.identityList->findData(identity->id().toInt()); + if (row < 0) { + qWarning() << "NetworksSettingsPage: Invalid identity to update!"; + return; + } + if (ui.identityList->itemText(row) != identity->identityName()) { + ui.identityList->setItemText(row, identity->identityName()); + } +} + + +void NetworksSettingsPage::clientIdentityRemoved(IdentityId id) +{ + IdentityId defaultId = defaultIdentity(); + if (currentId != 0) saveToNetworkInfo(networkInfos[currentId]); + foreach(NetworkInfo info, networkInfos.values()) { + if (info.identity == id) { + if (info.networkId == currentId) + ui.identityList->setCurrentIndex(0); + info.identity = defaultId; + networkInfos[info.networkId] = info; + if (info.networkId > 0) Client::updateNetwork(info); + } + } + ui.identityList->removeItem(ui.identityList->findData(id.toInt())); + widgetHasChanged(); +} + + +QListWidgetItem *NetworksSettingsPage::networkItem(NetworkId id) const +{ + for (int i = 0; i < ui.networkList->count(); i++) { + QListWidgetItem *item = ui.networkList->item(i); + if (item->data(Qt::UserRole).value() == id) return item; + } + 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), SIGNAL(connectionStateSet(Network::ConnectionState)), this, SLOT(networkConnectionStateChanged(Network::ConnectionState))); + connect(Client::network(id), SIGNAL(connectionError(const QString &)), this, SLOT(networkConnectionError(const QString &))); + + // 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())); +} + + +void NetworksSettingsPage::clientNetworkUpdated() +{ + const Network *net = qobject_cast(sender()); + if (!net) { + qWarning() << "Update request for unknown network received!"; + return; + } + networkInfos[net->networkId()] = net->networkInfo(); + setItemState(net->networkId()); + if (net->networkId() == currentId) displayNetwork(net->networkId()); setWidgetStates(); - } - _ignoreWidgetChanges = false; - currentId = id; -} - -void NetworksSettingsPage::saveToNetworkInfo(NetworkInfo &info) { - info.identity = ui.identityList->itemData(ui.identityList->currentIndex()).toInt(); - info.useRandomServer = ui.randomServer->isChecked(); - info.perform = ui.performEdit->toPlainText().split("\n"); - info.useAutoIdentify = ui.autoIdentify->isChecked(); - info.autoIdentifyService = ui.autoIdentifyService->text(); - info.autoIdentifyPassword = ui.autoIdentifyPassword->text(); - if(ui.useDefaultEncodings->isChecked()) { - info.codecForEncoding.clear(); - info.codecForDecoding.clear(); - info.codecForServer.clear(); - } else { - info.codecForEncoding = ui.sendEncoding->currentText().toLatin1(); - info.codecForDecoding = ui.recvEncoding->currentText().toLatin1(); - info.codecForServer = ui.serverEncoding->currentText().toLatin1(); - } - info.useAutoReconnect = ui.autoReconnect->isChecked(); - info.autoReconnectInterval = ui.reconnectInterval->value(); - info.autoReconnectRetries = ui.reconnectRetries->value(); - info.unlimitedReconnectRetries = ui.unlimitedRetries->isChecked(); - info.rejoinChannels = ui.rejoinOnReconnect->isChecked(); + widgetHasChanged(); } -/*** Network list ***/ -void NetworksSettingsPage::on_networkList_itemSelectionChanged() { - if(currentId != 0) { - saveToNetworkInfo(networkInfos[currentId]); - } - if(ui.networkList->selectedItems().count()) { - NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); - currentId = id; - displayNetwork(id); - ui.serverList->setCurrentRow(0); - } else { - currentId = 0; - } - setWidgetStates(); -} - -void NetworksSettingsPage::on_addNetwork_clicked() { - QStringList existing; - for(int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text(); - NetworkEditDlg dlg(QString(), existing, this); - if(dlg.exec() == QDialog::Accepted) { - NetworkId id; - for(id = 1; id <= networkInfos.count(); id++) { - widgetHasChanged(); - if(!networkInfos.keys().contains(-id.toInt())) break; - } - id = -id.toInt(); - NetworkInfo info; - info.networkId = id; - info.networkName = dlg.networkName(); - info.identity = 1; - - // defaults - info.useRandomServer = false; - info.useAutoReconnect = true; - info.autoReconnectInterval = 60; - info.autoReconnectRetries = 20; - info.unlimitedReconnectRetries = false; - info.useAutoIdentify = false; - info.autoIdentifyService = "NickServ"; - info.rejoinChannels = true; - networkInfos[id] = info; - QListWidgetItem *item = insertNetwork(info); - ui.networkList->setCurrentItem(item); +void NetworksSettingsPage::clientNetworkRemoved(NetworkId id) +{ + if (!networkInfos.contains(id)) return; + if (id == currentId) displayNetwork(0); + NetworkInfo info = networkInfos.take(id); + QList items = ui.networkList->findItems(info.networkName, Qt::MatchExactly); + foreach(QListWidgetItem *item, items) { + if (item->data(Qt::UserRole).value() == id) + delete ui.networkList->takeItem(ui.networkList->row(item)); + } setWidgetStates(); - } + widgetHasChanged(); } -void NetworksSettingsPage::on_deleteNetwork_clicked() { - if(ui.networkList->selectedItems().count()) { - NetworkId netid = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); - int ret = QMessageBox::question(this, tr("Delete Network?"), - tr("Do you really want to delete the network \"%1\" and all related settings, including the backlog?").arg(networkInfos[netid].networkName), - QMessageBox::Yes|QMessageBox::No, QMessageBox::No); - if(ret == QMessageBox::Yes) { - currentId = 0; - networkInfos.remove(netid); - delete ui.networkList->takeItem(ui.networkList->row(ui.networkList->selectedItems()[0])); - ui.networkList->setCurrentRow(qMin(ui.networkList->currentRow()+1, ui.networkList->count()-1)); - setWidgetStates(); - widgetHasChanged(); + +void NetworksSettingsPage::networkConnectionStateChanged(Network::ConnectionState state) +{ + Q_UNUSED(state); + const Network *net = qobject_cast(sender()); + if (!net) return; + /* + if(net->networkId() == currentId) { + ui.connectNow->setEnabled(state == Network::Initialized || state == Network::Disconnected); } - } + */ + setItemState(net->networkId()); + if (net->networkId() == currentId) { + // Network is currently shown. Update the capability-dependent UI in case capabilities have + // changed. + setNetworkCapStates(currentId); + } + setWidgetStates(); } -void NetworksSettingsPage::on_renameNetwork_clicked() { - if(!ui.networkList->selectedItems().count()) return; - QString old = ui.networkList->selectedItems()[0]->text(); - QStringList existing; - for(int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text(); - NetworkEditDlg dlg(old, existing, this); - if(dlg.exec() == QDialog::Accepted) { - ui.networkList->selectedItems()[0]->setText(dlg.networkName()); - NetworkId netid = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); - networkInfos[netid].networkName = dlg.networkName(); + +void NetworksSettingsPage::networkConnectionError(const QString &) +{ +} + + +QListWidgetItem *NetworksSettingsPage::insertNetwork(NetworkId id) +{ + NetworkInfo info = Client::network(id)->networkInfo(); + networkInfos[id] = info; + return insertNetwork(info); +} + + +QListWidgetItem *NetworksSettingsPage::insertNetwork(const NetworkInfo &info) +{ + QListWidgetItem *item = nullptr; + QList items = ui.networkList->findItems(info.networkName, Qt::MatchExactly); + if (!items.count()) item = new QListWidgetItem(disconnectedIcon, info.networkName, ui.networkList); + else { + // we overwrite an existing net if it a) has the same name and b) has a negative ID meaning we created it locally before + // -> then we can be sure that this is the core-side replacement for the net we created + foreach(QListWidgetItem *i, items) { + NetworkId id = i->data(Qt::UserRole).value(); + if (id < 0) { item = i; break; } + } + if (!item) item = new QListWidgetItem(disconnectedIcon, info.networkName, ui.networkList); + } + item->setData(Qt::UserRole, QVariant::fromValue(info.networkId)); + setItemState(info.networkId, item); widgetHasChanged(); - } + return item; +} + + +// 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; + if (id != 0) { + NetworkInfo info = networkInfos[id]; + +#ifdef HAVE_SSL + // this is only needed when the core supports SASL EXTERNAL + if (Client::isCoreFeatureEnabled(Quassel::Feature::SaslExternal)) { + if (_cid) { + disconnect(_cid, SIGNAL(sslSettingsUpdated()), this, SLOT(sslUpdated())); + delete _cid; + } + _cid = new CertIdentity(*Client::identity(info.identity), this); + _cid->enableEditSsl(true); + connect(_cid, SIGNAL(sslSettingsUpdated()), this, SLOT(sslUpdated())); + } +#endif + + ui.identityList->setCurrentIndex(ui.identityList->findData(info.identity.toInt())); + ui.serverList->clear(); + foreach(Network::Server server, info.serverList) { + QListWidgetItem *item = new QListWidgetItem(QString("%1:%2").arg(server.host).arg(server.port)); + if (server.useSsl) + item->setIcon(icon::get("document-encrypt")); + ui.serverList->addItem(item); + } + //setItemState(id); + //ui.randomServer->setChecked(info.useRandomServer); + // Update the capability-dependent UI in case capabilities have changed. + setNetworkCapStates(id); + ui.performEdit->setPlainText(info.perform.join("\n")); + ui.autoIdentify->setChecked(info.useAutoIdentify); + ui.autoIdentifyService->setText(info.autoIdentifyService); + ui.autoIdentifyPassword->setText(info.autoIdentifyPassword); + ui.sasl->setChecked(info.useSasl); + ui.saslAccount->setText(info.saslAccount); + ui.saslPassword->setText(info.saslPassword); + if (info.codecForEncoding.isEmpty()) { + ui.sendEncoding->setCurrentIndex(ui.sendEncoding->findText(Network::defaultCodecForEncoding())); + ui.recvEncoding->setCurrentIndex(ui.recvEncoding->findText(Network::defaultCodecForDecoding())); + ui.serverEncoding->setCurrentIndex(ui.serverEncoding->findText(Network::defaultCodecForServer())); + ui.useCustomEncodings->setChecked(false); + } + else { + ui.sendEncoding->setCurrentIndex(ui.sendEncoding->findText(info.codecForEncoding)); + ui.recvEncoding->setCurrentIndex(ui.recvEncoding->findText(info.codecForDecoding)); + ui.serverEncoding->setCurrentIndex(ui.serverEncoding->findText(info.codecForServer)); + ui.useCustomEncodings->setChecked(true); + } + ui.autoReconnect->setChecked(info.useAutoReconnect); + ui.reconnectInterval->setValue(info.autoReconnectInterval); + ui.reconnectRetries->setValue(info.autoReconnectRetries); + ui.unlimitedRetries->setChecked(info.unlimitedReconnectRetries); + ui.rejoinOnReconnect->setChecked(info.rejoinChannels); + // Custom rate limiting + ui.unlimitedMessageRate->setChecked(info.unlimitedMessageRate); + // Set 'ui.useCustomMessageRate' after 'ui.unlimitedMessageRate' so if the latter is + // disabled, 'ui.messageRateDelayFrame' will remain disabled. + ui.useCustomMessageRate->setChecked(info.useCustomMessageRate); + ui.messageRateBurstSize->setValue(info.messageRateBurstSize); + // Convert milliseconds (integer) into seconds (double) + ui.messageRateDelay->setValue(info.messageRateDelay / 1000.0f); + } + else { + // just clear widgets +#ifdef HAVE_SSL + if (_cid) { + disconnect(_cid, SIGNAL(sslSettingsUpdated()), this, SLOT(sslUpdated())); + delete _cid; + } +#endif + ui.identityList->setCurrentIndex(-1); + ui.serverList->clear(); + ui.performEdit->clear(); + ui.autoIdentifyService->clear(); + ui.autoIdentifyPassword->clear(); + ui.saslAccount->clear(); + ui.saslPassword->clear(); + setWidgetStates(); + } + _ignoreWidgetChanges = false; + currentId = id; +} + + +void NetworksSettingsPage::saveToNetworkInfo(NetworkInfo &info) +{ + info.identity = ui.identityList->itemData(ui.identityList->currentIndex()).toInt(); + //info.useRandomServer = ui.randomServer->isChecked(); + info.perform = ui.performEdit->toPlainText().split("\n"); + info.useAutoIdentify = ui.autoIdentify->isChecked(); + info.autoIdentifyService = ui.autoIdentifyService->text(); + info.autoIdentifyPassword = ui.autoIdentifyPassword->text(); + info.useSasl = ui.sasl->isChecked(); + info.saslAccount = ui.saslAccount->text(); + info.saslPassword = ui.saslPassword->text(); + if (!ui.useCustomEncodings->isChecked()) { + info.codecForEncoding.clear(); + info.codecForDecoding.clear(); + info.codecForServer.clear(); + } + else { + info.codecForEncoding = ui.sendEncoding->currentText().toLatin1(); + info.codecForDecoding = ui.recvEncoding->currentText().toLatin1(); + info.codecForServer = ui.serverEncoding->currentText().toLatin1(); + } + info.useAutoReconnect = ui.autoReconnect->isChecked(); + info.autoReconnectInterval = ui.reconnectInterval->value(); + info.autoReconnectRetries = ui.reconnectRetries->value(); + info.unlimitedReconnectRetries = ui.unlimitedRetries->isChecked(); + info.rejoinChannels = ui.rejoinOnReconnect->isChecked(); + // Custom rate limiting + info.useCustomMessageRate = ui.useCustomMessageRate->isChecked(); + info.messageRateBurstSize = ui.messageRateBurstSize->value(); + // Convert seconds (double) into milliseconds (integer) + info.messageRateDelay = static_cast((ui.messageRateDelay->value() * 1000)); + info.unlimitedMessageRate = ui.unlimitedMessageRate->isChecked(); +} + + +void NetworksSettingsPage::clientNetworkCapsUpdated() +{ + // Grab the updated network + const Network *net = qobject_cast(sender()); + if (!net) { + qWarning() << "Update request for unknown network received!"; + return; + } + if (net->networkId() == currentId) { + // Network is currently shown. Update the capability-dependent UI in case capabilities have + // changed. + setNetworkCapStates(currentId); + } +} + + +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("%1").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("%1").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("%1").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("%1").arg(tr("Supported by network"))); + ui.saslStatusIcon->setPixmap(infoIcon.pixmap(16)); + break; + } + } +} + + +#ifdef HAVE_SSL +void NetworksSettingsPage::sslUpdated() +{ + if (_cid && !_cid->sslKey().isNull()) { + ui.saslContents->setDisabled(true); + ui.saslExtInfo->setHidden(false); + } else { + 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); + } +} +#endif + + +/*** Network list ***/ + +void NetworksSettingsPage::on_networkList_itemSelectionChanged() +{ + if (currentId != 0) { + saveToNetworkInfo(networkInfos[currentId]); + } + if (ui.networkList->selectedItems().count()) { + NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); + currentId = id; + displayNetwork(id); + ui.serverList->setCurrentRow(0); + } + else { + currentId = 0; + } + setWidgetStates(); +} + + +void NetworksSettingsPage::on_addNetwork_clicked() +{ + QStringList existing; + for (int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text(); + NetworkAddDlg dlg(existing, this); + if (dlg.exec() == QDialog::Accepted) { + NetworkInfo info = dlg.networkInfo(); + if (info.networkName.isEmpty()) + return; // sanity check + + NetworkId id; + for (id = 1; id <= networkInfos.count(); id++) { + widgetHasChanged(); + if (!networkInfos.keys().contains(-id.toInt())) break; + } + id = -id.toInt(); + info.networkId = id; + info.identity = defaultIdentity(); + networkInfos[id] = info; + QListWidgetItem *item = insertNetwork(info); + ui.networkList->setCurrentItem(item); + setWidgetStates(); + } +} + + +void NetworksSettingsPage::on_deleteNetwork_clicked() +{ + if (ui.networkList->selectedItems().count()) { + NetworkId netid = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); + int ret = QMessageBox::question(this, tr("Delete Network?"), + tr("Do you really want to delete the network \"%1\" and all related settings, including the backlog?").arg(networkInfos[netid].networkName), + QMessageBox::Yes|QMessageBox::No, QMessageBox::No); + if (ret == QMessageBox::Yes) { + currentId = 0; + networkInfos.remove(netid); + delete ui.networkList->takeItem(ui.networkList->row(ui.networkList->selectedItems()[0])); + ui.networkList->setCurrentRow(qMin(ui.networkList->currentRow()+1, ui.networkList->count()-1)); + setWidgetStates(); + widgetHasChanged(); + } + } +} + + +void NetworksSettingsPage::on_renameNetwork_clicked() +{ + if (!ui.networkList->selectedItems().count()) return; + QString old = ui.networkList->selectedItems()[0]->text(); + QStringList existing; + for (int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text(); + NetworkEditDlg dlg(old, existing, this); + if (dlg.exec() == QDialog::Accepted) { + ui.networkList->selectedItems()[0]->setText(dlg.networkName()); + NetworkId netid = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); + networkInfos[netid].networkName = dlg.networkName(); + widgetHasChanged(); + } +} + + +/* void NetworksSettingsPage::on_connectNow_clicked() { if(!ui.networkList->selectedItems().count()) return; NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); @@ -565,160 +876,420 @@ void NetworksSettingsPage::on_connectNow_clicked() { if(net->connectionState() == Network::Disconnected) net->requestConnect(); else net->requestDisconnect(); } +*/ /*** Server list ***/ -void NetworksSettingsPage::on_serverList_itemSelectionChanged() { - setWidgetStates(); +void NetworksSettingsPage::on_serverList_itemSelectionChanged() +{ + setWidgetStates(); +} + + +void NetworksSettingsPage::on_addServer_clicked() +{ + if (currentId == 0) return; + ServerEditDlg dlg(Network::Server(), this); + if (dlg.exec() == QDialog::Accepted) { + networkInfos[currentId].serverList.append(dlg.serverData()); + displayNetwork(currentId); + ui.serverList->setCurrentRow(ui.serverList->count()-1); + widgetHasChanged(); + } +} + + +void NetworksSettingsPage::on_editServer_clicked() +{ + if (currentId == 0) return; + int cur = ui.serverList->currentRow(); + ServerEditDlg dlg(networkInfos[currentId].serverList[cur], this); + if (dlg.exec() == QDialog::Accepted) { + networkInfos[currentId].serverList[cur] = dlg.serverData(); + displayNetwork(currentId); + ui.serverList->setCurrentRow(cur); + widgetHasChanged(); + } } -void NetworksSettingsPage::on_addServer_clicked() { - if(currentId == 0) return; - ServerEditDlg dlg(QVariantMap(), this); - if(dlg.exec() == QDialog::Accepted) { - networkInfos[currentId].serverList.append(dlg.serverData()); + +void NetworksSettingsPage::on_deleteServer_clicked() +{ + if (currentId == 0) return; + int cur = ui.serverList->currentRow(); + networkInfos[currentId].serverList.removeAt(cur); displayNetwork(currentId); - ui.serverList->setCurrentRow(ui.serverList->count()-1); + ui.serverList->setCurrentRow(qMin(cur, ui.serverList->count()-1)); widgetHasChanged(); - } +} + +void NetworksSettingsPage::on_upServer_clicked() +{ + int cur = ui.serverList->currentRow(); + Network::Server server = networkInfos[currentId].serverList.takeAt(cur); + networkInfos[currentId].serverList.insert(cur-1, server); + displayNetwork(currentId); + ui.serverList->setCurrentRow(cur-1); + widgetHasChanged(); } -void NetworksSettingsPage::on_editServer_clicked() { - if(currentId == 0) return; - int cur = ui.serverList->currentRow(); - ServerEditDlg dlg(networkInfos[currentId].serverList[cur], this); - if(dlg.exec() == QDialog::Accepted) { - networkInfos[currentId].serverList[cur] = dlg.serverData(); + +void NetworksSettingsPage::on_downServer_clicked() +{ + int cur = ui.serverList->currentRow(); + Network::Server server = networkInfos[currentId].serverList.takeAt(cur); + networkInfos[currentId].serverList.insert(cur+1, server); displayNetwork(currentId); - ui.serverList->setCurrentRow(cur); + ui.serverList->setCurrentRow(cur+1); widgetHasChanged(); - } } -void NetworksSettingsPage::on_deleteServer_clicked() { - if(currentId == 0) return; - int cur = ui.serverList->currentRow(); - networkInfos[currentId].serverList.removeAt(cur); - displayNetwork(currentId); - ui.serverList->setCurrentRow(qMin(cur, ui.serverList->count()-1)); - widgetHasChanged(); + +void NetworksSettingsPage::on_editIdentities_clicked() +{ + SettingsPageDlg dlg(new IdentitiesSettingsPage(this), this); + dlg.exec(); } -void NetworksSettingsPage::on_upServer_clicked() { - int cur = ui.serverList->currentRow(); - QVariant foo = networkInfos[currentId].serverList.takeAt(cur); - networkInfos[currentId].serverList.insert(cur-1, foo); - displayNetwork(currentId); - ui.serverList->setCurrentRow(cur-1); - widgetHasChanged(); + +void NetworksSettingsPage::on_saslStatusDetails_clicked() +{ + if (ui.networkList->selectedItems().count()) { + NetworkId netid = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); + 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("

%1


%2


%3

" + ).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); + } + } } -void NetworksSettingsPage::on_downServer_clicked() { - int cur = ui.serverList->currentRow(); - QVariant foo = networkInfos[currentId].serverList.takeAt(cur); - networkInfos[currentId].serverList.insert(cur+1, foo); - displayNetwork(currentId); - ui.serverList->setCurrentRow(cur+1); - widgetHasChanged(); + +IdentityId NetworksSettingsPage::defaultIdentity() const +{ + IdentityId defaultId = 0; + QList ids = Client::identityIds(); + foreach(IdentityId id, ids) { + if (defaultId == 0 || id < defaultId) + defaultId = id; + } + return defaultId; } + +/************************************************************************** +* NetworkAddDlg +*************************************************************************/ + +NetworkAddDlg::NetworkAddDlg(QStringList exist, QWidget *parent) : QDialog(parent), existing(std::move(exist)) +{ + ui.setupUi(this); + 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::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))); + } else { + // Core isn't new enough to allow requiring SSL; disable checkbox and uncheck + ui.sslVerify->setEnabled(false); + ui.sslVerify->setChecked(false); + // Split up the message to allow re-using translations: + // [Original tool-tip] + // [Bold 'does not support feature' message] + // [Specific version needed and feature details] + ui.sslVerify->setToolTip(QString("%1
%2
%3").arg( + ui.sslVerify->toolTip(), + tr("Your Quassel core does not support this feature"), + tr("You need a Quassel core v0.13.0 or newer in order to " + "verify connection security."))); + } + + // read preset networks + QStringList networks = PresetNetworks::names(); + foreach(QString s, existing) + networks.removeAll(s); + if (networks.count()) + ui.presetList->addItems(networks); + else { + 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.usePreset, SIGNAL(toggled(bool)), SLOT(setButtonStates())); + connect(ui.useManual, SIGNAL(toggled(bool)), SLOT(setButtonStates())); + setButtonStates(); +} + + +NetworkInfo NetworkAddDlg::networkInfo() const +{ + if (ui.useManual->isChecked()) { + NetworkInfo info; + info.networkName = ui.networkName->text().trimmed(); + info.serverList << Network::Server(ui.serverAddress->text().trimmed(), ui.port->value(), + ui.serverPassword->text(), ui.useSSL->isChecked(), + ui.sslVerify->isChecked()); + return info; + } + else + return PresetNetworks::networkInfo(ui.presetList->currentText()); +} + + +void NetworkAddDlg::setButtonStates() +{ + bool ok = false; + if (ui.usePreset->isChecked() && ui.presetList->count()) + ok = true; + else if (ui.useManual->isChecked()) { + ok = !ui.networkName->text().trimmed().isEmpty() && !existing.contains(ui.networkName->text().trimmed()) + && !ui.serverAddress->text().isEmpty(); + } + ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok); +} + + +void NetworkAddDlg::updateSslPort(bool isChecked) +{ + // "Use encrypted connection" was toggled, check the state... + if (isChecked && ui.port->value() == Network::PORT_PLAINTEXT) { + // Had been using the plain-text port, use the SSL default + ui.port->setValue(Network::PORT_SSL); + } else if (!isChecked && ui.port->value() == Network::PORT_SSL) { + // Had been using the SSL port, use the plain-text default + ui.port->setValue(Network::PORT_PLAINTEXT); + } +} + + /************************************************************************** * NetworkEditDlg *************************************************************************/ -NetworkEditDlg::NetworkEditDlg(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) { - ui.setupUi(this); +NetworkEditDlg::NetworkEditDlg(const QString &old, QStringList exist, QWidget *parent) : QDialog(parent), existing(std::move(exist)) +{ + ui.setupUi(this); - if(old.isEmpty()) { - // new network - setWindowTitle(tr("Add Network")); - on_networkEdit_textChanged(""); // disable ok button - } else ui.networkEdit->setText(old); + if (old.isEmpty()) { + // new network + setWindowTitle(tr("Add Network")); + on_networkEdit_textChanged(""); // disable ok button + } + else ui.networkEdit->setText(old); } -QString NetworkEditDlg::networkName() const { - return ui.networkEdit->text(); +QString NetworkEditDlg::networkName() const +{ + return ui.networkEdit->text().trimmed(); } -void NetworkEditDlg::on_networkEdit_textChanged(const QString &text) { - ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text)); + +void NetworkEditDlg::on_networkEdit_textChanged(const QString &text) +{ + ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text.trimmed())); } /************************************************************************** * ServerEditDlg *************************************************************************/ +ServerEditDlg::ServerEditDlg(const Network::Server &server, QWidget *parent) : QDialog(parent) +{ + ui.setupUi(this); + ui.useSSL->setIcon(icon::get("document-encrypt")); + ui.host->setText(server.host); + ui.host->setFocus(); + ui.port->setValue(server.port); + ui.password->setText(server.password); + ui.useSSL->setChecked(server.useSsl); + ui.sslVerify->setChecked(server.sslVerify); + ui.sslVersion->setCurrentIndex(server.sslVersion); + ui.useProxy->setChecked(server.useProxy); + ui.proxyType->setCurrentIndex(server.proxyType == QNetworkProxy::Socks5Proxy ? 0 : 1); + ui.proxyHost->setText(server.proxyHost); + ui.proxyPort->setValue(server.proxyPort); + ui.proxyUsername->setText(server.proxyUser); + ui.proxyPassword->setText(server.proxyPass); + + // This is a dirty hack to display the core->IRC SSL protocol dropdown + // only if the core won't use autonegotiation to determine the best + // protocol. When autonegotiation was introduced, it would have been + // a good idea to use the CoreFeatures enum to accomplish this. + // However, since multiple versions have been released since then, that + // is no longer possible. Instead, we rely on the fact that the + // Datastream protocol was introduced in the same version (0.10) as SSL + // autonegotiation. Because of that, we can display the dropdown only + // if the Legacy protocol is in use. If any other RemotePeer protocol + // is in use, that means a newer protocol is in use and therefore the + // core will use autonegotiation. + if (Client::coreConnection()->peer()->protocol() != Protocol::LegacyProtocol) { + ui.label_3->hide(); + ui.sslVersion->hide(); + } -ServerEditDlg::ServerEditDlg(const QVariant &_serverData, QWidget *parent) : QDialog(parent) { - ui.setupUi(this); - QVariantMap serverData = _serverData.toMap(); - if(serverData.count()) { - ui.host->setText(serverData["Host"].toString()); - ui.port->setValue(serverData["Port"].toUInt()); - ui.password->setText(serverData["Password"].toString()); - ui.useSSL->setChecked(serverData["UseSSL"].toBool()); - } else { - ui.port->setValue(6667); - } - on_host_textChanged(); + // 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::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))); + } else { + // Core isn't new enough to allow requiring SSL; disable checkbox and uncheck + ui.sslVerify->setEnabled(false); + ui.sslVerify->setChecked(false); + // Split up the message to allow re-using translations: + // [Original tool-tip] + // [Bold 'does not support feature' message] + // [Specific version needed and feature details] + ui.sslVerify->setToolTip(QString("%1
%2
%3").arg( + ui.sslVerify->toolTip(), + tr("Your Quassel core does not support this feature"), + tr("You need a Quassel core v0.13.0 or newer in order to " + "verify connection security."))); + } + + on_host_textChanged(); } -QVariant ServerEditDlg::serverData() const { - QVariantMap _serverData; - _serverData["Host"] = ui.host->text().trimmed(); - _serverData["Port"] = ui.port->value(); - _serverData["Password"] = ui.password->text(); - _serverData["UseSSL"] = ui.useSSL->isChecked(); - return _serverData; + +Network::Server ServerEditDlg::serverData() const +{ + Network::Server server(ui.host->text().trimmed(), ui.port->value(), ui.password->text(), + ui.useSSL->isChecked(), ui.sslVerify->isChecked()); + server.sslVersion = ui.sslVersion->currentIndex(); + server.useProxy = ui.useProxy->isChecked(); + server.proxyType = ui.proxyType->currentIndex() == 0 ? QNetworkProxy::Socks5Proxy : QNetworkProxy::HttpProxy; + server.proxyHost = ui.proxyHost->text(); + server.proxyPort = ui.proxyPort->value(); + server.proxyUser = ui.proxyUsername->text(); + server.proxyPass = ui.proxyPassword->text(); + return server; } -void ServerEditDlg::on_host_textChanged() { - ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.host->text().trimmed().isEmpty()); + +void ServerEditDlg::on_host_textChanged() +{ + ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.host->text().trimmed().isEmpty()); +} + + +void ServerEditDlg::updateSslPort(bool isChecked) +{ + // "Use encrypted connection" was toggled, check the state... + if (isChecked && ui.port->value() == Network::PORT_PLAINTEXT) { + // Had been using the plain-text port, use the SSL default + ui.port->setValue(Network::PORT_SSL); + } else if (!isChecked && ui.port->value() == Network::PORT_SSL) { + // Had been using the SSL port, use the plain-text default + ui.port->setValue(Network::PORT_PLAINTEXT); + } } + /************************************************************************** * SaveNetworksDlg *************************************************************************/ SaveNetworksDlg::SaveNetworksDlg(const QList &toCreate, const QList &toUpdate, const QList &toRemove, QWidget *parent) : QDialog(parent) { - ui.setupUi(this); + ui.setupUi(this); - numevents = toCreate.count() + toUpdate.count() + toRemove.count(); - rcvevents = 0; - if(numevents) { - ui.progressBar->setMaximum(numevents); - ui.progressBar->setValue(0); + numevents = toCreate.count() + toUpdate.count() + toRemove.count(); + rcvevents = 0; + if (numevents) { + 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(), SIGNAL(networkCreated(NetworkId)), this, SLOT(clientEvent())); + connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), this, SLOT(clientEvent())); - foreach(NetworkId id, toRemove) { - Client::removeNetwork(id); - } - foreach(NetworkInfo info, toCreate) { - Client::createNetwork(info); + foreach(NetworkId id, toRemove) { + Client::removeNetwork(id); + } + foreach(NetworkInfo info, toCreate) { + Client::createNetwork(info); + } + foreach(NetworkInfo info, toUpdate) { + const Network *net = Client::network(info.networkId); + if (!net) { + qWarning() << "Invalid client network!"; + numevents--; + continue; + } + // FIXME this only checks for one changed item rather than all! + connect(net, SIGNAL(updatedRemotely()), this, SLOT(clientEvent())); + Client::updateNetwork(info); + } } - foreach(NetworkInfo info, toUpdate) { - const Network *net = Client::network(info.networkId); - if(!net) { - qWarning() << "Invalid client network!"; - numevents--; - continue; - } - // FIXME this only checks for one changed item rather than all! - connect(net, SIGNAL(updatedRemotely()), this, SLOT(clientEvent())); - Client::updateNetwork(info); + else { + qWarning() << "Sync dialog called without stuff to change!"; + accept(); } - } else { - qWarning() << "Sync dialog called without stuff to change!"; - accept(); - } } -void SaveNetworksDlg::clientEvent() { - ui.progressBar->setValue(++rcvevents); - if(rcvevents >= numevents) accept(); + +void SaveNetworksDlg::clientEvent() +{ + ui.progressBar->setValue(++rcvevents); + if (rcvevents >= numevents) accept(); }