aboutsummaryrefslogtreecommitdiff
path: root/src/qt/optionsmodel.cpp
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2015-11-25 09:04:49 +0100
committerJonas Schnelli <dev@jonasschnelli.ch>2015-11-25 09:05:19 +0100
commit26af1ac7cbce11e44c66f3032dfe014eaf311e1c (patch)
tree68e947520f90f6893ea4aa8c876a1a192e9b3f0d /src/qt/optionsmodel.cpp
parentb19fe277dd6208b80fea837adf9e64631b07f946 (diff)
parentf71bfefcb0c06c4639a668a325acfd49aa7b3a8c (diff)
downloadbitcoin-26af1ac7cbce11e44c66f3032dfe014eaf311e1c.tar.xz
Merge pull request #7006
f71bfef add UI help for -resetguisettings (Jonas Schnelli) ae98388 [Qt] add startup option to reset Qt settings (Jonas Schnelli)
Diffstat (limited to 'src/qt/optionsmodel.cpp')
-rw-r--r--src/qt/optionsmodel.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 65e490570e..3e5c6c72b1 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -26,10 +26,10 @@
#include <QSettings>
#include <QStringList>
-OptionsModel::OptionsModel(QObject *parent) :
+OptionsModel::OptionsModel(QObject *parent, bool resetSettings) :
QAbstractListModel(parent)
{
- Init();
+ Init(resetSettings);
}
void OptionsModel::addOverriddenOption(const std::string &option)
@@ -38,8 +38,11 @@ void OptionsModel::addOverriddenOption(const std::string &option)
}
// Writes all missing QSettings with their default values
-void OptionsModel::Init()
+void OptionsModel::Init(bool resetSettings)
{
+ if (resetSettings)
+ Reset();
+
QSettings settings;
// Ensure restart flag is unset on client startup