mirror/keepassxc
0
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-09-19 20:02:18 +02:00
Code

Show character count in password generator dialog (#10940)

Browse Source 
Displays the number of characters in the password field in the password generator dialog. This fixes #10858.
This commit is contained in:
AgostonSzepessy 2024-06-21 23:53:18 -04:00 committed by GitHub
parent 80ac50a144
commit 1f9c25cc91
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/translations/keepassxc_en.ts
View File

@ -6888,6 +6888,14 @@ Do you want to overwrite it?</source>
<source>Special Characters</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>passwordLength</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Characters: %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PasswordWidget</name>

9
src/gui/PasswordGeneratorWidget.cpp
View File

@ -57,6 +57,7 @@ PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent)
connect(m_ui->editNewPassword, SIGNAL(textChanged(QString)), SLOT(updateButtonsEnabled(QString)));
connect(m_ui->editNewPassword, SIGNAL(textChanged(QString)), SLOT(updatePasswordStrength()));
connect(m_ui->editNewPassword, SIGNAL(textChanged(QString)), SLOT(updatePasswordLengthLabel(QString)));
connect(m_ui->buttonAdvancedMode, SIGNAL(toggled(bool)), SLOT(setAdvancedMode(bool)));
connect(m_ui->buttonAddHex, SIGNAL(clicked()), SLOT(excludeHexChars()));
connect(m_ui->editAdditionalChars, SIGNAL(textChanged(QString)), SLOT(updateGenerator()));
@ -80,7 +81,7 @@ PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent)
connect(m_ui->tabWidget, SIGNAL(currentChanged(int)), SLOT(updateGenerator()));
connect(m_ui->wordCaseComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateGenerator()));
// set font size of password quality and entropy labels dynamically to 80% of
// set font size of password quality, characters, and entropy labels dynamically to 80% of
// the default font size, but make it no smaller than 8pt
QFont defaultFont;
auto smallerSize = static_cast<int>(defaultFont.pointSize() * 0.8f);
@ -88,6 +89,7 @@ PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent)
defaultFont.setPointSize(smallerSize);
m_ui->entropyLabel->setFont(defaultFont);
m_ui->strengthLabel->setFont(defaultFont);
m_ui->passwordLengthLabel->setFont(defaultFont);
}
// set default separator to Space
@ -316,6 +318,11 @@ void PasswordGeneratorWidget::updatePasswordStrength()
}
}
void PasswordGeneratorWidget::updatePasswordLengthLabel(const QString& password)
{
m_ui->passwordLengthLabel->setText(tr("Characters: %1").arg(QString::number(password.length())));
}
void PasswordGeneratorWidget::applyPassword()
{
saveSettings();

1
src/gui/PasswordGeneratorWidget.h
View File

@ -76,6 +76,7 @@ protected:
private slots:
void updateButtonsEnabled(const QString& password);
void updatePasswordStrength();
void updatePasswordLengthLabel(const QString& password);
void setAdvancedMode(bool advanced);
void excludeHexChars();

46
src/gui/PasswordGeneratorWidget.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>729</width>
<height>427</height>
<height>433</height>
</rect>
</property>
<property name="windowTitle">
@ -59,6 +59,50 @@
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="passwordLengthLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>70</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>30</height>
</size>
</property>
<property name="text">
<string>passwordLength</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
</property>
<property name="margin">
<number>3</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="entropyLabel">
<property name="sizePolicy">

3
tests/gui/TestGui.cpp
View File

@ -895,6 +895,7 @@ void TestGui::testPasswordEntryEntropy()
pwGeneratorWidget->findChild<PasswordWidget*>("editNewPassword")->findChild<QLineEdit*>("passwordEdit");
auto* entropyLabel = pwGeneratorWidget->findChild<QLabel*>("entropyLabel");
auto* strengthLabel = pwGeneratorWidget->findChild<QLabel*>("strengthLabel");
auto* passwordLengthLabel = pwGeneratorWidget->findChild<QLabel*>("passwordLengthLabel");
QFETCH(QString, password);
QFETCH(QString, expectedStrengthLabel);
@ -902,10 +903,12 @@ void TestGui::testPasswordEntryEntropy()
// Dynamically calculate entropy due to variances with zxcvbn wordlists
PasswordHealth health(password);
auto expectedEntropy = QString("Entropy: %1 bit").arg(QString::number(health.entropy(), 'f', 2));
auto expectedPasswordLength = QString("Characters: %1").arg(QString::number(password.length()));
generatedPassword->setText(password);
QCOMPARE(entropyLabel->text(), expectedEntropy);
QCOMPARE(strengthLabel->text(), expectedStrengthLabel);
QCOMPARE(passwordLengthLabel->text(), expectedPasswordLength);
QTest::mouseClick(generatedPassword, Qt::LeftButton);
QTest::keyClick(generatedPassword, Qt::Key_Escape););