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");
}
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);
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;
+ if(oldid == currentId) {
+ select = true;
+ currentId = 0;
+ }
int row = ui.networkList->row(i);
- if(row >= 0) delete ui.networkList->takeItem(row);
+ if(row >= 0) {
+ qDebug() << "ABOUT TO REMOVE: id=" << oldid << "from row" << row;
+ QListWidgetItem *olditem = ui.networkList->takeItem(row);
+ qDebug() << "Successfully removed item from list.";
+ 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;
}
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
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();
}
void NetworksSettingsPage::displayNetwork(NetworkId id) {
+ _ignoreWidgetChanges = true;
if(id != 0) {
NetworkInfo info = networkInfos[id];
ui.identityList->setCurrentIndex(ui.identityList->findData(info.identity.toInt()));
}
ui.autoReconnect->setChecked(info.useAutoReconnect);
ui.reconnectInterval->setValue(info.autoReconnectInterval);
- if(info.autoReconnectRetries >= 0) {
- ui.reconnectRetries->setValue(info.autoReconnectRetries);
- ui.unlimitedRetries->setChecked(false);
- } else {
- ui.reconnectRetries->setValue(1);
- ui.unlimitedRetries->setChecked(true);
- }
+ 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;
}
}
info.useAutoReconnect = ui.autoReconnect->isChecked();
info.autoReconnectInterval = ui.reconnectInterval->value();
- if(ui.unlimitedRetries->isChecked()) info.autoReconnectRetries = -1;
- else info.autoReconnectRetries = ui.reconnectRetries->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);
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();
}
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());
}
/**************************************************************************