#include <QHeaderView>
#include <QMessageBox>
+#include <QTextCodec>
#include "networkssettingspage.h"
#include "client.h"
-#include "global.h"
+#include "iconloader.h"
#include "identity.h"
#include "network.h"
NetworksSettingsPage::NetworksSettingsPage(QWidget *parent) : SettingsPage(tr("General"), tr("Networks"), parent) {
ui.setupUi(this);
- connectedIcon = QIcon(":/22x22/actions/network-connect");
- connectingIcon = QIcon(":/22x22/actions/gear");
- 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"));
+
+ _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(networkCreated(NetworkId)), this, SLOT(clientNetworkAdded(NetworkId)));
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.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::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(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);
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);
+ 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);
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) item->setSelected(true);
- delete ui.networkList->takeItem(ui.networkList->row(i));
+ 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);
}
}
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
}
QListWidgetItem *NetworksSettingsPage::networkItem(NetworkId id) const {
- for(int i = 0; i < ui.networkList->count(); i++) {
+ 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;
}
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 &)));
}
if(id == currentId) displayNetwork(0);
NetworkInfo info = networkInfos.take(id);
QList<QListWidgetItem *> items = ui.networkList->findItems(info.networkName, Qt::MatchExactly);
- if(items.count()) {
- Q_ASSERT(items[0]->data(Qt::UserRole).value<NetworkId>() == id);
- delete ui.networkList->takeItem(ui.networkList->row(items[0]));
+ foreach(QListWidgetItem *item, items) {
+ if(item->data(Qt::UserRole).value<NetworkId>() == id)
+ delete ui.networkList->takeItem(ui.networkList->row(item));
}
setWidgetStates();
widgetHasChanged();
ui.connectNow->setEnabled(state == Network::Initialized || state == Network::Disconnected);
}
setItemState(net->networkId());
+ setWidgetStates();
}
void NetworksSettingsPage::networkConnectionError(const QString &) {
}
void NetworksSettingsPage::displayNetwork(NetworkId id) {
+ _ignoreWidgetChanges = true;
if(id != 0) {
NetworkInfo info = networkInfos[id];
ui.identityList->setCurrentIndex(ui.identityList->findData(info.identity.toInt()));
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.serverEncoding->setCurrentIndex(ui.serverEncoding->findText(Network::defaultCodecForServer()));
+ ui.useDefaultEncodings->setChecked(true);
+ } 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.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();
+ 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 ***/
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);
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;
NetworkId id = ui.networkList->selectedItems()[0]->data(Qt::UserRole).value<NetworkId>();
const Network *net = Client::network(id);
if(!net) return;
- if(!net->isConnected()) net->requestConnect();
+ if(net->connectionState() == Network::Disconnected) net->requestConnect();
else net->requestDisconnect();
}
ServerEditDlg::ServerEditDlg(const QVariant &_serverData, 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.password->setText(serverData["Password"].toString());
ui.useSSL->setChecked(serverData["UseSSL"].toBool());
} else {
- ui.port->setValue(Global::defaultPort);
+ ui.port->setValue(6667);
}
on_host_textChanged();
}
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();
}
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());
}
/**************************************************************************
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);
}
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();