* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include "identitiessettingspage.h"
+
+#include <QDesktopServices>
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QFileDialog>
#include <QInputDialog>
#include <QMessageBox>
-#include "identitiessettingspage.h"
-
#include "client.h"
+#include "iconloader.h"
+#include "signalproxy.h"
IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent)
- : SettingsPage(tr("General"), tr("Identities"), parent) {
+ : SettingsPage(tr("General"), tr("Identities"), parent),
+ _editSsl(false)
+{
ui.setupUi(this);
- setEnabled(false); // need a core connection!
+ ui.renameIdentity->setIcon(BarIcon("edit-rename"));
+ ui.addIdentity->setIcon(BarIcon("list-add-user"));
+ ui.deleteIdentity->setIcon(BarIcon("list-remove-user"));
+ ui.addNick->setIcon(SmallIcon("list-add"));
+ ui.deleteNick->setIcon(SmallIcon("edit-delete"));
+ ui.renameNick->setIcon(SmallIcon("edit-rename"));
+ ui.nickUp->setIcon(SmallIcon("go-up"));
+ ui.nickDown->setIcon(SmallIcon("go-down"));
+
+ coreConnectionStateChanged(Client::isConnected()); // need a core connection!
setWidgetStates();
connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool)));
connect(Client::instance(), SIGNAL(identityCreated(IdentityId)), this, SLOT(clientIdentityCreated(IdentityId)));
connect(ui.awayNickEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.awayReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
connect(ui.awayReasonEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.returnMessage, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
- connect(ui.returnMessageEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.autoAwayEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.autoAwayTime, SIGNAL(valueChanged(int)), this, SLOT(widgetHasChanged()));
connect(ui.autoAwayReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
connect(ui.autoAwayReasonEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
- connect(ui.autoReturnMessage, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
- connect(ui.autoReturnMessageEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+ connect(ui.detachAwayEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
+ connect(ui.detachAwayReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
+ connect(ui.detachAwayReasonEnabled, SIGNAL(clicked(bool)), this, SLOT(widgetHasChanged()));
connect(ui.ident, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
connect(ui.kickReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
connect(ui.partReason, SIGNAL(textEdited(const QString &)), this, SLOT(widgetHasChanged()));
//connect(ui.nicknameList, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(setWidgetStates()));
//connect(ui.nicknameList->model(), SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(nicklistHasChanged()));
+#ifdef HAVE_SSL
+ ui.sslKeyGroupBox->setAcceptDrops(true);
+ ui.sslKeyGroupBox->installEventFilter(this);
+ ui.sslCertGroupBox->setAcceptDrops(true);
+ ui.sslCertGroupBox->installEventFilter(this);
+#endif
}
void IdentitiesSettingsPage::setWidgetStates() {
ui.nickDown->setDisabled(true);
}
ui.deleteNick->setEnabled(ui.nicknameList->count() > 1);
-
}
-void IdentitiesSettingsPage::coreConnectionStateChanged(bool state) {
- this->setEnabled(state);
- if(state) {
+void IdentitiesSettingsPage::coreConnectionStateChanged(bool connected) {
+ setEnabled(connected);
+ if(connected) {
+#ifdef HAVE_SSL
+ if(Client::signalProxy()->isSecure()) {
+ ui.keyAndCertSettings->setCurrentIndex(2);
+ _editSsl = true;
+ } else {
+ ui.keyAndCertSettings->setCurrentIndex(1);
+ _editSsl = false;
+ }
+#else
+ ui.keyAndCertSettings->setCurrentIndex(0);
+#endif
load();
} else {
// reset
void IdentitiesSettingsPage::save() {
setEnabled(false);
- QList<Identity *> toCreate, toUpdate;
+ 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, Identity *>::iterator i = identities.begin();
+ QHash<IdentityId, CertIdentity *>::iterator i = identities.begin();
while(i != identities.end()) {
if((*i)->id() < 0) {
- Identity *temp = *i;
+ 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())) {
+ if(**i != *Client::identity((*i)->id()) || (*i)->isDirty()) {
toUpdate.append(*i);
}
++i;
}
changedIdentities.clear();
deletedIdentities.clear();
- changeState(false);
+ setChangedState(false);
setEnabled(true);
}
foreach(IdentityId id, Client::identityIds()) {
clientIdentityCreated(id);
}
- changeState(false);
+ setChangedState(false);
}
void IdentitiesSettingsPage::widgetHasChanged() {
bool changed = testHasChanged();
- if(changed != hasChanged()) changeState(changed);
+ if(changed != hasChanged()) setChangedState(changed);
}
bool IdentitiesSettingsPage::testHasChanged() {
} else {
if(currentId != 0) {
changedIdentities.removeAll(currentId);
- Identity temp(currentId, this);
+ CertIdentity temp(currentId, this);
saveToIdentity(&temp);
temp.setIdentityName(identities[currentId]->identityName());
- if(temp != *Client::identity(currentId)) changedIdentities.append(currentId);
+ if(temp != *Client::identity(currentId) || temp.isDirty())
+ changedIdentities.append(currentId);
}
return changedIdentities.count();
}
}
void IdentitiesSettingsPage::clientIdentityCreated(IdentityId id) {
- insertIdentity(new Identity(*Client::identity(id), this));
+ CertIdentity *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()));
+#endif
connect(Client::identity(id), SIGNAL(updatedRemotely()), this, SLOT(clientIdentityUpdated()));
}
qWarning() << "Unknown identity to update:" << clientIdentity->identityName();
return;
}
- Identity *identity = identities[clientIdentity->id()];
- if(identity->identityName() != clientIdentity->identityName()) renameIdentity(identity->id(), clientIdentity->identityName());
+
+ CertIdentity *identity = identities[clientIdentity->id()];
+
+ if(identity->identityName() != clientIdentity->identityName())
+ renameIdentity(identity->id(), clientIdentity->identityName());
+
identity->update(*clientIdentity);
- if(identity->id() == currentId) displayIdentity(identity, true);
+
+ if(identity->id() == currentId)
+ displayIdentity(identity, true);
}
void IdentitiesSettingsPage::clientIdentityRemoved(IdentityId id) {
}
}
-void IdentitiesSettingsPage::insertIdentity(Identity *identity) {
+void IdentitiesSettingsPage::insertIdentity(CertIdentity *identity) {
IdentityId id = identity->id();
identities[id] = identity;
if(id == 1) {
}
}
-void IdentitiesSettingsPage::displayIdentity(Identity *id, bool dontsave) {
+void IdentitiesSettingsPage::displayIdentity(CertIdentity *id, bool dontsave) {
if(currentId != 0 && !dontsave && identities.contains(currentId)) {
saveToIdentity(identities[currentId]);
}
ui.awayNickEnabled->setChecked(id->awayNickEnabled());
ui.awayReason->setText(id->awayReason());
ui.awayReasonEnabled->setChecked(id->awayReasonEnabled());
- ui.returnMessage->setText(id->returnMessage());
- ui.returnMessageEnabled->setChecked(id->returnMessageEnabled());
ui.autoAwayEnabled->setChecked(id->autoAwayEnabled());
ui.autoAwayTime->setValue(id->autoAwayTime());
ui.autoAwayReason->setText(id->autoAwayReason());
ui.autoAwayReasonEnabled->setChecked(id->autoAwayReasonEnabled());
- ui.autoReturnMessage->setText(id->autoReturnMessage());
- ui.autoReturnMessageEnabled->setChecked(id->autoReturnMessageEnabled());
+ ui.detachAwayEnabled->setChecked(id->detachAwayEnabled());
+ ui.detachAwayReason->setText(id->detachAwayReason());
+ ui.detachAwayReasonEnabled->setChecked(id->detachAwayReasonEnabled());
ui.ident->setText(id->ident());
ui.kickReason->setText(id->kickReason());
ui.partReason->setText(id->partReason());
ui.quitReason->setText(id->quitReason());
+#ifdef HAVE_SSL
+ showKeyState(id->sslKey());
+ showCertState(id->sslCert());
+#endif
}
}
-void IdentitiesSettingsPage::saveToIdentity(Identity *id) {
+void IdentitiesSettingsPage::saveToIdentity(CertIdentity *id) {
id->setRealName(ui.realName->text());
QStringList nicks;
for(int i = 0; i < ui.nicknameList->count(); i++) {
id->setAwayNickEnabled(ui.awayNickEnabled->isChecked());
id->setAwayReason(ui.awayReason->text());
id->setAwayReasonEnabled(ui.awayReasonEnabled->isChecked());
- id->setReturnMessage(ui.returnMessage->text());
- id->setReturnMessageEnabled(ui.returnMessageEnabled->isChecked());
id->setAutoAwayEnabled(ui.autoAwayEnabled->isChecked());
id->setAutoAwayTime(ui.autoAwayTime->value());
id->setAutoAwayReason(ui.autoAwayReason->text());
id->setAutoAwayReasonEnabled(ui.autoAwayReasonEnabled->isChecked());
- id->setAutoReturnMessage(ui.autoReturnMessage->text());
- id->setAutoReturnMessageEnabled(ui.autoReturnMessageEnabled->isChecked());
+ id->setDetachAwayEnabled(ui.detachAwayEnabled->isChecked());
+ id->setDetachAwayReason(ui.detachAwayReason->text());
+ id->setDetachAwayReasonEnabled(ui.detachAwayReasonEnabled->isChecked());
id->setIdent(ui.ident->text());
id->setKickReason(ui.kickReason->text());
id->setPartReason(ui.partReason->text());
id->setQuitReason(ui.quitReason->text());
+#ifdef HAVE_SSL
+ id->setSslKey(QSslKey(ui.keyTypeLabel->property("sslKey").toByteArray(), (QSsl::KeyAlgorithm)(ui.keyTypeLabel->property("sslKeyType").toInt())));
+ id->setSslCert(QSslCertificate(ui.certOrgLabel->property("sslCert").toByteArray()));
+#endif
}
void IdentitiesSettingsPage::on_addIdentity_clicked() {
if(!identities.keys().contains(-id.toInt())) break;
}
id = -id.toInt();
- Identity *newId = new Identity(id, this);
+ CertIdentity *newId = new CertIdentity(id, this);
+#ifdef HAVE_SSL
+ newId->enableEditSsl(_editSsl);
+#endif
if(dlg.duplicateId() != 0) {
// duplicate
newId->update(*identities[dlg.duplicateId()]);
void IdentitiesSettingsPage::on_addNick_clicked() {
QStringList existing;
for(int i = 0; i < ui.nicknameList->count(); i++) existing << ui.nicknameList->item(i)->text();
- NickEditDlgNew dlg(QString(), existing, this);
+ NickEditDlg dlg(QString(), existing, this);
if(dlg.exec() == QDialog::Accepted) {
ui.nicknameList->addItem(dlg.nick());
ui.nicknameList->setCurrentRow(ui.nicknameList->count()-1);
setWidgetStates();
+ widgetHasChanged();
}
}
void IdentitiesSettingsPage::on_deleteNick_clicked() {
// no confirmation, since a nickname is really nothing hard to recreate
if(ui.nicknameList->selectedItems().count()) {
- delete ui.nicknameList->selectedItems()[0];
+ delete ui.nicknameList->takeItem(ui.nicknameList->row(ui.nicknameList->selectedItems()[0]));
ui.nicknameList->setCurrentRow(qMin(ui.nicknameList->currentRow()+1, ui.nicknameList->count()-1));
setWidgetStates();
widgetHasChanged();
QString old = ui.nicknameList->selectedItems()[0]->text();
QStringList existing;
for(int i = 0; i < ui.nicknameList->count(); i++) existing << ui.nicknameList->item(i)->text();
- NickEditDlgNew dlg(old, existing, this);
+ NickEditDlg dlg(old, existing, this);
if(dlg.exec() == QDialog::Accepted) {
ui.nicknameList->selectedItems()[0]->setText(dlg.nick());
}
}
}
+#ifdef HAVE_SSL
+void IdentitiesSettingsPage::on_continueUnsecured_clicked() {
+ _editSsl = true;
+
+ QHash<IdentityId, CertIdentity *>::iterator idIter;
+ for(idIter = identities.begin(); idIter != identities.end(); idIter++) {
+ idIter.value()->enableEditSsl();
+ }
+
+ ui.keyAndCertSettings->setCurrentIndex(2);
+}
+
+bool IdentitiesSettingsPage::eventFilter(QObject *watched, QEvent *event) {
+ bool isCert = (watched == ui.sslCertGroupBox);
+ switch(event->type()) {
+ case QEvent::DragEnter:
+ sslDragEnterEvent(static_cast<QDragEnterEvent *>(event));
+ return true;
+ case QEvent::Drop:
+ sslDropEvent(static_cast<QDropEvent *>(event), isCert);
+ return true;
+ default:
+ return false;
+ }
+}
+
+void IdentitiesSettingsPage::sslDragEnterEvent(QDragEnterEvent *event) {
+ if(event->mimeData()->hasFormat("text/uri-list") || event->mimeData()->hasFormat("text/uri")) {
+ event->setDropAction(Qt::CopyAction);
+ event->accept();
+ }
+}
+
+void IdentitiesSettingsPage::sslDropEvent(QDropEvent *event, bool isCert) {
+ QByteArray rawUris;
+ if(event->mimeData()->hasFormat("text/uri-list"))
+ rawUris = event->mimeData()->data("text/uri-list");
+ else
+ rawUris = event->mimeData()->data("text/uri");
+
+ QTextStream uriStream(rawUris);
+ QString filename = QUrl(uriStream.readLine()).toLocalFile();
+
+ if(isCert) {
+ QSslCertificate cert = certByFilename(filename);
+ if(cert.isValid())
+ showCertState(cert);
+ } else {
+ QSslKey key = keyByFilename(filename);
+ if(!key.isNull())
+ showKeyState(key);
+ }
+ event->accept();
+ widgetHasChanged();
+}
+
+void IdentitiesSettingsPage::on_clearOrLoadKeyButton_clicked() {
+ QSslKey key;
+
+ if(ui.keyTypeLabel->property("sslKey").toByteArray().isEmpty())
+ key = keyByFilename(QFileDialog::getOpenFileName(this, tr("Load a Key"), QDesktopServices::storageLocation(QDesktopServices::HomeLocation)));
+
+ showKeyState(key);
+ widgetHasChanged();
+}
+
+QSslKey IdentitiesSettingsPage::keyByFilename(const QString &filename) {
+ QSslKey key;
+
+ QFile keyFile(filename);
+ keyFile.open(QIODevice::ReadOnly);
+ QByteArray keyRaw = keyFile.read(2 << 20);
+ keyFile.close();
+
+ for(int i = 0; i < 2; i++) {
+ for(int j = 0; j < 2; j++) {
+ key = QSslKey(keyRaw, (QSsl::KeyAlgorithm)j, (QSsl::EncodingFormat)i);
+ if(!key.isNull())
+ goto returnKey;
+ }
+ }
+ returnKey:
+ return key;
+}
+
+void IdentitiesSettingsPage::showKeyState(const QSslKey &key) {
+ if(key.isNull()) {
+ ui.keyTypeLabel->setText(tr("No Key loaded"));
+ ui.clearOrLoadKeyButton->setText(tr("Load"));
+ } else {
+ switch(key.algorithm()) {
+ case QSsl::Rsa:
+ ui.keyTypeLabel->setText(tr("RSA"));
+ break;
+ case QSsl::Dsa:
+ ui.keyTypeLabel->setText(tr("DSA"));
+ break;
+ default:
+ ui.keyTypeLabel->setText(tr("No Key Loaded"));
+ }
+ ui.clearOrLoadKeyButton->setText(tr("Clear"));
+ }
+ ui.keyTypeLabel->setProperty("sslKey", key.toPem());
+ ui.keyTypeLabel->setProperty("sslKeyType", (int)key.algorithm());
+}
+
+void IdentitiesSettingsPage::on_clearOrLoadCertButton_clicked() {
+ QSslCertificate cert;
+
+ if(ui.certOrgLabel->property("sslCert").toByteArray().isEmpty())
+ cert = certByFilename(QFileDialog::getOpenFileName(this, tr("Load a Certificate"), QDesktopServices::storageLocation(QDesktopServices::HomeLocation)));
+
+ showCertState(cert);
+ widgetHasChanged();
+}
+
+QSslCertificate IdentitiesSettingsPage::certByFilename(const QString &filename) {
+ QSslCertificate cert;
+ QFile certFile(filename);
+ certFile.open(QIODevice::ReadOnly);
+ QByteArray certRaw = certFile.read(2 << 20);
+ certFile.close();
+
+ for(int i = 0; i < 2; i++) {
+ cert = QSslCertificate(certRaw, (QSsl::EncodingFormat)i);
+ if(cert.isValid())
+ break;
+ }
+ return cert;
+}
+
+void IdentitiesSettingsPage::showCertState(const QSslCertificate &cert) {
+ if(!cert.isValid()) {
+ ui.certOrgLabel->setText(tr("No Certificate loaded"));
+ ui.certCNameLabel->setText(tr("No Certificate loaded"));
+ ui.clearOrLoadCertButton->setText(tr("Load"));
+ } else {
+ ui.certOrgLabel->setText(cert.subjectInfo(QSslCertificate::Organization));
+ ui.certCNameLabel->setText(cert.subjectInfo(QSslCertificate::CommonName));
+ ui.clearOrLoadCertButton->setText(tr("Clear"));
+ }
+ ui.certOrgLabel->setProperty("sslCert", cert.toPem());
+ }
+#endif //HAVE_SSL
+
/*****************************************************************************************/
-CreateIdentityDlg::CreateIdentityDlg(QAbstractItemModel *model, QWidget *parent) : QDialog(parent) {
+CreateIdentityDlg::CreateIdentityDlg(QAbstractItemModel *model, QWidget *parent)
+ : QDialog(parent)
+{
ui.setupUi(this);
ui.identityList->setModel(model); // now we use the identity list of the main page... Trolltech <3
/*********************************************************************************************/
-SaveIdentitiesDlg::SaveIdentitiesDlg(QList<Identity *> tocreate, QList<Identity *> toupdate, QList<IdentityId> toremove, QWidget *parent)
- : QDialog(parent), toCreate(tocreate), toUpdate(toupdate), toRemove(toremove) {
+SaveIdentitiesDlg::SaveIdentitiesDlg(const QList<CertIdentity *> &toCreate, const QList<CertIdentity *> &toUpdate, const QList<IdentityId> &toRemove, QWidget *parent)
+ : QDialog(parent)
+{
ui.setupUi(this);
+ ui.abort->setIcon(SmallIcon("dialog-cancel"));
+
numevents = toCreate.count() + toUpdate.count() + toRemove.count();
rcvevents = 0;
if(numevents) {
connect(Client::instance(), SIGNAL(identityCreated(IdentityId)), this, SLOT(clientEvent()));
connect(Client::instance(), SIGNAL(identityRemoved(IdentityId)), this, SLOT(clientEvent()));
- foreach(Identity *id, toCreate) {
+ foreach(CertIdentity *id, toCreate) {
Client::createIdentity(*id);
}
- foreach(Identity *id, toUpdate) {
+ foreach(CertIdentity *id, toUpdate) {
const Identity *cid = Client::identity(id->id());
if(!cid) {
qWarning() << "Invalid client identity!";
continue;
}
connect(cid, SIGNAL(updatedRemotely()), this, SLOT(clientEvent()));
- Client::updateIdentity(*id);
+ Client::updateIdentity(id->id(), id->toVariantMap());
+#ifdef HAVE_SSL
+ id->requestUpdateSslSettings();
+#endif
}
foreach(IdentityId id, toRemove) {
Client::removeIdentity(id);
/*************************************************************************************************/
-NickEditDlgNew::NickEditDlgNew(const QString &old, const QStringList &exist, QWidget *parent)
+NickEditDlg::NickEditDlg(const QString &old, const QStringList &exist, QWidget *parent)
: QDialog(parent), oldNick(old), existing(exist) {
ui.setupUi(this);
} else ui.nickEdit->setText(old);
}
-QString NickEditDlgNew::nick() const {
+QString NickEditDlg::nick() const {
return ui.nickEdit->text();
}
-void NickEditDlgNew::on_nickEdit_textChanged(const QString &text) {
+void NickEditDlg::on_nickEdit_textChanged(const QString &text) {
ui.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(text.isEmpty() || existing.contains(text));
}
projects / quassel.git / blobdiff