Merge pull request #830 from isanae/settings-interface

Settings interface

1 files changed, 88 insertions, 163 deletions

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 1e164525..91e16716 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -94,15 +94,6 @@ static bool isOnline()
   return false;
 }
 
-static bool renameFile(const QString &oldName, const QString &newName,
-                       bool overwrite = true)
-{
-  if (overwrite && QFile::exists(newName)) {
-    QFile::remove(newName);
-  }
-  return QFile::rename(oldName, newName);
-}
-
 static std::wstring getProcessName(HANDLE process)
 {
   wchar_t buffer[MAX_PATH];
@@ -155,7 +146,7 @@ static void startSteam(QWidget *widget)
     QStringList args;
     QString username;
     QString password;
-    if (Settings::instance().getSteamLogin(username, password)) {
+    if (Settings::instance().steam().login(username, password)) {
       args << "-login";
       args << username;
       if (password != "") {
@@ -284,15 +275,13 @@ OrganizerCore::OrganizerCore(Settings &settings)
   , m_ArchivesInit(false)
   , m_PluginListsWriter(std::bind(&OrganizerCore::savePluginList, this))
 {
-  m_DownloadManager.setOutputDirectory(m_Settings.getDownloadDirectory());
-  m_DownloadManager.setPreferredServers(m_Settings.getPreferredServers());
-
-  NexusInterface::instance(m_PluginContainer)->setCacheDirectory(m_Settings.getCacheDirectory());
+  m_DownloadManager.setOutputDirectory(m_Settings.paths().downloads());
 
-  MOBase::QuestionBoxMemory::init(m_Settings.directInterface().fileName());
+  NexusInterface::instance(m_PluginContainer)->setCacheDirectory(
+    m_Settings.paths().cache());
 
-  m_InstallationManager.setModsDirectory(m_Settings.getModDirectory());
-  m_InstallationManager.setDownloadDirectory(m_Settings.getDownloadDirectory());
+  m_InstallationManager.setModsDirectory(m_Settings.paths().mods());
+  m_InstallationManager.setDownloadDirectory(m_Settings.paths().downloads());
 
   connect(&m_DownloadManager, SIGNAL(downloadSpeed(QString, int)), this,
           SLOT(downloadSpeed(QString, int)));
@@ -342,80 +331,33 @@ OrganizerCore::~OrganizerCore()
   delete m_DirectoryStructure;
 }
 
-QString OrganizerCore::commitSettings(const QString &iniFile)
-{
-  if (!shellRename(iniFile + ".new", iniFile, true, qApp->activeWindow())) {
-    DWORD err = ::GetLastError();
-    // make a second attempt using qt functions but if that fails print the
-    // error from the first attempt
-    if (!renameFile(iniFile + ".new", iniFile)) {
-      return QString::fromStdWString(formatSystemMessage(err));
-    }
-  }
-  return QString();
-}
-
-QSettings::Status OrganizerCore::storeSettings(const QString &fileName)
+void OrganizerCore::storeSettings()
 {
-  QSettings settings(fileName, QSettings::IniFormat);
-
-  if (m_UserInterface != nullptr) {
-    m_UserInterface->storeSettings(settings);
-  }
-
   if (m_CurrentProfile != nullptr) {
-    settings.setValue("selected_profile",
-                      m_CurrentProfile->name().toUtf8().constData());
+    m_Settings.game().setSelectedProfileName(m_CurrentProfile->name());
   }
 
-  m_ExecutablesList.store(settings);
-
-  FileDialogMemory::save(settings);
+  m_ExecutablesList.store(m_Settings);
 
-  settings.sync();
-  return settings.status();
-}
+  FileDialogMemory::save(m_Settings);
 
-void OrganizerCore::storeSettings()
-{
-  QString iniFile = qApp->property("dataPath").toString() + "/"
-                    + QString::fromStdWString(AppConfig::iniFileName());
-  if (QFileInfo(iniFile).exists()) {
-    if (!shellCopy(iniFile, iniFile + ".new", true, qApp->activeWindow())) {
-      const auto e = GetLastError();
-      QMessageBox::critical(
-          qApp->activeWindow(), tr("Failed to write settings"),
-          tr("An error occurred trying to update MO settings to %1: %2")
-              .arg(iniFile)
-              .arg(QString::fromStdWString(formatSystemMessage(e))));
-      return;
-    }
-  }
+  const auto result = m_Settings.sync();
 
-  QString writeTarget = iniFile + ".new";
-
-  QSettings::Status result = storeSettings(writeTarget);
+  if (result != QSettings::NoError) {
+    QString reason;
 
-  if (result == QSettings::NoError) {
-    QString errMsg = commitSettings(iniFile);
-    if (!errMsg.isEmpty()) {
-      log::warn(
-        "settings file not writable, may be locked by another "
-        "application, trying direct write");
-      writeTarget = iniFile;
-      result = storeSettings(iniFile);
+    if (result == QSettings::AccessError) {
+      reason = tr("File is write protected");
+    } else if (result == QSettings::FormatError) {
+      reason = tr("Invalid file format (probably a bug)");
+    } else {
+      reason = tr("Unknown error %1").arg(result);
     }
-  }
-  if (result != QSettings::NoError) {
-    QString reason = result == QSettings::AccessError
-                         ? tr("File is write protected")
-                         : result == QSettings::FormatError
-                               ? tr("Invalid file format (probably a bug)")
-                               : tr("Unknown error %1").arg(result);
+
     QMessageBox::critical(
-        qApp->activeWindow(), tr("Failed to write settings"),
-        tr("An error occurred trying to write back MO settings to %1: %2")
-            .arg(writeTarget, reason));
+      qApp->activeWindow(), tr("Failed to write settings"),
+      tr("An error occurred trying to write back MO settings to %1: %2")
+      .arg(m_Settings.filename(), reason));
   }
 }
 
@@ -480,19 +422,20 @@ return true;
 
 }
 
-void OrganizerCore::updateExecutablesList(QSettings &settings)
+void OrganizerCore::updateExecutablesList()
 {
   if (m_PluginContainer == nullptr) {
     log::error("can't update executables list now");
     return;
   }
 
-  m_ExecutablesList.load(managedGame(), settings);
+  m_ExecutablesList.load(managedGame(), m_Settings);
 
   // TODO this has nothing to do with executables list move to an appropriate
   // function!
-  ModInfo::updateFromDisc(m_Settings.getModDirectory(), &m_DirectoryStructure,
-                          m_PluginContainer, m_Settings.displayForeign(), managedGame());
+  ModInfo::updateFromDisc(
+    m_Settings.paths().mods(), &m_DirectoryStructure,
+    m_PluginContainer, m_Settings.interface().displayForeign(), managedGame());
 }
 
 void OrganizerCore::setUserInterface(IUserInterface *userInterface,
@@ -537,7 +480,7 @@ void OrganizerCore::setUserInterface(IUserInterface *userInterface,
   if (userInterface != nullptr) {
     // this currently wouldn't work reliably if the ui isn't initialized yet to
     // display the result
-    if (isOnline() && !m_Settings.offlineMode()) {
+    if (isOnline() && !m_Settings.network().offlineMode()) {
       m_Updater.testForUpdate();
     } else {
       log::debug("user doesn't seem to be connected to the internet");
@@ -571,7 +514,7 @@ void OrganizerCore::disconnectPlugins()
   m_DownloadManager.setPluginContainer(nullptr);
   m_ModList.setPluginContainer(nullptr);
 
-  m_Settings.clearPlugins();
+  m_Settings.plugins().clearPlugins();
   m_GamePlugin      = nullptr;
   m_PluginContainer = nullptr;
 }
@@ -600,7 +543,7 @@ bool OrganizerCore::nexusApi(bool retry)
     return false;
   } else {
     QString apiKey;
-    if (m_Settings.getNexusApiKey(apiKey)) {
+    if (m_Settings.nexus().apiKey(apiKey)) {
       // credentials stored or user entered them manually
       log::debug("attempt to verify nexus api key");
       accessManager->apiCheck(apiKey);
@@ -667,7 +610,7 @@ void OrganizerCore::removeOrigin(const QString &name)
 
 void OrganizerCore::downloadSpeed(const QString &serverName, int bytesPerSecond)
 {
-  m_Settings.setDownloadSpeed(serverName, bytesPerSecond);
+  m_Settings.network().setDownloadSpeed(serverName, bytesPerSecond);
 }
 
 InstallationManager *OrganizerCore::installationManager()
@@ -688,9 +631,9 @@ bool OrganizerCore::createDirectory(const QString &path) {
 }
 
 bool OrganizerCore::checkPathSymlinks() {
-  bool hasSymlink = (QFileInfo(m_Settings.getProfileDirectory()).isSymLink() ||
-    QFileInfo(m_Settings.getModDirectory()).isSymLink() ||
-    QFileInfo(m_Settings.getOverwriteDirectory()).isSymLink());
+  bool hasSymlink = (QFileInfo(m_Settings.paths().profiles()).isSymLink() ||
+    QFileInfo(m_Settings.paths().mods()).isSymLink() ||
+    QFileInfo(m_Settings.paths().overwrite()).isSymLink());
   if (hasSymlink) {
     QMessageBox::critical(nullptr, QObject::tr("Error"),
       QObject::tr("One of the configured MO2 directories (profiles, mods, or overwrite) "
@@ -702,17 +645,17 @@ bool OrganizerCore::checkPathSymlinks() {
 }
 
 bool OrganizerCore::bootstrap() {
-  return createDirectory(m_Settings.getProfileDirectory()) &&
-         createDirectory(m_Settings.getModDirectory()) &&
-         createDirectory(m_Settings.getDownloadDirectory()) &&
-         createDirectory(m_Settings.getOverwriteDirectory()) &&
+  return createDirectory(m_Settings.paths().profiles()) &&
+         createDirectory(m_Settings.paths().mods()) &&
+         createDirectory(m_Settings.paths().downloads()) &&
+         createDirectory(m_Settings.paths().overwrite()) &&
          createDirectory(QString::fromStdWString(crashDumpsPath())) &&
          checkPathSymlinks() && cycleDiagnostics();
 }
 
 void OrganizerCore::createDefaultProfile()
 {
-  QString profilesPath = settings().getProfileDirectory();
+  QString profilesPath = settings().paths().profiles();
   if (QDir(profilesPath).entryList(QDir::AllDirs | QDir::NoDotAndDotDot).size()
       == 0) {
     Profile newProf("Default", managedGame(), false);
@@ -725,7 +668,7 @@ void OrganizerCore::prepareVFS()
 }
 
 void OrganizerCore::updateVFSParams(
-  log::Levels logLevel, int crashDumpsType, QString executableBlacklist)
+  log::Levels logLevel, CrashDumpsType crashDumpsType, QString executableBlacklist)
 {
   setGlobalCrashDumpsType(crashDumpsType);
   m_USVFS.updateParams(logLevel, crashDumpsType, executableBlacklist);
@@ -733,25 +676,25 @@ void OrganizerCore::updateVFSParams(
 
 void OrganizerCore::setLogLevel(log::Levels level)
 {
-  m_Settings.setLogLevel(level);
+  m_Settings.diagnostics().setLogLevel(level);
 
   updateVFSParams(
-    m_Settings.logLevel(),
-    m_Settings.crashDumpsType(),
+    m_Settings.diagnostics().logLevel(),
+    m_Settings.diagnostics().crashDumpsType(),
     m_Settings.executablesBlacklist());
 
-  log::getDefault().setLevel(m_Settings.logLevel());
+  log::getDefault().setLevel(m_Settings.diagnostics().logLevel());
 }
 
 bool OrganizerCore::cycleDiagnostics() {
-  if (int maxDumps = settings().crashDumpsMax())
+  if (int maxDumps = settings().diagnostics().crashDumpsMax())
     removeOldFiles(QString::fromStdWString(crashDumpsPath()), "*.dmp", maxDumps, QDir::Time|QDir::Reversed);
   return true;
 }
 
 //static
-void OrganizerCore::setGlobalCrashDumpsType(int crashDumpsType) {
-  m_globalCrashDumpsType = ::crashDumpsType(crashDumpsType);
+void OrganizerCore::setGlobalCrashDumpsType(CrashDumpsType type) {
+  m_globalCrashDumpsType = type;
 }
 
 //static
@@ -779,7 +722,7 @@ void OrganizerCore::setCurrentProfile(const QString &profileName)
     return;
   }
 
-  QDir profileBaseDir(settings().getProfileDirectory());
+  QDir profileBaseDir(settings().paths().profiles());
   QString profileDir = profileBaseDir.absoluteFilePath(profileName);
 
   if (!QDir(profileDir).exists()) {
@@ -803,16 +746,11 @@ void OrganizerCore::setCurrentProfile(const QString &profileName)
     m_CurrentProfile->deactivateInvalidation();
   }
 
+  m_Settings.game().setSelectedProfileName(m_CurrentProfile->name());
+
   connect(m_CurrentProfile, SIGNAL(modStatusChanged(uint)), this, SLOT(modStatusChanged(uint)));
   connect(m_CurrentProfile, SIGNAL(modStatusChanged(QList<uint>)), this, SLOT(modStatusChanged(QList<uint>)));
   refreshDirectoryStructure();
-
-  //This line is not actually needed and was only added to allow some
-  //outside detection of Mo2 profile change. (like BaobobMiller utility)
-  if (m_CurrentProfile != nullptr) {
-    settings().directInterface().setValue("selected_profile",
-      m_CurrentProfile->name().toUtf8().constData());
-  }
 }
 
 MOBase::IModRepositoryBridge *OrganizerCore::createNexusBridge() const
@@ -840,22 +778,22 @@ QString OrganizerCore::profilePath() const
 
 QString OrganizerCore::downloadsPath() const
 {
-  return QDir::fromNativeSeparators(m_Settings.getDownloadDirectory());
+  return QDir::fromNativeSeparators(m_Settings.paths().downloads());
 }
 
 QString OrganizerCore::overwritePath() const
 {
-  return QDir::fromNativeSeparators(m_Settings.getOverwriteDirectory());
+  return QDir::fromNativeSeparators(m_Settings.paths().overwrite());
 }
 
 QString OrganizerCore::basePath() const
 {
-  return QDir::fromNativeSeparators(m_Settings.getBaseDirectory());
+  return QDir::fromNativeSeparators(m_Settings.paths().base());
 }
 
 QString OrganizerCore::modsPath() const
 {
-  return QDir::fromNativeSeparators(m_Settings.getModDirectory());
+  return QDir::fromNativeSeparators(m_Settings.paths().mods());
 }
 
 MOBase::VersionInfo OrganizerCore::appVersion() const
@@ -885,10 +823,10 @@ MOBase::IModInterface *OrganizerCore::createMod(GuessedValue<QString> &name)
     return nullptr;
   }
 
-  m_InstallationManager.setModsDirectory(m_Settings.getModDirectory());
+  m_InstallationManager.setModsDirectory(m_Settings.paths().mods());
 
   QString targetDirectory
-      = QDir::fromNativeSeparators(m_Settings.getModDirectory())
+      = QDir::fromNativeSeparators(m_Settings.paths().mods())
             .append("/")
             .append(name);
 
@@ -928,26 +866,26 @@ void OrganizerCore::modDataChanged(MOBase::IModInterface *)
 QVariant OrganizerCore::pluginSetting(const QString &pluginName,
                                       const QString &key) const
 {
-  return m_Settings.pluginSetting(pluginName, key);
+  return m_Settings.plugins().setting(pluginName, key);
 }
 
 void OrganizerCore::setPluginSetting(const QString &pluginName,
                                      const QString &key, const QVariant &value)
 {
-  m_Settings.setPluginSetting(pluginName, key, value);
+  m_Settings.plugins().setSetting(pluginName, key, value);
 }
 
 QVariant OrganizerCore::persistent(const QString &pluginName,
                                    const QString &key,
                                    const QVariant &def) const
 {
-  return m_Settings.pluginPersistent(pluginName, key, def);
+  return m_Settings.plugins().persistent(pluginName, key, def);
 }
 
 void OrganizerCore::setPersistent(const QString &pluginName, const QString &key,
                                   const QVariant &value, bool sync)
 {
-  m_Settings.setPluginPersistent(pluginName, key, value, sync);
+  m_Settings.plugins().setPersistent(pluginName, key, value, sync);
 }
 
 QString OrganizerCore::pluginDataPath() const
@@ -976,7 +914,7 @@ MOBase::IModInterface *OrganizerCore::installMod(const QString &fileName,
     modName.update(initModName, GUESS_USER);
   }
   m_CurrentProfile->writeModlistNow();
-  m_InstallationManager.setModsDirectory(m_Settings.getModDirectory());
+  m_InstallationManager.setModsDirectory(m_Settings.paths().mods());
   if (m_InstallationManager.install(fileName, modName, hasIniTweaks)) {
     MessageDialog::showMessage(tr("Installation successful"),
                                qApp->activeWindow());
@@ -1041,7 +979,7 @@ void OrganizerCore::installDownload(int index)
     m_CurrentProfile->writeModlistNow();
 
     bool hasIniTweaks = false;
-    m_InstallationManager.setModsDirectory(m_Settings.getModDirectory());
+    m_InstallationManager.setModsDirectory(m_Settings.paths().mods());
     if (m_InstallationManager.install(fileName, modName, hasIniTweaks)) {
       MessageDialog::showMessage(tr("Installation successful"),
                                  qApp->activeWindow());
@@ -1334,7 +1272,7 @@ bool OrganizerCore::previewFileWithAlternatives(
   else {
     // crude: we search for the next slash after the base mod directory to skip
     // everything up to the data-relative directory
-    int offset = settings().getModDirectory().size() + 1;
+    int offset = settings().paths().mods().size() + 1;
     offset = fileName.indexOf("/", offset);
     fileName = fileName.mid(offset + 1);
   }
@@ -1349,7 +1287,8 @@ bool OrganizerCore::previewFileWithAlternatives(
   }
 
   // set up preview dialog
-  PreviewDialog preview(fileName);
+  PreviewDialog preview(fileName, parent);
+
   auto addFunc = [&](int originId) {
     FilesOrigin &origin = directoryStructure()->getOriginByID(originId);
     QString filePath = QDir::fromNativeSeparators(ToQString(origin.getPath())) + "/" + fileName;
@@ -1404,16 +1343,7 @@ bool OrganizerCore::previewFileWithAlternatives(
   }
 
   if (preview.numVariants() > 0) {
-    QSettings &s = settings().directInterface();
-    QString key = QString("geometry/%1").arg(preview.objectName());
-    if (s.contains(key)) {
-      preview.restoreGeometry(s.value(key).toByteArray());
-    }
-
     preview.exec();
-
-    s.setValue(key, preview.saveGeometry());
-
     return true;
   }
   else {
@@ -1433,7 +1363,7 @@ bool OrganizerCore::previewFile(
     return false;
   }
 
-  PreviewDialog preview(path);
+  PreviewDialog preview(path, parent);
 
   QWidget *wid = m_PluginContainer->previewGenerator().genPreview(path);
   if (wid == nullptr) {
@@ -1442,17 +1372,8 @@ bool OrganizerCore::previewFile(
   }
 
   preview.addVariant(originName, wid);
-
-  QSettings &s = settings().directInterface();
-  QString key = QString("geometry/%1").arg(preview.objectName());
-  if (s.contains(key)) {
-    preview.restoreGeometry(s.value(key).toByteArray());
-  }
-
   preview.exec();
 
-  s.setValue(key, preview.saveGeometry());
-
   return true;
 }
 
@@ -1493,7 +1414,7 @@ HANDLE OrganizerCore::spawnBinaryDirect(const QFileInfo &binary,
                                         LPDWORD exitCode)
 {
   HANDLE processHandle = spawnBinaryProcess(binary, arguments, profileName, currentDirectory, steamAppID, customOverwrite, forcedLibraries);
-  if (Settings::instance().lockGUI() && processHandle != INVALID_HANDLE_VALUE) {
+  if (Settings::instance().interface().lockGUI() && processHandle != INVALID_HANDLE_VALUE) {
     std::unique_ptr<LockedDialog> dlg;
     ILockedWaitingForProcess* uilock = nullptr;
 
@@ -1542,7 +1463,7 @@ HANDLE OrganizerCore::spawnBinaryProcess(const QFileInfo &binary,
     ::SetEnvironmentVariableW(L"SteamAPPId", ToWString(steamAppID).c_str());
   } else {
     ::SetEnvironmentVariableW(L"SteamAPPId",
-                              ToWString(m_Settings.getSteamAppID()).c_str());
+                              ToWString(m_Settings.steam().appID()).c_str());
   }
 
   QWidget *window = qApp->activeWindow();
@@ -1558,7 +1479,7 @@ HANDLE OrganizerCore::spawnBinaryProcess(const QFileInfo &binary,
        || QFileInfo(managedGame()->gameDirectory().absoluteFilePath(
                         "steam_api64.dll"))
               .exists())
-      && (m_Settings.getLoadMechanism() == LoadMechanism::LOAD_MODORGANIZER)) {
+      && (m_Settings.game().loadMechanismType() == LoadMechanism::LOAD_MODORGANIZER)) {
 
     bool steamFound = true;
     bool steamAccess = true;
@@ -1673,7 +1594,7 @@ HANDLE OrganizerCore::spawnBinaryProcess(const QFileInfo &binary,
       }
     }
 
-    QString modsPath = settings().getModDirectory();
+    QString modsPath = settings().paths().mods();
 
     // Check if this a request with either an executable or a working directory under our mods folder
     // then will start the process in a virtualized "environment" with the appropriate paths fixed:
@@ -1830,7 +1751,7 @@ HANDLE OrganizerCore::startApplication(const QString &executable,
 
 bool OrganizerCore::waitForApplication(HANDLE handle, LPDWORD exitCode)
 {
-  if (!Settings::instance().lockGUI())
+  if (!Settings::instance().interface().lockGUI())
     return true;
 
   ILockedWaitingForProcess* uilock = nullptr;
@@ -2041,8 +1962,10 @@ void OrganizerCore::refreshModList(bool saveChanges)
   if (saveChanges) {
     m_CurrentProfile->writeModlistNow(true);
   }
-  ModInfo::updateFromDisc(m_Settings.getModDirectory(), &m_DirectoryStructure,
-                          m_PluginContainer, m_Settings.displayForeign(), managedGame());
+
+  ModInfo::updateFromDisc(
+    m_Settings.paths().mods(), &m_DirectoryStructure,
+    m_PluginContainer, m_Settings.interface().displayForeign(), managedGame());
 
   m_CurrentProfile->refreshModStatus();
 
@@ -2211,7 +2134,7 @@ void OrganizerCore::updateModsInDirectoryStructure(QMap<unsigned int, ModInfo::P
   updateModsActiveState(modInfo.keys(), true);
   m_PluginList.blockSignals(false);
   // now we need to refresh the bsa list and save it so there is no confusion
-  // about what archives are avaiable and active
+  // about what archives are available and active
   refreshBSAList();
   if (m_UserInterface != nullptr) {
     m_UserInterface->archivesWriter().writeImmediately(false);
@@ -2237,7 +2160,7 @@ void OrganizerCore::loggedInAction(QWidget* parent, std::function<void ()> f)
     f();
   } else {
     QString apiKey;
-    if (settings().getNexusApiKey(apiKey)) {
+    if (settings().nexus().apiKey(apiKey)) {
       doAfterLogin([f]{ f(); });
       NexusInterface::instance(m_PluginContainer)->getAccessManager()->apiCheck(apiKey);
     } else {
@@ -2376,8 +2299,10 @@ void OrganizerCore::profileRefresh()
 {
   // have to refresh mods twice (again in refreshModList), otherwise the refresh
   // isn't complete. Not sure why
-  ModInfo::updateFromDisc(m_Settings.getModDirectory(), &m_DirectoryStructure,
-                          m_PluginContainer, m_Settings.displayForeign(), managedGame());
+  ModInfo::updateFromDisc(
+    m_Settings.paths().mods(), &m_DirectoryStructure,
+    m_PluginContainer, m_Settings.interface().displayForeign(), managedGame());
+
   m_CurrentProfile->refreshModStatus();
 
   refreshModList();
@@ -2544,7 +2469,7 @@ void OrganizerCore::syncOverwrite()
   SyncOverwriteDialog syncDialog(modInfo->absolutePath(), m_DirectoryStructure,
                                  qApp->activeWindow());
   if (syncDialog.exec() == QDialog::Accepted) {
-    syncDialog.apply(QDir::fromNativeSeparators(m_Settings.getModDirectory()));
+    syncDialog.apply(QDir::fromNativeSeparators(m_Settings.paths().mods()));
     modInfo->testValid();
     refreshDirectoryStructure();
   }
@@ -2567,7 +2492,7 @@ std::vector<unsigned int> OrganizerCore::activeProblems() const
   const auto& hookdll = oldMO1HookDll();
   if (!hookdll.isEmpty()) {
     // This warning will now be shown every time the problems are checked, which is a bit
-    // of a "log spam". But since this is a sevre error which will most likely make the
+    // of a "log spam". But since this is a sever error which will most likely make the
     // game crash/freeze/etc. and is very hard to diagnose,  this "log spam" will make it
     // easier for the user to notice the warning.
     log::warn("hook.dll found in game folder: {}", hookdll);
@@ -2643,7 +2568,7 @@ void OrganizerCore::savePluginList()
   }
   m_PluginList.saveTo(m_CurrentProfile->getLockedOrderFileName(),
                       m_CurrentProfile->getDeleterFileName(),
-                      m_Settings.hideUncheckedPlugins());
+                      m_Settings.game().hideUncheckedPlugins());
   m_PluginList.saveLoadOrder(*m_DirectoryStructure);
 }
 
@@ -2655,7 +2580,7 @@ void OrganizerCore::prepareStart()
   m_CurrentProfile->writeModlist();
   m_CurrentProfile->createTweakedIniFile();
   saveCurrentLists();
-  m_Settings.setupLoadMechanism();
+  m_Settings.game().loadMechanism().activate(m_Settings.game().loadMechanismType());
   storeSettings();
 }
 
@@ -2669,7 +2594,7 @@ std::vector<Mapping> OrganizerCore::fileMapping(const QString &profileName,
   }
 
   IPluginGame *game  = qApp->property("managed_game").value<IPluginGame *>();
-  Profile profile(QDir(m_Settings.getProfileDirectory() + "/" + profileName),
+  Profile profile(QDir(m_Settings.paths().profiles() + "/" + profileName),
                   game);
 
   MappingType result;
@@ -2715,7 +2640,7 @@ std::vector<Mapping> OrganizerCore::fileMapping(const QString &profileName,
   }
 
   result.insert(result.end(), {
-                  QDir::toNativeSeparators(m_Settings.getOverwriteDirectory()),
+                  QDir::toNativeSeparators(m_Settings.paths().overwrite()),
                   dataPath,
                   true,
                   customOverwrite.isEmpty()