Optionsmodel #2

src/qt/optionsmodel.cpp

@@ -1,5 +1,7 @@
 #include "optionsmodel.h"
 #include "bitcoinunits.h"
+
+#include <QDebug>
 #include <QSettings>
 
 #include "init.h"
@@ -70,11 +72,55 @@ void OptionsModel::Init()
     if (settings.contains("fDisableUpdateCheck")) {
         SoftSetBoolArg("-disableupdatecheck", settings.value("fDisableUpdateCheck").toBool());
     }
-    if (settings.contains("dataDir")) {
-        SoftSetArg("-datadir", settings.value("dataDir").toString().toStdString());
+    if (settings.contains("dataDir") && dataDir != GUIUtil::getDefaultDataDirectory()) {
+        SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(settings.value("dataDir").toString()).string());
+    }
+}
+
+/** Helper function to copy contents from one QSettings to another.
+ * By using allKeys this also covers nested settings in a hierarchy.
+ */
+static void CopySettings(QSettings& dst, const QSettings& src)
+{
+    for (const QString& key : src.allKeys()) {
+        dst.setValue(key, src.value(key));
     }
 }
 
+/** Back up a QSettings to an ini-formatted file. */
+static void BackupSettings(const fs::path& filename, const QSettings& src)
+{
+    qInfo() << "Backing up GUI settings to" << GUIUtil::boostPathToQString(filename);
+    QSettings dst(GUIUtil::boostPathToQString(filename), QSettings::IniFormat);
+    dst.clear();
+    CopySettings(dst, src);
+}
+
+void OptionsModel::Reset()
+{
+    QSettings settings;
+
+    // Backup old settings to chain-specific datadir for troubleshooting
+    BackupSettings(GetDataDir(true) / "guisettings.ini.bak", settings);
+
+    // Save the strDataDir setting
+    QString dataDir = GUIUtil::getDefaultDataDirectory();
+    dataDir = settings.value("strDataDir", dataDir).toString();
+
+    // Remove all entries from our QSettings object
+    settings.clear();
+
+    // Set strDataDir
+    settings.setValue("strDataDir", dataDir);
+
+    // Set that this was reset
+    settings.setValue("fReset", true);
+
+    // default setting for OptionsModel::StartAtStartup - disabled
+    if (GUIUtil::GetStartOnSystemStartup())
+        GUIUtil::SetStartOnSystemStartup(false, true);
+}
+
 int OptionsModel::rowCount(const QModelIndex & parent) const
 {
     return OptionIDRowCount;

src/qt/optionsmodel.h

@@ -42,6 +42,7 @@ class OptionsModel : public QAbstractListModel
     };
 
     void Init();
+    void Reset();
 
     int rowCount(const QModelIndex & parent = QModelIndex()) const;
     QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;