X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.cpp;h=8b448e00ae61a91583bd621e86ba4baf0dd6c1f1;hp=c2dd3fb484d951826eb24795af7add6f29dcd8ea;hb=fdd6c6c1541faf23e8cb0f5889077b5c5dab2ea5;hpb=ddfd94072cc44fcbae497e5a962b9e50579b2026 diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp index c2dd3fb4..8b448e00 100644 --- a/src/qtui/settingspages/networkssettingspage.cpp +++ b/src/qtui/settingspages/networkssettingspage.cpp @@ -19,10 +19,12 @@ ***************************************************************************/ #include +#include #include "networkssettingspage.h" #include "client.h" +#include "global.h" #include "identity.h" #include "network.h" @@ -31,19 +33,21 @@ NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) : SettingsPage(tr("G ui.setupUi(this); connectedIcon = QIcon(":/22x22/actions/network-connect"); + connectingIcon = QIcon(":/22x22/actions/gear"); disconnectedIcon = QIcon(":/22x22/actions/network-disconnect"); 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.networkList, SIGNAL(itemSelectionChanged()), this, SLOT(setWidgetStates())); - //connect(ui.serverList, SIGNAL(itemSelectionChanged()), this, SLOT(setWidgetStates())); + connect(ui.identityList, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetHasChanged())); + //connect(ui., SIGNAL(), this, SLOT(widgetHasChanged())); + //connect(ui., SIGNAL(), this, SLOT(widgetHasChanged())); foreach(IdentityId id, Client::identityIds()) { clientIdentityAdded(id); @@ -51,8 +55,42 @@ NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) : SettingsPage(tr("G } 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() { @@ -69,15 +107,20 @@ void NetworksSettingsPage::reset() { ui.networkList->clear(); networkInfos.clear(); - /* - foreach(Identity *identity, identities.values()) { - identity->deleteLater(); +} + +bool NetworksSettingsPage::aboutToSave() { + if(currentId != 0) saveToNetworkInfo(networkInfos[currentId]); + QList errors; + foreach(NetworkInfo info, networkInfos.values()) { + if(!info.serverList.count()) errors.append(1); } - identities.clear(); - deletedIdentities.clear(); - changedIdentities.clear(); - ui.identityList->clear(); - */ + 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() { @@ -86,7 +129,14 @@ void NetworksSettingsPage::widgetHasChanged() { } 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; } @@ -97,8 +147,10 @@ void NetworksSettingsPage::setWidgetStates() { ui.detailsBox->setEnabled(true); ui.renameNetwork->setEnabled(true); ui.deleteNetwork->setEnabled(true); - ui.connectNow->setEnabled(true); - if(Client::network(id)->isConnected()) { + ui.connectNow->setEnabled(id > 0 + && (Client::network(id)->connectionState() == Network::Initialized + || Client::network(id)->connectionState() == Network::Disconnected)); + if(Client::network(id) && Client::network(id)->isConnected()) { ui.connectNow->setIcon(disconnectedIcon); ui.connectNow->setText(tr("Disconnect")); } else { @@ -123,6 +175,39 @@ void NetworksSettingsPage::setWidgetStates() { ui.upServer->setEnabled(false); ui.downServer->setEnabled(false); } + + // FIXME disable network creation/deletion because of the storage issue + ui.deleteNetwork->setEnabled(false); + ui.renameNetwork->setEnabled(false); +} + +void NetworksSettingsPage::setItemState(NetworkId id, QListWidgetItem *item) { + if(!item) item = networkItem(id); + 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) { + // 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) item->setSelected(true); + delete ui.networkList->takeItem(ui.networkList->row(i)); + networkInfos.remove(oldid); + break; + } + } + item->setText(net->networkName()); + } } void NetworksSettingsPage::coreConnectionStateChanged(bool state) { @@ -135,14 +220,6 @@ void NetworksSettingsPage::coreConnectionStateChanged(bool 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() == id) return item; - } - return 0; -} - void NetworksSettingsPage::clientIdentityAdded(IdentityId id) { const Identity * identity = Client::identity(id); connect(identity, SIGNAL(updatedRemotely()), this, SLOT(clientIdentityUpdated())); @@ -182,17 +259,34 @@ void NetworksSettingsPage::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() == 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(connectionStateSet(Network::ConnectionState)), this, SLOT(networkConnectionStateChanged(Network::ConnectionState))); + connect(Client::network(id), SIGNAL(connectionError(const QString &)), this, SLOT(networkConnectionError(const QString &))); } void NetworksSettingsPage::clientNetworkUpdated() { @@ -201,61 +295,228 @@ 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->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 items = ui.networkList->findItems(info.networkName, Qt::MatchExactly); + if(items.count()) { + Q_ASSERT(items[0]->data(Qt::UserRole).value() == id); + delete ui.networkList->takeItem(ui.networkList->row(items[0])); } + 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()); +} + +void NetworksSettingsPage::networkConnectionError(const QString &) { + +} -void NetworksSettingsPage::insertNetwork(NetworkId id) { +QListWidgetItem *NetworksSettingsPage::insertNetwork(NetworkId id) { NetworkInfo info = Client::network(id)->networkInfo(); networkInfos[id] = info; - QListWidgetItem *item = new QListWidgetItem(disconnectedIcon, info.networkName); - item->setData(Qt::UserRole, QVariant::fromValue(id)); - ui.networkList->addItem(item); - if(Client::network(id)->isConnected()) { - item->setIcon(connectedIcon); - } else { - item->setIcon(disconnectedIcon); + 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, bool dontsave) { - NetworkInfo info = networkInfos[id]; - ui.serverList->clear(); - foreach(QVariantMap v, info.serverList) { - ui.serverList->addItem(QString("%1:%2").arg(v["Address"].toString()).arg(v["Port"].toUInt())); +void NetworksSettingsPage::displayNetwork(NetworkId id) { + 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); + } else { + // just clear widgets + ui.identityList->setCurrentIndex(-1); + ui.serverList->clear(); + ui.performEdit->clear(); + setWidgetStates(); } - + currentId = id; } +void NetworksSettingsPage::saveToNetworkInfo(NetworkInfo &info) { + info.identity = ui.identityList->itemData(ui.identityList->currentIndex()).toInt(); +} /*** 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; + 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?" + "

