X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fnetworkssettingspage.cpp;h=f32540c96269f121ee8c83a5b1ac15282727df77;hp=ff582612979163a0244225bca459710b1bcf0aaa;hb=f2c9c9f60421892c011f6f11e5b5d7990394d7ac;hpb=5b083e1f67c77ceb7d1d134e976cd6081b70bf12 diff --git a/src/qtui/settingspages/networkssettingspage.cpp b/src/qtui/settingspages/networkssettingspage.cpp index ff582612..f32540c9 100644 --- a/src/qtui/settingspages/networkssettingspage.cpp +++ b/src/qtui/settingspages/networkssettingspage.cpp @@ -20,6 +20,7 @@ #include #include +#include #include "networkssettingspage.h" @@ -31,11 +32,19 @@ NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) : SettingsPage(tr("General"), tr("Networks"), parent) { ui.setupUi(this); + _ignoreWidgetChanges = false; connectedIcon = QIcon(":/22x22/actions/network-connect"); 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(Client::isConnected()); // need a core connection! setWidgetStates(); @@ -46,6 +55,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())); @@ -124,6 +146,7 @@ bool NetworksSettingsPage::aboutToSave() { } void NetworksSettingsPage::widgetHasChanged() { + if(_ignoreWidgetChanges) return; bool changed = testHasChanged(); if(changed != hasChanged()) setChangedState(changed); } @@ -144,18 +167,25 @@ void NetworksSettingsPage::setWidgetStates() { // network list if(ui.networkList->selectedItems().count()) { NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); + 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(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")); + 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); @@ -197,9 +227,17 @@ void NetworksSettingsPage::setItemState(NetworkId id, QListWidgetItem *item) { 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) select = true; + if(oldid == currentId) { + select = true; + currentId = 0; + ui.networkList->clearSelection(); + } int row = ui.networkList->row(i); - if(row >= 0) delete ui.networkList->takeItem(row); + if(row >= 0) { + QListWidgetItem *olditem = ui.networkList->takeItem(row); + Q_ASSERT(olditem); + delete olditem; + } networkInfos.remove(oldid); break; } @@ -261,7 +299,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 @@ -306,9 +344,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(); @@ -353,6 +391,7 @@ QListWidgetItem *NetworksSettingsPage::insertNetwork(const NetworkInfo &info) { } void NetworksSettingsPage::displayNetwork(NetworkId id) { + _ignoreWidgetChanges = true; if(id != 0) { NetworkInfo info = networkInfos[id]; ui.identityList->setCurrentIndex(ui.identityList->findData(info.identity.toInt())); @@ -360,19 +399,58 @@ void NetworksSettingsPage::displayNetwork(NetworkId id) { foreach(QVariant v, info.serverList) { ui.serverList->addItem(QString("%1:%2").arg(v.toMap()["Host"].toString()).arg(v.toMap()["Port"].toUInt())); } - setItemState(id); + //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); 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.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 ***/ @@ -406,6 +484,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); @@ -449,7 +538,7 @@ void NetworksSettingsPage::on_connectNow_clicked() { NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value(); const Network *net = Client::network(id); if(!net) return; - if(!net->isConnected()) net->requestConnect(); + if(net->connectionState() == Network::Disconnected) net->requestConnect(); else net->requestDisconnect(); } @@ -554,7 +643,7 @@ ServerEditDlg::ServerEditDlg(const QVariant &_serverData, QWidget *parent) : QDi QVariant ServerEditDlg::serverData() const { QVariantMap _serverData; - _serverData["Host"] = ui.host->text(); + _serverData["Host"] = ui.host->text().trimmed(); _serverData["Port"] = ui.port->value(); _serverData["Password"] = ui.password->text(); _serverData["UseSSL"] = ui.useSSL->isChecked(); @@ -562,7 +651,7 @@ QVariant ServerEditDlg::serverData() const { } void ServerEditDlg::on_host_textChanged() { - ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.host->text().isEmpty()); + ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(ui.host->text().trimmed().isEmpty()); } /**************************************************************************