Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix password generator properties initialization

Browse Source
This commit is contained in:
Balazs Gyurak 2019-06-21 22:02:39 +01:00 committed by Jonathan White
parent 12cefdb7d5
commit 11dabfa1b7
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -6,6 +6,7 @@
- Move notes to General tab on Group Preview Panel [#3336] - Move notes to General tab on Group Preview Panel [#3336]
- Add 'Monospaced font' option to the Notes field [#3321] - Add 'Monospaced font' option to the Notes field [#3321]
- Drop to background when copy feature [#3253] - Drop to background when copy feature [#3253]
- Fix password generator issues with special characters [#3303]
2.4.3 (2019-06-12) 2.4.3 (2019-06-12)
========================= =========================

14
src/gui/PasswordGeneratorWidget.cpp
View File

@ -92,13 +92,18 @@ PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent)
} }
loadSettings(); loadSettings();
reset();
} }
PasswordGeneratorWidget::~PasswordGeneratorWidget() PasswordGeneratorWidget::~PasswordGeneratorWidget()
{ {
} }
void PasswordGeneratorWidget::showEvent(QShowEvent* event)
{
QWidget::showEvent(event);
reset();
}
void PasswordGeneratorWidget::loadSettings() void PasswordGeneratorWidget::loadSettings()
{ {
// Password config // Password config
@ -107,6 +112,8 @@ void PasswordGeneratorWidget::loadSettings()
m_ui->checkBoxUpper->setChecked(config()->get("generator/UpperCase", PasswordGenerator::DefaultUpper).toBool()); m_ui->checkBoxUpper->setChecked(config()->get("generator/UpperCase", PasswordGenerator::DefaultUpper).toBool());
m_ui->checkBoxUpperAdv->setChecked(config()->get("generator/UpperCase", PasswordGenerator::DefaultUpper).toBool()); m_ui->checkBoxUpperAdv->setChecked(config()->get("generator/UpperCase", PasswordGenerator::DefaultUpper).toBool());
m_ui->checkBoxNumbers->setChecked(config()->get("generator/Numbers", PasswordGenerator::DefaultNumbers).toBool()); m_ui->checkBoxNumbers->setChecked(config()->get("generator/Numbers", PasswordGenerator::DefaultNumbers).toBool());
m_ui->checkBoxSpecialChars->setChecked(
config()->get("generator/SpecialChars", PasswordGenerator::DefaultSpecial).toBool());
m_ui->checkBoxNumbersAdv->setChecked( m_ui->checkBoxNumbersAdv->setChecked(
config()->get("generator/Numbers", PasswordGenerator::DefaultNumbers).toBool()); config()->get("generator/Numbers", PasswordGenerator::DefaultNumbers).toBool());
m_ui->advancedBar->setVisible( m_ui->advancedBar->setVisible(
@ -119,6 +126,7 @@ void PasswordGeneratorWidget::loadSettings()
config()->get("generator/AdvancedMode", PasswordGenerator::DefaultAdvancedMode).toBool()); config()->get("generator/AdvancedMode", PasswordGenerator::DefaultAdvancedMode).toBool());
m_ui->editExcludedChars->setText( m_ui->editExcludedChars->setText(
config()->get("generator/ExcludedChars", PasswordGenerator::DefaultExcludedChars).toString()); config()->get("generator/ExcludedChars", PasswordGenerator::DefaultExcludedChars).toString());
m_ui->simpleBar->setVisible( m_ui->simpleBar->setVisible(
!(config()->get("generator/AdvancedMode", PasswordGenerator::DefaultAdvancedMode).toBool())); !(config()->get("generator/AdvancedMode", PasswordGenerator::DefaultAdvancedMode).toBool()));
m_ui->checkBoxBraces->setChecked(config()->get("generator/Braces", PasswordGenerator::DefaultBraces).toBool()); m_ui->checkBoxBraces->setChecked(config()->get("generator/Braces", PasswordGenerator::DefaultBraces).toBool());
@ -164,6 +172,7 @@ void PasswordGeneratorWidget::saveSettings()
config()->set("generator/Numbers", m_ui->checkBoxNumbersAdv->isChecked()); config()->set("generator/Numbers", m_ui->checkBoxNumbersAdv->isChecked());
config()->set("generator/EASCII", m_ui->checkBoxExtASCIIAdv->isChecked()); config()->set("generator/EASCII", m_ui->checkBoxExtASCIIAdv->isChecked());
} }
config()->set("generator/AdvancedMode", m_ui->advancedBar->isVisible());
config()->set("generator/SpecialChars", m_ui->checkBoxSpecialChars->isChecked()); config()->set("generator/SpecialChars", m_ui->checkBoxSpecialChars->isChecked());
config()->set("generator/Braces", m_ui->checkBoxBraces->isChecked()); config()->set("generator/Braces", m_ui->checkBoxBraces->isChecked());
config()->set("generator/Punctuation", m_ui->checkBoxPunctuation->isChecked()); config()->set("generator/Punctuation", m_ui->checkBoxPunctuation->isChecked());
@ -406,7 +415,6 @@ PasswordGenerator::CharClasses PasswordGeneratorWidget::charClasses()
PasswordGenerator::CharClasses classes; PasswordGenerator::CharClasses classes;
if (m_ui->simpleBar->isVisible()) { if (m_ui->simpleBar->isVisible()) {
if (m_ui->checkBoxLower->isChecked()) { if (m_ui->checkBoxLower->isChecked()) {
classes |= PasswordGenerator::LowerLetters; classes |= PasswordGenerator::LowerLetters;
} }
@ -426,9 +434,7 @@ PasswordGenerator::CharClasses PasswordGeneratorWidget::charClasses()
if (m_ui->checkBoxExtASCII->isChecked()) { if (m_ui->checkBoxExtASCII->isChecked()) {
classes |= PasswordGenerator::EASCII; classes |= PasswordGenerator::EASCII;
} }
} else { } else {
if (m_ui->checkBoxLowerAdv->isChecked()) { if (m_ui->checkBoxLowerAdv->isChecked()) {
classes |= PasswordGenerator::LowerLetters; classes |= PasswordGenerator::LowerLetters;
} }

3
src/gui/PasswordGeneratorWidget.h
View File

@ -53,6 +53,9 @@ public:
QString getGeneratedPassword(); QString getGeneratedPassword();
bool isPasswordVisible() const; bool isPasswordVisible() const;
protected:
void showEvent(QShowEvent* event) override;
public slots: public slots:
void regeneratePassword(); void regeneratePassword();
void applyPassword(); void applyPassword();