#include "networkssettingspage.h"
#include "client.h"
-#include "global.h"
+#include "iconloader.h"
#include "identity.h"
#include "network.h"
NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) : SettingsPage(tr("General"), tr("Networks"), parent) {
ui.setupUi(this);
+
+ // set up icons
+ ui.renameNetwork->setIcon(SmallIcon("edit-rename"));
+ ui.addNetwork->setIcon(SmallIcon("list-add"));
+ ui.deleteNetwork->setIcon(SmallIcon("edit-delete"));
+ ui.addServer->setIcon(SmallIcon("list-add"));
+ ui.deleteServer->setIcon(SmallIcon("edit-delete"));
+ ui.editServer->setIcon(SmallIcon("configure"));
+ ui.upServer->setIcon(SmallIcon("go-up"));
+ ui.downServer->setIcon(SmallIcon("go-down"));
+
_ignoreWidgetChanges = false;
- connectedIcon = QIcon(":/22x22/actions/network-connect");
- connectingIcon = QIcon(":/22x22/actions/gear");
- disconnectedIcon = QIcon(":/22x22/actions/network-disconnect");
+ connectedIcon = SmallIcon("network-connect");
+ connectingIcon = SmallIcon("network-wired"); // FIXME network-connecting
+ disconnectedIcon = SmallIcon("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(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()));
}
QListWidgetItem *NetworksSettingsPage::networkItem(NetworkId id) const {
- for(int i = 0; i < ui.networkList->count(); i++) {
+ for(int i = 0; i < ui.networkList->count(); i++) {
QListWidgetItem *item = ui.networkList->item(i);
if(item->data(Qt::UserRole).value<NetworkId>() == id) return item;
}
ui.connectNow->setEnabled(state == Network::Initialized || state == Network::Disconnected);
}
setItemState(net->networkId());
+ setWidgetStates();
}
void NetworksSettingsPage::networkConnectionError(const QString &) {
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()));
+ foreach(Network::Server server, info.serverList) {
+ ui.serverList->addItem(QString("%1:%2").arg(server.host).arg(server.port));
}
//setItemState(id);
ui.randomServer->setChecked(info.useRandomServer);
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);
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();
void NetworksSettingsPage::on_addServer_clicked() {
if(currentId == 0) return;
- ServerEditDlg dlg(QVariantMap(), this);
+ 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() {
void NetworksSettingsPage::on_upServer_clicked() {
int cur = ui.serverList->currentRow();
- QVariant foo = networkInfos[currentId].serverList.takeAt(cur);
- networkInfos[currentId].serverList.insert(cur-1, foo);
+ 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_downServer_clicked() {
int cur = ui.serverList->currentRow();
- QVariant foo = networkInfos[currentId].serverList.takeAt(cur);
- networkInfos[currentId].serverList.insert(cur+1, foo);
+ Network::Server server = networkInfos[currentId].serverList.takeAt(cur);
+ networkInfos[currentId].serverList.insert(cur+1, server);
displayNetwork(currentId);
ui.serverList->setCurrentRow(cur+1);
widgetHasChanged();
}
QString NetworkEditDlg::networkName() const {
- return ui.networkEdit->text();
+ return ui.networkEdit->text().trimmed();
}
void NetworkEditDlg::on_networkEdit_textChanged(const QString &text) {
- ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text));
+ ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text.trimmed()));
}
/**************************************************************************
* ServerEditDlg
*************************************************************************/
-
-ServerEditDlg::ServerEditDlg(const QVariant &_serverData, QWidget *parent) : QDialog(parent) {
+ServerEditDlg::ServerEditDlg(const Network::Server &server, 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);
- }
+ ui.useSSL->setIcon(SmallIcon("document-encrypt"));
+ ui.host->setText(server.host);
+ 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);
+ ui.proxyPort->setValue(server.proxyPort);
+ ui.proxyUsername->setText(server.proxyUser);
+ ui.proxyPassword->setText(server.proxyPass);
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());
+ 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() {
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);
}
connect(net, SIGNAL(updatedRemotely()), this, SLOT(clientEvent()));
Client::updateNetwork(info);
}
- foreach(NetworkId id, toRemove) {
- Client::removeNetwork(id);
- }
} else {
qWarning() << "Sync dialog called without stuff to change!";
accept();