Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/PasswordGeneratorWidget.cpp')
-rw-r--r--src/gui/PasswordGeneratorWidget.cpp24
1 files changed, 18 insertions, 6 deletions
diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp
index 6495d83a2..4a4b438e3 100644
--- a/src/gui/PasswordGeneratorWidget.cpp
+++ b/src/gui/PasswordGeneratorWidget.cpp
@@ -45,11 +45,15 @@ PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent)
connect(m_ui->optionButtons, SIGNAL(buttonClicked(int)), SLOT(updateGenerator()));
- // set font size of password quality and entropy labels dynamically to 80% of the default font size
+ // set font size of password quality and entropy labels dynamically to 80% of
+ // the default font size, but make it no smaller than 8pt
QFont defaultFont;
- defaultFont.setPointSize(static_cast<int>(defaultFont.pointSize() * 0.8f));
- m_ui->entropyLabel->setFont(defaultFont);
- m_ui->strengthLabel->setFont(defaultFont);
+ int smallerSize = static_cast<int>(defaultFont.pointSize() * 0.8f);
+ if (smallerSize >= 8) {
+ defaultFont.setPointSize(smallerSize);
+ m_ui->entropyLabel->setFont(defaultFont);
+ m_ui->strengthLabel->setFont(defaultFont);
+ }
loadSettings();
reset();
@@ -132,8 +136,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 +285,11 @@ 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();
}