/***************************************************************************
- * 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 <QHeaderView>
#include <QMessageBox>
+#include <QTextCodec>
#include "networkssettingspage.h"
#include "client.h"
-#include "global.h"
+#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);
- connectedIcon = QIcon(":/22x22/actions/network-connect");
- disconnectedIcon = QIcon(":/22x22/actions/network-disconnect");
-
+ // 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"));
+ ui.editIdentities->setIcon(SmallIcon("configure"));
+
+ _ignoreWidgetChanges = false;
+
+ 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(false); // need a core connection!
+ setEnabled(Client::isConnected()); // need a core connection!
setWidgetStates();
connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool)));
- connect(Client::instance(), SIGNAL(networkAdded(NetworkId)), this, SLOT(clientNetworkAdded(NetworkId)));
+ 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.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()));
//connect(ui., SIGNAL(), this, SLOT(widgetHasChanged()));
//connect(ui., SIGNAL(), this, SLOT(widgetHasChanged()));
}
void NetworksSettingsPage::save() {
+ setEnabled(false);
if(currentId != 0) saveToNetworkInfo(networkInfos[currentId]);
- // First, remove the temporarily created networks
QList<NetworkInfo> toCreate, toUpdate;
QList<NetworkId> toRemove;
QHash<NetworkId, NetworkInfo>::iterator i = networkInfos.begin();
while(i != networkInfos.end()) {
- if((*i).networkId < 0) {
+ NetworkId id = (*i).networkId;
+ if(id < 0) {
toCreate.append(*i);
- i = networkInfos.erase(i);
+ //if(id == currentId) currentId = 0;
+ //QList<QListWidgetItem *> items = ui.networkList->findItems((*i).networkName, Qt::MatchExactly);
+ //if(items.count()) {
+ // Q_ASSERT(items[0]->data(Qt::UserRole).value<NetworkId>() == id);
+ // delete items[0];
+ //}
+ //i = networkInfos.erase(i);
+ ++i;
} else {
if((*i) != Client::network((*i).networkId)->networkInfo()) {
toUpdate.append(*i);
// canceled -> reload everything to be safe
load();
}
+ setChangedState(false);
+ setEnabled(true);
}
void NetworksSettingsPage::load() {
ui.networkList->clear();
networkInfos.clear();
- /*
- foreach(Identity *identity, identities.values()) {
- identity->deleteLater();
- }
- identities.clear();
- deletedIdentities.clear();
- changedIdentities.clear();
- ui.identityList->clear();
- */
}
bool NetworksSettingsPage::aboutToSave() {
-
- return true; // FIXME
+ if(currentId != 0) saveToNetworkInfo(networkInfos[currentId]);
+ QList<int> errors;
+ foreach(NetworkInfo info, networkInfos.values()) {
+ if(!info.serverList.count()) errors.append(1);
+ }
+ if(!errors.count()) return true;
+ QString error(tr("<b>The following problems need to be corrected before your changes can be applied:</b><ul>"));
+ if(errors.contains(1)) error += tr("<li>All networks need at least one server defined</li>");
+ error += tr("</ul>");
+ QMessageBox::warning(this, tr("Invalid Network Settings"), error);
+ return false;
}
void NetworksSettingsPage::widgetHasChanged() {
+ if(_ignoreWidgetChanges) return;
bool changed = testHasChanged();
if(changed != hasChanged()) setChangedState(changed);
}
// network list
if(ui.networkList->selectedItems().count()) {
NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value<NetworkId>();
+ 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(true);
- if(Client::network(id) && Client::network(id)->isConnected()) {
- ui.connectNow->setIcon(disconnectedIcon);
- ui.connectNow->setText(tr("Disconnect"));
+ /* button disabled for now
+ 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(connectedIcon);
- ui.connectNow->setText(tr("Connect"));
- }
+ 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
}
}
+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<QListWidgetItem *> items = ui.networkList->findItems(net->networkName(), Qt::MatchExactly);
+ if(items.count()) {
+ foreach(QListWidgetItem *i, items) {
+ NetworkId oldid = i->data(Qt::UserRole).value<NetworkId>();
+ 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;
+ }
+ }
+ item->setText(net->networkName());
+ if(select) item->setSelected(true);
+ }
+}
+
void NetworksSettingsPage::coreConnectionStateChanged(bool state) {
this->setEnabled(state);
if(state) {
}
}
-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<NetworkId>() == id) return item;
- }
- return 0;
-}
-
void NetworksSettingsPage::clientIdentityAdded(IdentityId id) {
const Identity * identity = Client::identity(id);
connect(identity, SIGNAL(updatedRemotely()), this, SLOT(clientIdentityUpdated()));
}
void NetworksSettingsPage::clientIdentityRemoved(IdentityId id) {
- ui.identityList->removeItem(ui.identityList->findData(id.toInt()));
+ if(currentId != 0) saveToNetworkInfo(networkInfos[currentId]);
+ //ui.identityList->removeItem(ui.identityList->findData(id.toInt()));
foreach(NetworkInfo info, networkInfos.values()) {
- if(info.identity == id) info.identity = 1; // set to default
+ //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<NetworkId>() == 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(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() {
qWarning() << "Update request for unknown network received!";
return;
}
- QListWidgetItem *item = networkItem(net->networkId());
- if(!item) return;
- item->setText(net->networkName());
- if(net->isInitialized()) item->setFlags(item->flags() | Qt::ItemIsEnabled);
- else item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
- if(net->isConnected()) {
- item->setIcon(connectedIcon);
- } else {
- item->setIcon(disconnectedIcon);
+ 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<QListWidgetItem *> items = ui.networkList->findItems(info.networkName, Qt::MatchExactly);
+ foreach(QListWidgetItem *item, items) {
+ if(item->data(Qt::UserRole).value<NetworkId>() == id)
+ delete ui.networkList->takeItem(ui.networkList->row(item));
}
+ setWidgetStates();
+ widgetHasChanged();
}
+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();
+}
+
+void NetworksSettingsPage::networkConnectionError(const QString &) {
+
+}
QListWidgetItem *NetworksSettingsPage::insertNetwork(NetworkId id) {
NetworkInfo info = Client::network(id)->networkInfo();
}
QListWidgetItem *NetworksSettingsPage::insertNetwork(const NetworkInfo &info) {
- QListWidgetItem *item = new QListWidgetItem(disconnectedIcon, info.networkName);
- item->setData(Qt::UserRole, QVariant::fromValue<NetworkId>(info.networkId));
- ui.networkList->addItem(item);
- const Network *net = Client::network(info.networkId);
- if(net->isInitialized()) item->setFlags(item->flags() | Qt::ItemIsEnabled);
- else item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
- if(net && net->isConnected()) {
- item->setIcon(connectedIcon);
- } else {
- item->setIcon(disconnectedIcon);
+ QListWidgetItem *item = 0;
+ QList<QListWidgetItem *> 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<NetworkId>();
+ if(id < 0) { item = i; break; }
+ }
+ if(!item) item = new QListWidgetItem(disconnectedIcon, info.networkName, ui.networkList);
}
+ item->setData(Qt::UserRole, QVariant::fromValue<NetworkId>(info.networkId));
+ setItemState(info.networkId, item);
widgetHasChanged();
return item;
}
-void NetworksSettingsPage::displayNetwork(NetworkId id, bool dontsave) {
- Q_UNUSED(dontsave);
- NetworkInfo info = networkInfos[id];
- ui.identityList->setCurrentIndex(ui.identityList->findData(info.identity.toInt()));
- ui.serverList->clear();
- foreach(QVariantMap v, info.serverList) {
- ui.serverList->addItem(QString("%1:%2").arg(v["Host"].toString()).arg(v["Port"].toUInt()));
+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(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.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.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);
+ } else {
+ // just clear widgets
+ ui.identityList->setCurrentIndex(-1);
+ ui.serverList->clear();
+ ui.performEdit->clear();
+ ui.autoIdentifyService->clear();
+ ui.autoIdentifyPassword->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();
+ 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();
}
/*** Network list ***/
void NetworksSettingsPage::on_addNetwork_clicked() {
QStringList existing;
for(int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text();
- NetworkEditDlgNew 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;
networkInfos[id] = info;
QListWidgetItem *item = insertNetwork(info);
ui.networkList->setCurrentItem(item);
if(ui.networkList->selectedItems().count()) {
NetworkId netid = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value<NetworkId>();
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?"
- "<br><br><em>NOTE: Backlog deletion hasn't actually been implemented yet.</em>").arg(networkInfos[netid].networkName),
+ 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); qDebug() << netid << networkInfos.count();
- delete ui.networkList->selectedItems()[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();
QString old = ui.networkList->selectedItems()[0]->text();
QStringList existing;
for(int i = 0; i < ui.networkList->count(); i++) existing << ui.networkList->item(i)->text();
- NetworkEditDlgNew dlg(old, existing, this);
+ 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<NetworkId>();
}
}
+/*
+void NetworksSettingsPage::on_connectNow_clicked() {
+ if(!ui.networkList->selectedItems().count()) return;
+ NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value<NetworkId>();
+ const Network *net = Client::network(id);
+ if(!net) return;
+ if(net->connectionState() == Network::Disconnected) net->requestConnect();
+ else net->requestDisconnect();
+}
+*/
+
/*** Server list ***/
void NetworksSettingsPage::on_serverList_itemSelectionChanged() {
void NetworksSettingsPage::on_addServer_clicked() {
if(currentId == 0) return;
- ServerEditDlgNew 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() {
if(currentId == 0) return;
int cur = ui.serverList->currentRow();
- ServerEditDlgNew dlg(networkInfos[currentId].serverList[cur], this);
+ ServerEditDlg dlg(networkInfos[currentId].serverList[cur], this);
if(dlg.exec() == QDialog::Accepted) {
networkInfos[currentId].serverList[cur] = dlg.serverData();
displayNetwork(currentId);
void NetworksSettingsPage::on_upServer_clicked() {
int cur = ui.serverList->currentRow();
- QVariantMap 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();
- QVariantMap 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();
+}
+
+/**************************************************************************
+* 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
*************************************************************************/
-NetworkEditDlgNew::NetworkEditDlgNew(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) {
+NetworkEditDlg::NetworkEditDlg(const QString &old, const QStringList &exist, QWidget *parent) : QDialog(parent), existing(exist) {
ui.setupUi(this);
if(old.isEmpty()) {
} else ui.networkEdit->setText(old);
}
-QString NetworkEditDlgNew::networkName() const {
- return ui.networkEdit->text();
+QString NetworkEditDlg::networkName() const {
+ return ui.networkEdit->text().trimmed();
}
-void NetworkEditDlgNew::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
*************************************************************************/
-
-ServerEditDlgNew::ServerEditDlgNew(const QVariantMap &serverData, QWidget *parent) : QDialog(parent) {
+ServerEditDlg::ServerEditDlg(const Network::Server &server, QWidget *parent) : QDialog(parent) {
ui.setupUi(this);
- 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(Global::defaultPort);
- }
+ 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();
}
-QVariantMap ServerEditDlgNew::serverData() const {
- QVariantMap _serverData;
- _serverData["Host"] = ui.host->text();
- _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 ServerEditDlgNew::on_host_textChanged() {
- ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.host->text().isEmpty());
+void ServerEditDlg::on_host_textChanged() {
+ ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.host->text().trimmed().isEmpty());
}
/**************************************************************************
{
ui.setupUi(this);
+ 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()));
+
+ 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);
+ }
+ } else {
+ qWarning() << "Sync dialog called without stuff to change!";
+ accept();
+ }
}
+void SaveNetworksDlg::clientEvent() {
+ ui.progressBar->setValue(++rcvevents);
+ if(rcvevents >= numevents) accept();
+}
projects / quassel.git / blobdiff