diff options
| -rw-r--r-- | src/core/Config.cpp | 1 | ||||
| -rw-r--r-- | src/core/Config.h | 1 | ||||
| -rw-r--r-- | src/gui/ApplicationSettingsWidget.cpp | 4 | ||||
| -rw-r--r-- | src/gui/ApplicationSettingsWidgetSecurity.ui | 7 | ||||
| -rw-r--r-- | src/gui/DatabaseWidget.cpp | 2 |
5 files changed, 15 insertions, 0 deletions
diff --git a/src/core/Config.cpp b/src/core/Config.cpp index ce5754428..8b2b16cf1 100644 --- a/src/core/Config.cpp +++ b/src/core/Config.cpp @@ -138,6 +138,7 @@ static const QHash<Config::ConfigKey, ConfigDirective> configStrings = { {Config::Security_ResetTouchId, {QS("Security/ResetTouchId"), Roaming, false}}, {Config::Security_ResetTouchIdTimeout, {QS("Security/ResetTouchIdTimeout"), Roaming, 30}}, {Config::Security_ResetTouchIdScreenlock,{QS("Security/ResetTouchIdScreenlock"), Roaming, true}}, + {Config::Security_NoConfirmMoveEntryToRecycleBin,{QS("Security/NoConfirmMoveEntryToRecycleBin"), Roaming, true}}, // Browser {Config::Browser_Enabled, {QS("Browser/Enabled"), Roaming, false}}, diff --git a/src/core/Config.h b/src/core/Config.h index 553804699..8b9a02a5f 100644 --- a/src/core/Config.h +++ b/src/core/Config.h @@ -119,6 +119,7 @@ public: Security_ResetTouchId, Security_ResetTouchIdTimeout, Security_ResetTouchIdScreenlock, + Security_NoConfirmMoveEntryToRecycleBin, Browser_Enabled, Browser_ShowNotification, diff --git a/src/gui/ApplicationSettingsWidget.cpp b/src/gui/ApplicationSettingsWidget.cpp index 09fb0515d..182dcd052 100644 --- a/src/gui/ApplicationSettingsWidget.cpp +++ b/src/gui/ApplicationSettingsWidget.cpp @@ -280,6 +280,8 @@ void ApplicationSettingsWidget::loadSettings() m_secUi->passwordsRepeatVisibleCheckBox->setChecked( config()->get(Config::Security_PasswordsRepeatVisible).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->touchIDResetSpinBox->setValue(config()->get(Config::Security_ResetTouchIdTimeout).toInt()); @@ -379,6 +381,8 @@ void ApplicationSettingsWidget::saveSettings() config()->set(Config::Security_HidePasswordPreviewPanel, m_secUi->passwordPreviewCleartextCheckBox->isChecked()); config()->set(Config::Security_PasswordsRepeatVisible, m_secUi->passwordsRepeatVisibleCheckBox->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_ResetTouchIdTimeout, m_secUi->touchIDResetSpinBox->value()); diff --git a/src/gui/ApplicationSettingsWidgetSecurity.ui b/src/gui/ApplicationSettingsWidgetSecurity.ui index bd4af19fa..b338ffa86 100644 --- a/src/gui/ApplicationSettingsWidgetSecurity.ui +++ b/src/gui/ApplicationSettingsWidgetSecurity.ui @@ -257,6 +257,13 @@ </property> </widget> </item> + <item> + <widget class="QCheckBox" name="NoConfirmMoveEntryToRecycleBinCheckBox"> + <property name="text"> + <string>Move entries to recycle bin without confirmation</string> + </property> + </widget> + </item> </layout> </widget> </item> diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index c96b2a6bd..ef1ed68ea 100644 --- a/src/gui/DatabaseWidget.cpp +++ b/src/gui/DatabaseWidget.cpp @@ -571,6 +571,8 @@ bool DatabaseWidget::confirmDeleteEntries(QList<Entry*> entries, bool permanent) MessageBox::Cancel); return answer == MessageBox::Delete; + } else if (config()->get(Config::Security_NoConfirmMoveEntryToRecycleBin).toBool()) { + return true; } else { QString prompt; if (entries.size() == 1) { |