From 7d4ef0b8d0577b4b75d60cec560a24f97c71bfd4 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sat, 6 Aug 2016 11:29:47 +0200 Subject: [PATCH 1/5] Generate new password whenever the generator widget is opened. Closes #414 --- src/gui/PasswordGeneratorWidget.cpp | 13 +++++++++---- src/gui/PasswordGeneratorWidget.h | 1 + src/gui/entry/EditEntryWidget.cpp | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp index 4cb14c4de..95efa5b2b 100644 --- a/src/gui/PasswordGeneratorWidget.cpp +++ b/src/gui/PasswordGeneratorWidget.cpp @@ -88,6 +88,14 @@ void PasswordGeneratorWidget::reset() updateGenerator(); } +void PasswordGeneratorWidget::regeneratePassword() +{ + if (m_generator->isValid()) { + QString password = m_generator->generatePassword(); + m_ui->editNewPassword->setEditText(password); + } +} + void PasswordGeneratorWidget::updateApplyEnabled(const QString& password) { m_ui->buttonApply->setEnabled(!password.isEmpty()); @@ -199,8 +207,5 @@ void PasswordGeneratorWidget::updateGenerator() m_generator->setCharClasses(classes); m_generator->setFlags(flags); - if (m_generator->isValid()) { - QString password = m_generator->generatePassword(); - m_ui->editNewPassword->setEditText(password); - } + regeneratePassword(); } diff --git a/src/gui/PasswordGeneratorWidget.h b/src/gui/PasswordGeneratorWidget.h index 96f3f6023..8759672a2 100644 --- a/src/gui/PasswordGeneratorWidget.h +++ b/src/gui/PasswordGeneratorWidget.h @@ -39,6 +39,7 @@ public: ~PasswordGeneratorWidget(); void loadSettings(); void reset(); + void regeneratePassword(); Q_SIGNALS: void newPassword(const QString& password); diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index 8cad92462..035abad4a 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -487,6 +487,7 @@ void EditEntryWidget::clear() void EditEntryWidget::togglePasswordGeneratorButton(bool checked) { + m_mainUi->passwordGenerator->regeneratePassword(); m_mainUi->passwordGenerator->setVisible(checked); } From 9bb291235d7a50e21988e1e96a12e48f9382280f Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sat, 6 Aug 2016 18:39:25 +0200 Subject: [PATCH 2/5] Fix monospace font on Windows. Closes #424 --- src/gui/PasswordComboBox.cpp | 2 +- src/gui/PasswordEdit.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/PasswordComboBox.cpp b/src/gui/PasswordComboBox.cpp index f11311a9a..2fad2aba0 100644 --- a/src/gui/PasswordComboBox.cpp +++ b/src/gui/PasswordComboBox.cpp @@ -49,7 +49,7 @@ void PasswordComboBox::setEcho(bool echo) // Qt on Mac OS doesn't seem to know the generic monospace family (tested with 4.8.6) setStyleSheet("QComboBox { font-family: monospace,Menlo,Monaco; }"); #else - setStyleSheet("QComboBox { font-family: monospace,Courier; }"); + setStyleSheet("QComboBox { font-family: monospace,Courier New; }"); #endif } diff --git a/src/gui/PasswordEdit.cpp b/src/gui/PasswordEdit.cpp index b68eef68b..77b523ad9 100644 --- a/src/gui/PasswordEdit.cpp +++ b/src/gui/PasswordEdit.cpp @@ -60,7 +60,7 @@ void PasswordEdit::updateStylesheet() // Qt on Mac OS doesn't seem to know the generic monospace family (tested with 4.8.6) stylesheet.append("font-family: monospace,Menlo,Monaco; "); #else - stylesheet.append("font-family: monospace; "); + stylesheet.append("font-family: monospace,Courier New; "); #endif } From 595b1011dd585bd23f74fe357e59895c4a660fcb Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Fri, 2 Sep 2016 11:30:54 +0200 Subject: [PATCH 3/5] Refresh fileInfo after creating the file. Fixes canonicalFilePath() returning an empty string. --- src/gui/DatabaseTabWidget.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp index 0478222eb..65c54309d 100644 --- a/src/gui/DatabaseTabWidget.cpp +++ b/src/gui/DatabaseTabWidget.cpp @@ -390,6 +390,9 @@ bool DatabaseTabWidget::saveDatabaseAs(Database* db) return false; } + // refresh fileinfo since the file didn't exist before + fileInfo.refresh(); + dbStruct.modified = false; dbStruct.saveToFilename = true; dbStruct.readOnly = false; From 1635a5211f1636f68bb5819d3e6507cf111b2968 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Fri, 2 Sep 2016 11:47:22 +0200 Subject: [PATCH 4/5] Pass entryFlags to clone() when recursing into sub-groups. Based on https://github.com/keepassx/keepassx/pull/178 by Mois Moshev Closes #525 --- src/core/Group.cpp | 2 +- tests/TestGroup.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/Group.cpp b/src/core/Group.cpp index 371f3e4d1..cae53dbc5 100644 --- a/src/core/Group.cpp +++ b/src/core/Group.cpp @@ -504,7 +504,7 @@ Group* Group::clone(Entry::CloneFlags entryFlags) const } Q_FOREACH (Group* groupChild, children()) { - Group* clonedGroupChild = groupChild->clone(); + Group* clonedGroupChild = groupChild->clone(entryFlags); clonedGroupChild->setParent(clonedGroup); } diff --git a/tests/TestGroup.cpp b/tests/TestGroup.cpp index 507cf155d..514ef6dd9 100644 --- a/tests/TestGroup.cpp +++ b/tests/TestGroup.cpp @@ -386,7 +386,12 @@ void TestGroup::testClone() QVERIFY(clonedSubGroupEntry->uuid() != subGroupEntry->uuid()); QCOMPARE(clonedSubGroupEntry->title(), QString("SubGroupEntry")); + Group* clonedGroupKeepUuid = originalGroup->clone(Entry::CloneNoFlags); + QCOMPARE(clonedGroupKeepUuid->entries().at(0)->uuid(), originalGroupEntry->uuid()); + QCOMPARE(clonedGroupKeepUuid->children().at(0)->entries().at(0)->uuid(), subGroupEntry->uuid()); + delete clonedGroup; + delete clonedGroupKeepUuid; delete db; } From 878995366aacf55bdff7e7fc9274073aca9d4c87 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Fri, 2 Sep 2016 12:00:12 +0200 Subject: [PATCH 5/5] Ask the user before moving an entry to the recycle bin. Closes #447 --- src/gui/DatabaseWidget.cpp | 20 +++++++++++++++----- tests/gui/TestGui.cpp | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index 92720e660..257bcb65d 100644 --- a/src/gui/DatabaseWidget.cpp +++ b/src/gui/DatabaseWidget.cpp @@ -341,14 +341,24 @@ void DatabaseWidget::deleteEntries() } } else { - if (selected.size() > 1) { - QMessageBox::StandardButton result = MessageBox::question( + QMessageBox::StandardButton result; + + if (selected.size() == 1) { + result = MessageBox::question( + this, tr("Move entry to recycle bin?"), + tr("Do you really want to move entry \"%1\" to the recycle bin?") + .arg(selectedEntries.first()->title()), + QMessageBox::Yes | QMessageBox::No); + } + else { + result = MessageBox::question( this, tr("Move entries to recycle bin?"), tr("Do you really want to move %n entry(s) to the recycle bin?", 0, selected.size()), QMessageBox::Yes | QMessageBox::No); - if (result == QMessageBox::No) { - return; - } + } + + if (result == QMessageBox::No) { + return; } Q_FOREACH (Entry* entry, selectedEntries) { diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp index 6aa49b836..8845c60e3 100644 --- a/tests/gui/TestGui.cpp +++ b/tests/gui/TestGui.cpp @@ -239,6 +239,7 @@ void TestGui::testSearch() QVERIFY(entryDeleteWidget->isEnabled()); QVERIFY(!m_db->metadata()->recycleBin()); + MessageBox::setNextAnswer(QMessageBox::Yes); QTest::mouseClick(entryDeleteWidget, Qt::LeftButton); QCOMPARE(entryView->model()->rowCount(), 3);