X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fidentitiessettingspage.cpp;h=af62c9efd0e71fa8e590e4240762b828fa35007b;hp=198b8ba4e4fcb903bd55a07cbf5f54a42d73d1a2;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222 diff --git a/src/qtui/settingspages/identitiessettingspage.cpp b/src/qtui/settingspages/identitiessettingspage.cpp index 198b8ba4..af62c9ef 100644 --- a/src/qtui/settingspages/identitiessettingspage.cpp +++ b/src/qtui/settingspages/identitiessettingspage.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2012 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 * @@ -22,29 +22,29 @@ #include #include +#include #include "client.h" -#include "iconloader.h" +#include "icon.h" #include "signalproxy.h" IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent) - : SettingsPage(tr("IRC"), 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.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))); + 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; @@ -84,7 +84,7 @@ void IdentitiesSettingsPage::continueUnsecured() _editSsl = true; QHash::iterator idIter; - for (idIter = identities.begin(); idIter != identities.end(); idIter++) { + for (idIter = identities.begin(); idIter != identities.end(); ++idIter) { idIter.value()->enableEditSsl(); } @@ -175,6 +175,12 @@ bool IdentitiesSettingsPage::testHasChanged() 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()) @@ -209,15 +215,15 @@ bool IdentitiesSettingsPage::aboutToSave() void IdentitiesSettingsPage::clientIdentityCreated(IdentityId id) { - CertIdentity *identity = new CertIdentity(*Client::identity(id), this); + auto *identity = new CertIdentity(*Client::identity(id), this); #ifdef HAVE_SSL identity->enableEditSsl(_editSsl); #endif 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); } @@ -297,13 +303,13 @@ void IdentitiesSettingsPage::removeIdentity(Identity *id) void IdentitiesSettingsPage::on_identityList_currentIndexChanged(int index) { - CertIdentity *previousIdentity = 0; + CertIdentity *previousIdentity = nullptr; if (currentId != 0 && identities.contains(currentId)) previousIdentity = identities[currentId]; if (index < 0) { //ui.identityList->setEditable(false); - ui.identityEditor->displayIdentity(0, previousIdentity); + ui.identityEditor->displayIdentity(nullptr, previousIdentity); currentId = 0; } else { @@ -326,7 +332,7 @@ void IdentitiesSettingsPage::on_addIdentity_clicked() if (!identities.keys().contains(-id.toInt())) break; } id = -id.toInt(); - CertIdentity *newId = new CertIdentity(id, this); + auto *newId = new CertIdentity(id, this); #ifdef HAVE_SSL newId->enableEditSsl(_editSsl); #endif @@ -411,7 +417,7 @@ SaveIdentitiesDlg::SaveIdentitiesDlg(const QList &toCreate, cons : QDialog(parent) { ui.setupUi(this); - ui.abort->setIcon(SmallIcon("dialog-cancel")); + ui.abort->setIcon(icon::get("dialog-cancel")); numevents = toCreate.count() + toUpdate.count() + toRemove.count(); rcvevents = 0; @@ -419,8 +425,8 @@ SaveIdentitiesDlg::SaveIdentitiesDlg(const QList &toCreate, cons 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())); + connect(Client::instance(), &Client::identityCreated, this, &SaveIdentitiesDlg::clientEvent); + connect(Client::instance(), &Client::identityRemoved, this, &SaveIdentitiesDlg::clientEvent); foreach(CertIdentity *id, toCreate) { Client::createIdentity(*id); @@ -432,7 +438,7 @@ SaveIdentitiesDlg::SaveIdentitiesDlg(const QList &toCreate, cons numevents--; continue; } - connect(cid, SIGNAL(updatedRemotely()), this, SLOT(clientEvent())); + connect(cid, &SyncableObject::updatedRemotely, this, &SaveIdentitiesDlg::clientEvent); Client::updateIdentity(id->id(), id->toVariantMap()); #ifdef HAVE_SSL id->requestUpdateSslSettings(); @@ -458,15 +464,15 @@ void SaveIdentitiesDlg::clientEvent() /*************************************************************************************************/ -NickEditDlg::NickEditDlg(const QString &old, const QStringList &exist, QWidget *parent) - : QDialog(parent), oldNick(old), existing(exist) +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 = "\x5b-\x60\x7b-\x7d"; + 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()) {