From 5dadedbf700871cadfda47df8fc7337521b2f5e2 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Tue, 12 Mar 2013 22:42:06 +0100 Subject: [PATCH] Implement the GUI for the password generator. Closes #52 --- src/gui/PasswordGeneratorWidget.cpp | 92 +++++++++++++++- src/gui/PasswordGeneratorWidget.h | 14 +++ src/gui/PasswordGeneratorWidget.ui | 158 +++++++++++++++++++++++++++- src/gui/entry/EditEntryWidget.cpp | 11 ++ src/gui/entry/EditEntryWidget.h | 1 + 5 files changed, 270 insertions(+), 6 deletions(-) diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp index a917ca919..1b22b09ae 100644 --- a/src/gui/PasswordGeneratorWidget.cpp +++ b/src/gui/PasswordGeneratorWidget.cpp @@ -23,9 +23,99 @@ PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent) , m_ui(new Ui::PasswordGeneratorWidget()) { m_ui->setupUi(this); + + connect(m_ui->editNewPassword, SIGNAL(textChanged(QString)), SLOT(updateApplyEnabled(QString))); + connect(m_ui->togglePasswordButton, SIGNAL(toggled(bool)), SLOT(togglePassword(bool))); + connect(m_ui->buttonGenerate, SIGNAL(clicked()), SLOT(generatePassword())); + connect(m_ui->buttonApply, SIGNAL(clicked()), SLOT(emitNewPassword())); + + reset(); } PasswordGeneratorWidget::~PasswordGeneratorWidget() { - ; +} + +void PasswordGeneratorWidget::reset() +{ + m_ui->checkBoxLower->setChecked(true); + m_ui->checkBoxUpper->setChecked(true); + m_ui->checkBoxNumbers->setChecked(true); + m_ui->checkBoxSpecialChars->setChecked(false); + + m_ui->checkBoxExcludeAlike->setChecked(true); + m_ui->checkBoxEnsureEvery->setChecked(true); + + m_ui->spinBoxLength->setValue(16); + + m_ui->editNewPassword->setText(""); + m_ui->togglePasswordButton->setChecked(true); +} + +void PasswordGeneratorWidget::updateApplyEnabled(const QString& password) +{ + m_ui->buttonApply->setEnabled(!password.isEmpty()); +} + +void PasswordGeneratorWidget::togglePassword(bool checked) +{ + m_ui->editNewPassword->setEchoMode(checked ? QLineEdit::Password : QLineEdit::Normal); +} + +void PasswordGeneratorWidget::generatePassword() +{ + int length = m_ui->spinBoxLength->value(); + PasswordGenerator::CharClasses classes = charClasses(); + PasswordGenerator::GeneratorFlags flags = generatorFlags(); + + if (!passwordGenerator()->isValidCombination(length, classes, flags)) { + // TODO: display error + return; + } + + QString password = passwordGenerator()->generatePassword(length, classes, flags); + m_ui->editNewPassword->setText(password); +} + +void PasswordGeneratorWidget::emitNewPassword() +{ + Q_EMIT newPassword(m_ui->editNewPassword->text()); +} + +PasswordGenerator::CharClasses PasswordGeneratorWidget::charClasses() +{ + PasswordGenerator::CharClasses classes; + + if (m_ui->checkBoxLower->isChecked()) { + classes |= PasswordGenerator::LowerLetters; + } + + if (m_ui->checkBoxUpper->isChecked()) { + classes |= PasswordGenerator::UpperLetters; + } + + if (m_ui->checkBoxNumbers->isChecked()) { + classes |= PasswordGenerator::Numbers; + } + + if (m_ui->checkBoxSpecialChars->isChecked()) { + classes |= PasswordGenerator::SpecialCharacters; + } + + return classes; +} + +PasswordGenerator::GeneratorFlags PasswordGeneratorWidget::generatorFlags() +{ + PasswordGenerator::GeneratorFlags flags; + + if (m_ui->checkBoxExcludeAlike->isChecked()) { + flags |= PasswordGenerator::ExcludeLookAlike; + } + + if (m_ui->checkBoxEnsureEvery->isChecked()) { + flags |= PasswordGenerator::CharFromEveryGroup; + } + + return flags; } diff --git a/src/gui/PasswordGeneratorWidget.h b/src/gui/PasswordGeneratorWidget.h index ad0f7540b..5716652d5 100644 --- a/src/gui/PasswordGeneratorWidget.h +++ b/src/gui/PasswordGeneratorWidget.h @@ -21,6 +21,7 @@ #include #include "core/Global.h" +#include "core/PasswordGenerator.h" namespace Ui { class PasswordGeneratorWidget; @@ -33,8 +34,21 @@ class PasswordGeneratorWidget : public QWidget public: explicit PasswordGeneratorWidget(QWidget* parent = Q_NULLPTR); ~PasswordGeneratorWidget(); + void reset(); + +Q_SIGNALS: + void newPassword(const QString& password); + +private Q_SLOTS: + void updateApplyEnabled(const QString& password); + void togglePassword(bool checked); + void generatePassword(); + void emitNewPassword(); private: + PasswordGenerator::CharClasses charClasses(); + PasswordGenerator::GeneratorFlags generatorFlags(); + const QScopedPointer m_ui; }; diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui index e3cd6d9dc..c11b124e9 100644 --- a/src/gui/PasswordGeneratorWidget.ui +++ b/src/gui/PasswordGeneratorWidget.ui @@ -6,21 +6,169 @@ 0 0 - 383 - 181 + 468 + 298 - + - + - Password Generator + Use the following password groups: + + + + + + Qt::Horizontal + + + QSizePolicy::Maximum + + + + 20 + 1 + + + + + + + + + + Lower letters + + + + + + + Numbers + + + + + + + Upper letters + + + + + + + Special characters + + + + + + + + + + + Exclude look-alike characters + + + + + + + Ensure that the password contains characters from every group + + + + + + + + + Length: + + + + + + + 1 + + + 999 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + New password: + + + + + + + QLineEdit::Password + + + + + + + ... + + + true + + + true + + + + + + + Generate + + + + + + + false + + + Apply + + + + + diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index 91d1c4b98..042de4732 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -92,11 +92,13 @@ void EditEntryWidget::setupMain() connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool))); connect(m_mainUi->passwordEdit, SIGNAL(textEdited(QString)), SLOT(setPasswordCheckColors())); connect(m_mainUi->passwordRepeatEdit, SIGNAL(textEdited(QString)), SLOT(setPasswordCheckColors())); + connect(m_mainUi->passwordGenerator, SIGNAL(newPassword(QString)), SLOT(setGeneratedPassword(QString))); m_mainUi->expirePresets->setMenu(createPresetsMenu()); connect(m_mainUi->expirePresets->menu(), SIGNAL(triggered(QAction*)), this, SLOT(useExpiryPreset(QAction*))); m_mainUi->passwordGenerator->hide(); + m_mainUi->passwordGenerator->reset(); } void EditEntryWidget::setupAdvanced() @@ -279,6 +281,7 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore) m_mainUi->expireDatePicker->setReadOnly(m_history); m_mainUi->notesEdit->setReadOnly(m_history); m_mainUi->tooglePasswordGeneratorButton->setChecked(false); + m_mainUi->passwordGenerator->reset(); m_advancedUi->addAttachmentButton->setEnabled(!m_history); m_advancedUi->removeAttachmentButton->setEnabled(!m_history); m_advancedUi->addAttributeButton->setEnabled(!m_history); @@ -510,6 +513,14 @@ void EditEntryWidget::setPasswordCheckColors() } } +void EditEntryWidget::setGeneratedPassword(const QString& password) +{ + m_mainUi->passwordEdit->setText(password); + m_mainUi->passwordRepeatEdit->setText(password); + + m_mainUi->tooglePasswordGeneratorButton->setChecked(false); +} + void EditEntryWidget::insertAttribute() { Q_ASSERT(!m_history); diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h index c4123a161..7a3aaa8aa 100644 --- a/src/gui/entry/EditEntryWidget.h +++ b/src/gui/entry/EditEntryWidget.h @@ -74,6 +74,7 @@ private Q_SLOTS: void togglePassword(bool checked); void togglePasswordGeneratorButton(bool checked); void setPasswordCheckColors(); + void setGeneratedPassword(const QString& password); void insertAttribute(); void editCurrentAttribute(); void removeCurrentAttribute();