NOTE: Backlog deletion hasn't actually been implemented yet.").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(); + const Network *net = Client::network(id); + if(!net) return; + if(!net->isConnected()) net->requestConnect(); + else net->requestDisconnect(); +} + +/*** Server list ***/ +void NetworksSettingsPage::on_serverList_itemSelectionChanged() { + setWidgetStates(); +} + +void NetworksSettingsPage::on_addServer_clicked() { + if(currentId == 0) return; + ServerEditDlg dlg(QVariantMap(), 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_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_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_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(); } /************************************************************************** * 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()) { @@ -265,12 +526,12 @@ NetworkEditDlgNew::NetworkEditDlgNew(const QString &old, const QStringList &exis } else ui.networkEdit->setText(old); } -QString NetworkEditDlgNew::networkName() const { +QString NetworkEditDlg::networkName() const { return ui.networkEdit->text(); } -void NetworkEditDlgNew::on_networkEdit_textChanged(const QString &text) { +void NetworkEditDlg::on_networkEdit_textChanged(const QString &text) { ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text)); } @@ -279,9 +540,74 @@ void NetworkEditDlgNew::on_networkEdit_textChanged(const QString &text) { * ServerEditDlg *************************************************************************/ -//ServerEditDlg:: +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(); +} + +QVariant ServerEditDlg::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; +} + +void ServerEditDlg::on_host_textChanged() { + ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.host->text().isEmpty()); +} +/************************************************************************** + * SaveNetworksDlg + *************************************************************************/ +SaveNetworksDlg::SaveNetworksDlg(const QList &toCreate, const QList &toUpdate, const QList &toRemove, QWidget *parent) : QDialog(parent) +{ + 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(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(NetworkId id, toRemove) { + Client::removeNetwork(id); + } + } else { + qWarning() << "Sync dialog called without stuff to change!"; + accept(); + } +} + +void SaveNetworksDlg::clientEvent() { + ui.progressBar->setValue(++rcvevents); + if(rcvevents >= numevents) accept(); +}