Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-11-25 17:16:33 -05:00
Code Issues Projects Releases Packages Wiki Activity

Prompt to delete recycle bin when disabling it

Browse source 
Fixes #3365

Add prompt to delete the recycle bin when disabling it. If the user chooses not to delete it, the recycle bin will be suffixed with "(old)" and the icon changed to the default group icon.

Also moved recycle bin creation within the database class where it belongs.
This commit is contained in:
Mark Hakansson 2019-10-12 15:27:35 +02:00 • committed by Jonathan White
parent a1e12c1b30
commit a876b3b72f
5 changed files with 39 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/gui/dbsettings/DatabaseSettingsWidgetGeneral.cpp
View file

@ -23,6 +23,7 @@
#include "core/Entry.h"
#include "core/Group.h"
#include "core/Metadata.h"
#include "gui/MessageBox.h"
DatabaseSettingsWidgetGeneral::DatabaseSettingsWidgetGeneral(QWidget* parent)
: DatabaseSettingsWidget(parent)
@ -77,9 +78,31 @@ void DatabaseSettingsWidgetGeneral::showEvent(QShowEvent* event)
bool DatabaseSettingsWidgetGeneral::save()
{
auto* meta = m_db->metadata();
if (!m_ui->recycleBinEnabledCheckBox->isChecked() && meta->recycleBinEnabled()) {
auto recycleBin = meta->recycleBin();
if (recycleBin && !recycleBin->isEmpty()) {
auto result = MessageBox::question(this,
tr("Delete Recycle Bin"),
tr("Do you want to delete the current recycle bin and all its "
"contents?\nThis action is not reversible."),
MessageBox::Delete | MessageBox::No,
MessageBox::No);
if (result == MessageBox::Delete) {
recycleBin->deleteLater();
} else {
recycleBin->setName(recycleBin->name().append(tr(" (old)")));
recycleBin->setIcon(Group::DefaultIconNumber);
}
}
meta->setRecycleBin(nullptr);
}
m_db->setCompressionAlgorithm(m_ui->compressionCheckbox->isChecked() ? Database::CompressionGZip
: Database::CompressionNone);
Metadata* meta = m_db->metadata();
meta->setName(m_ui->dbNameEdit->text());
meta->setDescription(m_ui->dbDescriptionEdit->text());