/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel IRC Team *
+ * Copyright (C) 2005-09 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 "settingspagedlg.h"
+#include "util.h"
+#include "settingspages/identitiessettingspage.h"
-NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) : SettingsPage(tr("General"), tr("Networks"), parent) {
+NetworksSettingsPage::NetworksSettingsPage(QWidget *parent)
+: SettingsPage(tr("Misc"), tr("Networks"), parent) {
ui.setupUi(this);
// set up icons
ui.editServer->setIcon(SmallIcon("configure"));
ui.upServer->setIcon(SmallIcon("go-up"));
ui.downServer->setIcon(SmallIcon("go-down"));
+ ui.editIdentities->setIcon(SmallIcon("configure"));
_ignoreWidgetChanges = false;
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.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.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()));
ui.detailsBox->setEnabled(true);
ui.renameNetwork->setEnabled(true);
ui.deleteNetwork->setEnabled(true);
+ /* button disabled for now
ui.connectNow->setEnabled(net);
// && (Client::network(id)->connectionState() == Network::Initialized
// || Client::network(id)->connectionState() == Network::Disconnected));
} 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.connectNow->setEnabled(false);
ui.detailsBox->setEnabled(false);
}
// network details
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 {
- 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;
- }
+ 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;
}
- // append
- ui.identityList->insertItem(ui.identityList->count(), name, id.toInt());
- widgetHasChanged();
}
+ // append
+ ui.identityList->insertItem(ui.identityList->count(), name, id.toInt());
+ widgetHasChanged();
}
void NetworksSettingsPage::clientIdentityUpdated() {
}
void NetworksSettingsPage::clientIdentityRemoved(IdentityId id) {
+ IdentityId defaultId = defaultIdentity();
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
+ if(info.networkId == currentId)
+ ui.identityList->setCurrentIndex(0);
+ info.identity = defaultId;
networkInfos[info.networkId] = info;
if(info.networkId > 0) Client::updateNetwork(info);
}
}
void NetworksSettingsPage::networkConnectionStateChanged(Network::ConnectionState state) {
+ Q_UNUSED(state);
const Network *net = qobject_cast<const Network *>(sender());
if(!net) return;
+ /*
if(net->networkId() == currentId) {
ui.connectNow->setEnabled(state == Network::Initialized || state == Network::Disconnected);
}
+ */
setItemState(net->networkId());
setWidgetStates();
}
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) {
+ QListWidgetItem *item = new QListWidgetItem(QString("%1:%2").arg(server.host).arg(server.port));
+ if(server.useSsl)
+ item->setIcon(SmallIcon("document-encrypt"));
+ ui.serverList->addItem(item);
}
//setItemState(id);
- ui.randomServer->setChecked(info.useRandomServer);
+ //ui.randomServer->setChecked(info.useRandomServer);
ui.performEdit->setPlainText(info.perform.join("\n"));
ui.autoIdentify->setChecked(info.useAutoIdentify);
ui.autoIdentifyService->setText(info.autoIdentifyService);
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);
+ 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.useDefaultEncodings->setChecked(false);
+ ui.useCustomEncodings->setChecked(true);
}
ui.autoReconnect->setChecked(info.useAutoReconnect);
ui.reconnectInterval->setValue(info.autoReconnectInterval);
void NetworksSettingsPage::saveToNetworkInfo(NetworkInfo &info) {
info.identity = ui.identityList->itemData(ui.identityList->currentIndex()).toInt();
- info.useRandomServer = ui.randomServer->isChecked();
+ //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()) {
+ if(!ui.useCustomEncodings->isChecked()) {
info.codecForEncoding.clear();
info.codecForDecoding.clear();
info.codecForServer.clear();
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);
+ 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();
- 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;
-
+ info.identity = defaultIdentity();
networkInfos[id] = info;
QListWidgetItem *item = insertNetwork(info);
ui.networkList->setCurrentItem(item);
}
}
+/*
void NetworksSettingsPage::on_connectNow_clicked() {
if(!ui.networkList->selectedItems().count()) return;
NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value<NetworkId>();
if(net->connectionState() == Network::Disconnected) net->requestConnect();
else net->requestDisconnect();
}
+*/
/*** Server list ***/
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();
}
+void NetworksSettingsPage::on_editIdentities_clicked() {
+ SettingsPageDlg dlg(new IdentitiesSettingsPage(this), this);
+ dlg.exec();
+}
+
+IdentityId NetworksSettingsPage::defaultIdentity() const {
+ IdentityId defaultId = 0;
+ QList<IdentityId> ids = Client::identityIds();
+ foreach(IdentityId id, ids) {
+ if(defaultId == 0 || id < defaultId)
+ defaultId = id;
+ }
+ return defaultId;
+}
+
+/**************************************************************************
+* NetworkAddDlg
+*************************************************************************/
+
+NetworkAddDlg::NetworkAddDlg(const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) {
+ ui.setupUi(this);
+ ui.useSSL->setIcon(SmallIcon("document-encrypt"));
+
+ // read preset networks
+ QStringList networks = Network::presetNetworks();
+ 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()));
+ 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());
+ return info;
+ } else
+ return Network::networkInfoFromPreset(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);
+}
+
/**************************************************************************
* NetworkEditDlg
*************************************************************************/
}
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);
ui.useSSL->setIcon(SmallIcon("document-encrypt"));
-
- 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.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() {