X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.cpp;h=80da554c9366195316f8a4219ec87c40015583ee;hp=30de94b73d629d44c9a381e18a8f4b85d5268f16;hb=87b24eb1af046b40109dcba3a9f65b7939d3a35d;hpb=92bc51670686fe3e2c7077e7114389d25cbbfe13 diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp index 30de94b7..80da554c 100644 --- a/src/qtui/settingspages/networkssettingspage.cpp +++ b/src/qtui/settingspages/networkssettingspage.cpp @@ -20,6 +20,7 @@ #include #include +#include #include "networkssettingspage.h" @@ -36,8 +37,15 @@ NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) : SettingsPage(tr("G connectingIcon = QIcon(":/22x22/actions/gear"); disconnectedIcon = QIcon(":/22x22/actions/network-disconnect"); + foreach(int mib, QTextCodec::availableMibs()) { + QByteArray codec = QTextCodec::codecForMib(mib)->name(); + ui.sendEncoding->addItem(codec); + ui.recvEncoding->addItem(codec); + } + ui.sendEncoding->model()->sort(0); + ui.recvEncoding->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(networkCreated(NetworkId)), this, SLOT(clientNetworkAdded(NetworkId))); @@ -46,6 +54,19 @@ NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) : SettingsPage(tr("G 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.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.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())); @@ -175,15 +196,10 @@ void NetworksSettingsPage::setWidgetStates() { ui.upServer->setEnabled(false); ui.downServer->setEnabled(false); } - - // FIXME disable network creation/deletion because of the storage issue - ui.addNetwork->setEnabled(false); - ui.deleteNetwork->setEnabled(false); - ui.renameNetwork->setEnabled(false); } void NetworksSettingsPage::setItemState(NetworkId id, QListWidgetItem *item) { - if(!item) item = networkItem(id); + 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); @@ -195,19 +211,29 @@ void NetworksSettingsPage::setItemState(NetworkId id, QListWidgetItem *item) { 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 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)); + if(oldid == currentId) select = true; + int row = ui.networkList->row(i); + if(row >= 0) { + QListWidgetItem *olditem = ui.networkList->takeItem(row); + if(!olditem) { + qWarning() << "NetworksSettingsPage::setItemState(): Why the heck don't we have an itempointer here?"; + Q_ASSERT(olditem); // abort non-gracefully, I need to figure out what's causing this + } + else delete olditem; + } networkInfos.remove(oldid); break; } } item->setText(net->networkName()); + if(select) item->setSelected(true); } } @@ -263,7 +289,7 @@ void NetworksSettingsPage::clientIdentityRemoved(IdentityId id) { 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; + //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 @@ -308,9 +334,9 @@ void NetworksSettingsPage::clientNetworkRemoved(NetworkId id) { 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])); + foreach(QListWidgetItem *item, items) { + if(item->data(Qt::UserRole).value() == id) + delete ui.networkList->takeItem(ui.networkList->row(item)); } setWidgetStates(); widgetHasChanged(); @@ -363,6 +389,25 @@ void NetworksSettingsPage::displayNetwork(NetworkId id) { ui.serverList->addItem(QString("%1:%2").arg(v.toMap()["Host"].toString()).arg(v.toMap()["Port"].toUInt())); } 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.useDefaultEncodings->setChecked(true); + } else { + ui.sendEncoding->setCurrentIndex(ui.sendEncoding->findText(info.codecForEncoding)); + ui.recvEncoding->setCurrentIndex(ui.recvEncoding->findText(info.codecForDecoding)); + ui.useDefaultEncodings->setChecked(false); + } + 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); @@ -375,6 +420,23 @@ void NetworksSettingsPage::displayNetwork(NetworkId 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.useDefaultEncodings->isChecked()) { + info.codecForEncoding.clear(); + info.codecForDecoding.clear(); + } else { + info.codecForEncoding = ui.sendEncoding->currentText().toLatin1(); + info.codecForDecoding = ui.recvEncoding->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 ***/ @@ -408,6 +470,17 @@ void NetworksSettingsPage::on_addNetwork_clicked() { 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; + networkInfos[id] = info; QListWidgetItem *item = insertNetwork(info); ui.networkList->setCurrentItem(item); @@ -419,8 +492,7 @@ 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), + 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; @@ -550,7 +622,7 @@ ServerEditDlg::ServerEditDlg(const QVariant &_serverData, QWidget *parent) : QDi ui.password->setText(serverData["Password"].toString()); ui.useSSL->setChecked(serverData["UseSSL"].toBool()); } else { - ui.port->setValue(Global::defaultPort); + ui.port->setValue(6667); } on_host_textChanged(); }