Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-28 08:49:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add "move to recycle bin without confirmation" setting"

Browse Source 
This reverts commit de44764efa.
This commit is contained in:
Janek Bevendorff 2020-12-11 13:11:42 +01:00
parent de44764efa
commit c9d1512748
No known key found for this signature in database
GPG Key ID: 2FDEB0D40BCA5E11
5 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/Config.cpp
View File

@ -138,7 +138,6 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = {
{Config::Security_ResetTouchId, {QS("Security/ResetTouchId"), Roaming, false}}, {Config::Security_ResetTouchId, {QS("Security/ResetTouchId"), Roaming, false}},
{Config::Security_ResetTouchIdTimeout, {QS("Security/ResetTouchIdTimeout"), Roaming, 30}}, {Config::Security_ResetTouchIdTimeout, {QS("Security/ResetTouchIdTimeout"), Roaming, 30}},
{Config::Security_ResetTouchIdScreenlock,{QS("Security/ResetTouchIdScreenlock"), Roaming, true}}, {Config::Security_ResetTouchIdScreenlock,{QS("Security/ResetTouchIdScreenlock"), Roaming, true}},
{Config::Security_NoConfirmMoveEntryToRecycleBin,{QS("Security/NoConfirmMoveEntryToRecycleBin"), Roaming, true}},
// Browser // Browser
{Config::Browser_Enabled, {QS("Browser/Enabled"), Roaming, false}}, {Config::Browser_Enabled, {QS("Browser/Enabled"), Roaming, false}},

1
src/core/Config.h
View File

@ -119,7 +119,6 @@ public:
Security_ResetTouchId, Security_ResetTouchId,
Security_ResetTouchIdTimeout, Security_ResetTouchIdTimeout,
Security_ResetTouchIdScreenlock, Security_ResetTouchIdScreenlock,
Security_NoConfirmMoveEntryToRecycleBin,
Browser_Enabled, Browser_Enabled,
Browser_ShowNotification, Browser_ShowNotification,

4
src/gui/ApplicationSettingsWidget.cpp
View File

@ -280,8 +280,6 @@ void ApplicationSettingsWidget::loadSettings()
m_secUi->passwordsRepeatVisibleCheckBox->setChecked( m_secUi->passwordsRepeatVisibleCheckBox->setChecked(
config()->get(Config::Security_PasswordsRepeatVisible).toBool()); config()->get(Config::Security_PasswordsRepeatVisible).toBool());
m_secUi->hideNotesCheckBox->setChecked(config()->get(Config::Security_HideNotes).toBool()); m_secUi->hideNotesCheckBox->setChecked(config()->get(Config::Security_HideNotes).toBool());
m_secUi->NoConfirmMoveEntryToRecycleBinCheckBox->setChecked(
config()->get(Config::Security_NoConfirmMoveEntryToRecycleBin).toBool());
m_secUi->touchIDResetCheckBox->setChecked(config()->get(Config::Security_ResetTouchId).toBool()); m_secUi->touchIDResetCheckBox->setChecked(config()->get(Config::Security_ResetTouchId).toBool());
m_secUi->touchIDResetSpinBox->setValue(config()->get(Config::Security_ResetTouchIdTimeout).toInt()); m_secUi->touchIDResetSpinBox->setValue(config()->get(Config::Security_ResetTouchIdTimeout).toInt());
@ -381,8 +379,6 @@ void ApplicationSettingsWidget::saveSettings()
config()->set(Config::Security_HidePasswordPreviewPanel, m_secUi->passwordPreviewCleartextCheckBox->isChecked()); config()->set(Config::Security_HidePasswordPreviewPanel, m_secUi->passwordPreviewCleartextCheckBox->isChecked());
config()->set(Config::Security_PasswordsRepeatVisible, m_secUi->passwordsRepeatVisibleCheckBox->isChecked()); config()->set(Config::Security_PasswordsRepeatVisible, m_secUi->passwordsRepeatVisibleCheckBox->isChecked());
config()->set(Config::Security_HideNotes, m_secUi->hideNotesCheckBox->isChecked()); config()->set(Config::Security_HideNotes, m_secUi->hideNotesCheckBox->isChecked());
config()->set(Config::Security_NoConfirmMoveEntryToRecycleBin,
m_secUi->NoConfirmMoveEntryToRecycleBinCheckBox->isChecked());
config()->set(Config::Security_ResetTouchId, m_secUi->touchIDResetCheckBox->isChecked()); config()->set(Config::Security_ResetTouchId, m_secUi->touchIDResetCheckBox->isChecked());
config()->set(Config::Security_ResetTouchIdTimeout, m_secUi->touchIDResetSpinBox->value()); config()->set(Config::Security_ResetTouchIdTimeout, m_secUi->touchIDResetSpinBox->value());

7
src/gui/ApplicationSettingsWidgetSecurity.ui
View File

@ -257,13 +257,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="NoConfirmMoveEntryToRecycleBinCheckBox">
<property name="text">
<string>Move entries to recycle bin without confirmation</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

2
src/gui/DatabaseWidget.cpp
View File

@ -571,8 +571,6 @@ bool DatabaseWidget::confirmDeleteEntries(QList<Entry*> entries, bool permanent)
MessageBox::Cancel); MessageBox::Cancel);
return answer == MessageBox::Delete; return answer == MessageBox::Delete;
} else if (config()->get(Config::Security_NoConfirmMoveEntryToRecycleBin).toBool()) {
return true;
} else { } else {
QString prompt; QString prompt;
if (entries.size() == 1) { if (entries.size() == 1) {