Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-27 16:29:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into lock-on-minimize

Browse Source
This commit is contained in:
Jonathan White 2016-10-28 10:24:21 -04:00 committed by GitHub
commit 13c3743ff5
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/SettingsWidget.cpp
View File

@ -23,10 +23,6 @@
#include "core/Config.h" #include "core/Config.h"
#include "core/Translator.h" #include "core/Translator.h"
#include "http/OptionDialog.h"
#include "http/HttpSettings.h"
class SettingsWidget::ExtraPage class SettingsWidget::ExtraPage
{ {
public: public:

2
src/http/HttpSettings.cpp
View File

@ -103,7 +103,7 @@ bool HttpSettings::alwaysAllowUpdate()
void HttpSettings::setAlwaysAllowUpdate(bool alwaysAllowUpdate) void HttpSettings::setAlwaysAllowUpdate(bool alwaysAllowUpdate)
{ {
config()->set("Http/AlwaysAllowAccess", alwaysAllowUpdate); config()->set("Http/AlwaysAllowUpdate", alwaysAllowUpdate);
} }
bool HttpSettings::searchInAllDatabases() bool HttpSettings::searchInAllDatabases()

2
src/http/OptionDialog.cpp
View File

@ -57,6 +57,7 @@ void OptionDialog::loadSettings()
ui->alwaysAllowAccess->setChecked(settings.alwaysAllowAccess()); ui->alwaysAllowAccess->setChecked(settings.alwaysAllowAccess());
ui->alwaysAllowUpdate->setChecked(settings.alwaysAllowUpdate()); ui->alwaysAllowUpdate->setChecked(settings.alwaysAllowUpdate());
ui->searchInAllDatabases->setChecked(settings.searchInAllDatabases()); ui->searchInAllDatabases->setChecked(settings.searchInAllDatabases());
ui->supportKphFields->setChecked(settings.supportKphFields());
} }
void OptionDialog::saveSettings() void OptionDialog::saveSettings()
@ -85,4 +86,5 @@ void OptionDialog::saveSettings()
settings.setAlwaysAllowAccess(ui->alwaysAllowAccess->isChecked()); settings.setAlwaysAllowAccess(ui->alwaysAllowAccess->isChecked());
settings.setAlwaysAllowUpdate(ui->alwaysAllowUpdate->isChecked()); settings.setAlwaysAllowUpdate(ui->alwaysAllowUpdate->isChecked());
settings.setSearchInAllDatabases(ui->searchInAllDatabases->isChecked()); settings.setSearchInAllDatabases(ui->searchInAllDatabases->isChecked());
settings.setSupportKphFields(ui->supportKphFields->isChecked());
} }