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) {
qDebug() << "ABOUT TO REMOVE: id=" << oldid << "from row" << row;
}
void NetworksSettingsPage::displayNetwork(NetworkId id) {
+ _ignoreWidgetChanges = true;
if(id != 0) {
NetworkInfo info = networkInfos[id];
ui.identityList->setCurrentIndex(ui.identityList->findData(info.identity.toInt()));
ui.identityList->setCurrentIndex(-1);
ui.serverList->clear();
ui.performEdit->clear();
+ ui.autoIdentifyService->clear();
+ ui.autoIdentifyPassword->clear();
setWidgetStates();
}
+ _ignoreWidgetChanges = false;
currentId = id;
}
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());
}
/**************************************************************************