/***************************************************************************
- * Copyright (C) 2005-09 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
+ * (at your option) version 3. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "identitiessettingspage.h"
#include <QInputDialog>
#include <QMessageBox>
+#include <utility>
#include "client.h"
-#include "iconloader.h"
+#include "icon.h"
#include "signalproxy.h"
IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent)
- : SettingsPage(tr("General"), tr("Identities"), parent),
- _editSsl(false)
+ : SettingsPage(tr("IRC"), tr("Identities"), parent)
{
- ui.setupUi(this);
- ui.renameIdentity->setIcon(BarIcon("edit-rename"));
- ui.addIdentity->setIcon(BarIcon("list-add-user"));
- ui.deleteIdentity->setIcon(BarIcon("list-remove-user"));
+ ui.setupUi(this);
+ ui.renameIdentity->setIcon(icon::get("edit-rename"));
+ ui.addIdentity->setIcon(icon::get("list-add-user"));
+ ui.deleteIdentity->setIcon(icon::get("list-remove-user"));
- coreConnectionStateChanged(Client::isConnected()); // need a core connection!
- connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool)));
+ coreConnectionStateChanged(Client::isConnected()); // need a core connection!
+ connect(Client::instance(), &Client::coreConnectionStateChanged, this, &IdentitiesSettingsPage::coreConnectionStateChanged);
- connect(Client::instance(), SIGNAL(identityCreated(IdentityId)), this, SLOT(clientIdentityCreated(IdentityId)));
- connect(Client::instance(), SIGNAL(identityRemoved(IdentityId)), this, SLOT(clientIdentityRemoved(IdentityId)));
+ connect(Client::instance(), &Client::identityCreated, this, &IdentitiesSettingsPage::clientIdentityCreated);
+ connect(Client::instance(), &Client::identityRemoved, this, &IdentitiesSettingsPage::clientIdentityRemoved);
- connect(ui.identityEditor, SIGNAL(widgetHasChanged()), this, SLOT(widgetHasChanged()));
+ connect(ui.identityEditor, &IdentityEditWidget::widgetHasChanged, this, &IdentitiesSettingsPage::widgetHasChanged);
#ifdef HAVE_SSL
- connect(ui.identityEditor, SIGNAL(requestEditSsl()), this, SLOT(continueUnsecured()));
+ connect(ui.identityEditor, &IdentityEditWidget::requestEditSsl, this, &IdentitiesSettingsPage::continueUnsecured);
#endif
- currentId = 0;
+ currentId = 0;
- //connect(ui.identityList, SIGNAL(editTextChanged(const QString &)), this, SLOT(widgetHasChanged()));
+ //connect(ui.identityList, SIGNAL(editTextChanged(const QString &)), this, SLOT(widgetHasChanged()));
}
-void IdentitiesSettingsPage::coreConnectionStateChanged(bool connected) {
- setEnabled(connected);
- if(connected) {
+
+void IdentitiesSettingsPage::coreConnectionStateChanged(bool connected)
+{
+ setEnabled(connected);
+ if (connected) {
#ifdef HAVE_SSL
- if(Client::signalProxy()->isSecure()) {
- ui.identityEditor->setSslState(IdentityEditWidget::AllowSsl);
- _editSsl = true;
- } else {
- ui.identityEditor->setSslState(IdentityEditWidget::UnsecureSsl);
- _editSsl = false;
- }
+ if (Client::signalProxy()->isSecure()) {
+ ui.identityEditor->setSslState(IdentityEditWidget::AllowSsl);
+ _editSsl = true;
+ }
+ else {
+ ui.identityEditor->setSslState(IdentityEditWidget::UnsecureSsl);
+ _editSsl = false;
+ }
#else
- ui.identityEditor->setSslState(IdentityEditWidget::NoSsl);
+ ui.identityEditor->setSslState(IdentityEditWidget::NoSsl);
#endif
- load();
- } else {
- // reset
- currentId = 0;
- }
+ load();
+ }
+ else {
+ // reset
+ currentId = 0;
+ }
}
+
#ifdef HAVE_SSL
-void IdentitiesSettingsPage::continueUnsecured() {
- _editSsl = true;
+void IdentitiesSettingsPage::continueUnsecured()
+{
+ _editSsl = true;
- QHash<IdentityId, CertIdentity *>::iterator idIter;
- for(idIter = identities.begin(); idIter != identities.end(); idIter++) {
- idIter.value()->enableEditSsl();
- }
+ QHash<IdentityId, CertIdentity *>::iterator idIter;
+ for (idIter = identities.begin(); idIter != identities.end(); ++idIter) {
+ idIter.value()->enableEditSsl();
+ }
- ui.identityEditor->setSslState(IdentityEditWidget::AllowSsl);
+ ui.identityEditor->setSslState(IdentityEditWidget::AllowSsl);
}
+
+
#endif
-void IdentitiesSettingsPage::save() {
- setEnabled(false);
- QList<CertIdentity *> toCreate, toUpdate;
- // we need to remove our temporarily created identities.
- // these are going to be re-added after the core has propagated them back...
- QHash<IdentityId, CertIdentity *>::iterator i = identities.begin();
- while(i != identities.end()) {
- if((*i)->id() < 0) {
- CertIdentity *temp = *i;
- i = identities.erase(i);
- toCreate.append(temp);
- ui.identityList->removeItem(ui.identityList->findData(temp->id().toInt()));
- } else {
- if(**i != *Client::identity((*i)->id()) || (*i)->isDirty()) {
- toUpdate.append(*i);
- }
- ++i;
+void IdentitiesSettingsPage::save()
+{
+ setEnabled(false);
+ QList<CertIdentity *> toCreate, toUpdate;
+ // we need to remove our temporarily created identities.
+ // these are going to be re-added after the core has propagated them back...
+ QHash<IdentityId, CertIdentity *>::iterator i = identities.begin();
+ while (i != identities.end()) {
+ if ((*i)->id() < 0) {
+ CertIdentity *temp = *i;
+ i = identities.erase(i);
+ toCreate.append(temp);
+ ui.identityList->removeItem(ui.identityList->findData(temp->id().toInt()));
+ }
+ else {
+ if (**i != *Client::identity((*i)->id()) || (*i)->isDirty()) {
+ toUpdate.append(*i);
+ }
+ ++i;
+ }
}
- }
- SaveIdentitiesDlg dlg(toCreate, toUpdate, deletedIdentities, this);
- int ret = dlg.exec();
- if(ret == QDialog::Rejected) {
- // canceled -> reload everything to be safe
- load();
- }
- foreach(Identity *id, toCreate) {
- id->deleteLater();
- }
- changedIdentities.clear();
- deletedIdentities.clear();
- setChangedState(false);
- setEnabled(true);
+ SaveIdentitiesDlg dlg(toCreate, toUpdate, deletedIdentities, this);
+ int ret = dlg.exec();
+ if (ret == QDialog::Rejected) {
+ // canceled -> reload everything to be safe
+ load();
+ }
+ foreach(Identity *id, toCreate) {
+ id->deleteLater();
+ }
+ changedIdentities.clear();
+ deletedIdentities.clear();
+ setChangedState(false);
+ setEnabled(true);
+}
+
+
+void IdentitiesSettingsPage::load()
+{
+ currentId = 0;
+ foreach(Identity *identity, identities.values()) {
+ identity->deleteLater();
+ }
+ identities.clear();
+ deletedIdentities.clear();
+ changedIdentities.clear();
+ ui.identityList->clear();
+ setWidgetStates();
+ foreach(IdentityId id, Client::identityIds()) {
+ clientIdentityCreated(id);
+ }
+ setChangedState(false);
}
-void IdentitiesSettingsPage::load() {
- currentId = 0;
- foreach(Identity *identity, identities.values()) {
- identity->deleteLater();
- }
- identities.clear();
- deletedIdentities.clear();
- changedIdentities.clear();
- ui.identityList->clear();
- foreach(IdentityId id, Client::identityIds()) {
- clientIdentityCreated(id);
- }
- setChangedState(false);
+
+void IdentitiesSettingsPage::widgetHasChanged()
+{
+ bool changed = testHasChanged();
+ if (changed != hasChanged()) setChangedState(changed);
}
-void IdentitiesSettingsPage::widgetHasChanged() {
- bool changed = testHasChanged();
- if(changed != hasChanged()) setChangedState(changed);
+
+void IdentitiesSettingsPage::setWidgetStates()
+{
+ bool enabled = (ui.identityList->count() > 0);
+ ui.identityEditor->setEnabled(enabled);
+ ui.renameIdentity->setEnabled(enabled);
+ ui.deleteIdentity->setEnabled(ui.identityList->count() > 1);
}
-bool IdentitiesSettingsPage::testHasChanged() {
- if(deletedIdentities.count()) return true;
- if(currentId < 0) {
- return true; // new identity
- } else {
- if(currentId != 0) {
- changedIdentities.removeAll(currentId);
- CertIdentity temp(currentId, this);
- ui.identityEditor->saveToIdentity(&temp);
- temp.setIdentityName(identities[currentId]->identityName());
- if(temp != *Client::identity(currentId) || temp.isDirty())
- changedIdentities.append(currentId);
+
+bool IdentitiesSettingsPage::testHasChanged()
+{
+ if (deletedIdentities.count()) return true;
+ if (currentId < 0) {
+ return true; // new identity
+ }
+ else {
+ if (currentId != 0) {
+ changedIdentities.removeAll(currentId);
+ CertIdentity temp(currentId, this);
+#ifdef HAVE_SSL
+ // we need to set the cert and key manually, as they aren't synced
+ CertIdentity *old = identities[currentId];
+ temp.setSslKey(old->sslKey());
+ temp.setSslCert(old->sslCert());
+#endif
+ ui.identityEditor->saveToIdentity(&temp);
+ temp.setIdentityName(identities[currentId]->identityName());
+ if (temp != *Client::identity(currentId) || temp.isDirty())
+ changedIdentities.append(currentId);
+ }
+ return changedIdentities.count();
}
- return changedIdentities.count();
- }
}
-bool IdentitiesSettingsPage::aboutToSave() {
- ui.identityEditor->saveToIdentity(identities[currentId]);
- QList<int> errors;
- foreach(Identity *id, identities.values()) {
- if(id->identityName().isEmpty()) errors.append(1);
- if(!id->nicks().count()) errors.append(2);
- if(id->realName().isEmpty()) errors.append(3);
- if(id->ident().isEmpty()) errors.append(4);
- }
- if(!errors.count()) return true;
- QString error(tr("<b>The following problems need to be corrected before your changes can be applied:</b><ul>"));
- if(errors.contains(1)) error += tr("<li>All identities need an identity name set</li>");
- if(errors.contains(2)) error += tr("<li>Every identity needs at least one nickname defined</li>");
- if(errors.contains(3)) error += tr("<li>You need to specify a real name for every identity</li>");
- if(errors.contains(4)) error += tr("<li>You need to specify an ident for every identity</li>");
- error += tr("</ul>");
- QMessageBox::warning(this, tr("One or more identities are invalid"), error);
- return false;
+
+bool IdentitiesSettingsPage::aboutToSave()
+{
+ ui.identityEditor->saveToIdentity(identities[currentId]);
+ QList<int> errors;
+ foreach(Identity *id, identities.values()) {
+ if (id->identityName().isEmpty()) errors.append(1);
+ if (!id->nicks().count()) errors.append(2);
+ if (id->realName().isEmpty()) errors.append(3);
+ if (id->ident().isEmpty()) errors.append(4);
+ }
+ if (!errors.count()) return true;
+ QString error(tr("<b>The following problems need to be corrected before your changes can be applied:</b><ul>"));
+ if (errors.contains(1)) error += tr("<li>All identities need an identity name set</li>");
+ if (errors.contains(2)) error += tr("<li>Every identity needs at least one nickname defined</li>");
+ if (errors.contains(3)) error += tr("<li>You need to specify a real name for every identity</li>");
+ if (errors.contains(4)) error += tr("<li>You need to specify an ident for every identity</li>");
+ error += tr("</ul>");
+ QMessageBox::warning(this, tr("One or more identities are invalid"), error);
+ return false;
}
-void IdentitiesSettingsPage::clientIdentityCreated(IdentityId id) {
- CertIdentity *identity = new CertIdentity(*Client::identity(id), this);
+
+void IdentitiesSettingsPage::clientIdentityCreated(IdentityId id)
+{
+ auto *identity = new CertIdentity(*Client::identity(id), this);
#ifdef HAVE_SSL
- identity->enableEditSsl(_editSsl);
+ identity->enableEditSsl(_editSsl);
#endif
- insertIdentity(identity);
+ insertIdentity(identity);
#ifdef HAVE_SSL
- connect(identity, SIGNAL(sslSettingsUpdated()), this, SLOT(clientIdentityUpdated()));
+ connect(identity, &CertIdentity::sslSettingsUpdated, this, &IdentitiesSettingsPage::clientIdentityUpdated);
#endif
- connect(Client::identity(id), SIGNAL(updatedRemotely()), this, SLOT(clientIdentityUpdated()));
+ connect(Client::identity(id), &SyncableObject::updatedRemotely, this, &IdentitiesSettingsPage::clientIdentityUpdated);
}
-void IdentitiesSettingsPage::clientIdentityUpdated() {
- const Identity *clientIdentity = qobject_cast<Identity *>(sender());
- if(!clientIdentity) {
- qWarning() << "Invalid identity to update!";
- return;
- }
- if(!identities.contains(clientIdentity->id())) {
- qWarning() << "Unknown identity to update:" << clientIdentity->identityName();
- return;
- }
- CertIdentity *identity = identities[clientIdentity->id()];
+void IdentitiesSettingsPage::clientIdentityUpdated()
+{
+ const Identity *clientIdentity = qobject_cast<Identity *>(sender());
+ if (!clientIdentity) {
+ qWarning() << "Invalid identity to update!";
+ return;
+ }
+ if (!identities.contains(clientIdentity->id())) {
+ qWarning() << "Unknown identity to update:" << clientIdentity->identityName();
+ return;
+ }
+
+ CertIdentity *identity = identities[clientIdentity->id()];
- if(identity->identityName() != clientIdentity->identityName())
- renameIdentity(identity->id(), clientIdentity->identityName());
+ if (identity->identityName() != clientIdentity->identityName())
+ renameIdentity(identity->id(), clientIdentity->identityName());
- identity->copyFrom(*clientIdentity);
+ identity->copyFrom(*clientIdentity);
- if(identity->id() == currentId)
- ui.identityEditor->displayIdentity(identity);
+ if (identity->id() == currentId)
+ ui.identityEditor->displayIdentity(identity);
}
-void IdentitiesSettingsPage::clientIdentityRemoved(IdentityId id) {
- if(identities.contains(id)) {
- removeIdentity(identities[id]);
- changedIdentities.removeAll(id);
- deletedIdentities.removeAll(id);
- }
+
+void IdentitiesSettingsPage::clientIdentityRemoved(IdentityId id)
+{
+ if (identities.contains(id)) {
+ removeIdentity(identities[id]);
+ changedIdentities.removeAll(id);
+ deletedIdentities.removeAll(id);
+ }
}
-void IdentitiesSettingsPage::insertIdentity(CertIdentity *identity) {
- IdentityId id = identity->id();
- identities[id] = identity;
- if(id == 1) {
- // default identity is always the first one!
- ui.identityList->insertItem(0, identity->identityName(), id.toInt());
- } else {
+
+void IdentitiesSettingsPage::insertIdentity(CertIdentity *identity)
+{
+ IdentityId id = identity->id();
+ identities[id] = identity;
+
QString name = identity->identityName();
- for(int j = 0; j < ui.identityList->count(); j++) {
- if((j>0 || ui.identityList->itemData(0).toInt() != 1) && name.localeAwareCompare(ui.identityList->itemText(j)) < 0) {
- ui.identityList->insertItem(j, name, id.toInt());
- widgetHasChanged();
- return;
- }
+ for (int j = 0; j < ui.identityList->count(); j++) {
+ if ((j > 0 || ui.identityList->itemData(0).toInt() != 1) && name.localeAwareCompare(ui.identityList->itemText(j)) < 0) {
+ ui.identityList->insertItem(j, name, id.toInt());
+ widgetHasChanged();
+ return;
+ }
}
// append
ui.identityList->insertItem(ui.identityList->count(), name, id.toInt());
+ setWidgetStates();
widgetHasChanged();
- }
}
-void IdentitiesSettingsPage::renameIdentity(IdentityId id, const QString &newName) {
- Identity *identity = identities[id];
- ui.identityList->setItemText(ui.identityList->findData(identity->id().toInt()), newName);
- identity->setIdentityName(newName);
+
+void IdentitiesSettingsPage::renameIdentity(IdentityId id, const QString &newName)
+{
+ Identity *identity = identities[id];
+ ui.identityList->setItemText(ui.identityList->findData(identity->id().toInt()), newName);
+ identity->setIdentityName(newName);
}
-void IdentitiesSettingsPage::removeIdentity(Identity *id) {
- identities.remove(id->id());
- ui.identityList->removeItem(ui.identityList->findData(id->id().toInt()));
- changedIdentities.removeAll(id->id());
- if(currentId == id->id()) currentId = 0;
- id->deleteLater();
- widgetHasChanged();
+
+void IdentitiesSettingsPage::removeIdentity(Identity *id)
+{
+ identities.remove(id->id());
+ ui.identityList->removeItem(ui.identityList->findData(id->id().toInt()));
+ changedIdentities.removeAll(id->id());
+ if (currentId == id->id()) currentId = 0;
+ id->deleteLater();
+ setWidgetStates();
+ widgetHasChanged();
}
-void IdentitiesSettingsPage::on_identityList_currentIndexChanged(int index) {
- CertIdentity *previousIdentity = 0;
- if(currentId != 0 && identities.contains(currentId))
- previousIdentity = identities[currentId];
- if(index < 0) {
- //ui.identityList->setEditable(false);
- ui.identityEditor->displayIdentity(0, previousIdentity);
- currentId = 0;
- } else {
- IdentityId id = ui.identityList->itemData(index).toInt();
- if(identities.contains(id)) {
- ui.identityEditor->displayIdentity(identities[id], previousIdentity);
- currentId = id;
+void IdentitiesSettingsPage::on_identityList_currentIndexChanged(int index)
+{
+ CertIdentity *previousIdentity = nullptr;
+ if (currentId != 0 && identities.contains(currentId))
+ previousIdentity = identities[currentId];
+
+ if (index < 0) {
+ //ui.identityList->setEditable(false);
+ ui.identityEditor->displayIdentity(nullptr, previousIdentity);
+ currentId = 0;
+ }
+ else {
+ IdentityId id = ui.identityList->itemData(index).toInt();
+ if (identities.contains(id)) {
+ ui.identityEditor->displayIdentity(identities[id], previousIdentity);
+ currentId = id;
+ }
}
- ui.deleteIdentity->setEnabled(id != 1); // default identity cannot be deleted
- ui.renameIdentity->setEnabled(id != 1); // ...or renamed
- }
}
-void IdentitiesSettingsPage::on_addIdentity_clicked() {
- CreateIdentityDlg dlg(ui.identityList->model(), this);
- if(dlg.exec() == QDialog::Accepted) {
- // find a free (negative) ID
- IdentityId id;
- for(id = 1; id <= identities.count(); id++) {
- if(!identities.keys().contains(-id.toInt())) break;
- }
- id = -id.toInt();
- CertIdentity *newId = new CertIdentity(id, this);
+
+void IdentitiesSettingsPage::on_addIdentity_clicked()
+{
+ CreateIdentityDlg dlg(ui.identityList->model(), this);
+ if (dlg.exec() == QDialog::Accepted) {
+ // find a free (negative) ID
+ IdentityId id;
+ for (id = 1; id <= identities.count(); id++) {
+ if (!identities.keys().contains(-id.toInt())) break;
+ }
+ id = -id.toInt();
+ auto *newId = new CertIdentity(id, this);
#ifdef HAVE_SSL
- newId->enableEditSsl(_editSsl);
+ newId->enableEditSsl(_editSsl);
#endif
- if(dlg.duplicateId() != 0) {
- // duplicate
- newId->copyFrom(*identities[dlg.duplicateId()]);
- newId->setId(id);
+ if (dlg.duplicateId() != 0) {
+ // duplicate
+ newId->copyFrom(*identities[dlg.duplicateId()]);
+ newId->setId(id);
+ }
+ newId->setIdentityName(dlg.identityName());
+ identities[id] = newId;
+ insertIdentity(newId);
+ ui.identityList->setCurrentIndex(ui.identityList->findData(id.toInt()));
+ widgetHasChanged();
}
- newId->setIdentityName(dlg.identityName());
- identities[id] = newId;
- insertIdentity(newId);
- ui.identityList->setCurrentIndex(ui.identityList->findData(id.toInt()));
- widgetHasChanged();
- }
}
-void IdentitiesSettingsPage::on_deleteIdentity_clicked() {
- Identity *id = identities[currentId];
- int ret = QMessageBox::question(this, tr("Delete Identity?"),
- tr("Do you really want to delete identity \"%1\"?").arg(id->identityName()),
- QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
- if(ret != QMessageBox::Yes) return;
- if(id->id() > 0) deletedIdentities.append(id->id());
- currentId = 0;
- removeIdentity(id);
+
+void IdentitiesSettingsPage::on_deleteIdentity_clicked()
+{
+ Identity *id = identities[currentId];
+ int ret = QMessageBox::question(this, tr("Delete Identity?"),
+ tr("Do you really want to delete identity \"%1\"?").arg(id->identityName()),
+ QMessageBox::Yes|QMessageBox::No, QMessageBox::No);
+ if (ret != QMessageBox::Yes) return;
+ if (id->id() > 0) deletedIdentities.append(id->id());
+ currentId = 0;
+ removeIdentity(id);
}
-void IdentitiesSettingsPage::on_renameIdentity_clicked() {
- QString oldName = identities[currentId]->identityName();
- bool ok = false;
- QString name = QInputDialog::getText(this, tr("Rename Identity"),
- tr("Please enter a new name for the identity \"%1\"!").arg(oldName),
- QLineEdit::Normal, oldName, &ok);
- if(ok && !name.isEmpty()) {
- renameIdentity(currentId, name);
- widgetHasChanged();
- }
+
+void IdentitiesSettingsPage::on_renameIdentity_clicked()
+{
+ QString oldName = identities[currentId]->identityName();
+ bool ok = false;
+ QString name = QInputDialog::getText(this, tr("Rename Identity"),
+ tr("Please enter a new name for the identity \"%1\"!").arg(oldName),
+ QLineEdit::Normal, oldName, &ok);
+ if (ok && !name.isEmpty()) {
+ renameIdentity(currentId, name);
+ widgetHasChanged();
+ }
}
+
/*****************************************************************************************/
CreateIdentityDlg::CreateIdentityDlg(QAbstractItemModel *model, QWidget *parent)
- : QDialog(parent)
+ : QDialog(parent)
{
- ui.setupUi(this);
+ ui.setupUi(this);
- ui.identityList->setModel(model); // now we use the identity list of the main page... Trolltech <3
- on_identityName_textChanged(""); // disable ok button :)
+ ui.identityList->setModel(model); // now we use the identity list of the main page... Trolltech <3
+ on_identityName_textChanged(""); // disable ok button :)
}
-QString CreateIdentityDlg::identityName() const {
- return ui.identityName->text();
-}
-IdentityId CreateIdentityDlg::duplicateId() const {
- if(!ui.duplicateIdentity->isChecked()) return 0;
- if(ui.identityList->currentIndex() >= 0) {
- return ui.identityList->itemData(ui.identityList->currentIndex()).toInt();
- }
- return 0;
+QString CreateIdentityDlg::identityName() const
+{
+ return ui.identityName->text();
}
-void CreateIdentityDlg::on_identityName_textChanged(const QString &text) {
- ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(text.count());
+IdentityId CreateIdentityDlg::duplicateId() const
+{
+ if (!ui.duplicateIdentity->isChecked()) return 0;
+ if (ui.identityList->currentIndex() >= 0) {
+ return ui.identityList->itemData(ui.identityList->currentIndex()).toInt();
+ }
+ return 0;
}
-/*********************************************************************************************/
-SaveIdentitiesDlg::SaveIdentitiesDlg(const QList<CertIdentity *> &toCreate, const QList<CertIdentity *> &toUpdate, const QList<IdentityId> &toRemove, QWidget *parent)
- : QDialog(parent)
+void CreateIdentityDlg::on_identityName_textChanged(const QString &text)
{
- ui.setupUi(this);
- ui.abort->setIcon(SmallIcon("dialog-cancel"));
+ ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(text.count());
+}
- numevents = toCreate.count() + toUpdate.count() + toRemove.count();
- rcvevents = 0;
- if(numevents) {
- ui.progressBar->setMaximum(numevents);
- ui.progressBar->setValue(0);
- connect(Client::instance(), SIGNAL(identityCreated(IdentityId)), this, SLOT(clientEvent()));
- connect(Client::instance(), SIGNAL(identityRemoved(IdentityId)), this, SLOT(clientEvent()));
+/*********************************************************************************************/
- foreach(CertIdentity *id, toCreate) {
- Client::createIdentity(*id);
- }
- foreach(CertIdentity *id, toUpdate) {
- const Identity *cid = Client::identity(id->id());
- if(!cid) {
- qWarning() << "Invalid client identity!";
- numevents--;
- continue;
- }
- connect(cid, SIGNAL(updatedRemotely()), this, SLOT(clientEvent()));
- Client::updateIdentity(id->id(), id->toVariantMap());
+SaveIdentitiesDlg::SaveIdentitiesDlg(const QList<CertIdentity *> &toCreate, const QList<CertIdentity *> &toUpdate, const QList<IdentityId> &toRemove, QWidget *parent)
+ : QDialog(parent)
+{
+ ui.setupUi(this);
+ ui.abort->setIcon(icon::get("dialog-cancel"));
+
+ numevents = toCreate.count() + toUpdate.count() + toRemove.count();
+ rcvevents = 0;
+ if (numevents) {
+ ui.progressBar->setMaximum(numevents);
+ ui.progressBar->setValue(0);
+
+ connect(Client::instance(), &Client::identityCreated, this, &SaveIdentitiesDlg::clientEvent);
+ connect(Client::instance(), &Client::identityRemoved, this, &SaveIdentitiesDlg::clientEvent);
+
+ foreach(CertIdentity *id, toCreate) {
+ Client::createIdentity(*id);
+ }
+ foreach(CertIdentity *id, toUpdate) {
+ const Identity *cid = Client::identity(id->id());
+ if (!cid) {
+ qWarning() << "Invalid client identity!";
+ numevents--;
+ continue;
+ }
+ connect(cid, &SyncableObject::updatedRemotely, this, &SaveIdentitiesDlg::clientEvent);
+ Client::updateIdentity(id->id(), id->toVariantMap());
#ifdef HAVE_SSL
- id->requestUpdateSslSettings();
+ id->requestUpdateSslSettings();
#endif
+ }
+ foreach(IdentityId id, toRemove) {
+ Client::removeIdentity(id);
+ }
}
- foreach(IdentityId id, toRemove) {
- Client::removeIdentity(id);
+ else {
+ qWarning() << "Sync dialog called without stuff to change!";
+ accept();
}
- } else {
- qWarning() << "Sync dialog called without stuff to change!";
- accept();
- }
}
-void SaveIdentitiesDlg::clientEvent() {
- ui.progressBar->setValue(++rcvevents);
- if(rcvevents >= numevents) accept();
+
+void SaveIdentitiesDlg::clientEvent()
+{
+ ui.progressBar->setValue(++rcvevents);
+ if (rcvevents >= numevents) accept();
}
+
/*************************************************************************************************/
-NickEditDlg::NickEditDlg(const QString &old, const QStringList &exist, QWidget *parent)
- : QDialog(parent), oldNick(old), existing(exist) {
- ui.setupUi(this);
-
- // define a regexp for valid nicknames
- // TODO: add max nicklength according to ISUPPORT
- QString letter = "A-Za-z";
- QString special = "\x5b-\x60\x7b-\x7d";
- QRegExp rx(QString("[%1%2][%1%2\\d-]*").arg(letter, special));
- ui.nickEdit->setValidator(new QRegExpValidator(rx, ui.nickEdit));
- if(old.isEmpty()) {
- // new nick
- setWindowTitle(tr("Add Nickname"));
- on_nickEdit_textChanged(""); // disable ok button
- } else ui.nickEdit->setText(old);
+NickEditDlg::NickEditDlg(const QString &old, QStringList exist, QWidget *parent)
+ : QDialog(parent), oldNick(old), existing(std::move(exist))
+{
+ ui.setupUi(this);
+
+ // define a regexp for valid nicknames
+ // TODO: add max nicklength according to ISUPPORT
+ QString letter = "A-Za-z";
+ QString special = R"([-`{-})";
+ QRegExp rx(QString("[%1%2][%1%2\\d-]*").arg(letter, special));
+ ui.nickEdit->setValidator(new QRegExpValidator(rx, ui.nickEdit));
+ if (old.isEmpty()) {
+ // new nick
+ setWindowTitle(tr("Add Nickname"));
+ on_nickEdit_textChanged(""); // disable ok button
+ }
+ else ui.nickEdit->setText(old);
}
-QString NickEditDlg::nick() const {
- return ui.nickEdit->text();
-}
-
-void NickEditDlg::on_nickEdit_textChanged(const QString &text) {
- ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text));
+QString NickEditDlg::nick() const
+{
+ return ui.nickEdit->text();
}
-
+void NickEditDlg::on_nickEdit_textChanged(const QString &text)
+{
+ ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text));
+}
projects / quassel.git / blobdiff