From a80c415fc09fed34c7a84e77325e5e18ceb6795f Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Thu, 26 Jan 2017 18:38:50 -0500 Subject: [PATCH 1/2] Disable buttonGenerate when no classes. --- src/gui/PasswordGeneratorWidget.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp index 6495d83a..d61528f9 100644 --- a/src/gui/PasswordGeneratorWidget.cpp +++ b/src/gui/PasswordGeneratorWidget.cpp @@ -132,8 +132,10 @@ void PasswordGeneratorWidget::updatePasswordStrength(const QString& password) void PasswordGeneratorWidget::generatePassword() { - QString password = m_generator->generatePassword(); - m_ui->editNewPassword->setText(password); + if (m_generator->isValid()) { + QString password = m_generator->generatePassword(); + m_ui->editNewPassword->setText(password); + } } void PasswordGeneratorWidget::applyPassword() @@ -279,5 +281,12 @@ void PasswordGeneratorWidget::updateGenerator() m_generator->setCharClasses(classes); m_generator->setFlags(flags); + if (m_generator->isValid()) { + m_ui->buttonGenerate->setEnabled(true); + } + else { + m_ui->buttonGenerate->setEnabled(false); + } + regeneratePassword(); } From 0d222e138f9d612bdbcd92953aa8f322b98da8f4 Mon Sep 17 00:00:00 2001 From: Louis-Bertrand Varin Date: Thu, 26 Jan 2017 20:18:09 -0500 Subject: [PATCH 2/2] else on the same line. --- src/gui/PasswordGeneratorWidget.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp index d61528f9..9f2bf31c 100644 --- a/src/gui/PasswordGeneratorWidget.cpp +++ b/src/gui/PasswordGeneratorWidget.cpp @@ -283,8 +283,7 @@ void PasswordGeneratorWidget::updateGenerator() if (m_generator->isValid()) { m_ui->buttonGenerate->setEnabled(true); - } - else { + } else { m_ui->buttonGenerate->setEnabled(false); }