/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2014 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "iconloader.h"
#include "identity.h"
#include "network.h"
+#include "presetnetworks.h"
#include "settingspagedlg.h"
#include "util.h"
if (!(Client::coreFeatures() & Quassel::SaslAuthentication))
ui.sasl->hide();
if (!(Client::coreFeatures() & Quassel::SaslExternal))
- ui.label_saslext->hide();
+ ui.saslExtInfo->hide();
#ifndef HAVE_SSL
- ui.label_saslext->hide();
+ ui.saslExtInfo->hide();
#endif
// set up icons
{
if (_cid && !_cid->sslKey().isNull()) {
ui.saslAccount->setDisabled(true);
- ui.label_10->setDisabled(true);
+ ui.saslAccountLabel->setDisabled(true);
ui.saslPassword->setDisabled(true);
- ui.label_11->setDisabled(true);
- ui.label_saslext->setHidden(false);
+ ui.saslPasswordLabel->setDisabled(true);
+ ui.saslExtInfo->setHidden(false);
} else {
ui.saslAccount->setDisabled(false);
- ui.label_10->setDisabled(false);
+ ui.saslAccountLabel->setDisabled(false);
ui.saslPassword->setDisabled(false);
- ui.label_11->setDisabled(false);
- ui.label_saslext->setHidden(true);
+ ui.saslPasswordLabel->setDisabled(false);
+ ui.saslExtInfo->setHidden(true);
}
}
#endif
ui.useSSL->setIcon(SmallIcon("document-encrypt"));
// read preset networks
- QStringList networks = Network::presetNetworks();
+ QStringList networks = PresetNetworks::names();
foreach(QString s, existing)
networks.removeAll(s);
if (networks.count())
return info;
}
else
- return Network::networkInfoFromPreset(ui.presetList->currentText());
+ return PresetNetworks::networkInfo(ui.presetList->currentText());
}
ui.port->setValue(server.port);
ui.password->setText(server.password);
ui.useSSL->setChecked(server.useSsl);
- ui.sslVersion->setCurrentIndex(server.sslVersion);
ui.useProxy->setChecked(server.useProxy);
ui.proxyType->setCurrentIndex(server.proxyType == QNetworkProxy::Socks5Proxy ? 0 : 1);
ui.proxyHost->setText(server.proxyHost);
Network::Server ServerEditDlg::serverData() const
{
Network::Server server(ui.host->text().trimmed(), ui.port->value(), ui.password->text(), ui.useSSL->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();