From 54d98e291701f2187174a67c186f1ea762c6b959 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 16 Jul 2019 05:38:32 -0400
Subject: removed unused or redundant stuff in error_report.h renamed log() to
 vlog() for now extracted console creation to Console class rewrote LogBuffer
 to work with logging from uibase, renamed to LogModel added fmt dependency

---
 src/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f197211a..a359b8a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -520,6 +520,9 @@ LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 FIND_PACKAGE(zlib REQUIRED)
 # TODO FindZlib doesn't find the static zlib library
 
+# fmt
+find_package(fmt REQUIRED)
+
 INCLUDE_DIRECTORIES(${project_path}/uibase/src
                     ${project_path}/bsatk/src
                     ${project_path}/esptk/src
@@ -551,10 +554,11 @@ ELSE()
 ENDIF()
 
 ADD_EXECUTABLE(ModOrganizer WIN32 ${organizer_HDRS} ${organizer_SRCS} ${organizer_UIS} ${organizer_RCS} ${organizer_QRCS} ${organizer_translations_qm})
+
 TARGET_LINK_LIBRARIES(ModOrganizer
                       Qt5::Widgets Qt5::WinExtras Qt5::WebEngineWidgets Qt5::Quick
                       Qt5::Qml Qt5::QuickWidgets Qt5::Network Qt5::WebSockets
-                      ${Boost_LIBRARIES}
+                      ${Boost_LIBRARIES} fmt::fmt
                       zlibstatic
                       uibase esptk bsatk githubpp
                       ${usvfs_name}
-- 
cgit v1.3.1


From 6217f910f095adea4b06f370726636b09efea4ed Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 16 Jul 2019 05:42:22 -0400
Subject: renamed logbuffer files to loglist

---
 src/CMakeLists.txt    |   6 +-
 src/logbuffer.cpp     | 171 --------------------------------------------------
 src/logbuffer.h       |  61 ------------------
 src/loglist.cpp       | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/loglist.h         |  61 ++++++++++++++++++
 src/main.cpp          |   2 +-
 src/mainwindow.cpp    |   2 +-
 src/organizercore.cpp |   1 -
 8 files changed, 237 insertions(+), 238 deletions(-)
 delete mode 100644 src/logbuffer.cpp
 delete mode 100644 src/logbuffer.h
 create mode 100644 src/loglist.cpp
 create mode 100644 src/loglist.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a359b8a9..9dbab132 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -73,7 +73,7 @@ SET(organizer_SRCS
     mainwindow.cpp
     main.cpp
     loghighlighter.cpp
-    logbuffer.cpp
+    loglist.cpp
     lockeddialogbase.cpp
     lockeddialog.cpp
     waitingonclosedialog.cpp
@@ -181,7 +181,7 @@ SET(organizer_HDRS
     messagedialog.h
     mainwindow.h
     loghighlighter.h
-    logbuffer.h
+    loglist.h
     lockeddialogbase.h
     lockeddialog.h
     waitingonclosedialog.h
@@ -436,7 +436,7 @@ set(widgets
 	filterwidget
 	icondelegate
 	lcdnumber
-	logbuffer
+	loglist
 	loghighlighter
 	modflagicondelegate
 	modidlineedit
diff --git a/src/logbuffer.cpp b/src/logbuffer.cpp
deleted file mode 100644
index 9e3cd712..00000000
--- a/src/logbuffer.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "logbuffer.h"
-#include <scopeguard.h>
-#include <report.h>
-#include <log.h>
-#include <QMutexLocker>
-#include <QFile>
-#include <QIcon>
-#include <QDateTime>
-#include <Windows.h>
-
-using namespace MOBase;
-
-static LogModel* g_instance = nullptr;
-const std::size_t MaxLines = 1000;
-
-LogModel::LogModel()
-{
-  connect(this, &LogModel::entryAdded, [&](auto&& e){ onEntryAdded(e); });
-}
-
-void LogModel::create()
-{
-  g_instance = new LogModel;
-}
-
-LogModel& LogModel::instance()
-{
-  return *g_instance;
-}
-
-void LogModel::add(MOBase::log::Entry e)
-{
-  emit entryAdded(std::move(e));
-}
-
-void LogModel::onEntryAdded(MOBase::log::Entry e)
-{
-  bool full = false;
-  if (m_messages.size() > MaxLines) {
-    m_messages.pop_front();
-    full = true;
-  }
-
-  const int row = static_cast<int>(m_messages.size());
-
-  if (!full) {
-    beginInsertRows(QModelIndex(), row, row + 1);
-  }
-
-  m_messages.emplace_back(std::move(e));
-
-  if (!full) {
-    endInsertRows();
-  } else {
-    emit dataChanged(
-      createIndex(row, 0),
-      createIndex(row + 1, columnCount({})));
-  }
-}
-
-QModelIndex LogModel::index(int row, int column, const QModelIndex&) const
-{
-  return createIndex(row, column, row);
-}
-
-QModelIndex LogModel::parent(const QModelIndex&) const
-{
-  return QModelIndex();
-}
-
-int LogModel::rowCount(const QModelIndex& parent) const
-{
-  if (parent.isValid())
-    return 0;
-  else
-    return static_cast<int>(m_messages.size());
-}
-
-int LogModel::columnCount(const QModelIndex&) const
-{
-  return 3;
-}
-
-QVariant LogModel::data(const QModelIndex& index, int role) const
-{
-  using namespace std::chrono;
-
-  const auto row = static_cast<std::size_t>(index.row());
-  if (row >= m_messages.size()) {
-    return {};
-  }
-
-  const auto& e = m_messages[row];
-
-  if (role == Qt::DisplayRole) {
-    if (index.column() == 1) {
-      const auto ms = duration_cast<milliseconds>(e.time.time_since_epoch());
-      const auto s = duration_cast<seconds>(ms);
-
-      const std::time_t t = s.count();
-      const std::size_t frac = ms.count() % 1000;
-
-      auto time = QDateTime::fromTime_t(t).time();
-      time = time.addMSecs(frac);
-
-      return time.toString("hh:mm:ss.zzz");
-    } else if (index.column() == 2) {
-      return QString::fromStdString(e.message);
-    }
-  }
-
-  if (role == Qt::DecorationRole) {
-    if (index.column() == 0) {
-      switch (e.level) {
-        case log::Warning:
-          return QIcon(":/MO/gui/warning");
-
-        case log::Error:
-          return QIcon(":/MO/gui/problem");
-
-        case log::Debug:  // fall-through
-        case log::Info:
-        default:
-          return {};
-      }
-    }
-  }
-
-  return QVariant();
-}
-
-QVariant LogModel::headerData(int, Qt::Orientation, int) const
-{
-  return {};
-}
-
-void vlog(const char *format, ...)
-{
-  va_list argList;
-  va_start(argList, format);
-
-  static const int BUFFERSIZE = 1000;
-
-  char buffer[BUFFERSIZE + 1];
-  buffer[BUFFERSIZE] = '\0';
-
-  vsnprintf(buffer, BUFFERSIZE, format, argList);
-
-  qCritical("%s", buffer);
-
-  va_end(argList);
-}
diff --git a/src/logbuffer.h b/src/logbuffer.h
deleted file mode 100644
index 1bf8901b..00000000
--- a/src/logbuffer.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef LOGBUFFER_H
-#define LOGBUFFER_H
-
-#include <QObject>
-#include <QMutex>
-#include <QScopedPointer>
-#include <QStringListModel>
-#include <QTime>
-#include <vector>
-#include <log.h>
-
-class LogModel : public QAbstractItemModel
-{
-  Q_OBJECT
-
-public:
-  static void create();
-  static LogModel& instance();
-
-  void add(MOBase::log::Entry e);
-
-protected:
-  QModelIndex index(int row, int column, const QModelIndex& parent) const override;
-  QModelIndex parent(const QModelIndex &child) const override;
-  int rowCount(const QModelIndex &parent) const override;
-  int columnCount(const QModelIndex &parent) const override;
-  QVariant data(const QModelIndex &index, int role) const override;
-  
-  QVariant headerData(
-    int section, Qt::Orientation ori, int role=Qt::DisplayRole) const override;
-
-signals:
-  void entryAdded(MOBase::log::Entry e);
-
-private:
-  std::deque<MOBase::log::Entry> m_messages;
-
-  LogModel();
-  void onEntryAdded(MOBase::log::Entry e);
-};
-
-#endif // LOGBUFFER_H
diff --git a/src/loglist.cpp b/src/loglist.cpp
new file mode 100644
index 00000000..cb927272
--- /dev/null
+++ b/src/loglist.cpp
@@ -0,0 +1,171 @@
+/*
+Copyright (C) 2012 Sebastian Herbord. All rights reserved.
+
+This file is part of Mod Organizer.
+
+Mod Organizer is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Mod Organizer is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "loglist.h"
+#include <scopeguard.h>
+#include <report.h>
+#include <log.h>
+#include <QMutexLocker>
+#include <QFile>
+#include <QIcon>
+#include <QDateTime>
+#include <Windows.h>
+
+using namespace MOBase;
+
+static LogModel* g_instance = nullptr;
+const std::size_t MaxLines = 1000;
+
+LogModel::LogModel()
+{
+  connect(this, &LogModel::entryAdded, [&](auto&& e){ onEntryAdded(e); });
+}
+
+void LogModel::create()
+{
+  g_instance = new LogModel;
+}
+
+LogModel& LogModel::instance()
+{
+  return *g_instance;
+}
+
+void LogModel::add(MOBase::log::Entry e)
+{
+  emit entryAdded(std::move(e));
+}
+
+void LogModel::onEntryAdded(MOBase::log::Entry e)
+{
+  bool full = false;
+  if (m_messages.size() > MaxLines) {
+    m_messages.pop_front();
+    full = true;
+  }
+
+  const int row = static_cast<int>(m_messages.size());
+
+  if (!full) {
+    beginInsertRows(QModelIndex(), row, row + 1);
+  }
+
+  m_messages.emplace_back(std::move(e));
+
+  if (!full) {
+    endInsertRows();
+  } else {
+    emit dataChanged(
+      createIndex(row, 0),
+      createIndex(row + 1, columnCount({})));
+  }
+}
+
+QModelIndex LogModel::index(int row, int column, const QModelIndex&) const
+{
+  return createIndex(row, column, row);
+}
+
+QModelIndex LogModel::parent(const QModelIndex&) const
+{
+  return QModelIndex();
+}
+
+int LogModel::rowCount(const QModelIndex& parent) const
+{
+  if (parent.isValid())
+    return 0;
+  else
+    return static_cast<int>(m_messages.size());
+}
+
+int LogModel::columnCount(const QModelIndex&) const
+{
+  return 3;
+}
+
+QVariant LogModel::data(const QModelIndex& index, int role) const
+{
+  using namespace std::chrono;
+
+  const auto row = static_cast<std::size_t>(index.row());
+  if (row >= m_messages.size()) {
+    return {};
+  }
+
+  const auto& e = m_messages[row];
+
+  if (role == Qt::DisplayRole) {
+    if (index.column() == 1) {
+      const auto ms = duration_cast<milliseconds>(e.time.time_since_epoch());
+      const auto s = duration_cast<seconds>(ms);
+
+      const std::time_t t = s.count();
+      const std::size_t frac = ms.count() % 1000;
+
+      auto time = QDateTime::fromTime_t(t).time();
+      time = time.addMSecs(frac);
+
+      return time.toString("hh:mm:ss.zzz");
+    } else if (index.column() == 2) {
+      return QString::fromStdString(e.message);
+    }
+  }
+
+  if (role == Qt::DecorationRole) {
+    if (index.column() == 0) {
+      switch (e.level) {
+        case log::Warning:
+          return QIcon(":/MO/gui/warning");
+
+        case log::Error:
+          return QIcon(":/MO/gui/problem");
+
+        case log::Debug:  // fall-through
+        case log::Info:
+        default:
+          return {};
+      }
+    }
+  }
+
+  return QVariant();
+}
+
+QVariant LogModel::headerData(int, Qt::Orientation, int) const
+{
+  return {};
+}
+
+void vlog(const char *format, ...)
+{
+  va_list argList;
+  va_start(argList, format);
+
+  static const int BUFFERSIZE = 1000;
+
+  char buffer[BUFFERSIZE + 1];
+  buffer[BUFFERSIZE] = '\0';
+
+  vsnprintf(buffer, BUFFERSIZE, format, argList);
+
+  qCritical("%s", buffer);
+
+  va_end(argList);
+}
diff --git a/src/loglist.h b/src/loglist.h
new file mode 100644
index 00000000..1bf8901b
--- /dev/null
+++ b/src/loglist.h
@@ -0,0 +1,61 @@
+/*
+Copyright (C) 2012 Sebastian Herbord. All rights reserved.
+
+This file is part of Mod Organizer.
+
+Mod Organizer is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+Mod Organizer is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef LOGBUFFER_H
+#define LOGBUFFER_H
+
+#include <QObject>
+#include <QMutex>
+#include <QScopedPointer>
+#include <QStringListModel>
+#include <QTime>
+#include <vector>
+#include <log.h>
+
+class LogModel : public QAbstractItemModel
+{
+  Q_OBJECT
+
+public:
+  static void create();
+  static LogModel& instance();
+
+  void add(MOBase::log::Entry e);
+
+protected:
+  QModelIndex index(int row, int column, const QModelIndex& parent) const override;
+  QModelIndex parent(const QModelIndex &child) const override;
+  int rowCount(const QModelIndex &parent) const override;
+  int columnCount(const QModelIndex &parent) const override;
+  QVariant data(const QModelIndex &index, int role) const override;
+  
+  QVariant headerData(
+    int section, Qt::Orientation ori, int role=Qt::DisplayRole) const override;
+
+signals:
+  void entryAdded(MOBase::log::Entry e);
+
+private:
+  std::deque<MOBase::log::Entry> m_messages;
+
+  LogModel();
+  void onEntryAdded(MOBase::log::Entry e);
+};
+
+#endif // LOGBUFFER_H
diff --git a/src/main.cpp b/src/main.cpp
index 23ea234a..8b5648c9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -39,7 +39,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "singleinstance.h"
 #include "utility.h"
 #include "helper.h"
-#include "logbuffer.h"
+#include "loglist.h"
 #include "selectiondialog.h"
 #include "moapplication.h"
 #include "tutorialmanager.h"
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index cd224414..107f3e09 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -59,7 +59,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "installationmanager.h"
 #include "lockeddialog.h"
 #include "waitingonclosedialog.h"
-#include "logbuffer.h"
+#include "loglist.h"
 #include "downloadlistsortproxy.h"
 #include "motddialog.h"
 #include "filedialogmemory.h"
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 5f5c3afe..d3cd54ee 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -14,7 +14,6 @@
 #include "plugincontainer.h"
 #include "pluginlistsortproxy.h"
 #include "profile.h"
-#include "logbuffer.h"
 #include "credentialsdialog.h"
 #include "filedialogmemory.h"
 #include "modinfodialog.h"
-- 
cgit v1.3.1


From b2a1e1391fdd6bdee1c5e8d337b273447c70a506 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Thu, 18 Jul 2019 23:13:57 -0400
Subject: split env

---
 src/CMakeLists.txt  |   25 +-
 src/env.cpp         |  479 ++++++++++++
 src/env.h           |  117 +++
 src/envmetrics.cpp  |  224 ++++++
 src/envmetrics.h    |   28 +
 src/envmodule.cpp   |  390 ++++++++++
 src/envmodule.h     |   98 +++
 src/envsecurity.cpp |  418 ++++++++++
 src/envsecurity.h   |   49 ++
 src/envshortcut.cpp |  376 +++++++++
 src/envshortcut.h   |  114 +++
 src/envwindows.cpp  |  236 ++++++
 src/envwindows.h    |  106 +++
 src/main.cpp        |    2 +
 src/mainwindow.cpp  |    1 +
 src/shared/util.cpp | 2123 +--------------------------------------------------
 src/shared/util.h   |  443 -----------
 17 files changed, 2663 insertions(+), 2566 deletions(-)
 create mode 100644 src/env.cpp
 create mode 100644 src/env.h
 create mode 100644 src/envmetrics.cpp
 create mode 100644 src/envmetrics.h
 create mode 100644 src/envmodule.cpp
 create mode 100644 src/envmodule.h
 create mode 100644 src/envsecurity.cpp
 create mode 100644 src/envsecurity.h
 create mode 100644 src/envshortcut.cpp
 create mode 100644 src/envshortcut.h
 create mode 100644 src/envwindows.cpp
 create mode 100644 src/envwindows.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9dbab132..9785dc3d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -129,6 +129,12 @@ SET(organizer_SRCS
 	filerenamer.cpp
 	texteditor.cpp
 	expanderwidget.cpp
+	env.cpp
+	envmetrics.cpp
+	envmodule.cpp
+	envsecurity.cpp
+	envshortcut.cpp
+	envwindows.cpp
 
     shared/windows_error.cpp
     shared/error_report.cpp
@@ -239,6 +245,12 @@ SET(organizer_HDRS
 	filerenamer.h
 	texteditor.h
 	expanderwidget.h
+	env.h
+	envmetrics.h
+	envmodule.h
+	envsecurity.h
+	envshortcut.h
+	envwindows.h
 
     shared/windows_error.h
     shared/error_report.h
@@ -350,6 +362,15 @@ set(downloads
 	downloadmanager
 )
 
+set(env
+	env
+	envmetrics
+	envmodule
+	envsecurity
+	envshortcut
+	envwindows
+)
+
 set(executables
 	executableslist
 	editexecutablesdialog
@@ -447,8 +468,8 @@ set(widgets
 )
 
 set(src_filters
-	application core browser dialogs downloads executables locking modinfo modinfo\\dialog
-	modlist plugins previews profiles settings utilities widgets
+	application core browser dialogs downloads env executables locking modinfo
+	modinfo\\dialog modlist plugins previews profiles settings utilities widgets
 )
 
 foreach(filter in list ${src_filters})
diff --git a/src/env.cpp b/src/env.cpp
new file mode 100644
index 00000000..641eb4a7
--- /dev/null
+++ b/src/env.cpp
@@ -0,0 +1,479 @@
+#include "env.h"
+#include "envmetrics.h"
+#include "envmodule.h"
+#include "envsecurity.h"
+#include "envshortcut.h"
+#include "envwindows.h"
+#include <log.h>
+#include <utility.h>
+
+namespace env
+{
+
+using namespace MOBase;
+
+Console::Console()
+  : m_hasConsole(false), m_in(nullptr), m_out(nullptr), m_err(nullptr)
+{
+  // open a console
+  if (!AllocConsole()) {
+    // failed, ignore
+  }
+
+  m_hasConsole = true;
+
+  // redirect stdin, stdout and stderr to it
+  freopen_s(&m_in, "CONIN$", "r", stdin);
+  freopen_s(&m_out, "CONOUT$", "w", stdout);
+  freopen_s(&m_err, "CONOUT$", "w", stderr);
+}
+
+Console::~Console()
+{
+  // close redirected handles and redirect standard stream to NUL in case
+  // they're used after this
+
+  if (m_err) {
+    std::fclose(m_err);
+    freopen_s(&m_err, "NUL", "w", stderr);
+  }
+
+  if (m_out) {
+    std::fclose(m_out);
+    freopen_s(&m_out, "NUL", "w", stdout);
+  }
+
+  if (m_in) {
+    std::fclose(m_in);
+    freopen_s(&m_in, "NUL", "r", stdin);
+  }
+
+  // close console
+  if (m_hasConsole) {
+    FreeConsole();
+  }
+}
+
+
+Environment::Environment()
+  : m_windows(new WindowsInfo), m_metrics(new Metrics)
+{
+  m_modules = getLoadedModules();
+  m_security = getSecurityProducts();
+}
+
+// anchor
+Environment::~Environment() = default;
+
+const std::vector<Module>& Environment::loadedModules() const
+{
+  return m_modules;
+}
+
+const WindowsInfo& Environment::windowsInfo() const
+{
+  return *m_windows;
+}
+
+const std::vector<SecurityProduct>& Environment::securityProducts() const
+{
+  return m_security;
+}
+
+const Metrics& Environment::metrics() const
+{
+  return *m_metrics;
+}
+
+void Environment::dump() const
+{
+  log::debug("windows: {}", m_windows->toString());
+
+  if (m_windows->compatibilityMode()) {
+    log::warn("MO seems to be running in compatibility mode");
+  }
+
+  log::debug("security products:");
+  for (const auto& sp : m_security) {
+    log::debug("  . {}", sp.toString());
+  }
+
+  log::debug("modules loaded in process:");
+  for (const auto& m : m_modules) {
+    log::debug(" . {}", m.toString());
+  }
+
+  log::debug("displays:");
+  for (const auto& d : m_metrics->displays()) {
+    log::debug(" . {}", d.toString());
+  }
+}
+
+
+struct Process
+{
+  std::wstring filename;
+  DWORD pid;
+
+  Process(std::wstring f, DWORD id)
+    : filename(std::move(f)), pid(id)
+  {
+  }
+};
+
+
+// returns the filename of the given process or the current one
+//
+std::wstring processFilename(HANDLE process=INVALID_HANDLE_VALUE)
+{
+  // double the buffer size 10 times
+  const int MaxTries = 10;
+
+  DWORD bufferSize = MAX_PATH;
+
+  for (int tries=0; tries<MaxTries; ++tries)
+  {
+    auto buffer = std::make_unique<wchar_t[]>(bufferSize + 1);
+    std::fill(buffer.get(), buffer.get() + bufferSize + 1, 0);
+
+    DWORD writtenSize = 0;
+
+    if (process == INVALID_HANDLE_VALUE) {
+      // query this process
+      writtenSize = GetModuleFileNameW(0, buffer.get(), bufferSize);
+    } else {
+      // query another process
+      writtenSize = GetModuleBaseNameW(process, 0, buffer.get(), bufferSize);
+    }
+
+    if (writtenSize == 0) {
+      // hard failure
+      const auto e = GetLastError();
+      std::wcerr << formatSystemMessage(e) << L"\n";
+      break;
+    } else if (writtenSize >= bufferSize) {
+      // buffer is too small, try again
+      bufferSize *= 2;
+    } else {
+      // if GetModuleFileName() works, `writtenSize` does not include the null
+      // terminator
+      const std::wstring s(buffer.get(), writtenSize);
+      const std::filesystem::path path(s);
+
+      return path.filename().native();
+    }
+  }
+
+  // something failed or the path is way too long to make sense
+
+  std::wstring what;
+  if (process == INVALID_HANDLE_VALUE) {
+    what = L"the current process";
+  } else {
+    what = L"pid " + std::to_wstring(reinterpret_cast<std::uintptr_t>(process));
+  }
+
+  std::wcerr << L"failed to get filename for " << what << L"\n";
+  return {};
+}
+
+std::vector<DWORD> runningProcessesIds()
+{
+  // double the buffer size 10 times
+  const int MaxTries = 10;
+
+  // initial size of 300 processes, unlikely to be more than that
+  std::size_t size = 300;
+
+  for (int tries=0; tries<MaxTries; ++tries) {
+    auto ids = std::make_unique<DWORD[]>(size);
+    std::fill(ids.get(), ids.get() + size, 0);
+
+    DWORD bytesGiven = static_cast<DWORD>(size * sizeof(ids[0]));
+    DWORD bytesWritten = 0;
+
+    if (!EnumProcesses(ids.get(), bytesGiven, &bytesWritten))
+    {
+      const auto e = GetLastError();
+
+      std::wcerr
+        << L"failed to enumerate processes, "
+        << formatSystemMessage(e) << L"\n";
+
+      return {};
+    }
+
+    if (bytesWritten == bytesGiven) {
+      // no way to distinguish between an exact fit and not enough space,
+      // just try again
+      size *= 2;
+      continue;
+    }
+
+    const auto count = bytesWritten / sizeof(ids[0]);
+    return std::vector<DWORD>(ids.get(), ids.get() + count);
+  }
+
+  std::cerr << L"too many processes to enumerate";
+  return {};
+}
+
+std::vector<Process> runningProcesses()
+{
+  const auto pids = runningProcessesIds();
+  std::vector<Process> v;
+
+  for (const auto& pid : pids) {
+    if (pid == 0) {
+      // the idle process has pid 0 and seems to be picked up by EnumProcesses()
+      continue;
+    }
+
+    HandlePtr h(OpenProcess(
+      PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid));
+
+    if (!h) {
+      const auto e = GetLastError();
+
+      if (e != ERROR_ACCESS_DENIED) {
+        // don't log access denied, will happen a lot for system processes, even
+        // when elevated
+        std::wcerr
+          << L"failed to open process " << pid << L", "
+          << formatSystemMessage(e) << L"\n";
+      }
+
+      continue;
+    }
+
+    auto filename = processFilename(h.get());
+    if (!filename.empty()) {
+      v.emplace_back(std::move(filename), pid);
+    }
+  }
+
+  return v;
+}
+
+DWORD findOtherPid()
+{
+  const std::wstring defaultName = L"ModOrganizer.exe";
+
+  std::wclog << L"looking for the other process...\n";
+
+  // used to skip the current process below
+  const auto thisPid = GetCurrentProcessId();
+  std::wclog << L"this process id is " << thisPid << L"\n";
+
+  // getting the filename for this process, assumes the other process has the
+  // smae one
+  auto filename = processFilename();
+  if (filename.empty()) {
+    std::wcerr
+      << L"can't get current process filename, defaulting to "
+      << defaultName << L"\n";
+
+    filename = defaultName;
+  } else {
+    std::wclog << L"this process filename is " << filename << L"\n";
+  }
+
+  // getting all running processes
+  const auto processes = runningProcesses();
+  std::wclog << L"there are " << processes.size() << L" processes running\n";
+
+  // going through processes, trying to find one with the same name and a
+  // different pid than this process has
+  for (const auto& p : processes) {
+    if (p.filename == filename) {
+      if (p.pid != thisPid) {
+        return p.pid;
+      }
+    }
+  }
+
+  std::wclog
+    << L"no process with this filename\n"
+    << L"MO may not be running, or it may be running as administrator\n"
+    << L"you can try running this again as administrator\n";
+
+  return 0;
+}
+
+std::wstring tempDir()
+{
+  const DWORD bufferSize = MAX_PATH + 1;
+  wchar_t buffer[bufferSize + 1] = {};
+
+  const auto written = GetTempPathW(bufferSize, buffer);
+  if (written == 0) {
+    const auto e = GetLastError();
+
+    std::wcerr
+      << L"failed to get temp path, " << formatSystemMessage(e) << L"\n";
+
+    return {};
+  }
+
+  // `written` does not include the null terminator
+  return std::wstring(buffer, buffer + written);
+}
+
+HandlePtr tempFile(const std::wstring dir)
+{
+  // maximum tries of incrementing the counter
+  const int MaxTries = 100;
+
+  // UTC time and date will be in the filename
+  const auto now = std::time(0);
+  const auto tm = std::gmtime(&now);
+
+  // "ModOrganizer-YYYYMMDDThhmmss.dmp", with a possible "-i" appended, where
+  // i can go until MaxTries
+  std::wostringstream oss;
+  oss
+    << L"ModOrganizer-"
+    << std::setw(4) << (1900 + tm->tm_year)
+    << std::setw(2) << std::setfill(L'0') << (tm->tm_mon + 1)
+    << std::setw(2) << std::setfill(L'0') << tm->tm_mday << "T"
+    << std::setw(2) << std::setfill(L'0') << tm->tm_hour
+    << std::setw(2) << std::setfill(L'0') << tm->tm_min
+    << std::setw(2) << std::setfill(L'0') << tm->tm_sec;
+
+  const std::wstring prefix = oss.str();
+  const std::wstring ext = L".dmp";
+
+  // first path to try, without counter in it
+  std::wstring path = dir + L"\\" + prefix + ext;
+
+  for (int i=0; i<MaxTries; ++i) {
+    std::wclog << L"trying file '" << path << L"'\n";
+
+    HandlePtr h (CreateFileW(
+      path.c_str(), GENERIC_WRITE, 0, nullptr,
+      CREATE_NEW, FILE_ATTRIBUTE_NORMAL, nullptr));
+
+    if (h.get() != INVALID_HANDLE_VALUE) {
+      // worked
+      return h;
+    }
+
+    const auto e = GetLastError();
+
+    if (e != ERROR_FILE_EXISTS) {
+      // probably no write access
+      std::wcerr
+        << L"failed to create dump file, " << formatSystemMessage(e) << L"\n";
+
+      return {};
+    }
+
+    // try again with "-i"
+    path = dir + L"\\" + prefix + L"-" + std::to_wstring(i + 1) + ext;
+  }
+
+  std::wcerr << L"can't create dump file, ran out of filenames\n";
+  return {};
+}
+
+HandlePtr dumpFile()
+{
+  // try the current directory
+  HandlePtr h = tempFile(L".");
+  if (h.get() != INVALID_HANDLE_VALUE) {
+    return h;
+  }
+
+  std::wclog << L"cannot write dump file in current directory\n";
+
+  // try the temp directory
+  const auto dir = tempDir();
+
+  if (!dir.empty()) {
+    h = tempFile(dir.c_str());
+    if (h.get() != INVALID_HANDLE_VALUE) {
+      return h;
+    }
+  }
+
+  return {};
+}
+
+bool createMiniDump(HANDLE process, CoreDumpTypes type)
+{
+  const DWORD pid = GetProcessId(process);
+
+  const HandlePtr file = dumpFile();
+  if (!file) {
+    std::wcerr << L"nowhere to write the dump file\n";
+    return false;
+  }
+
+  auto flags = _MINIDUMP_TYPE(
+    MiniDumpNormal |
+    MiniDumpWithHandleData |
+    MiniDumpWithUnloadedModules |
+    MiniDumpWithProcessThreadData);
+
+  if (type == CoreDumpTypes::Data) {
+    std::wclog << L"writing minidump with data\n";
+    flags = _MINIDUMP_TYPE(flags | MiniDumpWithDataSegs);
+  } else if (type ==  CoreDumpTypes::Full) {
+    std::wclog << L"writing full minidump\n";
+    flags = _MINIDUMP_TYPE(flags | MiniDumpWithFullMemory);
+  } else {
+    std::wclog << L"writing mini minidump\n";
+  }
+
+  const auto ret = MiniDumpWriteDump(
+    process, pid, file.get(), flags, nullptr, nullptr, nullptr);
+
+  if (!ret) {
+    const auto e = GetLastError();
+
+    std::wcerr
+      << L"failed to write mini dump, " << formatSystemMessage(e) << L"\n";
+
+    return false;
+  }
+
+  std::wclog << L"minidump written correctly\n";
+  return true;
+}
+
+
+bool coredump(CoreDumpTypes type)
+{
+  std::wclog << L"creating minidump for the current process\n";
+  return createMiniDump(GetCurrentProcess(), type);
+}
+
+bool coredumpOther(CoreDumpTypes type)
+{
+  std::wclog << L"creating minidump for an running process\n";
+
+  const auto pid = findOtherPid();
+  if (pid == 0) {
+    std::wcerr << L"no other process found\n";
+    return false;
+  }
+
+  std::wclog << L"found other process with pid " << pid << L"\n";
+
+  HandlePtr handle(OpenProcess(
+    PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid));
+
+  if (!handle) {
+    const auto e = GetLastError();
+
+    std::wcerr
+      << L"failed to open process " << pid << L", "
+      << formatSystemMessage(e) << L"\n";
+
+    return false;
+  }
+
+  return createMiniDump(handle.get(), type);
+}
+
+} // namespace
diff --git a/src/env.h b/src/env.h
new file mode 100644
index 00000000..1e913a40
--- /dev/null
+++ b/src/env.h
@@ -0,0 +1,117 @@
+namespace env
+{
+
+class Module;
+class SecurityProduct;
+class WindowsInfo;
+class Metrics;
+
+struct HandleCloser
+{
+  using pointer = HANDLE;
+
+  void operator()(HANDLE h)
+  {
+    if (h != INVALID_HANDLE_VALUE) {
+      ::CloseHandle(h);
+    }
+  }
+};
+
+using HandlePtr = std::unique_ptr<HANDLE, HandleCloser>;
+
+
+struct LibraryFreer
+{
+  using pointer = HINSTANCE;
+
+  void operator()(HINSTANCE h)
+  {
+    if (h != 0) {
+      ::FreeLibrary(h);
+    }
+  }
+};
+
+struct COMReleaser
+{
+  void operator()(IUnknown* p)
+  {
+    if (p) {
+      p->Release();
+    }
+  }
+};
+
+
+template <class T>
+using COMPtr = std::unique_ptr<T, COMReleaser>;
+
+
+class Console
+{
+public:
+  Console();
+  ~Console();
+
+private:
+  bool m_hasConsole;
+  FILE* m_in;
+  FILE* m_out;
+  FILE* m_err;
+};
+
+
+// represents the process's environment
+//
+class Environment
+{
+public:
+  Environment();
+  ~Environment();
+
+  // list of loaded modules in the current process
+  //
+  const std::vector<Module>& loadedModules() const;
+
+  // information about the operating system
+  //
+  const WindowsInfo& windowsInfo() const;
+
+  // information about the installed security products
+  //
+  const std::vector<SecurityProduct>& securityProducts() const;
+
+  // information about displays
+  //
+  const Metrics& metrics() const;
+
+  // logs the environment
+  //
+  void dump() const;
+
+private:
+  std::vector<Module> m_modules;
+  std::unique_ptr<WindowsInfo> m_windows;
+  std::vector<SecurityProduct> m_security;
+  std::unique_ptr<Metrics> m_metrics;
+};
+
+
+enum class CoreDumpTypes
+{
+  Mini = 1,
+  Data,
+  Full
+};
+
+// creates a minidump file for the given process
+//
+bool coredump(CoreDumpTypes type);
+
+// finds another process with the same name as this one and creates a minidump
+// file for it
+//
+bool coredumpOther(CoreDumpTypes type);
+
+} // namespace env
diff --git a/src/envmetrics.cpp b/src/envmetrics.cpp
new file mode 100644
index 00000000..a6988909
--- /dev/null
+++ b/src/envmetrics.cpp
@@ -0,0 +1,224 @@
+#include "envmetrics.h"
+#include "env.h"
+#include <Windows.h>
+#include <shellscalingapi.h>
+#include <log.h>
+#include <utility.h>
+
+namespace env
+{
+
+using namespace MOBase;
+
+class DisplayEnumerator
+{
+public:
+  DisplayEnumerator()
+    : m_GetDpiForMonitor(nullptr)
+  {
+    m_shcore.reset(LoadLibraryW(L"Shcore.dll"));
+
+    if (m_shcore) {
+      // windows 8.1+ only
+      m_GetDpiForMonitor = reinterpret_cast<GetDpiForMonitorFunction*>(
+        GetProcAddress(m_shcore.get(), "GetDpiForMonitor"));
+    }
+
+    // gets all monitors and the device they're running on
+    getDisplayDevices();
+  }
+
+  std::vector<Metrics::Display>&& displays() &&
+  {
+    return std::move(m_displays);
+  }
+
+  const std::vector<Metrics::Display>& displays() const &
+  {
+    return m_displays;
+  }
+
+private:
+  using GetDpiForMonitorFunction =
+    HRESULT WINAPI (HMONITOR, MONITOR_DPI_TYPE, UINT*, UINT*);
+
+  std::unique_ptr<HINSTANCE, LibraryFreer> m_shcore;
+  GetDpiForMonitorFunction* m_GetDpiForMonitor;
+  std::vector<Metrics::Display> m_displays;
+
+  void getDisplayDevices()
+  {
+    // don't bother if it goes over 100
+    for (int i=0; i<100; ++i) {
+      DISPLAY_DEVICEW device = {};
+      device.cb = sizeof(device);
+
+      if (!EnumDisplayDevicesW(nullptr, i, &device, 0)) {
+        // no more
+        break;
+      }
+
+      // EnumDisplayDevices() seems to be returning a lot of devices that are
+      // not actually monitors, but those don't have the
+      // DISPLAY_DEVICE_ATTACHED_TO_DESKTOP bit set
+      if ((device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) == 0) {
+        continue;
+      }
+
+      m_displays.push_back(createDisplay(device));
+    }
+  }
+
+  Metrics::Display createDisplay(const DISPLAY_DEVICEW& device)
+  {
+    Metrics::Display d;
+
+    d.adapter = QString::fromWCharArray(device.DeviceString);
+    d.monitor = QString::fromWCharArray(device.DeviceName);
+    d.primary = (device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE);
+
+    getDisplaySettings(device.DeviceName, d);
+    getDpi(d);
+
+    return d;
+  }
+
+  void getDisplaySettings(const wchar_t* monitorName, Metrics::Display& d)
+  {
+    DEVMODEW dm = {};
+    dm.dmSize = sizeof(dm);
+
+    if (!EnumDisplaySettingsW(monitorName, ENUM_CURRENT_SETTINGS, &dm)) {
+      log::error("EnumDisplaySettings() failed for '{}'", d.monitor);
+      return;
+    }
+
+    // all these fields should be available
+
+    if (dm.dmFields & DM_DISPLAYFREQUENCY) {
+      d.refreshRate = dm.dmDisplayFrequency;
+    }
+
+    if (dm.dmFields & DM_PELSWIDTH) {
+      d.resX = dm.dmPelsWidth;
+    }
+
+    if (dm.dmFields & DM_PELSHEIGHT) {
+      d.resY = dm.dmPelsHeight;
+    }
+  }
+
+  void getDpi(Metrics::Display& d)
+  {
+    if (!m_GetDpiForMonitor) {
+      // this happens on windows 7, get the desktop dpi instead
+      getDesktopDpi(d);
+      return;
+    }
+
+    // there's no way to get an HMONITOR from a device name, so all monitors
+    // will have to be enumerated and their name checked
+    HMONITOR hm = findMonitor(d.monitor);
+    if (!hm) {
+      log::error("can't get dpi for monitor '{}', not found", d.monitor);
+      return;
+    }
+
+    UINT dpiX=0, dpiY=0;
+    const auto r = m_GetDpiForMonitor(hm, MDT_EFFECTIVE_DPI, &dpiX, &dpiY);
+
+    if (FAILED(r)) {
+      log::error(
+        "GetDpiForMonitor() failed for '{}', {}",
+        d.monitor, formatSystemMessageQ(r));
+
+      return;
+    }
+
+    // dpiX and dpiY are always identical, as per the documentation
+    d.dpi = dpiX;
+  }
+
+  void getDesktopDpi(Metrics::Display& d)
+  {
+    // desktop dc
+    HDC dc = GetDC(0);
+
+    if (!dc) {
+      const auto e = GetLastError();
+      log::error("can't get desktop DC, {}", formatSystemMessageQ(e));
+      return;
+    }
+
+    d.dpi = GetDeviceCaps(dc, LOGPIXELSX);
+
+    ReleaseDC(0, dc);
+  }
+
+  HMONITOR findMonitor(const QString& name)
+  {
+    // passed to the enumeration callback
+    struct Data
+    {
+      DisplayEnumerator* self;
+      QString name;
+      HMONITOR hm;
+    };
+
+    Data data = {this, name, 0};
+
+    // for each monitor
+    EnumDisplayMonitors(0, nullptr, [](HMONITOR hm, HDC, RECT*, LPARAM lp) {
+      auto& data = *reinterpret_cast<Data*>(lp);
+
+      MONITORINFOEX mi = {};
+      mi.cbSize = sizeof(mi);
+
+      // monitor info will include the name
+      if (!GetMonitorInfoW(hm, &mi)) {
+        const auto e = GetLastError();
+        log::error(
+          "GetMonitorInfo() failed for '{}', {}",
+          data.name, formatSystemMessageQ(e));
+
+        // error for this monitor, but continue
+        return TRUE;
+      }
+
+      if (QString::fromWCharArray(mi.szDevice) == data.name) {
+        // found, stop
+        data.hm = hm;
+        return FALSE;
+      }
+
+      // not found, continue to the next monitor
+      return TRUE;
+      }, reinterpret_cast<LPARAM>(&data));
+
+    return data.hm;
+  }
+};
+
+
+Metrics::Metrics()
+{
+  m_displays = DisplayEnumerator().displays();
+}
+
+const std::vector<Metrics::Display>& Metrics::displays() const
+{
+  return m_displays;
+}
+
+QString Metrics::Display::toString() const
+{
+  return QString("%1*%2 %3hz dpi=%4 on %5%6")
+    .arg(resX)
+    .arg(resY)
+    .arg(refreshRate)
+    .arg(dpi)
+    .arg(adapter)
+    .arg(primary ? " (primary)" : "");
+}
+
+} // namespace
diff --git a/src/envmetrics.h b/src/envmetrics.h
new file mode 100644
index 00000000..62fc8c49
--- /dev/null
+++ b/src/envmetrics.h
@@ -0,0 +1,28 @@
+#include <QString>
+#include <vector>
+
+namespace env
+{
+
+class Metrics
+{
+public:
+  struct Display
+  {
+    int resX=0, resY=0, dpi=0;
+    bool primary=false;
+    int refreshRate = 0;
+    QString monitor, adapter;
+
+    QString toString() const;
+  };
+
+  Metrics();
+
+  const std::vector<Display>& displays() const;
+
+private:
+  std::vector<Display> m_displays;
+};
+
+} // namespace
diff --git a/src/envmodule.cpp b/src/envmodule.cpp
new file mode 100644
index 00000000..1717da15
--- /dev/null
+++ b/src/envmodule.cpp
@@ -0,0 +1,390 @@
+#include "envmodule.h"
+#include "env.h"
+#include <utility.h>
+
+namespace env
+{
+
+using namespace MOBase;
+
+Module::Module(QString path, std::size_t fileSize)
+  : m_path(std::move(path)), m_fileSize(fileSize)
+{
+  const auto fi = getFileInfo();
+
+  m_version = getVersion(fi.ffi);
+  m_timestamp = getTimestamp(fi.ffi);
+  m_versionString = fi.fileDescription;
+  m_md5 = getMD5();
+}
+
+const QString& Module::path() const
+{
+  return m_path;
+}
+
+QString Module::displayPath() const
+{
+  return QDir::fromNativeSeparators(m_path.toLower());
+}
+
+std::size_t Module::fileSize() const
+{
+  return m_fileSize;
+}
+
+const QString& Module::version() const
+{
+  return m_version;
+}
+
+const QString& Module::versionString() const
+{
+  return m_versionString;
+}
+
+const QDateTime& Module::timestamp() const
+{
+  return m_timestamp;
+}
+
+const QString& Module::md5() const
+{
+  return m_md5;
+}
+
+QString Module::timestampString() const
+{
+  if (!m_timestamp.isValid()) {
+    return "(no timestamp)";
+  }
+
+  return m_timestamp.toString(Qt::DateFormat::ISODate);
+}
+
+QString Module::toString() const
+{
+  QStringList sl;
+
+  // file size
+  sl.push_back(displayPath());
+  sl.push_back(QString("%1 B").arg(m_fileSize));
+
+  // version
+  if (m_version.isEmpty() && m_versionString.isEmpty()) {
+    sl.push_back("(no version)");
+  } else {
+    if (!m_version.isEmpty()) {
+      sl.push_back(m_version);
+    }
+
+    if (!m_versionString.isEmpty() && m_versionString != m_version) {
+      sl.push_back(versionString());
+    }
+  }
+
+  // timestamp
+  if (m_timestamp.isValid()) {
+    sl.push_back(m_timestamp.toString(Qt::DateFormat::ISODate));
+  } else {
+    sl.push_back("(no timestamp)");
+  }
+
+  // md5
+  if (!m_md5.isEmpty()) {
+    sl.push_back(m_md5);
+  }
+
+  return sl.join(", ");
+}
+
+Module::FileInfo Module::getFileInfo() const
+{
+  const auto wspath = m_path.toStdWString();
+
+  // getting version info size
+  DWORD dummy = 0;
+  const DWORD size = GetFileVersionInfoSizeW(wspath.c_str(), &dummy);
+
+  if (size == 0) {
+    const auto e = GetLastError();
+
+    if (e == ERROR_RESOURCE_TYPE_NOT_FOUND) {
+      // not an error, no version information built into that module
+      return {};
+    }
+
+    qCritical().nospace().noquote()
+      << "GetFileVersionInfoSizeW() failed on '" << m_path << "', "
+      << formatSystemMessageQ(e);
+
+    return {};
+  }
+
+  // getting version info
+  auto buffer = std::make_unique<std::byte[]>(size);
+
+  if (!GetFileVersionInfoW(wspath.c_str(), 0, size, buffer.get())) {
+    const auto e = GetLastError();
+
+    qCritical().nospace().noquote()
+      << "GetFileVersionInfoW() failed on '" << m_path << "', "
+      << formatSystemMessageQ(e);
+
+    return {};
+  }
+
+  // the version info has two major parts: a fixed version and a localizable
+  // set of strings
+
+  FileInfo fi;
+  fi.ffi = getFixedFileInfo(buffer.get());
+  fi.fileDescription = getFileDescription(buffer.get());
+
+  return fi;
+}
+
+VS_FIXEDFILEINFO Module::getFixedFileInfo(std::byte* buffer) const
+{
+  void* valuePointer = nullptr;
+  unsigned int valueSize = 0;
+
+  // the fixed version info is in the root
+  const auto ret = VerQueryValueW(buffer, L"\\", &valuePointer, &valueSize);
+
+  if (!ret || !valuePointer || valueSize == 0) {
+    // not an error, no fixed file info
+    return {};
+  }
+
+  const auto* fi = static_cast<VS_FIXEDFILEINFO*>(valuePointer);
+
+  // signature is always 0xfeef04bd
+  if (fi->dwSignature != 0xfeef04bd) {
+    qCritical().nospace().noquote()
+      << "bad file info signature 0x" << hex << fi->dwSignature << " for "
+      << "'" << m_path << "'";
+
+    return {};
+  }
+
+  return *fi;
+}
+
+QString Module::getFileDescription(std::byte* buffer) const
+{
+  struct LANGANDCODEPAGE
+  {
+    WORD wLanguage;
+    WORD wCodePage;
+  };
+
+  void* valuePointer = nullptr;
+  unsigned int valueSize = 0;
+
+  // getting list of available languages
+  auto ret = VerQueryValueW(
+    buffer, L"\\VarFileInfo\\Translation", &valuePointer, &valueSize);
+
+  if (!ret || !valuePointer || valueSize == 0) {
+    qCritical().nospace().noquote()
+      << "VerQueryValueW() for translations failed on '" << m_path << "'";
+
+    return {};
+  }
+
+  // number of languages
+  const auto count = valueSize / sizeof(LANGANDCODEPAGE);
+  if (count == 0) {
+    return {};
+  }
+
+  // using the first language in the list to get FileVersion
+  const auto* lcp = static_cast<LANGANDCODEPAGE*>(valuePointer);
+
+  const auto subBlock = QString("\\StringFileInfo\\%1%2\\FileVersion")
+    .arg(lcp->wLanguage, 4, 16, QChar('0'))
+    .arg(lcp->wCodePage, 4, 16, QChar('0'));
+
+  ret = VerQueryValueW(
+    buffer, subBlock.toStdWString().c_str(), &valuePointer, &valueSize);
+
+  if (!ret || !valuePointer || valueSize == 0) {
+    // not an error, no file version
+    return {};
+  }
+
+  // valueSize includes the null terminator
+  return QString::fromWCharArray(
+    static_cast<wchar_t*>(valuePointer), valueSize - 1);
+}
+
+QString Module::getVersion(const VS_FIXEDFILEINFO& fi) const
+{
+  if (fi.dwSignature == 0) {
+    return {};
+  }
+
+  const DWORD major = (fi.dwFileVersionMS >> 16 ) & 0xffff;
+  const DWORD minor = (fi.dwFileVersionMS >>  0 ) & 0xffff;
+  const DWORD maintenance = (fi.dwFileVersionLS >> 16 ) & 0xffff;
+  const DWORD build = (fi.dwFileVersionLS >>  0 ) & 0xffff;
+
+  if (major == 0 && minor == 0 && maintenance == 0 && build == 0) {
+    return {};
+  }
+
+  return QString("%1.%2.%3.%4")
+    .arg(major).arg(minor).arg(maintenance).arg(build);
+}
+
+QDateTime Module::getTimestamp(const VS_FIXEDFILEINFO& fi) const
+{
+  FILETIME ft = {};
+
+  if (fi.dwSignature == 0 || (fi.dwFileDateMS == 0 && fi.dwFileDateLS == 0)) {
+    // if the file info is invalid or doesn't have a date, use the creation
+    // time on the file
+
+    // opening the file
+    HandlePtr h(CreateFileW(
+      m_path.toStdWString().c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr,
+      OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0));
+
+    if (h.get() == INVALID_HANDLE_VALUE) {
+      const auto e = GetLastError();
+
+      qCritical().nospace().noquote()
+        << "can't open file '" << m_path << "' for timestamp, "
+        << formatSystemMessageQ(e);
+
+      return {};
+    }
+
+    // getting the file time
+    if (!GetFileTime(h.get(), &ft, nullptr, nullptr)) {
+      const auto e = GetLastError();
+      qCritical().nospace().noquote()
+        << "can't get file time for '" << m_path << "', "
+        << formatSystemMessageQ(e);
+
+      return {};
+    }
+  } else {
+    // use the time from the file info
+    ft.dwHighDateTime = fi.dwFileDateMS;
+    ft.dwLowDateTime = fi.dwFileDateLS;
+  }
+
+
+  // converting to SYSTEMTIME
+  SYSTEMTIME utc = {};
+
+  if (!FileTimeToSystemTime(&ft, &utc)) {
+    qCritical().nospace().noquote()
+      << "FileTimeToSystemTime() failed on timestamp "
+      << "high=0x" << hex << ft.dwHighDateTime << " "
+      << "low=0x" << hex << ft.dwLowDateTime << " for "
+      << "'" << m_path << "'";
+
+    return {};
+  }
+
+  return QDateTime(
+    QDate(utc.wYear, utc.wMonth, utc.wDay),
+    QTime(utc.wHour, utc.wMinute, utc.wSecond, utc.wMilliseconds));
+}
+
+QString Module::getMD5() const
+{
+  if (m_path.contains("\\windows\\", Qt::CaseInsensitive)) {
+    // don't calculate md5 for system files, it's not really relevant and
+    // it takes a while
+    return {};
+  }
+
+  // opening the file
+  QFile f(m_path);
+
+  if (!f.open(QFile::ReadOnly)) {
+    qCritical().nospace().noquote()
+      << "failed to open file '" << m_path << "' for md5";
+
+    return {};
+  }
+
+  // hashing
+  QCryptographicHash hash(QCryptographicHash::Md5);
+  if (!hash.addData(&f)) {
+    qCritical().nospace().noquote()
+      << "failed to calculate md5 for '" << m_path << "'";
+
+    return {};
+  }
+
+  return hash.result().toHex();
+}
+
+
+std::vector<Module> getLoadedModules()
+{
+  HandlePtr snapshot(CreateToolhelp32Snapshot(
+    TH32CS_SNAPMODULE32 | TH32CS_SNAPMODULE, GetCurrentProcessId()));
+
+  if (snapshot.get() == INVALID_HANDLE_VALUE)
+  {
+    const auto e = GetLastError();
+
+    qCritical().nospace().noquote()
+      << "CreateToolhelp32Snapshot() failed, "
+      << formatSystemMessageQ(e);
+
+    return {};
+  }
+
+  MODULEENTRY32 me = {};
+  me.dwSize = sizeof(me);
+
+  // first module, this shouldn't fail because there's at least the executable
+  if (!Module32First(snapshot.get(), &me))
+  {
+    const auto e = GetLastError();
+
+    qCritical().nospace().noquote()
+      << "Module32First() failed, " << formatSystemMessageQ(e);
+
+    return {};
+  }
+
+  std::vector<Module> v;
+
+  for (;;)
+  {
+    const auto path = QString::fromWCharArray(me.szExePath);
+    if (!path.isEmpty()) {
+      v.push_back(Module(path, me.modBaseSize));
+    }
+
+    // next module
+    if (!Module32Next(snapshot.get(), &me)) {
+      const auto e = GetLastError();
+
+      // no more modules is not an error
+      if (e != ERROR_NO_MORE_FILES) {
+        qCritical().nospace().noquote()
+          << "Module32Next() failed, " << formatSystemMessageQ(e);
+      }
+
+      break;
+    }
+  }
+
+  // sorting by display name
+  std::sort(v.begin(), v.end(), [](auto&& a, auto&& b) {
+    return (a.displayPath().compare(b.displayPath(), Qt::CaseInsensitive) < 0);
+    });
+
+  return v;
+}
+
+} // namespace
diff --git a/src/envmodule.h b/src/envmodule.h
new file mode 100644
index 00000000..ea1156bd
--- /dev/null
+++ b/src/envmodule.h
@@ -0,0 +1,98 @@
+#include <QString>
+#include <QDateTime>
+
+namespace env
+{
+
+// represents one module
+//
+class Module
+{
+public:
+  explicit Module(QString path, std::size_t fileSize);
+
+  // returns the module's path
+  //
+  const QString& path() const;
+
+  // returns the module's path in lowercase and using forward slashes
+  //
+  QString displayPath() const;
+
+  // returns the size in bytes, may be 0
+  //
+  std::size_t fileSize() const;
+
+  // returns the x.x.x.x version embedded from the version info, may be empty
+  //
+  const QString& version() const;
+
+  // returns the FileVersion entry from the resource file, returns
+  // "(no version)" if not available
+  //
+  const QString& versionString() const;
+
+  // returns the build date from the version info, or the creation time of the
+  // file on the filesystem, may be empty
+  //
+  const QDateTime& timestamp() const;
+
+  // returns the md5 of the file, may be empty for system files
+  //
+  const QString& md5() const;
+
+  // converts timestamp() to a string for display, returns "(no timestamp)" if
+  // not available
+  //
+  QString timestampString() const;
+
+  // returns a string with all the above information on one line
+  //
+  QString toString() const;
+
+private:
+  // contains the information from the version resource
+  //
+  struct FileInfo
+  {
+    VS_FIXEDFILEINFO ffi;
+    QString fileDescription;
+  };
+
+  QString m_path;
+  std::size_t m_fileSize;
+  QString m_version;
+  QDateTime m_timestamp;
+  QString m_versionString;
+  QString m_md5;
+
+  // returns information from the version resource
+  //
+  FileInfo getFileInfo() const;
+
+  // uses VS_FIXEDFILEINFO to build the version string
+  //
+  QString getVersion(const VS_FIXEDFILEINFO& fi) const;
+
+  // uses the file date from VS_FIXEDFILEINFO if available, or gets the
+  // creation date on the file
+  //
+  QDateTime getTimestamp(const VS_FIXEDFILEINFO& fi) const;
+
+  // returns the md5 hash unless the path contains "\windows\"
+  //
+  QString getMD5() const;
+
+  // gets VS_FIXEDFILEINFO from the file version info buffer
+  //
+  VS_FIXEDFILEINFO getFixedFileInfo(std::byte* buffer) const;
+
+  // gets FileVersion from the file version info buffer
+  //
+  QString getFileDescription(std::byte* buffer) const;
+};
+
+
+std::vector<Module> getLoadedModules();
+
+} // namespace env
diff --git a/src/envsecurity.cpp b/src/envsecurity.cpp
new file mode 100644
index 00000000..559ce4ad
--- /dev/null
+++ b/src/envsecurity.cpp
@@ -0,0 +1,418 @@
+#include "envsecurity.h"
+#include "env.h"
+#include <utility.h>
+
+#include <Wbemidl.h>
+#include <wscapi.h>
+#include <comdef.h>
+#include <netfw.h>
+#pragma comment(lib, "Wbemuuid.lib")
+
+namespace env
+{
+
+using namespace MOBase;
+
+class WMI
+{
+public:
+  class failed {};
+
+  WMI(const std::string& ns)
+  {
+    try
+    {
+      createLocator();
+      createService(ns);
+      setSecurity();
+    }
+    catch(failed&)
+    {
+    }
+  }
+
+  template <class F>
+  void query(const std::string& q, F&& f)
+  {
+    if (!m_locator || !m_service) {
+      return;
+    }
+
+    auto enumerator = getEnumerator(q);
+    if (!enumerator) {
+      return;
+    }
+
+    for (;;)
+    {
+      COMPtr<IWbemClassObject> object;
+
+      {
+        IWbemClassObject* rawObject = nullptr;
+        ULONG count = 0;
+        auto ret = enumerator->Next(WBEM_INFINITE, 1, &rawObject, &count);
+
+        if (count == 0 || !rawObject) {
+          break;
+        }
+
+        if (FAILED(ret)) {
+          qCritical()
+            << "enumerator->next() failed, " << formatSystemMessageQ(ret);
+          break;
+        }
+
+        object.reset(rawObject);
+      }
+
+      f(object.get());
+    }
+  }
+
+private:
+  COMPtr<IWbemLocator> m_locator;
+  COMPtr<IWbemServices> m_service;
+
+  void createLocator()
+  {
+    void* rawLocator = nullptr;
+
+    const auto ret = CoCreateInstance(
+      CLSID_WbemLocator, nullptr, CLSCTX_INPROC_SERVER,
+      IID_IWbemLocator, &rawLocator);
+
+    if (FAILED(ret) || !rawLocator) {
+      qCritical()
+        << "CoCreateInstance for WbemLocator failed, "
+        << formatSystemMessageQ(ret);
+
+      throw failed();
+    }
+
+    m_locator.reset(static_cast<IWbemLocator*>(rawLocator));
+  }
+
+  void createService(const std::string& ns)
+  {
+    IWbemServices* rawService = nullptr;
+
+    const auto res = m_locator->ConnectServer(
+      _bstr_t(ns.c_str()),
+      nullptr, nullptr, nullptr, 0, nullptr, nullptr,
+      &rawService);
+
+    if (FAILED(res) || !rawService) {
+      qCritical()
+        << "locator->ConnectServer() failed for namespace "
+        << "'" << QString::fromStdString(ns) << "', "
+        << formatSystemMessageQ(res);
+
+      throw failed();
+    }
+
+    m_service.reset(rawService);
+  }
+
+  void setSecurity()
+  {
+    auto ret = CoSetProxyBlanket(
+      m_service.get(), RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, nullptr,
+      RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, 0, EOAC_NONE);
+
+    if (FAILED(ret))
+    {
+      qCritical()
+        << "CoSetProxyBlanket() failed, " << formatSystemMessageQ(ret);
+
+      throw failed();
+    }
+  }
+
+  COMPtr<IEnumWbemClassObject> getEnumerator(
+    const std::string& query)
+  {
+    IEnumWbemClassObject* rawEnumerator = NULL;
+
+    auto ret = m_service->ExecQuery(
+      bstr_t("WQL"),
+      bstr_t(query.c_str()),
+      WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY,
+      NULL,
+      &rawEnumerator);
+
+    if (FAILED(ret) || !rawEnumerator)
+    {
+      qCritical()
+        << "query '" << QString::fromStdString(query) << "' failed, "
+        << formatSystemMessageQ(ret);
+
+      return {};
+    }
+
+    return COMPtr<IEnumWbemClassObject>(rawEnumerator);
+  }
+};
+
+
+SecurityProduct::SecurityProduct(
+  QUuid guid, QString name, int provider,
+  bool active, bool upToDate) :
+  m_guid(std::move(guid)), m_name(std::move(name)), m_provider(provider),
+  m_active(active), m_upToDate(upToDate)
+{
+}
+
+const QString& SecurityProduct::name() const
+{
+  return m_name;
+}
+
+int SecurityProduct::provider() const
+{
+  return m_provider;
+}
+
+bool SecurityProduct::active() const
+{
+  return m_active;
+}
+
+bool SecurityProduct::upToDate() const
+{
+  return m_upToDate;
+}
+
+QString SecurityProduct::toString() const
+{
+  QString s;
+
+  s += m_name + " (" + providerToString() + ")";
+
+  if (!m_active) {
+    s += ", inactive";
+  }
+
+  if (!m_upToDate) {
+    s += ", definitions outdated";
+  }
+
+  if (!m_guid.isNull()) {
+    s += ", " + m_guid.toString(QUuid::QUuid::WithoutBraces);
+  }
+
+  return s;
+}
+
+QString SecurityProduct::providerToString() const
+{
+  QStringList ps;
+
+  if (m_provider & WSC_SECURITY_PROVIDER_FIREWALL) {
+    ps.push_back("firewall");
+  }
+
+  if (m_provider & WSC_SECURITY_PROVIDER_AUTOUPDATE_SETTINGS) {
+    ps.push_back("autoupdate");
+  }
+
+  if (m_provider & WSC_SECURITY_PROVIDER_ANTIVIRUS) {
+    ps.push_back("antivirus");
+  }
+
+  if (m_provider & WSC_SECURITY_PROVIDER_ANTISPYWARE) {
+    ps.push_back("antispyware");
+  }
+
+  if (m_provider & WSC_SECURITY_PROVIDER_INTERNET_SETTINGS) {
+    ps.push_back("settings");
+  }
+
+  if (m_provider & WSC_SECURITY_PROVIDER_USER_ACCOUNT_CONTROL) {
+    ps.push_back("uac");
+  }
+
+  if (m_provider & WSC_SECURITY_PROVIDER_SERVICE) {
+    ps.push_back("service");
+  }
+
+  if (ps.empty()) {
+    return "doesn't provider anything";
+  }
+
+  return ps.join("|");
+}
+
+
+std::vector<SecurityProduct> getSecurityProductsFromWMI()
+{
+  // some products may be present in multiple queries, such as a product marked
+  // as both antivirus and antispyware, but they'll have the same GUID, so use
+  // that to avoid duplicating entries
+  std::map<QUuid, SecurityProduct> map;
+
+  auto handleProduct = [&](auto* o) {
+    VARIANT prop;
+
+    // display name
+    auto ret = o->Get(L"displayName", 0, &prop, 0, 0);
+    if (FAILED(ret)) {
+      qCritical()
+        << "failed to get displayName, "
+        << formatSystemMessageQ(ret);
+
+      return;
+    }
+
+    if (prop.vt != VT_BSTR) {
+      qCritical() << "displayName is a " << prop.vt << ", not a bstr";
+      return;
+    }
+
+    const std::wstring name = prop.bstrVal;
+    VariantClear(&prop);
+
+    // product state
+    ret = o->Get(L"productState", 0, &prop, 0, 0);
+    if (FAILED(ret)) {
+      qCritical()
+        << "failed to get productState, "
+        << formatSystemMessageQ(ret);
+
+      return;
+    }
+
+    if (prop.vt != VT_UI4 && prop.vt != VT_I4) {
+      qCritical() << "productState is a " << prop.vt << ", is not a VT_UI4";
+      return;
+    }
+
+    DWORD state = 0;
+    if (prop.vt == VT_I4) {
+      state = prop.lVal;
+    } else {
+      state = prop.ulVal;
+    }
+
+    VariantClear(&prop);
+
+    // guid
+    ret = o->Get(L"instanceGuid", 0, &prop, 0, 0);
+    if (FAILED(ret)) {
+      qCritical()
+        << "failed to get instanceGuid, "
+        << formatSystemMessageQ(ret);
+
+      return;
+    }
+
+    if (prop.vt != VT_BSTR) {
+      qCritical() << "instanceGuid is a " << prop.vt << ", is not a bstr";
+      return;
+    }
+
+    const QUuid guid(QString::fromWCharArray(prop.bstrVal));
+    VariantClear(&prop);
+
+    const auto provider = static_cast<int>((state >> 16) & 0xff);
+    const auto scanner = (state >> 8) & 0xff;
+    const auto definitions = state & 0xff;
+
+    const bool active = ((scanner & 0x10) != 0);
+    const bool upToDate = (definitions == 0);
+
+    map.insert({
+      guid,
+      {guid, QString::fromStdWString(name), provider, active, upToDate}});
+  };
+
+  {
+    WMI wmi("root\\SecurityCenter2");
+    wmi.query("select * from AntivirusProduct", handleProduct);
+    wmi.query("select * from FirewallProduct", handleProduct);
+    wmi.query("select * from AntiSpywareProduct", handleProduct);
+  }
+
+  {
+    WMI wmi("root\\SecurityCenter");
+    wmi.query("select * from AntivirusProduct", handleProduct);
+    wmi.query("select * from FirewallProduct", handleProduct);
+    wmi.query("select * from AntiSpywareProduct", handleProduct);
+  }
+
+  std::vector<SecurityProduct> v;
+
+  for (auto&& p : map) {
+    v.push_back(p.second);
+  }
+
+  return v;
+}
+
+std::optional<SecurityProduct> getWindowsFirewall()
+{
+  HRESULT hr = 0;
+
+  COMPtr<INetFwPolicy2> policy;
+
+  {
+    void* rawPolicy = nullptr;
+
+    hr = CoCreateInstance(
+      __uuidof(NetFwPolicy2), nullptr, CLSCTX_INPROC_SERVER,
+      __uuidof(INetFwPolicy2), &rawPolicy);
+
+    if (FAILED(hr) || !rawPolicy) {
+      qCritical()
+        << "CoCreateInstance for NetFwPolicy2 failed, "
+        << formatSystemMessageQ(hr);
+
+      return {};
+    }
+
+    policy.reset(static_cast<INetFwPolicy2*>(rawPolicy));
+  }
+
+  VARIANT_BOOL enabledVariant;
+
+  if (policy) {
+    hr = policy->get_FirewallEnabled(NET_FW_PROFILE2_PUBLIC, &enabledVariant);
+    if (FAILED(hr))
+    {
+      qCritical()
+        << "get_FirewallEnabled failed, "
+        << formatSystemMessageQ(hr);
+
+      return {};
+    }
+  }
+
+  const auto enabled = (enabledVariant != VARIANT_FALSE);
+  if (!enabled) {
+    return {};
+  }
+
+  return SecurityProduct(
+    {}, "Windows Firewall", WSC_SECURITY_PROVIDER_FIREWALL, true, true);
+}
+
+
+std::vector<SecurityProduct> getSecurityProducts()
+{
+  std::vector<SecurityProduct> v;
+
+  {
+    auto fromWMI = getSecurityProductsFromWMI();
+    v.insert(
+      v.end(),
+      std::make_move_iterator(fromWMI.begin()),
+      std::make_move_iterator(fromWMI.end()));
+  }
+
+  if (auto p=getWindowsFirewall()) {
+    v.push_back(std::move(*p));
+  }
+
+  return v;
+}
+
+} // namespace
diff --git a/src/envsecurity.h b/src/envsecurity.h
new file mode 100644
index 00000000..200cb531
--- /dev/null
+++ b/src/envsecurity.h
@@ -0,0 +1,49 @@
+#include <QUuid>
+#include <QString>
+
+namespace env
+{
+
+// represents a security product, such as an antivirus or a firewall
+//
+class SecurityProduct
+{
+public:
+  SecurityProduct(
+    QUuid guid, QString name, int provider,
+    bool active, bool upToDate);
+
+  // display name of the product
+  //
+  const QString& name() const;
+
+  // a bunch of _WSC_SECURITY_PROVIDER flags
+  //
+  int provider() const;
+
+  // whether the product is active
+  //
+  bool active() const;
+
+  // whether its definitions are up-to-date
+  //
+  bool upToDate() const;
+
+  // string representation of the above
+  //
+  QString toString() const;
+
+private:
+  QUuid m_guid;
+  QString m_name;
+  int m_provider;
+  bool m_active;
+  bool m_upToDate;
+
+  QString providerToString() const;
+};
+
+
+std::vector<SecurityProduct> getSecurityProducts();
+
+} // namespace env
diff --git a/src/envshortcut.cpp b/src/envshortcut.cpp
new file mode 100644
index 00000000..30ef4633
--- /dev/null
+++ b/src/envshortcut.cpp
@@ -0,0 +1,376 @@
+#include "envshortcut.h"
+#include "env.h"
+#include "executableslist.h"
+#include "instancemanager.h"
+#include <utility.h>
+
+namespace env
+{
+
+using namespace MOBase;
+
+class ShellLinkException
+{
+public:
+  ShellLinkException(QString s)
+    : m_what(std::move(s))
+  {
+  }
+
+  const QString& what() const
+  {
+    return m_what;
+  }
+
+private:
+  QString m_what;
+};
+
+// just a wrapper around IShellLink operations that throws ShellLinkException
+// on errors
+//
+class ShellLinkWrapper
+{
+public:
+  ShellLinkWrapper()
+  {
+    m_link = createShellLink();
+    m_file = createPersistFile();
+  }
+
+  void setPath(const QString& s)
+  {
+    if (s.isEmpty()) {
+      throw ShellLinkException("path cannot be empty");
+    }
+
+    const auto r = m_link->SetPath(s.toStdWString().c_str());
+    throwOnFail(r, QString("failed to set target path '%1'").arg(s));
+  }
+
+  void setArguments(const QString& s)
+  {
+    const auto r = m_link->SetArguments(s.toStdWString().c_str());
+    throwOnFail(r, QString("failed to set arguments '%1'").arg(s));
+  }
+
+  void setDescription(const QString& s)
+  {
+    if (s.isEmpty()) {
+      return;
+    }
+
+    const auto r = m_link->SetDescription(s.toStdWString().c_str());
+    throwOnFail(r, QString("failed to set description '%1'").arg(s));
+  }
+
+  void setIcon(const QString& file, int i)
+  {
+    if (file.isEmpty()) {
+      return;
+    }
+
+    const auto r = m_link->SetIconLocation(file.toStdWString().c_str(), i);
+    throwOnFail(r, QString("failed to set icon '%1' @ %2").arg(file).arg(i));
+  }
+
+  void setWorkingDirectory(const QString& s)
+  {
+    if (s.isEmpty()) {
+      return;
+    }
+
+    const auto r = m_link->SetWorkingDirectory(s.toStdWString().c_str());
+    throwOnFail(r, QString("failed to set working directory '%1'").arg(s));
+  }
+
+  void save(const QString& path)
+  {
+    const auto r = m_file->Save(path.toStdWString().c_str(), TRUE);
+    throwOnFail(r, QString("failed to save link '%1'").arg(path));
+  }
+
+private:
+  COMPtr<IShellLink> m_link;
+  COMPtr<IPersistFile> m_file;
+
+  void throwOnFail(HRESULT r, const QString& s)
+  {
+    if (FAILED(r)) {
+      throw ShellLinkException(QString("%1, %2")
+        .arg(s)
+        .arg(formatSystemMessageQ(r)));
+    }
+  }
+
+  COMPtr<IShellLink> createShellLink()
+  {
+    void* link = nullptr;
+
+    const auto r = CoCreateInstance(
+      CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER,
+      IID_IShellLink, &link);
+
+    throwOnFail(r, "failed to create IShellLink instance");
+
+    if (!link) {
+      throw ShellLinkException("creating IShellLink worked, pointer is null");
+    }
+
+    return COMPtr<IShellLink>(static_cast<IShellLink*>(link));
+  }
+
+  COMPtr<IPersistFile> createPersistFile()
+  {
+    void* file = nullptr;
+
+    const auto r = m_link->QueryInterface(IID_IPersistFile, &file);
+    throwOnFail(r, "failed to get IPersistFile interface");
+
+    if (!file) {
+      throw ShellLinkException("querying IPersistFile worked, pointer is null");
+    }
+
+    return COMPtr<IPersistFile>(static_cast<IPersistFile*>(file));
+  }
+};
+
+
+Shortcut::Shortcut()
+  : m_iconIndex(0)
+{
+}
+
+Shortcut::Shortcut(const Executable& exe)
+  : Shortcut()
+{
+  m_name = exe.title();
+  m_target = QFileInfo(qApp->applicationFilePath()).absoluteFilePath();
+
+  m_arguments = QString("\"moshortcut://%1:%2\"")
+    .arg(InstanceManager::instance().currentInstance())
+    .arg(exe.title());
+
+  m_description = QString("Run %1 with ModOrganizer").arg(exe.title());
+
+  if (exe.usesOwnIcon()) {
+    m_icon = exe.binaryInfo().absoluteFilePath();
+  }
+
+  m_workingDirectory = qApp->applicationDirPath();
+}
+
+Shortcut& Shortcut::name(const QString& s)
+{
+  m_name = s;
+  return *this;
+}
+
+Shortcut& Shortcut::target(const QString& s)
+{
+  m_target = s;
+  return *this;
+}
+
+Shortcut& Shortcut::arguments(const QString& s)
+{
+  m_arguments = s;
+  return *this;
+}
+
+Shortcut& Shortcut::description(const QString& s)
+{
+  m_description = s;
+  return *this;
+}
+
+Shortcut& Shortcut::icon(const QString& s, int index)
+{
+  m_icon = s;
+  m_iconIndex = index;
+  return *this;
+}
+
+Shortcut& Shortcut::workingDirectory(const QString& s)
+{
+  m_workingDirectory = s;
+  return *this;
+}
+
+bool Shortcut::exists(Locations loc) const
+{
+  const auto path = shortcutPath(loc);
+  if (path.isEmpty()) {
+    return false;
+  }
+
+  return QFileInfo(path).exists();
+}
+
+bool Shortcut::toggle(Locations loc)
+{
+  if (exists(loc)) {
+    return remove(loc);
+  } else {
+    return add(loc);
+  }
+}
+
+bool Shortcut::add(Locations loc)
+{
+  debug()
+    << "adding shortcut to " << toString(loc) << ":\n"
+    << "  . name: '" << m_name << "'\n"
+    << "  . target: '" << m_target << "'\n"
+    << "  . arguments: '" << m_arguments << "'\n"
+    << "  . description: '" << m_description << "'\n"
+    << "  . icon: '" << m_icon << "' @ " << m_iconIndex << "\n"
+    << "  . working directory: '" << m_workingDirectory << "'";
+
+  if (m_target.isEmpty()) {
+    critical() << "target is empty";
+    return false;
+  }
+
+  const auto path = shortcutPath(loc);
+  if (path.isEmpty()) {
+    return false;
+  }
+
+  debug() << "shorcut file will be saved at '" << path << "'";
+
+  try
+  {
+    ShellLinkWrapper link;
+
+    link.setPath(m_target);
+    link.setArguments(m_arguments);
+    link.setDescription(m_description);
+    link.setIcon(m_icon, m_iconIndex);
+    link.setWorkingDirectory(m_workingDirectory);
+
+    link.save(path);
+
+    return true;
+  }
+  catch(ShellLinkException& e)
+  {
+    critical() << e.what() << "\nshortcut file was not saved";
+  }
+
+  return false;
+}
+
+bool Shortcut::remove(Locations loc)
+{
+  debug() << "removing shortcut for '" << m_name << "' from " << toString(loc);
+
+  const auto path = shortcutPath(loc);
+  if (path.isEmpty()) {
+    return false;
+  }
+
+  debug() << "path to shortcut file is '" << path << "'";
+
+  if (!QFile::exists(path)) {
+    critical() << "can't remove '" << path << "', file not found";
+    return false;
+  }
+
+  if (!MOBase::shellDelete({path})) {
+    const auto e = ::GetLastError();
+
+    critical()
+      << "failed to remove '" << path << "', "
+      << formatSystemMessageQ(e);
+
+    return false;
+  }
+
+  return true;
+}
+
+QString Shortcut::shortcutPath(Locations loc) const
+{
+  const auto dir = shortcutDirectory(loc);
+  if (dir.isEmpty()) {
+    return {};
+  }
+
+  const auto file = shortcutFilename();
+  if (file.isEmpty()) {
+    return {};
+  }
+
+  return dir + QDir::separator() + file;
+}
+
+QString Shortcut::shortcutDirectory(Locations loc) const
+{
+  QString dir;
+
+  try
+  {
+    switch (loc)
+    {
+      case Desktop:
+        dir = MOBase::getDesktopDirectory();
+        break;
+
+      case StartMenu:
+        dir = MOBase::getStartMenuDirectory();
+        break;
+
+      case None:
+      default:
+        critical() << "bad location " << loc;
+        break;
+    }
+  }
+  catch(std::exception&)
+  {
+  }
+
+  return QDir::toNativeSeparators(dir);
+}
+
+QString Shortcut::shortcutFilename() const
+{
+  if (m_name.isEmpty()) {
+    critical() << "name is empty";
+    return {};
+  }
+
+  return m_name + ".lnk";
+}
+
+QDebug Shortcut::debug() const
+{
+  return qDebug().noquote().nospace() << "system shortcut: ";
+}
+
+QDebug Shortcut::critical() const
+{
+  return qCritical().noquote().nospace() << "system shortcut: ";
+}
+
+
+QString toString(Shortcut::Locations loc)
+{
+  switch (loc)
+  {
+    case Shortcut::None:
+      return "none";
+
+    case Shortcut::Desktop:
+      return "desktop";
+
+    case Shortcut::StartMenu:
+      return "start menu";
+
+    default:
+      return QString("? (%1)").arg(static_cast<int>(loc));
+  }
+}
+
+} // namespace
diff --git a/src/envshortcut.h b/src/envshortcut.h
new file mode 100644
index 00000000..904b3ab7
--- /dev/null
+++ b/src/envshortcut.h
@@ -0,0 +1,114 @@
+#include <QString>
+
+class Executable;
+
+namespace env
+{
+
+// an application shortcut that can be either on the desktop or the start menu
+//
+class Shortcut
+{
+public:
+  // location of a shortcut
+  //
+  enum Locations
+  {
+    None = 0,
+
+    // on the desktop
+    Desktop,
+
+    // in the start menu
+    StartMenu
+  };
+
+
+  // empty shortcut
+  //
+  Shortcut();
+
+  // shortcut from an executable
+  //
+  explicit Shortcut(const Executable& exe);
+
+  // sets the name of the shortcut, shown on icons and start menu entries
+  //
+  Shortcut& name(const QString& s);
+
+  // the program to start
+  //
+  Shortcut& target(const QString& s);
+
+  // arguments to pass
+  //
+  Shortcut& arguments(const QString& s);
+
+  // shows in the status bar of explorer, for example
+  //
+  Shortcut& description(const QString& s);
+
+  // path to a binary that contains the icon and its index
+  //
+  Shortcut& icon(const QString& s, int index=0);
+
+  // "start in" option for this shortcut
+  //
+  Shortcut& workingDirectory(const QString& s);
+
+
+  // returns whether this shortcut already exists at the given location; this
+  // does not check whether the shortcut parameters are different, it merely if
+  // the .lnk file exists
+  //
+  bool exists(Locations loc) const;
+
+  // calls remove() if exists(), or add()
+  //
+  bool toggle(Locations loc);
+
+  // adds the shortcut to the given location
+  //
+  bool add(Locations loc);
+
+  // removes the shortcut from the given location
+  //
+  bool remove(Locations loc);
+
+private:
+  QString m_name;
+  QString m_target;
+  QString m_arguments;
+  QString m_description;
+  QString m_icon;
+  int m_iconIndex;
+  QString m_workingDirectory;
+
+  // returns a qCritical() logger with a prefix already logged
+  //
+  QDebug critical() const;
+
+  // returns a qDebug() logger with a prefix already logged
+  //
+  QDebug debug() const;
+
+
+  // returns the path where the shortcut file should be saved
+  //
+  QString shortcutPath(Locations loc) const;
+
+  // returns the directory where the shortcut file should be saved
+  //
+  QString shortcutDirectory(Locations loc) const;
+
+  // returns the filename of the shortcut file that should be used when saving
+  //
+  QString shortcutFilename() const;
+};
+
+
+// returns a string representation of the given location
+//
+QString toString(Shortcut::Locations loc);
+
+} // namespace
diff --git a/src/envwindows.cpp b/src/envwindows.cpp
new file mode 100644
index 00000000..718cf2ce
--- /dev/null
+++ b/src/envwindows.cpp
@@ -0,0 +1,236 @@
+#include "envwindows.h"
+#include "env.h"
+#include <utility.h>
+
+namespace env
+{
+
+using namespace MOBase;
+
+WindowsInfo::WindowsInfo()
+{
+  // loading ntdll.dll, the functions will be found with GetProcAddress()
+  std::unique_ptr<HINSTANCE, LibraryFreer> ntdll(LoadLibraryW(L"ntdll.dll"));
+
+  if (!ntdll) {
+    qCritical() << "failed to load ntdll.dll while getting version";
+    return;
+  } else {
+    m_reported = getReportedVersion(ntdll.get());
+    m_real = getRealVersion(ntdll.get());
+  }
+
+  m_release = getRelease();
+  m_elevated = getElevated();
+}
+
+bool WindowsInfo::compatibilityMode() const
+{
+  if (m_real == Version()) {
+    // don't know the real version, can't guess compatibility mode
+    return false;
+  }
+
+  return (m_real != m_reported);
+}
+
+const WindowsInfo::Version& WindowsInfo::reportedVersion() const
+{
+  return m_reported;
+}
+
+const WindowsInfo::Version& WindowsInfo::realVersion() const
+{
+  return m_real;
+}
+
+const WindowsInfo::Release& WindowsInfo::release() const
+{
+  return m_release;
+}
+
+std::optional<bool> WindowsInfo::isElevated() const
+{
+  return m_elevated;
+}
+
+QString WindowsInfo::toString() const
+{
+  QStringList sl;
+
+  const QString reported = m_reported.toString();
+  const QString real = m_real.toString();
+
+  // version
+  sl.push_back("version " + reported);
+
+  // real version if different
+  if (compatibilityMode()) {
+    sl.push_back("real version " + real);
+  }
+
+  // build.UBR, such as 17763.557
+  if (m_release.UBR != 0) {
+    DWORD build = 0;
+
+    if (compatibilityMode()) {
+      build = m_real.build;
+    } else {
+      build = m_reported.build;
+    }
+
+    sl.push_back(QString("%1.%2").arg(build).arg(m_release.UBR));
+  }
+
+  // release ID
+  if (!m_release.ID.isEmpty()) {
+    sl.push_back("release " + m_release.ID);
+  }
+
+  // buildlab string
+  if (!m_release.buildLab.isEmpty()) {
+    sl.push_back(m_release.buildLab);
+  }
+
+  // product name
+  if (!m_release.productName.isEmpty()) {
+    sl.push_back(m_release.productName);
+  }
+
+  // elevated
+  QString elevated = "?";
+  if (m_elevated.has_value()) {
+    elevated = (*m_elevated ? "yes" : "no");
+  }
+
+  sl.push_back("elevated: " + elevated);
+
+  return sl.join(", ");
+}
+
+WindowsInfo::Version WindowsInfo::getReportedVersion(HINSTANCE ntdll) const
+{
+  // windows has been deprecating pretty much all the functions having to do
+  // with getting version information because apparently, people keep misusing
+  // them for feature detection
+  //
+  // there's still RtlGetVersion() though
+
+  using RtlGetVersionType = NTSTATUS (NTAPI)(PRTL_OSVERSIONINFOW);
+
+  auto* RtlGetVersion = reinterpret_cast<RtlGetVersionType*>(
+    GetProcAddress(ntdll, "RtlGetVersion"));
+
+  if (!RtlGetVersion) {
+    qCritical() << "RtlGetVersion() not found in ntdll.dll";
+    return {};
+  }
+
+  OSVERSIONINFOEX vi = {};
+  vi.dwOSVersionInfoSize = sizeof(vi);
+
+  // this apparently never fails
+  RtlGetVersion((RTL_OSVERSIONINFOW*)&vi);
+
+  return {vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber};
+}
+
+WindowsInfo::Version WindowsInfo::getRealVersion(HINSTANCE ntdll) const
+{
+  // getting the actual windows version is more difficult because all the
+  // functions are lying when running in compatibility mode
+  //
+  // RtlGetNtVersionNumbers() is an undocumented function that seems to work
+  // fine, but it might not in the future
+
+  using RtlGetNtVersionNumbersType = void (NTAPI)(DWORD*, DWORD*, DWORD*);
+
+  auto* RtlGetNtVersionNumbers = reinterpret_cast<RtlGetNtVersionNumbersType*>(
+    GetProcAddress(ntdll, "RtlGetNtVersionNumbers"));
+
+  if (!RtlGetNtVersionNumbers) {
+    qCritical() << "RtlGetNtVersionNumbers not found in ntdll.dll";
+    return {};
+  }
+
+  DWORD major=0, minor=0, build=0;
+  RtlGetNtVersionNumbers(&major, &minor, &build);
+
+  // for whatever reason, the build number has 0xf0000000 set
+  build = 0x0fffffff & build;
+
+  return {major, minor, build};
+}
+
+WindowsInfo::Release WindowsInfo::getRelease() const
+{
+  // there are several interesting items in the registry, but most of them
+  // are undocumented, not always available, and localizable
+  //
+  // most of them are used to provide as much information as possible in case
+  // any of the other versions fail to work
+
+  QSettings settings(
+    R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)",
+    QSettings::NativeFormat);
+
+  Release r;
+
+  // buildlab seems to be an internal name from the build system
+  r.buildLab = settings.value("BuildLabEx", "").toString();
+  if (r.buildLab.isEmpty()) {
+    r.buildLab = settings.value("BuildLab", "").toString();
+    if (r.buildLab.isEmpty()) {
+      r.buildLab = settings.value("BuildBranch", "").toString();
+    }
+  }
+
+  // localized name of windows, such as "Windows 10 Pro"
+  r.productName = settings.value("ProductName", "").toString();
+
+  // release ID, such as 1803
+  r.ID = settings.value("ReleaseId", "").toString();
+
+  // some other build number, shown in winver.exe
+  r.UBR = settings.value("UBR", 0).toUInt();
+
+  return r;
+}
+
+std::optional<bool> WindowsInfo::getElevated() const
+{
+  HandlePtr token;
+
+  {
+    HANDLE rawToken = 0;
+
+    if (!OpenProcessToken(GetCurrentProcess( ), TOKEN_QUERY, &rawToken)) {
+      const auto e = GetLastError();
+
+      qCritical()
+        << "while trying to check if process is elevated, "
+        << "OpenProcessToken() failed: " << formatSystemMessageQ(e);
+
+      return {};
+    }
+
+    token.reset(rawToken);
+  }
+
+  TOKEN_ELEVATION e = {};
+  DWORD size = sizeof(TOKEN_ELEVATION);
+
+  if (!GetTokenInformation(token.get(), TokenElevation, &e, sizeof(e), &size)) {
+    const auto e = GetLastError();
+
+    qCritical()
+      << "while trying to check if process is elevated, "
+      << "GetTokenInformation() failed: " << formatSystemMessageQ(e);
+
+    return {};
+  }
+
+  return (e.TokenIsElevated != 0);
+}
+
+} // namespace
diff --git a/src/envwindows.h b/src/envwindows.h
new file mode 100644
index 00000000..c23f99f4
--- /dev/null
+++ b/src/envwindows.h
@@ -0,0 +1,106 @@
+#include <QString>
+#include <optional>
+
+namespace env
+{
+
+// a variety of information on windows
+//
+class WindowsInfo
+{
+public:
+  struct Version
+  {
+    DWORD major=0, minor=0, build=0;
+
+    QString toString() const
+    {
+      return QString("%1.%2.%3").arg(major).arg(minor).arg(build);
+    }
+
+    friend bool operator==(const Version& a, const Version& b)
+    {
+      return
+        a.major == b.major &&
+        a.minor == b.minor &&
+        a.build == b.build;
+    }
+
+    friend bool operator!=(const Version& a, const Version& b)
+    {
+      return !(a == b);
+    }
+  };
+
+  struct Release
+  {
+    // the BuildLab entry from the registry, may be empty
+    QString buildLab;
+
+    // product name such as "Windows 10 Pro", may not be in English, may be
+    // empty
+    QString productName;
+
+    // release ID such as 1809, may be mepty
+    QString ID;
+
+    // some sub-build number, undocumented, may be empty
+    DWORD UBR;
+
+    Release()
+      : UBR(0)
+    {
+    }
+  };
+
+
+  WindowsInfo();
+
+  // tries to guess whether this process is running in compatibility mode
+  //
+  bool compatibilityMode() const;
+
+  // returns the Windows version, may not correspond to the actual version
+  // if the process is running in compatibility mode
+  //
+  const Version& reportedVersion() const;
+
+  // tries to guess the real Windows version that's running, can be empty
+  //
+  const Version& realVersion() const;
+
+  // various information about the current release
+  //
+  const Release& release() const;
+
+  // whether this process is running as administrator, may be empty if the
+  // information is not available
+  std::optional<bool> isElevated() const;
+
+  // returns a string with all the above information on one line
+  //
+  QString toString() const;
+
+private:
+  Version m_reported, m_real;
+  Release m_release;
+  std::optional<bool> m_elevated;
+
+  // uses RtlGetVersion() to get the version number as reported by Windows
+  //
+  Version getReportedVersion(HINSTANCE ntdll) const;
+
+  // uses RtlGetNtVersionNumbers() to get the real version number
+  //
+  Version getRealVersion(HINSTANCE ntdll) const;
+
+  // gets various information from the registry
+  //
+  Release getRelease() const;
+
+  // gets whether the process is elevated
+  //
+  std::optional<bool> getElevated() const;
+};
+
+} // namespace
diff --git a/src/main.cpp b/src/main.cpp
index 09da9408..5c5ce945 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -47,6 +47,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "instancemanager.h"
 #include "moshortcut.h"
 #include "organizercore.h"
+#include "env.h"
+#include "envmodule.h"
 
 #include <eh.h>
 #include <windows_error.h>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6c2ab389..87ee2c8e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -86,6 +86,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <usvfs.h>
 #include "localsavegames.h"
 #include "listdialog.h"
+#include "envshortcut.h"
 
 #include <QAbstractItemDelegate>
 #include <QAbstractProxyModel>
diff --git a/src/shared/util.cpp b/src/shared/util.cpp
index 4ee4b766..07983e12 100644
--- a/src/shared/util.cpp
+++ b/src/shared/util.cpp
@@ -19,35 +19,9 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "util.h"
 #include "windows_error.h"
-#include "error_report.h"
-#include "executableslist.h"
-#include "instancemanager.h"
-#include <utility.h>
-#include <log.h>
-
-#include <sstream>
-#include <locale>
-#include <algorithm>
-#include <set>
-#include <filesystem>
-
-#include <DbgHelp.h>
-#include <boost/scoped_array.hpp>
-#include <QApplication>
-
-#include <comdef.h>
-#include <Wbemidl.h>
-#include <wscapi.h>
-#include <netfw.h>
-#include <shellscalingapi.h>
-
-#pragma comment(lib, "Wbemuuid.lib")
-
-using namespace MOBase;
-namespace fs = std::filesystem;
-
-namespace MOShared {
 
+namespace MOShared
+{
 
 bool FileExists(const std::string &filename)
 {
@@ -269,2097 +243,4 @@ MOBase::VersionInfo createVersionInfo()
   }
 }
 
-
-namespace env
-{
-
-struct HandleCloser
-{
-  using pointer = HANDLE;
-
-  void operator()(HANDLE h)
-  {
-    if (h != INVALID_HANDLE_VALUE) {
-      ::CloseHandle(h);
-    }
-  }
-};
-
-using HandlePtr = std::unique_ptr<HANDLE, HandleCloser>;
-
-
-struct LibraryFreer
-{
-  using pointer = HINSTANCE;
-
-  void operator()(HINSTANCE h)
-  {
-    if (h != 0) {
-      ::FreeLibrary(h);
-    }
-  }
-};
-
-struct COMReleaser
-{
-  void operator()(IUnknown* p)
-  {
-    if (p) {
-      p->Release();
-    }
-  }
-};
-
-
-template <class T>
-using COMPtr = std::unique_ptr<T, COMReleaser>;
-
-
-class ShellLinkException
-{
-public:
-  ShellLinkException(QString s)
-    : m_what(std::move(s))
-  {
-  }
-
-  const QString& what() const
-  {
-    return m_what;
-  }
-
-private:
-  QString m_what;
-};
-
-// just a wrapper around IShellLink operations that throws ShellLinkException
-// on errors
-//
-class ShellLinkWrapper
-{
-public:
-  ShellLinkWrapper()
-  {
-    m_link = createShellLink();
-    m_file = createPersistFile();
-  }
-
-  void setPath(const QString& s)
-  {
-    if (s.isEmpty()) {
-      throw ShellLinkException("path cannot be empty");
-    }
-
-    const auto r = m_link->SetPath(s.toStdWString().c_str());
-    throwOnFail(r, QString("failed to set target path '%1'").arg(s));
-  }
-
-  void setArguments(const QString& s)
-  {
-    const auto r = m_link->SetArguments(s.toStdWString().c_str());
-    throwOnFail(r, QString("failed to set arguments '%1'").arg(s));
-  }
-
-  void setDescription(const QString& s)
-  {
-    if (s.isEmpty()) {
-      return;
-    }
-
-    const auto r = m_link->SetDescription(s.toStdWString().c_str());
-    throwOnFail(r, QString("failed to set description '%1'").arg(s));
-  }
-
-  void setIcon(const QString& file, int i)
-  {
-    if (file.isEmpty()) {
-      return;
-    }
-
-    const auto r = m_link->SetIconLocation(file.toStdWString().c_str(), i);
-    throwOnFail(r, QString("failed to set icon '%1' @ %2").arg(file).arg(i));
-  }
-
-  void setWorkingDirectory(const QString& s)
-  {
-    if (s.isEmpty()) {
-      return;
-    }
-
-    const auto r = m_link->SetWorkingDirectory(s.toStdWString().c_str());
-    throwOnFail(r, QString("failed to set working directory '%1'").arg(s));
-  }
-
-  void save(const QString& path)
-  {
-    const auto r = m_file->Save(path.toStdWString().c_str(), TRUE);
-    throwOnFail(r, QString("failed to save link '%1'").arg(path));
-  }
-
-private:
-  COMPtr<IShellLink> m_link;
-  COMPtr<IPersistFile> m_file;
-
-  void throwOnFail(HRESULT r, const QString& s)
-  {
-    if (FAILED(r)) {
-      throw ShellLinkException(QString("%1, %2")
-        .arg(s)
-        .arg(formatSystemMessageQ(r)));
-    }
-  }
-
-  COMPtr<IShellLink> createShellLink()
-  {
-    void* link = nullptr;
-
-    const auto r = CoCreateInstance(
-      CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER,
-      IID_IShellLink, &link);
-
-    throwOnFail(r, "failed to create IShellLink instance");
-
-    if (!link) {
-      throw ShellLinkException("creating IShellLink worked, pointer is null");
-    }
-
-    return COMPtr<IShellLink>(static_cast<IShellLink*>(link));
-  }
-
-  COMPtr<IPersistFile> createPersistFile()
-  {
-    void* file = nullptr;
-
-    const auto r = m_link->QueryInterface(IID_IPersistFile, &file);
-    throwOnFail(r, "failed to get IPersistFile interface");
-
-    if (!file) {
-      throw ShellLinkException("querying IPersistFile worked, pointer is null");
-    }
-
-    return COMPtr<IPersistFile>(static_cast<IPersistFile*>(file));
-  }
-};
-
-
-Console::Console()
-  : m_hasConsole(false), m_in(nullptr), m_out(nullptr), m_err(nullptr)
-{
-  // open a console
-  if (!AllocConsole()) {
-    // failed, ignore
-  }
-
-  m_hasConsole = true;
-
-  // redirect stdin, stdout and stderr to it
-  freopen_s(&m_in, "CONIN$", "r", stdin);
-  freopen_s(&m_out, "CONOUT$", "w", stdout);
-  freopen_s(&m_err, "CONOUT$", "w", stderr);
-}
-
-Console::~Console()
-{
-  // close redirected handles and redirect standard stream to NUL in case
-  // they're used after this
-
-  if (m_err) {
-    std::fclose(m_err);
-    freopen_s(&m_err, "NUL", "w", stderr);
-  }
-
-  if (m_out) {
-    std::fclose(m_out);
-    freopen_s(&m_out, "NUL", "w", stdout);
-  }
-
-  if (m_in) {
-    std::fclose(m_in);
-    freopen_s(&m_in, "NUL", "r", stdin);
-  }
-
-  // close console
-  if (m_hasConsole) {
-    FreeConsole();
-  }
-}
-
-
-Shortcut::Shortcut()
-  : m_iconIndex(0)
-{
-}
-
-Shortcut::Shortcut(const Executable& exe)
-  : Shortcut()
-{
-  m_name = exe.title();
-  m_target = QFileInfo(qApp->applicationFilePath()).absoluteFilePath();
-
-  m_arguments = QString("\"moshortcut://%1:%2\"")
-      .arg(InstanceManager::instance().currentInstance())
-      .arg(exe.title());
-
-  m_description = QString("Run %1 with ModOrganizer").arg(exe.title());
-
-  if (exe.usesOwnIcon()) {
-    m_icon = exe.binaryInfo().absoluteFilePath();
-  }
-
-  m_workingDirectory = qApp->applicationDirPath();
-}
-
-Shortcut& Shortcut::name(const QString& s)
-{
-  m_name = s;
-  return *this;
-}
-
-Shortcut& Shortcut::target(const QString& s)
-{
-  m_target = s;
-  return *this;
-}
-
-Shortcut& Shortcut::arguments(const QString& s)
-{
-  m_arguments = s;
-  return *this;
-}
-
-Shortcut& Shortcut::description(const QString& s)
-{
-  m_description = s;
-  return *this;
-}
-
-Shortcut& Shortcut::icon(const QString& s, int index)
-{
-  m_icon = s;
-  m_iconIndex = index;
-  return *this;
-}
-
-Shortcut& Shortcut::workingDirectory(const QString& s)
-{
-  m_workingDirectory = s;
-  return *this;
-}
-
-bool Shortcut::exists(Locations loc) const
-{
-  const auto path = shortcutPath(loc);
-  if (path.isEmpty()) {
-    return false;
-  }
-
-  return QFileInfo(path).exists();
-}
-
-bool Shortcut::toggle(Locations loc)
-{
-  if (exists(loc)) {
-    return remove(loc);
-  } else {
-    return add(loc);
-  }
-}
-
-bool Shortcut::add(Locations loc)
-{
-  debug()
-    << "adding shortcut to " << toString(loc) << ":\n"
-    << "  . name: '" << m_name << "'\n"
-    << "  . target: '" << m_target << "'\n"
-    << "  . arguments: '" << m_arguments << "'\n"
-    << "  . description: '" << m_description << "'\n"
-    << "  . icon: '" << m_icon << "' @ " << m_iconIndex << "\n"
-    << "  . working directory: '" << m_workingDirectory << "'";
-
-  if (m_target.isEmpty()) {
-    critical() << "target is empty";
-    return false;
-  }
-
-  const auto path = shortcutPath(loc);
-  if (path.isEmpty()) {
-    return false;
-  }
-
-  debug() << "shorcut file will be saved at '" << path << "'";
-
-  try
-  {
-    ShellLinkWrapper link;
-
-    link.setPath(m_target);
-    link.setArguments(m_arguments);
-    link.setDescription(m_description);
-    link.setIcon(m_icon, m_iconIndex);
-    link.setWorkingDirectory(m_workingDirectory);
-
-    link.save(path);
-
-    return true;
-  }
-  catch(ShellLinkException& e)
-  {
-    critical() << e.what() << "\nshortcut file was not saved";
-  }
-
-  return false;
-}
-
-bool Shortcut::remove(Locations loc)
-{
-  debug() << "removing shortcut for '" << m_name << "' from " << toString(loc);
-
-  const auto path = shortcutPath(loc);
-  if (path.isEmpty()) {
-    return false;
-  }
-
-  debug() << "path to shortcut file is '" << path << "'";
-
-  if (!QFile::exists(path)) {
-    critical() << "can't remove '" << path << "', file not found";
-    return false;
-  }
-
-  if (!MOBase::shellDelete({path})) {
-    const auto e = ::GetLastError();
-
-    critical()
-      << "failed to remove '" << path << "', "
-      << formatSystemMessageQ(e);
-
-    return false;
-  }
-
-  return true;
-}
-
-QString Shortcut::shortcutPath(Locations loc) const
-{
-  const auto dir = shortcutDirectory(loc);
-  if (dir.isEmpty()) {
-    return {};
-  }
-
-  const auto file = shortcutFilename();
-  if (file.isEmpty()) {
-    return {};
-  }
-
-  return dir + QDir::separator() + file;
-}
-
-QString Shortcut::shortcutDirectory(Locations loc) const
-{
-  QString dir;
-
-  try
-  {
-    switch (loc)
-    {
-      case Desktop:
-        dir = MOBase::getDesktopDirectory();
-        break;
-
-      case StartMenu:
-        dir = MOBase::getStartMenuDirectory();
-        break;
-
-      case None:
-      default:
-        critical() << "bad location " << loc;
-        break;
-    }
-  }
-  catch(std::exception&)
-  {
-  }
-
-  return QDir::toNativeSeparators(dir);
-}
-
-QString Shortcut::shortcutFilename() const
-{
-  if (m_name.isEmpty()) {
-    critical() << "name is empty";
-    return {};
-  }
-
-  return m_name + ".lnk";
-}
-
-QDebug Shortcut::debug() const
-{
-  return qDebug().noquote().nospace() << "system shortcut: ";
-}
-
-QDebug Shortcut::critical() const
-{
-  return qCritical().noquote().nospace() << "system shortcut: ";
-}
-
-
-QString toString(Shortcut::Locations loc)
-{
-  switch (loc)
-  {
-    case Shortcut::None:
-      return "none";
-
-    case Shortcut::Desktop:
-      return "desktop";
-
-    case Shortcut::StartMenu:
-      return "start menu";
-
-    default:
-      return QString("? (%1)").arg(static_cast<int>(loc));
-  }
-}
-
-
-
-class WMI
-{
-public:
-  class failed {};
-
-  WMI(const std::string& ns)
-  {
-    try
-    {
-      createLocator();
-      createService(ns);
-      setSecurity();
-    }
-    catch(failed&)
-    {
-    }
-  }
-
-  template <class F>
-  void query(const std::string& q, F&& f)
-  {
-    if (!m_locator || !m_service) {
-      return;
-    }
-
-    auto enumerator = getEnumerator(q);
-    if (!enumerator) {
-      return;
-    }
-
-    for (;;)
-    {
-      COMPtr<IWbemClassObject> object;
-
-      {
-        IWbemClassObject* rawObject = nullptr;
-        ULONG count = 0;
-        auto ret = enumerator->Next(WBEM_INFINITE, 1, &rawObject, &count);
-
-        if (count == 0 || !rawObject) {
-          break;
-        }
-
-        if (FAILED(ret)) {
-          qCritical()
-            << "enumerator->next() failed, " << formatSystemMessageQ(ret);
-          break;
-        }
-
-        object.reset(rawObject);
-      }
-
-      f(object.get());
-    }
-  }
-
-private:
-  COMPtr<IWbemLocator> m_locator;
-  COMPtr<IWbemServices> m_service;
-
-  void createLocator()
-  {
-    void* rawLocator = nullptr;
-
-    const auto ret = CoCreateInstance(
-      CLSID_WbemLocator, nullptr, CLSCTX_INPROC_SERVER,
-      IID_IWbemLocator, &rawLocator);
-
-    if (FAILED(ret) || !rawLocator) {
-      qCritical()
-        << "CoCreateInstance for WbemLocator failed, "
-        << formatSystemMessageQ(ret);
-
-      throw failed();
-    }
-
-    m_locator.reset(static_cast<IWbemLocator*>(rawLocator));
-  }
-
-  void createService(const std::string& ns)
-  {
-    IWbemServices* rawService = nullptr;
-
-    const auto res = m_locator->ConnectServer(
-      _bstr_t(ns.c_str()),
-      nullptr, nullptr, nullptr, 0, nullptr, nullptr,
-      &rawService);
-
-    if (FAILED(res) || !rawService) {
-      qCritical()
-        << "locator->ConnectServer() failed for namespace "
-        << "'" << QString::fromStdString(ns) << "', "
-        << formatSystemMessageQ(res);
-
-      throw failed();
-    }
-
-    m_service.reset(rawService);
-  }
-
-  void setSecurity()
-  {
-    auto ret = CoSetProxyBlanket(
-      m_service.get(), RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, nullptr,
-      RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, 0, EOAC_NONE);
-
-    if (FAILED(ret))
-    {
-      qCritical()
-        << "CoSetProxyBlanket() failed, " << formatSystemMessageQ(ret);
-
-      throw failed();
-    }
-  }
-
-  COMPtr<IEnumWbemClassObject> getEnumerator(
-    const std::string& query)
-  {
-    IEnumWbemClassObject* rawEnumerator = NULL;
-
-    auto ret = m_service->ExecQuery(
-      bstr_t("WQL"),
-      bstr_t(query.c_str()),
-      WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY,
-      NULL,
-      &rawEnumerator);
-
-    if (FAILED(ret) || !rawEnumerator)
-    {
-      qCritical()
-        << "query '" << QString::fromStdString(query) << "' failed, "
-        << formatSystemMessageQ(ret);
-
-      return {};
-    }
-
-    return COMPtr<IEnumWbemClassObject>(rawEnumerator);
-  }
-};
-
-
-class DisplayEnumerator
-{
-public:
-  DisplayEnumerator()
-    : m_GetDpiForMonitor(nullptr)
-  {
-    m_shcore.reset(LoadLibraryW(L"Shcore.dll"));
-
-    if (m_shcore) {
-      // windows 8.1+ only
-      m_GetDpiForMonitor = reinterpret_cast<GetDpiForMonitorFunction*>(
-        GetProcAddress(m_shcore.get(), "GetDpiForMonitor"));
-    }
-
-    // gets all monitors and the device they're running on
-    getDisplayDevices();
-  }
-
-  std::vector<Metrics::Display>&& displays() &&
-  {
-    return std::move(m_displays);
-  }
-
-  const std::vector<Metrics::Display>& displays() const &
-  {
-    return m_displays;
-  }
-
-private:
-  using GetDpiForMonitorFunction =
-    HRESULT WINAPI (HMONITOR, MONITOR_DPI_TYPE, UINT*, UINT*);
-
-  std::unique_ptr<HINSTANCE, LibraryFreer> m_shcore;
-  GetDpiForMonitorFunction* m_GetDpiForMonitor;
-  std::vector<Metrics::Display> m_displays;
-
-  void getDisplayDevices()
-  {
-    // don't bother if it goes over 100
-    for (int i=0; i<100; ++i) {
-      DISPLAY_DEVICEW device = {};
-      device.cb = sizeof(device);
-
-      if (!EnumDisplayDevicesW(nullptr, i, &device, 0)) {
-        // no more
-        break;
-      }
-
-      // EnumDisplayDevices() seems to be returning a lot of devices that are
-      // not actually monitors, but those don't have the
-      // DISPLAY_DEVICE_ATTACHED_TO_DESKTOP bit set
-      if ((device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) == 0) {
-        continue;
-      }
-
-      m_displays.push_back(createDisplay(device));
-    }
-  }
-
-  Metrics::Display createDisplay(const DISPLAY_DEVICEW& device)
-  {
-    Metrics::Display d;
-
-    d.adapter = QString::fromWCharArray(device.DeviceString);
-    d.monitor = QString::fromWCharArray(device.DeviceName);
-    d.primary = (device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE);
-
-    getDisplaySettings(device.DeviceName, d);
-    getDpi(d);
-
-    return d;
-  }
-
-  void getDisplaySettings(const wchar_t* monitorName, Metrics::Display& d)
-  {
-    DEVMODEW dm = {};
-    dm.dmSize = sizeof(dm);
-
-    if (!EnumDisplaySettingsW(monitorName, ENUM_CURRENT_SETTINGS, &dm)) {
-      log::error("EnumDisplaySettings() failed for '{}'", d.monitor);
-      return;
-    }
-
-    // all these fields should be available
-
-    if (dm.dmFields & DM_DISPLAYFREQUENCY) {
-      d.refreshRate = dm.dmDisplayFrequency;
-    }
-
-    if (dm.dmFields & DM_PELSWIDTH) {
-      d.resX = dm.dmPelsWidth;
-    }
-
-    if (dm.dmFields & DM_PELSHEIGHT) {
-      d.resY = dm.dmPelsHeight;
-    }
-  }
-
-  void getDpi(Metrics::Display& d)
-  {
-    if (!m_GetDpiForMonitor) {
-      // this happens on windows 7, get the desktop dpi instead
-      getDesktopDpi(d);
-      return;
-    }
-
-    // there's no way to get an HMONITOR from a device name, so all monitors
-    // will have to be enumerated and their name checked
-    HMONITOR hm = findMonitor(d.monitor);
-    if (!hm) {
-      log::error("can't get dpi for monitor '{}', not found", d.monitor);
-      return;
-    }
-
-    UINT dpiX=0, dpiY=0;
-    const auto r = m_GetDpiForMonitor(hm, MDT_EFFECTIVE_DPI, &dpiX, &dpiY);
-
-    if (FAILED(r)) {
-      log::error(
-        "GetDpiForMonitor() failed for '{}', {}",
-        d.monitor, formatSystemMessageQ(r));
-
-      return;
-    }
-
-    // dpiX and dpiY are always identical, as per the documentation
-    d.dpi = dpiX;
-  }
-
-  void getDesktopDpi(Metrics::Display& d)
-  {
-    // desktop dc
-    HDC dc = GetDC(0);
-
-    if (!dc) {
-      const auto e = GetLastError();
-      log::error("can't get desktop DC, {}", formatSystemMessageQ(e));
-      return;
-    }
-
-    d.dpi = GetDeviceCaps(dc, LOGPIXELSX);
-
-    ReleaseDC(0, dc);
-  }
-
-  HMONITOR findMonitor(const QString& name)
-  {
-    // passed to the enumeration callback
-    struct Data
-    {
-      DisplayEnumerator* self;
-      QString name;
-      HMONITOR hm;
-    };
-
-    Data data = {this, name, 0};
-
-    // for each monitor
-    EnumDisplayMonitors(0, nullptr, [](HMONITOR hm, HDC, RECT*, LPARAM lp) {
-      auto& data = *reinterpret_cast<Data*>(lp);
-
-      MONITORINFOEX mi = {};
-      mi.cbSize = sizeof(mi);
-
-      // monitor info will include the name
-      if (!GetMonitorInfoW(hm, &mi)) {
-        const auto e = GetLastError();
-        log::error(
-          "GetMonitorInfo() failed for '{}', {}",
-          data.name, formatSystemMessageQ(e));
-
-        // error for this monitor, but continue
-        return TRUE;
-      }
-
-      if (QString::fromWCharArray(mi.szDevice) == data.name) {
-        // found, stop
-        data.hm = hm;
-        return FALSE;
-      }
-
-      // not found, continue to the next monitor
-      return TRUE;
-    }, reinterpret_cast<LPARAM>(&data));
-
-    return data.hm;
-  }
-};
-
-
-Environment::Environment()
-{
-  m_modules = getLoadedModules();
-  m_security = getSecurityProducts();
-}
-
-const std::vector<Module>& Environment::loadedModules() const
-{
-  return m_modules;
-}
-
-const WindowsInfo& Environment::windowsInfo() const
-{
-  return m_windows;
-}
-
-const std::vector<SecurityProduct>& Environment::securityProducts() const
-{
-  return m_security;
-}
-
-const Metrics& Environment::metrics() const
-{
-  return m_metrics;
-}
-
-void Environment::dump() const
-{
-  log::debug("windows: {}", windowsInfo().toString());
-
-  if (windowsInfo().compatibilityMode()) {
-    log::warn("MO seems to be running in compatibility mode");
-  }
-
-  log::debug("security products:");
-  for (const auto& sp : securityProducts()) {
-    log::debug("  . {}", sp.toString());
-  }
-
-  log::debug("modules loaded in process:");
-  for (const auto& m : loadedModules()) {
-    log::debug(" . {}", m.toString());
-  }
-
-  log::debug("displays:");
-  for (const auto& d : m_metrics.displays()) {
-    log::debug(" . {}", d.toString());
-  }
-}
-
-std::vector<Module> Environment::getLoadedModules() const
-{
-  HandlePtr snapshot(CreateToolhelp32Snapshot(
-    TH32CS_SNAPMODULE32 | TH32CS_SNAPMODULE, GetCurrentProcessId()));
-
-  if (snapshot.get() == INVALID_HANDLE_VALUE)
-  {
-    const auto e = GetLastError();
-
-    qCritical().nospace().noquote()
-      << "CreateToolhelp32Snapshot() failed, "
-      << formatSystemMessageQ(e);
-
-    return {};
-  }
-
-  MODULEENTRY32 me = {};
-  me.dwSize = sizeof(me);
-
-  // first module, this shouldn't fail because there's at least the executable
-  if (!Module32First(snapshot.get(), &me))
-  {
-    const auto e = GetLastError();
-
-    qCritical().nospace().noquote()
-      << "Module32First() failed, " << formatSystemMessageQ(e);
-
-    return {};
-  }
-
-  std::vector<Module> v;
-
-  for (;;)
-  {
-    const auto path = QString::fromWCharArray(me.szExePath);
-    if (!path.isEmpty()) {
-      v.push_back(Module(path, me.modBaseSize));
-    }
-
-    // next module
-    if (!Module32Next(snapshot.get(), &me)) {
-      const auto e = GetLastError();
-
-      // no more modules is not an error
-      if (e != ERROR_NO_MORE_FILES) {
-       qCritical().nospace().noquote()
-        << "Module32Next() failed, " << formatSystemMessageQ(e);
-      }
-
-      break;
-    }
-  }
-
-  // sorting by display name
-  std::sort(v.begin(), v.end(), [](auto&& a, auto&& b) {
-    return (a.displayPath().compare(b.displayPath(), Qt::CaseInsensitive) < 0);
-  });
-
-  return v;
-}
-
-std::vector<SecurityProduct> Environment::getSecurityProducts() const
-{
-  std::vector<SecurityProduct> v;
-
-  {
-    auto fromWMI = getSecurityProductsFromWMI();
-    v.insert(
-      v.end(),
-      std::make_move_iterator(fromWMI.begin()),
-      std::make_move_iterator(fromWMI.end()));
-  }
-
-  if (auto p=getWindowsFirewall()) {
-    v.push_back(std::move(*p));
-  }
-
-  return v;
-}
-
-std::vector<SecurityProduct> Environment::getSecurityProductsFromWMI() const
-{
-  // some products may be present in multiple queries, such as a product marked
-  // as both antivirus and antispyware, but they'll have the same GUID, so use
-  // that to avoid duplicating entries
-  std::map<QUuid, SecurityProduct> map;
-
-  auto handleProduct = [&](auto* o) {
-    VARIANT prop;
-
-    // display name
-    auto ret = o->Get(L"displayName", 0, &prop, 0, 0);
-    if (FAILED(ret)) {
-      qCritical()
-        << "failed to get displayName, "
-        << formatSystemMessageQ(ret);
-
-      return;
-    }
-
-    if (prop.vt != VT_BSTR) {
-      qCritical() << "displayName is a " << prop.vt << ", not a bstr";
-      return;
-    }
-
-    const std::wstring name = prop.bstrVal;
-    VariantClear(&prop);
-
-    // product state
-    ret = o->Get(L"productState", 0, &prop, 0, 0);
-    if (FAILED(ret)) {
-      qCritical()
-        << "failed to get productState, "
-        << formatSystemMessageQ(ret);
-
-      return;
-    }
-
-    if (prop.vt != VT_UI4 && prop.vt != VT_I4) {
-      qCritical() << "productState is a " << prop.vt << ", is not a VT_UI4";
-      return;
-    }
-
-    DWORD state = 0;
-    if (prop.vt == VT_I4) {
-      state = prop.lVal;
-    } else {
-      state = prop.ulVal;
-    }
-
-    VariantClear(&prop);
-
-    // guid
-    ret = o->Get(L"instanceGuid", 0, &prop, 0, 0);
-    if (FAILED(ret)) {
-      qCritical()
-        << "failed to get instanceGuid, "
-        << formatSystemMessageQ(ret);
-
-      return;
-    }
-
-    if (prop.vt != VT_BSTR) {
-      qCritical() << "instanceGuid is a " << prop.vt << ", is not a bstr";
-      return;
-    }
-
-    const QUuid guid(QString::fromWCharArray(prop.bstrVal));
-    VariantClear(&prop);
-
-    const auto provider = static_cast<int>((state >> 16) & 0xff);
-    const auto scanner = (state >> 8) & 0xff;
-    const auto definitions = state & 0xff;
-
-    const bool active = ((scanner & 0x10) != 0);
-    const bool upToDate = (definitions == 0);
-
-    map.insert({
-      guid,
-      {guid, QString::fromStdWString(name), provider, active, upToDate}});
-  };
-
-  {
-    WMI wmi("root\\SecurityCenter2");
-    wmi.query("select * from AntivirusProduct", handleProduct);
-    wmi.query("select * from FirewallProduct", handleProduct);
-    wmi.query("select * from AntiSpywareProduct", handleProduct);
-  }
-
-  {
-    WMI wmi("root\\SecurityCenter");
-    wmi.query("select * from AntivirusProduct", handleProduct);
-    wmi.query("select * from FirewallProduct", handleProduct);
-    wmi.query("select * from AntiSpywareProduct", handleProduct);
-  }
-
-  std::vector<SecurityProduct> v;
-
-  for (auto&& p : map) {
-    v.push_back(p.second);
-  }
-
-  return v;
-}
-
-std::optional<SecurityProduct> Environment::getWindowsFirewall() const
-{
-  HRESULT hr = 0;
-
-  COMPtr<INetFwPolicy2> policy;
-
-  {
-    void* rawPolicy = nullptr;
-
-    hr = CoCreateInstance(
-      __uuidof(NetFwPolicy2), nullptr, CLSCTX_INPROC_SERVER,
-      __uuidof(INetFwPolicy2), &rawPolicy);
-
-    if (FAILED(hr) || !rawPolicy) {
-      qCritical()
-        << "CoCreateInstance for NetFwPolicy2 failed, "
-        << formatSystemMessageQ(hr);
-
-      return {};
-    }
-
-    policy.reset(static_cast<INetFwPolicy2*>(rawPolicy));
-  }
-
-  VARIANT_BOOL enabledVariant;
-
-  if (policy) {
-    hr = policy->get_FirewallEnabled(NET_FW_PROFILE2_PUBLIC, &enabledVariant);
-    if (FAILED(hr))
-    {
-      qCritical()
-        << "get_FirewallEnabled failed, "
-        << formatSystemMessageQ(hr);
-
-      return {};
-    }
-  }
-
-  const auto enabled = (enabledVariant != VARIANT_FALSE);
-  if (!enabled) {
-    return {};
-  }
-
-  return SecurityProduct(
-    {}, "Windows Firewall", WSC_SECURITY_PROVIDER_FIREWALL, true, true);
-}
-
-
-Metrics::Metrics()
-{
-  m_displays = DisplayEnumerator().displays();
-}
-
-const std::vector<Metrics::Display>& Metrics::displays() const
-{
-  return m_displays;
-}
-
-QString Metrics::Display::toString() const
-{
-  return QString("%1*%2 %3hz dpi=%4 on %5%6")
-    .arg(resX)
-    .arg(resY)
-    .arg(refreshRate)
-    .arg(dpi)
-    .arg(adapter)
-    .arg(primary ? " (primary)" : "");
-}
-
-
-Module::Module(QString path, std::size_t fileSize)
-  : m_path(std::move(path)), m_fileSize(fileSize)
-{
-  const auto fi = getFileInfo();
-
-  m_version = getVersion(fi.ffi);
-  m_timestamp = getTimestamp(fi.ffi);
-  m_versionString = fi.fileDescription;
-  m_md5 = getMD5();
-}
-
-const QString& Module::path() const
-{
-  return m_path;
-}
-
-QString Module::displayPath() const
-{
-  return QDir::fromNativeSeparators(m_path.toLower());
-}
-
-std::size_t Module::fileSize() const
-{
-  return m_fileSize;
-}
-
-const QString& Module::version() const
-{
-  return m_version;
-}
-
-const QString& Module::versionString() const
-{
-  return m_versionString;
-}
-
-const QDateTime& Module::timestamp() const
-{
-  return m_timestamp;
-}
-
-const QString& Module::md5() const
-{
-  return m_md5;
-}
-
-QString Module::timestampString() const
-{
-  if (!m_timestamp.isValid()) {
-    return "(no timestamp)";
-  }
-
-  return m_timestamp.toString(Qt::DateFormat::ISODate);
-}
-
-QString Module::toString() const
-{
-  QStringList sl;
-
-  // file size
-  sl.push_back(displayPath());
-  sl.push_back(QString("%1 B").arg(m_fileSize));
-
-  // version
-  if (m_version.isEmpty() && m_versionString.isEmpty()) {
-    sl.push_back("(no version)");
-  } else {
-    if (!m_version.isEmpty()) {
-      sl.push_back(m_version);
-    }
-
-    if (!m_versionString.isEmpty() && m_versionString != m_version) {
-      sl.push_back(versionString());
-    }
-  }
-
-  // timestamp
-  if (m_timestamp.isValid()) {
-    sl.push_back(m_timestamp.toString(Qt::DateFormat::ISODate));
-  } else {
-    sl.push_back("(no timestamp)");
-  }
-
-  // md5
-  if (!m_md5.isEmpty()) {
-    sl.push_back(m_md5);
-  }
-
-  return sl.join(", ");
-}
-
-Module::FileInfo Module::getFileInfo() const
-{
-  const auto wspath = m_path.toStdWString();
-
-  // getting version info size
-  DWORD dummy = 0;
-  const DWORD size = GetFileVersionInfoSizeW(wspath.c_str(), &dummy);
-
-  if (size == 0) {
-    const auto e = GetLastError();
-
-    if (e == ERROR_RESOURCE_TYPE_NOT_FOUND) {
-      // not an error, no version information built into that module
-      return {};
-    }
-
-    qCritical().nospace().noquote()
-      << "GetFileVersionInfoSizeW() failed on '" << m_path << "', "
-      << formatSystemMessageQ(e);
-
-    return {};
-  }
-
-  // getting version info
-  auto buffer = std::make_unique<std::byte[]>(size);
-
-  if (!GetFileVersionInfoW(wspath.c_str(), 0, size, buffer.get())) {
-    const auto e = GetLastError();
-
-    qCritical().nospace().noquote()
-      << "GetFileVersionInfoW() failed on '" << m_path << "', "
-      << formatSystemMessageQ(e);
-
-    return {};
-  }
-
-  // the version info has two major parts: a fixed version and a localizable
-  // set of strings
-
-  FileInfo fi;
-  fi.ffi = getFixedFileInfo(buffer.get());
-  fi.fileDescription = getFileDescription(buffer.get());
-
-  return fi;
-}
-
-VS_FIXEDFILEINFO Module::getFixedFileInfo(std::byte* buffer) const
-{
-  void* valuePointer = nullptr;
-  unsigned int valueSize = 0;
-
-  // the fixed version info is in the root
-  const auto ret = VerQueryValueW(buffer, L"\\", &valuePointer, &valueSize);
-
-  if (!ret || !valuePointer || valueSize == 0) {
-    // not an error, no fixed file info
-    return {};
-  }
-
-  const auto* fi = static_cast<VS_FIXEDFILEINFO*>(valuePointer);
-
-  // signature is always 0xfeef04bd
-  if (fi->dwSignature != 0xfeef04bd) {
-    qCritical().nospace().noquote()
-      << "bad file info signature 0x" << hex << fi->dwSignature << " for "
-      << "'" << m_path << "'";
-
-    return {};
-  }
-
-  return *fi;
-}
-
-QString Module::getFileDescription(std::byte* buffer) const
-{
-  struct LANGANDCODEPAGE
-  {
-    WORD wLanguage;
-    WORD wCodePage;
-  };
-
-  void* valuePointer = nullptr;
-  unsigned int valueSize = 0;
-
-  // getting list of available languages
-  auto ret = VerQueryValueW(
-    buffer, L"\\VarFileInfo\\Translation", &valuePointer, &valueSize);
-
-  if (!ret || !valuePointer || valueSize == 0) {
-    qCritical().nospace().noquote()
-      << "VerQueryValueW() for translations failed on '" << m_path << "'";
-
-    return {};
-  }
-
-  // number of languages
-  const auto count = valueSize / sizeof(LANGANDCODEPAGE);
-  if (count == 0) {
-    return {};
-  }
-
-  // using the first language in the list to get FileVersion
-  const auto* lcp = static_cast<LANGANDCODEPAGE*>(valuePointer);
-
-  const auto subBlock = QString("\\StringFileInfo\\%1%2\\FileVersion")
-    .arg(lcp->wLanguage, 4, 16, QChar('0'))
-    .arg(lcp->wCodePage, 4, 16, QChar('0'));
-
-  ret = VerQueryValueW(
-    buffer, subBlock.toStdWString().c_str(), &valuePointer, &valueSize);
-
-  if (!ret || !valuePointer || valueSize == 0) {
-    // not an error, no file version
-    return {};
-  }
-
-  // valueSize includes the null terminator
-  return QString::fromWCharArray(
-    static_cast<wchar_t*>(valuePointer), valueSize - 1);
-}
-
-QString Module::getVersion(const VS_FIXEDFILEINFO& fi) const
-{
-  if (fi.dwSignature == 0) {
-    return {};
-  }
-
-  const DWORD major = (fi.dwFileVersionMS >> 16 ) & 0xffff;
-  const DWORD minor = (fi.dwFileVersionMS >>  0 ) & 0xffff;
-  const DWORD maintenance = (fi.dwFileVersionLS >> 16 ) & 0xffff;
-  const DWORD build = (fi.dwFileVersionLS >>  0 ) & 0xffff;
-
-  if (major == 0 && minor == 0 && maintenance == 0 && build == 0) {
-    return {};
-  }
-
-  return QString("%1.%2.%3.%4")
-    .arg(major).arg(minor).arg(maintenance).arg(build);
-}
-
-QDateTime Module::getTimestamp(const VS_FIXEDFILEINFO& fi) const
-{
-  FILETIME ft = {};
-
-  if (fi.dwSignature == 0 || (fi.dwFileDateMS == 0 && fi.dwFileDateLS == 0)) {
-    // if the file info is invalid or doesn't have a date, use the creation
-    // time on the file
-
-    // opening the file
-    HandlePtr h(CreateFileW(
-      m_path.toStdWString().c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr,
-      OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0));
-
-    if (h.get() == INVALID_HANDLE_VALUE) {
-      const auto e = GetLastError();
-
-      qCritical().nospace().noquote()
-        << "can't open file '" << m_path << "' for timestamp, "
-        << formatSystemMessageQ(e);
-
-      return {};
-    }
-
-    // getting the file time
-    if (!GetFileTime(h.get(), &ft, nullptr, nullptr)) {
-      const auto e = GetLastError();
-      qCritical().nospace().noquote()
-        << "can't get file time for '" << m_path << "', "
-        << formatSystemMessageQ(e);
-
-      return {};
-    }
-  } else {
-    // use the time from the file info
-    ft.dwHighDateTime = fi.dwFileDateMS;
-    ft.dwLowDateTime = fi.dwFileDateLS;
-  }
-
-
-  // converting to SYSTEMTIME
-  SYSTEMTIME utc = {};
-
-  if (!FileTimeToSystemTime(&ft, &utc)) {
-    qCritical().nospace().noquote()
-      << "FileTimeToSystemTime() failed on timestamp "
-      << "high=0x" << hex << ft.dwHighDateTime << " "
-      << "low=0x" << hex << ft.dwLowDateTime << " for "
-      << "'" << m_path << "'";
-
-    return {};
-  }
-
-  return QDateTime(
-    QDate(utc.wYear, utc.wMonth, utc.wDay),
-    QTime(utc.wHour, utc.wMinute, utc.wSecond, utc.wMilliseconds));
-}
-
-QString Module::getMD5() const
-{
-  if (m_path.contains("\\windows\\", Qt::CaseInsensitive)) {
-    // don't calculate md5 for system files, it's not really relevant and
-    // it takes a while
-    return {};
-  }
-
-  // opening the file
-  QFile f(m_path);
-
-  if (!f.open(QFile::ReadOnly)) {
-    qCritical().nospace().noquote()
-      << "failed to open file '" << m_path << "' for md5";
-
-    return {};
-  }
-
-  // hashing
-  QCryptographicHash hash(QCryptographicHash::Md5);
-  if (!hash.addData(&f)) {
-    qCritical().nospace().noquote()
-      << "failed to calculate md5 for '" << m_path << "'";
-
-    return {};
-  }
-
-  return hash.result().toHex();
-}
-
-
-WindowsInfo::WindowsInfo()
-{
-  // loading ntdll.dll, the functions will be found with GetProcAddress()
-  std::unique_ptr<HINSTANCE, LibraryFreer> ntdll(LoadLibraryW(L"ntdll.dll"));
-
-  if (!ntdll) {
-    qCritical() << "failed to load ntdll.dll while getting version";
-    return;
-  } else {
-    m_reported = getReportedVersion(ntdll.get());
-    m_real = getRealVersion(ntdll.get());
-  }
-
-  m_release = getRelease();
-  m_elevated = getElevated();
-}
-
-bool WindowsInfo::compatibilityMode() const
-{
-  if (m_real == Version()) {
-    // don't know the real version, can't guess compatibility mode
-    return false;
-  }
-
-  return (m_real != m_reported);
-}
-
-const WindowsInfo::Version& WindowsInfo::reportedVersion() const
-{
-  return m_reported;
-}
-
-const WindowsInfo::Version& WindowsInfo::realVersion() const
-{
-  return m_real;
-}
-
-const WindowsInfo::Release& WindowsInfo::release() const
-{
-  return m_release;
-}
-
-std::optional<bool> WindowsInfo::isElevated() const
-{
-  return m_elevated;
-}
-
-QString WindowsInfo::toString() const
-{
-  QStringList sl;
-
-  const QString reported = m_reported.toString();
-  const QString real = m_real.toString();
-
-  // version
-  sl.push_back("version " + reported);
-
-  // real version if different
-  if (compatibilityMode()) {
-    sl.push_back("real version " + real);
-  }
-
-  // build.UBR, such as 17763.557
-  if (m_release.UBR != 0) {
-    DWORD build = 0;
-
-    if (compatibilityMode()) {
-      build = m_real.build;
-    } else {
-      build = m_reported.build;
-    }
-
-    sl.push_back(QString("%1.%2").arg(build).arg(m_release.UBR));
-  }
-
-  // release ID
-  if (!m_release.ID.isEmpty()) {
-    sl.push_back("release " + m_release.ID);
-  }
-
-  // buildlab string
-  if (!m_release.buildLab.isEmpty()) {
-    sl.push_back(m_release.buildLab);
-  }
-
-  // product name
-  if (!m_release.productName.isEmpty()) {
-    sl.push_back(m_release.productName);
-  }
-
-  // elevated
-  QString elevated = "?";
-  if (m_elevated.has_value()) {
-    elevated = (*m_elevated ? "yes" : "no");
-  }
-
-  sl.push_back("elevated: " + elevated);
-
-  return sl.join(", ");
-}
-
-WindowsInfo::Version WindowsInfo::getReportedVersion(HINSTANCE ntdll) const
-{
-  // windows has been deprecating pretty much all the functions having to do
-  // with getting version information because apparently, people keep misusing
-  // them for feature detection
-  //
-  // there's still RtlGetVersion() though
-
-  using RtlGetVersionType = NTSTATUS (NTAPI)(PRTL_OSVERSIONINFOW);
-
-  auto* RtlGetVersion = reinterpret_cast<RtlGetVersionType*>(
-    GetProcAddress(ntdll, "RtlGetVersion"));
-
-  if (!RtlGetVersion) {
-    qCritical() << "RtlGetVersion() not found in ntdll.dll";
-    return {};
-  }
-
-  OSVERSIONINFOEX vi = {};
-  vi.dwOSVersionInfoSize = sizeof(vi);
-
-  // this apparently never fails
-  RtlGetVersion((RTL_OSVERSIONINFOW*)&vi);
-
-  return {vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber};
-}
-
-WindowsInfo::Version WindowsInfo::getRealVersion(HINSTANCE ntdll) const
-{
-  // getting the actual windows version is more difficult because all the
-  // functions are lying when running in compatibility mode
-  //
-  // RtlGetNtVersionNumbers() is an undocumented function that seems to work
-  // fine, but it might not in the future
-
-  using RtlGetNtVersionNumbersType = void (NTAPI)(DWORD*, DWORD*, DWORD*);
-
-  auto* RtlGetNtVersionNumbers = reinterpret_cast<RtlGetNtVersionNumbersType*>(
-    GetProcAddress(ntdll, "RtlGetNtVersionNumbers"));
-
-  if (!RtlGetNtVersionNumbers) {
-    qCritical() << "RtlGetNtVersionNumbers not found in ntdll.dll";
-    return {};
-  }
-
-  DWORD major=0, minor=0, build=0;
-  RtlGetNtVersionNumbers(&major, &minor, &build);
-
-  // for whatever reason, the build number has 0xf0000000 set
-  build = 0x0fffffff & build;
-
-  return {major, minor, build};
-}
-
-WindowsInfo::Release WindowsInfo::getRelease() const
-{
-  // there are several interesting items in the registry, but most of them
-  // are undocumented, not always available, and localizable
-  //
-  // most of them are used to provide as much information as possible in case
-  // any of the other versions fail to work
-
-  QSettings settings(
-    R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)",
-    QSettings::NativeFormat);
-
-  Release r;
-
-  // buildlab seems to be an internal name from the build system
-  r.buildLab = settings.value("BuildLabEx", "").toString();
-  if (r.buildLab.isEmpty()) {
-    r.buildLab = settings.value("BuildLab", "").toString();
-    if (r.buildLab.isEmpty()) {
-      r.buildLab = settings.value("BuildBranch", "").toString();
-    }
-  }
-
-  // localized name of windows, such as "Windows 10 Pro"
-  r.productName = settings.value("ProductName", "").toString();
-
-  // release ID, such as 1803
-  r.ID = settings.value("ReleaseId", "").toString();
-
-  // some other build number, shown in winver.exe
-  r.UBR = settings.value("UBR", 0).toUInt();
-
-  return r;
-}
-
-std::optional<bool> WindowsInfo::getElevated() const
-{
-  HandlePtr token;
-
-  {
-    HANDLE rawToken = 0;
-
-    if (!OpenProcessToken(GetCurrentProcess( ), TOKEN_QUERY, &rawToken)) {
-      const auto e = GetLastError();
-
-      qCritical()
-        << "while trying to check if process is elevated, "
-        << "OpenProcessToken() failed: " << formatSystemMessageQ(e);
-
-      return {};
-    }
-
-    token.reset(rawToken);
-  }
-
-  TOKEN_ELEVATION e = {};
-  DWORD size = sizeof(TOKEN_ELEVATION);
-
-  if (!GetTokenInformation(token.get(), TokenElevation, &e, sizeof(e), &size)) {
-    const auto e = GetLastError();
-
-    qCritical()
-      << "while trying to check if process is elevated, "
-      << "GetTokenInformation() failed: " << formatSystemMessageQ(e);
-
-    return {};
-  }
-
-  return (e.TokenIsElevated != 0);
-}
-
-
-SecurityProduct::SecurityProduct(
-  QUuid guid, QString name, int provider,
-  bool active, bool upToDate) :
-    m_guid(std::move(guid)), m_name(std::move(name)), m_provider(provider),
-    m_active(active), m_upToDate(upToDate)
-{
-}
-
-const QString& SecurityProduct::name() const
-{
-  return m_name;
-}
-
-int SecurityProduct::provider() const
-{
-  return m_provider;
-}
-
-bool SecurityProduct::active() const
-{
-  return m_active;
-}
-
-bool SecurityProduct::upToDate() const
-{
-  return m_upToDate;
-}
-
-QString SecurityProduct::toString() const
-{
-  QString s;
-
-  s += m_name + " (" + providerToString() + ")";
-
-  if (!m_active) {
-    s += ", inactive";
-  }
-
-  if (!m_upToDate) {
-    s += ", definitions outdated";
-  }
-
-  if (!m_guid.isNull()) {
-    s += ", " + m_guid.toString(QUuid::QUuid::WithoutBraces);
-  }
-
-  return s;
-}
-
-QString SecurityProduct::providerToString() const
-{
-  QStringList ps;
-
-  if (m_provider & WSC_SECURITY_PROVIDER_FIREWALL) {
-    ps.push_back("firewall");
-  }
-
-  if (m_provider & WSC_SECURITY_PROVIDER_AUTOUPDATE_SETTINGS) {
-    ps.push_back("autoupdate");
-  }
-
-  if (m_provider & WSC_SECURITY_PROVIDER_ANTIVIRUS) {
-    ps.push_back("antivirus");
-  }
-
-  if (m_provider & WSC_SECURITY_PROVIDER_ANTISPYWARE) {
-    ps.push_back("antispyware");
-  }
-
-  if (m_provider & WSC_SECURITY_PROVIDER_INTERNET_SETTINGS) {
-    ps.push_back("settings");
-  }
-
-  if (m_provider & WSC_SECURITY_PROVIDER_USER_ACCOUNT_CONTROL) {
-    ps.push_back("uac");
-  }
-
-  if (m_provider & WSC_SECURITY_PROVIDER_SERVICE) {
-    ps.push_back("service");
-  }
-
-  if (ps.empty()) {
-    return "doesn't provider anything";
-  }
-
-  return ps.join("|");
-}
-
-
-struct Process
-{
-  std::wstring filename;
-  DWORD pid;
-
-  Process(std::wstring f, DWORD id)
-    : filename(std::move(f)), pid(id)
-  {
-  }
-};
-
-// returns the filename of the given process or the current one
-//
-std::wstring processFilename(HANDLE process=INVALID_HANDLE_VALUE)
-{
-  // double the buffer size 10 times
-  const int MaxTries = 10;
-
-  DWORD bufferSize = MAX_PATH;
-
-  for (int tries=0; tries<MaxTries; ++tries)
-  {
-    auto buffer = std::make_unique<wchar_t[]>(bufferSize + 1);
-    std::fill(buffer.get(), buffer.get() + bufferSize + 1, 0);
-
-    DWORD writtenSize = 0;
-
-    if (process == INVALID_HANDLE_VALUE) {
-      // query this process
-      writtenSize = GetModuleFileNameW(0, buffer.get(), bufferSize);
-    } else {
-      // query another process
-      writtenSize = GetModuleBaseNameW(process, 0, buffer.get(), bufferSize);
-    }
-
-    if (writtenSize == 0) {
-      // hard failure
-      const auto e = GetLastError();
-      std::wcerr << formatSystemMessage(e) << L"\n";
-      break;
-    } else if (writtenSize >= bufferSize) {
-      // buffer is too small, try again
-      bufferSize *= 2;
-    } else {
-      // if GetModuleFileName() works, `writtenSize` does not include the null
-      // terminator
-      const std::wstring s(buffer.get(), writtenSize);
-      const fs::path path(s);
-
-      return path.filename().native();
-    }
-  }
-
-  // something failed or the path is way too long to make sense
-
-  std::wstring what;
-  if (process == INVALID_HANDLE_VALUE) {
-    what = L"the current process";
-  } else {
-    what = L"pid " + std::to_wstring(reinterpret_cast<std::uintptr_t>(process));
-  }
-
-  std::wcerr << L"failed to get filename for " << what << L"\n";
-  return {};
-}
-
-std::vector<DWORD> runningProcessesIds()
-{
-  // double the buffer size 10 times
-  const int MaxTries = 10;
-
-  // initial size of 300 processes, unlikely to be more than that
-  std::size_t size = 300;
-
-  for (int tries=0; tries<MaxTries; ++tries) {
-    auto ids = std::make_unique<DWORD[]>(size);
-    std::fill(ids.get(), ids.get() + size, 0);
-
-    DWORD bytesGiven = static_cast<DWORD>(size * sizeof(ids[0]));
-    DWORD bytesWritten = 0;
-
-    if (!EnumProcesses(ids.get(), bytesGiven, &bytesWritten))
-    {
-      const auto e = GetLastError();
-
-      std::wcerr
-        << L"failed to enumerate processes, "
-        << formatSystemMessage(e) << L"\n";
-
-      return {};
-    }
-
-    if (bytesWritten == bytesGiven) {
-      // no way to distinguish between an exact fit and not enough space,
-      // just try again
-      size *= 2;
-      continue;
-    }
-
-    const auto count = bytesWritten / sizeof(ids[0]);
-    return std::vector<DWORD>(ids.get(), ids.get() + count);
-  }
-
-  std::cerr << L"too many processes to enumerate";
-  return {};
-}
-
-std::vector<Process> runningProcesses()
-{
-  const auto pids = runningProcessesIds();
-  std::vector<Process> v;
-
-  for (const auto& pid : pids) {
-    if (pid == 0) {
-      // the idle process has pid 0 and seems to be picked up by EnumProcesses()
-      continue;
-    }
-
-    HandlePtr h(OpenProcess(
-      PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid));
-
-    if (!h) {
-      const auto e = GetLastError();
-
-      if (e != ERROR_ACCESS_DENIED) {
-        // don't log access denied, will happen a lot for system processes, even
-        // when elevated
-        std::wcerr
-          << L"failed to open process " << pid << L", "
-          << formatSystemMessage(e) << L"\n";
-      }
-
-      continue;
-    }
-
-    auto filename = processFilename(h.get());
-    if (!filename.empty()) {
-      v.emplace_back(std::move(filename), pid);
-    }
-  }
-
-  return v;
-}
-
-DWORD findOtherPid()
-{
-  const std::wstring defaultName = L"ModOrganizer.exe";
-
-  std::wclog << L"looking for the other process...\n";
-
-  // used to skip the current process below
-  const auto thisPid = GetCurrentProcessId();
-  std::wclog << L"this process id is " << thisPid << L"\n";
-
-  // getting the filename for this process, assumes the other process has the
-  // smae one
-  auto filename = processFilename();
-  if (filename.empty()) {
-    std::wcerr
-      << L"can't get current process filename, defaulting to "
-      << defaultName << L"\n";
-
-    filename = defaultName;
-  } else {
-    std::wclog << L"this process filename is " << filename << L"\n";
-  }
-
-  // getting all running processes
-  const auto processes = runningProcesses();
-  std::wclog << L"there are " << processes.size() << L" processes running\n";
-
-  // going through processes, trying to find one with the same name and a
-  // different pid than this process has
-  for (const auto& p : processes) {
-    if (p.filename == filename) {
-      if (p.pid != thisPid) {
-        return p.pid;
-      }
-    }
-  }
-
-  std::wclog
-    << L"no process with this filename\n"
-    << L"MO may not be running, or it may be running as administrator\n"
-    << L"you can try running this again as administrator\n";
-
-  return 0;
-}
-
-std::wstring tempDir()
-{
-  const DWORD bufferSize = MAX_PATH + 1;
-  wchar_t buffer[bufferSize + 1] = {};
-
-  const auto written = GetTempPathW(bufferSize, buffer);
-  if (written == 0) {
-    const auto e = GetLastError();
-
-    std::wcerr
-      << L"failed to get temp path, " << formatSystemMessage(e) << L"\n";
-
-    return {};
-  }
-
-  // `written` does not include the null terminator
-  return std::wstring(buffer, buffer + written);
-}
-
-HandlePtr tempFile(const std::wstring dir)
-{
-  // maximum tries of incrementing the counter
-  const int MaxTries = 100;
-
-  // UTC time and date will be in the filename
-  const auto now = std::time(0);
-  const auto tm = std::gmtime(&now);
-
-  // "ModOrganizer-YYYYMMDDThhmmss.dmp", with a possible "-i" appended, where
-  // i can go until MaxTries
-  std::wostringstream oss;
-  oss
-    << L"ModOrganizer-"
-    << std::setw(4) << (1900 + tm->tm_year)
-    << std::setw(2) << std::setfill(L'0') << (tm->tm_mon + 1)
-    << std::setw(2) << std::setfill(L'0') << tm->tm_mday << "T"
-    << std::setw(2) << std::setfill(L'0') << tm->tm_hour
-    << std::setw(2) << std::setfill(L'0') << tm->tm_min
-    << std::setw(2) << std::setfill(L'0') << tm->tm_sec;
-
-  const std::wstring prefix = oss.str();
-  const std::wstring ext = L".dmp";
-
-  // first path to try, without counter in it
-  std::wstring path = dir + L"\\" + prefix + ext;
-
-  for (int i=0; i<MaxTries; ++i) {
-    std::wclog << L"trying file '" << path << L"'\n";
-
-    HandlePtr h (CreateFileW(
-      path.c_str(), GENERIC_WRITE, 0, nullptr,
-      CREATE_NEW, FILE_ATTRIBUTE_NORMAL, nullptr));
-
-    if (h.get() != INVALID_HANDLE_VALUE) {
-      // worked
-      return h;
-    }
-
-    const auto e = GetLastError();
-
-    if (e != ERROR_FILE_EXISTS) {
-      // probably no write access
-      std::wcerr
-        << L"failed to create dump file, " << formatSystemMessage(e) << L"\n";
-
-      return {};
-    }
-
-    // try again with "-i"
-    path = dir + L"\\" + prefix + L"-" + std::to_wstring(i + 1) + ext;
-  }
-
-  std::wcerr << L"can't create dump file, ran out of filenames\n";
-  return {};
-}
-
-HandlePtr dumpFile()
-{
-  // try the current directory
-  HandlePtr h = tempFile(L".");
-  if (h.get() != INVALID_HANDLE_VALUE) {
-    return h;
-  }
-
-  std::wclog << L"cannot write dump file in current directory\n";
-
-  // try the temp directory
-  const auto dir = tempDir();
-
-  if (!dir.empty()) {
-    h = tempFile(dir.c_str());
-    if (h.get() != INVALID_HANDLE_VALUE) {
-      return h;
-    }
-  }
-
-  return {};
-}
-
-bool createMiniDump(HANDLE process, CoreDumpTypes type)
-{
-  const DWORD pid = GetProcessId(process);
-
-  const HandlePtr file = dumpFile();
-  if (!file) {
-    std::wcerr << L"nowhere to write the dump file\n";
-    return false;
-  }
-
-  auto flags = _MINIDUMP_TYPE(
-    MiniDumpNormal |
-    MiniDumpWithHandleData |
-    MiniDumpWithUnloadedModules |
-    MiniDumpWithProcessThreadData);
-
-  if (type == CoreDumpTypes::Data) {
-    std::wclog << L"writing minidump with data\n";
-    flags = _MINIDUMP_TYPE(flags | MiniDumpWithDataSegs);
-  } else if (type ==  CoreDumpTypes::Full) {
-    std::wclog << L"writing full minidump\n";
-    flags = _MINIDUMP_TYPE(flags | MiniDumpWithFullMemory);
-  } else {
-    std::wclog << L"writing mini minidump\n";
-  }
-
-  const auto ret = MiniDumpWriteDump(
-    process, pid, file.get(), flags, nullptr, nullptr, nullptr);
-
-  if (!ret) {
-    const auto e = GetLastError();
-
-    std::wcerr
-      << L"failed to write mini dump, " << formatSystemMessage(e) << L"\n";
-
-    return false;
-  }
-
-  std::wclog << L"minidump written correctly\n";
-  return true;
-}
-
-
-bool coredump(CoreDumpTypes type)
-{
-  std::wclog << L"creating minidump for the current process\n";
-  return createMiniDump(GetCurrentProcess(), type);
-}
-
-bool coredumpOther(CoreDumpTypes type)
-{
-  std::wclog << L"creating minidump for an running process\n";
-
-  const auto pid = findOtherPid();
-  if (pid == 0) {
-    std::wcerr << L"no other process found\n";
-    return false;
-  }
-
-  std::wclog << L"found other process with pid " << pid << L"\n";
-
-  HandlePtr handle(OpenProcess(
-    PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid));
-
-  if (!handle) {
-    const auto e = GetLastError();
-
-    std::wcerr
-      << L"failed to open process " << pid << L", "
-      << formatSystemMessage(e) << L"\n";
-
-    return false;
-  }
-
-  return createMiniDump(handle.get(), type);
-}
-
-} // namespace env
-
 } // namespace MOShared
diff --git a/src/shared/util.h b/src/shared/util.h
index 46764367..7bae96f2 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -20,15 +20,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef UTIL_H
 #define UTIL_H
 
-
 #include <string>
-#include <optional>
-
-#define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-
 #include <versioninfo.h>
-#include <QUuid>
 
 class Executable;
 
@@ -51,442 +44,6 @@ std::wstring ToLower(const std::wstring &text);
 
 bool CaseInsensitiveEqual(const std::wstring &lhs, const std::wstring &rhs);
 
-
-namespace env
-{
-
-class Console
-{
-public:
-  Console();
-  ~Console();
-
-private:
-  bool m_hasConsole;
-  FILE* m_in;
-  FILE* m_out;
-  FILE* m_err;
-};
-
-
-// an application shortcut that can be either on the desktop or the start menu
-//
-class Shortcut
-{
-public:
-  // location of a shortcut
-  //
-  enum Locations
-  {
-    None = 0,
-
-    // on the desktop
-    Desktop,
-
-    // in the start menu
-    StartMenu
-  };
-
-
-  // empty shortcut
-  //
-  Shortcut();
-
-  // shortcut from an executable
-  //
-  explicit Shortcut(const Executable& exe);
-
-  // sets the name of the shortcut, shown on icons and start menu entries
-  //
-  Shortcut& name(const QString& s);
-
-  // the program to start
-  //
-  Shortcut& target(const QString& s);
-
-  // arguments to pass
-  //
-  Shortcut& arguments(const QString& s);
-
-  // shows in the status bar of explorer, for example
-  //
-  Shortcut& description(const QString& s);
-
-  // path to a binary that contains the icon and its index
-  //
-  Shortcut& icon(const QString& s, int index=0);
-
-  // "start in" option for this shortcut
-  //
-  Shortcut& workingDirectory(const QString& s);
-
-
-  // returns whether this shortcut already exists at the given location; this
-  // does not check whether the shortcut parameters are different, it merely if
-  // the .lnk file exists
-  //
-  bool exists(Locations loc) const;
-
-  // calls remove() if exists(), or add()
-  //
-  bool toggle(Locations loc);
-
-  // adds the shortcut to the given location
-  //
-  bool add(Locations loc);
-
-  // removes the shortcut from the given location
-  //
-  bool remove(Locations loc);
-
-private:
-  QString m_name;
-  QString m_target;
-  QString m_arguments;
-  QString m_description;
-  QString m_icon;
-  int m_iconIndex;
-  QString m_workingDirectory;
-
-  // returns a qCritical() logger with a prefix already logged
-  //
-  QDebug critical() const;
-
-  // returns a qDebug() logger with a prefix already logged
-  //
-  QDebug debug() const;
-
-
-  // returns the path where the shortcut file should be saved
-  //
-  QString shortcutPath(Locations loc) const;
-
-  // returns the directory where the shortcut file should be saved
-  //
-  QString shortcutDirectory(Locations loc) const;
-
-  // returns the filename of the shortcut file that should be used when saving
-  //
-  QString shortcutFilename() const;
-};
-
-
-// returns a string representation of the given location
-//
-QString toString(Shortcut::Locations loc);
-
-
-// represents one module
-//
-class Module
-{
-public:
-  explicit Module(QString path, std::size_t fileSize);
-
-  // returns the module's path
-  //
-  const QString& path() const;
-
-  // returns the module's path in lowercase and using forward slashes
-  //
-  QString displayPath() const;
-
-  // returns the size in bytes, may be 0
-  //
-  std::size_t fileSize() const;
-
-  // returns the x.x.x.x version embedded from the version info, may be empty
-  //
-  const QString& version() const;
-
-  // returns the FileVersion entry from the resource file, returns
-  // "(no version)" if not available
-  //
-  const QString& versionString() const;
-
-  // returns the build date from the version info, or the creation time of the
-  // file on the filesystem, may be empty
-  //
-  const QDateTime& timestamp() const;
-
-  // returns the md5 of the file, may be empty for system files
-  //
-  const QString& md5() const;
-
-  // converts timestamp() to a string for display, returns "(no timestamp)" if
-  // not available
-  //
-  QString timestampString() const;
-
-  // returns a string with all the above information on one line
-  //
-  QString toString() const;
-
-private:
-  // contains the information from the version resource
-  //
-  struct FileInfo
-  {
-    VS_FIXEDFILEINFO ffi;
-    QString fileDescription;
-  };
-
-  QString m_path;
-  std::size_t m_fileSize;
-  QString m_version;
-  QDateTime m_timestamp;
-  QString m_versionString;
-  QString m_md5;
-
-  // returns information from the version resource
-  //
-  FileInfo getFileInfo() const;
-
-  // uses VS_FIXEDFILEINFO to build the version string
-  //
-  QString getVersion(const VS_FIXEDFILEINFO& fi) const;
-
-  // uses the file date from VS_FIXEDFILEINFO if available, or gets the
-  // creation date on the file
-  //
-  QDateTime getTimestamp(const VS_FIXEDFILEINFO& fi) const;
-
-  // returns the md5 hash unless the path contains "\windows\"
-  //
-  QString getMD5() const;
-
-  // gets VS_FIXEDFILEINFO from the file version info buffer
-  //
-  VS_FIXEDFILEINFO getFixedFileInfo(std::byte* buffer) const;
-
-  // gets FileVersion from the file version info buffer
-  //
-  QString getFileDescription(std::byte* buffer) const;
-};
-
-
-// a variety of information on windows
-//
-class WindowsInfo
-{
-public:
-  struct Version
-  {
-    DWORD major=0, minor=0, build=0;
-
-    QString toString() const
-    {
-      return QString("%1.%2.%3").arg(major).arg(minor).arg(build);
-    }
-
-    friend bool operator==(const Version& a, const Version& b)
-    {
-      return
-        a.major == b.major &&
-        a.minor == b.minor &&
-        a.build == b.build;
-    }
-
-    friend bool operator!=(const Version& a, const Version& b)
-    {
-      return !(a == b);
-    }
-  };
-
-  struct Release
-  {
-    // the BuildLab entry from the registry, may be empty
-    QString buildLab;
-
-    // product name such as "Windows 10 Pro", may not be in English, may be
-    // empty
-    QString productName;
-
-    // release ID such as 1809, may be mepty
-    QString ID;
-
-    // some sub-build number, undocumented, may be empty
-    DWORD UBR;
-
-    Release()
-      : UBR(0)
-    {
-    }
-  };
-
-
-  WindowsInfo();
-
-  // tries to guess whether this process is running in compatibility mode
-  //
-  bool compatibilityMode() const;
-
-  // returns the Windows version, may not correspond to the actual version
-  // if the process is running in compatibility mode
-  //
-  const Version& reportedVersion() const;
-
-  // tries to guess the real Windows version that's running, can be empty
-  //
-  const Version& realVersion() const;
-
-  // various information about the current release
-  //
-  const Release& release() const;
-
-  // whether this process is running as administrator, may be empty if the
-  // information is not available
-  std::optional<bool> isElevated() const;
-
-  // returns a string with all the above information on one line
-  //
-  QString toString() const;
-
-private:
-  Version m_reported, m_real;
-  Release m_release;
-  std::optional<bool> m_elevated;
-
-  // uses RtlGetVersion() to get the version number as reported by Windows
-  //
-  Version getReportedVersion(HINSTANCE ntdll) const;
-
-  // uses RtlGetNtVersionNumbers() to get the real version number
-  //
-  Version getRealVersion(HINSTANCE ntdll) const;
-
-  // gets various information from the registry
-  //
-  Release getRelease() const;
-
-  // gets whether the process is elevated
-  //
-  std::optional<bool> getElevated() const;
-};
-
-
-// represents a security product, such as an antivirus or a firewall
-//
-class SecurityProduct
-{
-public:
-  SecurityProduct(
-    QUuid guid, QString name, int provider,
-    bool active, bool upToDate);
-
-  // display name of the product
-  //
-  const QString& name() const;
-
-  // a bunch of _WSC_SECURITY_PROVIDER flags
-  //
-  int provider() const;
-
-  // whether the product is active
-  //
-  bool active() const;
-
-  // whether its definitions are up-to-date
-  //
-  bool upToDate() const;
-
-  // string representation of the above
-  //
-  QString toString() const;
-
-private:
-  QUuid m_guid;
-  QString m_name;
-  int m_provider;
-  bool m_active;
-  bool m_upToDate;
-
-  QString providerToString() const;
-};
-
-
-class Metrics
-{
-public:
-  struct Display
-  {
-    int resX=0, resY=0, dpi=0;
-    bool primary=false;
-    int refreshRate = 0;
-    QString monitor, adapter;
-
-    QString toString() const;
-  };
-
-  Metrics();
-
-  const std::vector<Display>& displays() const;
-
-private:
-  std::vector<Display> m_displays;
-};
-
-
-// represents the process's environment
-//
-class Environment
-{
-public:
-  Environment();
-
-  // list of loaded modules in the current process
-  //
-  const std::vector<Module>& loadedModules() const;
-
-  // information about the operating system
-  //
-  const WindowsInfo& windowsInfo() const;
-
-  // information about the installed security products
-  //
-  const std::vector<SecurityProduct>& securityProducts() const;
-
-  // information about displays
-  //
-  const Metrics& metrics() const;
-
-  // logs the environment
-  //
-  void dump() const;
-
-private:
-  std::vector<Module> m_modules;
-  WindowsInfo m_windows;
-  std::vector<SecurityProduct> m_security;
-  Metrics m_metrics;
-
-  std::vector<Module> getLoadedModules() const;
-  std::vector<SecurityProduct> getSecurityProducts() const;
-
-  std::vector<SecurityProduct> getSecurityProductsFromWMI() const;
-  std::optional<SecurityProduct> getWindowsFirewall() const;
-};
-
-
-enum class CoreDumpTypes
-{
-  Mini = 1,
-  Data,
-  Full
-};
-
-// creates a minidump file for the given process
-//
-bool coredump(CoreDumpTypes type);
-
-// finds another process with the same name as this one and creates a minidump
-// file for it
-//
-bool coredumpOther(CoreDumpTypes type);
-
-} // namespace env
-
-
 MOBase::VersionInfo createVersionInfo();
 
 } // namespace MOShared
-- 
cgit v1.3.1


From 6b5c9675ae1e8b343dcbc9192d43c63e482a30bd Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 20 Jul 2019 08:43:46 -0400
Subject: moved SettingsTab out of Settings split general tab

---
 src/CMakeLists.txt            |   3 +
 src/settings.cpp              | 204 ++++---------------------------
 src/settings.h                |  65 ++++------
 src/settingsdialog.cpp        | 105 ----------------
 src/settingsdialog.h          |  63 +++-------
 src/settingsdialoggeneral.cpp | 274 ++++++++++++++++++++++++++++++++++++++++++
 src/settingsdialoggeneral.h   |  53 ++++++++
 7 files changed, 392 insertions(+), 375 deletions(-)
 create mode 100644 src/settingsdialoggeneral.cpp
 create mode 100644 src/settingsdialoggeneral.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9785dc3d..29c419b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,6 +37,7 @@ SET(organizer_SRCS
     spawn.cpp
     singleinstance.cpp
     settingsdialog.cpp
+	settingsdialoggeneral.cpp
     settings.cpp
     selfupdater.cpp
     selectiondialog.cpp
@@ -151,6 +152,7 @@ SET(organizer_HDRS
     spawn.h
     singleinstance.h
     settingsdialog.h
+	settingsdialoggeneral.h
     settings.h
     selfupdater.h
     selectiondialog.h
@@ -431,6 +433,7 @@ set(profiles
 set(settings
 	settings
 	settingsdialog
+	settingsdialoggeneral
 )
 
 set(utilities
diff --git a/src/settings.cpp b/src/settings.cpp
index 5ad066b2..0911b155 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -22,6 +22,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "pluginsetting.h"
 #include "serverinfo.h"
 #include "settingsdialog.h"
+#include "settingsdialoggeneral.h"
 #include "versioninfo.h"
 #include "appconfig.h"
 #include "organizercore.h"
@@ -81,6 +82,23 @@ private:
 };
 
 
+SettingsTab::SettingsTab(Settings *m_parent, SettingsDialog &m_dialog)
+  : m_parent(m_parent)
+  , m_Settings(m_parent->settingsRef())
+  , m_dialog(m_dialog)
+  , ui(m_dialog.ui)
+{
+}
+
+SettingsTab::~SettingsTab()
+{}
+
+QWidget* SettingsTab::parentWidget()
+{
+  return &m_dialog;
+}
+
+
 Settings *Settings::s_Instance = nullptr;
 
 
@@ -663,63 +681,9 @@ void Settings::writePluginBlacklist()
   m_Settings.endArray();
 }
 
-void Settings::addLanguages(QComboBox *languageBox)
-{
-  std::vector<std::pair<QString, QString>> languages;
-
-  QDirIterator langIter(QCoreApplication::applicationDirPath() + "/translations", QDir::Files);
-  QString pattern = ToQString(AppConfig::translationPrefix()) +  "_([a-z]{2,3}(_[A-Z]{2,2})?).qm";
-  QRegExp exp(pattern);
-  while (langIter.hasNext()) {
-    langIter.next();
-    QString file = langIter.fileName();
-    if (exp.exactMatch(file)) {
-      QString languageCode = exp.cap(1);
-      QLocale locale(languageCode);
-      QString languageString = QString("%1 (%2)").arg(locale.nativeLanguageName()).arg(locale.nativeCountryName());  //QLocale::languageToString(locale.language());
-      if (locale.language() == QLocale::Chinese) {
-        if (languageCode == "zh_TW") {
-          languageString = "Chinese (traditional)";
-        } else {
-          languageString = "Chinese (simplified)";
-        }
-      }
-      languages.push_back(std::make_pair(QString("%1").arg(languageString), exp.cap(1)));
-      //languageBox->addItem(QString("%1").arg(languageString), exp.cap(1));
-    }
-  }
-  if (!languageBox->findText("English")) {
-    languages.push_back(std::make_pair(QString("English"), QString("en_US")));
-    //languageBox->addItem("English", "en_US");
-  }
-  std::sort(languages.begin(), languages.end());
-  for (const auto &lang : languages) {
-    languageBox->addItem(lang.first, lang.second);
-  }
-}
-
-void Settings::addStyles(QComboBox *styleBox)
-{
-  styleBox->addItem("None", "");
-  styleBox->addItem("Fusion", "Fusion");
-
-  QDirIterator langIter(QCoreApplication::applicationDirPath() + "/" + ToQString(AppConfig::stylesheetsPath()), QStringList("*.qss"), QDir::Files);
-  while (langIter.hasNext()) {
-    langIter.next();
-    QString style = langIter.fileName();
-    styleBox->addItem(style, style);
-  }
-}
-
-void Settings::resetDialogs()
-{
-  QuestionBoxMemory::resetDialogs();
-}
-
 void Settings::query(PluginContainer *pluginContainer, QWidget *parent)
 {
   SettingsDialog dialog(pluginContainer, this, parent);
-  connect(&dialog, SIGNAL(resetDialogs()), this, SLOT(resetDialogs()));
 
   std::vector<std::unique_ptr<SettingsTab>> tabs;
 
@@ -787,128 +751,6 @@ void Settings::query(PluginContainer *pluginContainer, QWidget *parent)
 
 }
 
-Settings::SettingsTab::SettingsTab(Settings *m_parent, SettingsDialog &m_dialog)
-  : m_parent(m_parent)
-  , m_Settings(m_parent->m_Settings)
-  , m_dialog(m_dialog)
-{
-}
-
-Settings::SettingsTab::~SettingsTab()
-{}
-
-Settings::GeneralTab::GeneralTab(Settings *m_parent, SettingsDialog &m_dialog)
-  : Settings::SettingsTab(m_parent, m_dialog)
-  , m_languageBox(m_dialog.findChild<QComboBox *>("languageBox"))
-  , m_styleBox(m_dialog.findChild<QComboBox *>("styleBox"))
-  , m_compactBox(m_dialog.findChild<QCheckBox *>("compactBox"))
-  , m_showMetaBox(m_dialog.findChild<QCheckBox *>("showMetaBox"))
-  , m_usePrereleaseBox(m_dialog.findChild<QCheckBox *>("usePrereleaseBox"))
-  , m_overwritingBtn(m_dialog.findChild<QPushButton *>("overwritingBtn"))
-  , m_overwrittenBtn(m_dialog.findChild<QPushButton *>("overwrittenBtn"))
-  , m_overwritingArchiveBtn(m_dialog.findChild<QPushButton *>("overwritingArchiveBtn"))
-  , m_overwrittenArchiveBtn(m_dialog.findChild<QPushButton *>("overwrittenArchiveBtn"))
-  , m_containsBtn(m_dialog.findChild<QPushButton *>("containsBtn"))
-  , m_containedBtn(m_dialog.findChild<QPushButton *>("containedBtn"))
-  , m_colorSeparatorsBox(m_dialog.findChild<QCheckBox *>("colorSeparatorsBox"))
-{
-  // FIXME I think 'addLanguages' lives in here not in parent
-  m_parent->addLanguages(m_languageBox);
-  {
-    QString languageCode = m_parent->language();
-    int currentID        = m_languageBox->findData(languageCode);
-    // I made a mess. :( Most languages are stored with only the iso country
-    // code (2 characters like "de") but chinese
-    // with the exact language variant (zh_TW) so I have to search for both
-    // variants
-    if (currentID == -1) {
-      currentID = m_languageBox->findData(languageCode.mid(0, 2));
-    }
-    if (currentID != -1) {
-      m_languageBox->setCurrentIndex(currentID);
-    }
-  }
-
-  // FIXME I think addStyles lives in here not in parent
-  m_parent->addStyles(m_styleBox);
-  {
-    int currentID = m_styleBox->findData(
-        m_Settings.value("Settings/style", "").toString());
-    if (currentID != -1) {
-      m_styleBox->setCurrentIndex(currentID);
-    }
-  }
-  /* verision using palette only works with fusion theme for some stupid reason...
-  m_overwritingBtn->setAutoFillBackground(true);
-  m_overwrittenBtn->setAutoFillBackground(true);
-  m_containsBtn->setAutoFillBackground(true);
-  m_containedBtn->setAutoFillBackground(true);
-  m_overwritingBtn->setPalette(QPalette(m_parent->modlistOverwritingLooseColor()));
-  m_overwrittenBtn->setPalette(QPalette(m_parent->modlistOverwrittenLooseColor()));
-  m_containsBtn->setPalette(QPalette(m_parent->modlistContainsPluginColor()));
-  m_containedBtn->setPalette(QPalette(m_parent->pluginListContainedColor()));
-  QPalette palette1 = m_overwritingBtn->palette();
-  QPalette palette2 = m_overwrittenBtn->palette();
-  QPalette palette3 = m_containsBtn->palette();
-  QPalette palette4 = m_containedBtn->palette();
-  palette1.setColor(QPalette::Background, m_parent->modlistOverwritingLooseColor());
-  palette2.setColor(QPalette::Background, m_parent->modlistOverwrittenLooseColor());
-  palette3.setColor(QPalette::Background, m_parent->modlistContainsPluginColor());
-  palette4.setColor(QPalette::Background, m_parent->pluginListContainedColor());
-  m_overwritingBtn->setPalette(palette1);
-  m_overwrittenBtn->setPalette(palette2);
-  m_containsBtn->setPalette(palette3);
-  m_containedBtn->setPalette(palette4);
-  */
-
-  //version with stylesheet
-  m_dialog.setButtonColor(m_overwritingBtn, m_parent->modlistOverwritingLooseColor());
-  m_dialog.setButtonColor(m_overwrittenBtn, m_parent->modlistOverwrittenLooseColor());
-  m_dialog.setButtonColor(m_overwritingArchiveBtn, m_parent->modlistOverwritingArchiveColor());
-  m_dialog.setButtonColor(m_overwrittenArchiveBtn, m_parent->modlistOverwrittenArchiveColor());
-  m_dialog.setButtonColor(m_containsBtn, m_parent->modlistContainsPluginColor());
-  m_dialog.setButtonColor(m_containedBtn, m_parent->pluginListContainedColor());
-
-  m_dialog.setOverwritingColor(m_parent->modlistOverwritingLooseColor());
-  m_dialog.setOverwrittenColor(m_parent->modlistOverwrittenLooseColor());
-  m_dialog.setOverwritingArchiveColor(m_parent->modlistOverwritingArchiveColor());
-  m_dialog.setOverwrittenArchiveColor(m_parent->modlistOverwrittenArchiveColor());
-  m_dialog.setContainsColor(m_parent->modlistContainsPluginColor());
-  m_dialog.setContainedColor(m_parent->pluginListContainedColor());
-
-  m_compactBox->setChecked(m_parent->compactDownloads());
-  m_showMetaBox->setChecked(m_parent->metaDownloads());
-  m_usePrereleaseBox->setChecked(m_parent->usePrereleases());
-  m_colorSeparatorsBox->setChecked(m_parent->colorSeparatorScrollbar());
-}
-
-void Settings::GeneralTab::update()
-{
-  QString oldLanguage = m_parent->language();
-  QString newLanguage = m_languageBox->itemData(m_languageBox->currentIndex()).toString();
-  if (newLanguage != oldLanguage) {
-    m_Settings.setValue("Settings/language", newLanguage);
-    emit m_parent->languageChanged(newLanguage);
-  }
-
-  QString oldStyle = m_Settings.value("Settings/style", "").toString();
-  QString newStyle = m_styleBox->itemData(m_styleBox->currentIndex()).toString();
-  if (oldStyle != newStyle) {
-    m_Settings.setValue("Settings/style", newStyle);
-    emit m_parent->styleChanged(newStyle);
-  }
-
-  m_Settings.setValue("Settings/overwritingLooseFilesColor", m_dialog.getOverwritingColor());
-  m_Settings.setValue("Settings/overwrittenLooseFilesColor", m_dialog.getOverwrittenColor());
-  m_Settings.setValue("Settings/overwritingArchiveFilesColor", m_dialog.getOverwritingArchiveColor());
-  m_Settings.setValue("Settings/overwrittenArchiveFilesColor", m_dialog.getOverwrittenArchiveColor());
-  m_Settings.setValue("Settings/containsPluginColor", m_dialog.getContainsColor());
-  m_Settings.setValue("Settings/containedColor", m_dialog.getContainedColor());
-  m_Settings.setValue("Settings/compact_downloads", m_compactBox->isChecked());
-  m_Settings.setValue("Settings/meta_downloads", m_showMetaBox->isChecked());
-  m_Settings.setValue("Settings/use_prereleases", m_usePrereleaseBox->isChecked());
-  m_Settings.setValue("Settings/colorSeparatorScrollbars", m_colorSeparatorsBox->isChecked());
-}
 
 Settings::PathsTab::PathsTab(Settings *parent, SettingsDialog &dialog)
   : SettingsTab(parent, dialog)
@@ -991,7 +833,7 @@ void Settings::PathsTab::update()
 }
 
 Settings::DiagnosticsTab::DiagnosticsTab(Settings *m_parent, SettingsDialog &m_dialog)
-  : Settings::SettingsTab(m_parent, m_dialog)
+  : SettingsTab(m_parent, m_dialog)
   , m_logLevelBox(m_dialog.findChild<QComboBox *>("logLevelBox"))
   , m_dumpsTypeBox(m_dialog.findChild<QComboBox *>("dumpsTypeBox"))
   , m_dumpsMaxEdit(m_dialog.findChild<QSpinBox *>("dumpsMaxEdit"))
@@ -1036,7 +878,7 @@ void Settings::DiagnosticsTab::setLevelsBox()
 }
 
 Settings::NexusTab::NexusTab(Settings *parent, SettingsDialog &dialog)
-  : Settings::SettingsTab(parent, dialog)
+  : SettingsTab(parent, dialog)
   , m_offlineBox(dialog.findChild<QCheckBox *>("offlineBox"))
   , m_proxyBox(dialog.findChild<QCheckBox *>("proxyBox"))
   , m_knownServersList(dialog.findChild<QListWidget *>("knownServersList"))
@@ -1114,7 +956,7 @@ void Settings::NexusTab::update()
 }
 
 Settings::SteamTab::SteamTab(Settings *m_parent, SettingsDialog &m_dialog)
-  : Settings::SettingsTab(m_parent, m_dialog)
+  : SettingsTab(m_parent, m_dialog)
   , m_steamUserEdit(m_dialog.findChild<QLineEdit *>("steamUserEdit"))
   , m_steamPassEdit(m_dialog.findChild<QLineEdit *>("steamPassEdit"))
 {
@@ -1134,7 +976,7 @@ void Settings::SteamTab::update()
 }
 
 Settings::PluginsTab::PluginsTab(Settings *m_parent, SettingsDialog &m_dialog)
-  : Settings::SettingsTab(m_parent, m_dialog)
+  : SettingsTab(m_parent, m_dialog)
   , m_pluginsList(m_dialog.findChild<QListWidget *>("pluginsList"))
   , m_pluginBlacklistList(m_dialog.findChild<QListWidget *>("pluginBlacklist"))
 {
@@ -1181,7 +1023,7 @@ void Settings::PluginsTab::update()
 
 Settings::WorkaroundsTab::WorkaroundsTab(Settings *m_parent,
                                          SettingsDialog &m_dialog)
-  : Settings::SettingsTab(m_parent, m_dialog)
+  : SettingsTab(m_parent, m_dialog)
   , m_appIDEdit(m_dialog.findChild<QLineEdit *>("appIDEdit"))
   , m_mechanismBox(m_dialog.findChild<QComboBox *>("mechanismBox"))
   , m_hideUncheckedBox(m_dialog.findChild<QCheckBox *>("hideUncheckedBox"))
diff --git a/src/settings.h b/src/settings.h
index c66eb94c..e88080ba 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -55,8 +55,30 @@ namespace MOBase {
   class IPluginGame;
 }
 
+namespace Ui {
+  class SettingsDialog;
+}
+
 class SettingsDialog;
 class PluginContainer;
+class Settings;
+
+class SettingsTab
+{
+public:
+  SettingsTab(Settings *m_parent, SettingsDialog &m_dialog);
+  virtual ~SettingsTab();
+
+  virtual void update() = 0;
+
+protected:
+  Settings *m_parent;
+  QSettings &m_Settings;
+  SettingsDialog &m_dialog;
+  Ui::SettingsDialog* ui;
+
+  QWidget* parentWidget();
+};
 
 /**
  * manages the settings for Mod Organizer. The settings are not cached
@@ -404,6 +426,8 @@ public:
    */
   bool colorSeparatorScrollbar() const;
 
+  QSettings& settingsRef() { return m_Settings; }
+
 public slots:
 
   void managedGameChanged(MOBase::IPluginGame const *gamePlugin);
@@ -414,49 +438,10 @@ private:
   static bool obfuscate(const QString key, const QString data);
   static QString deObfuscate(const QString key);
 
-  void addLanguages(QComboBox *languageBox);
-  void addStyles(QComboBox *styleBox);
   void readPluginBlacklist();
   void writePluginBlacklist();
   QString getConfigurablePath(const QString &key, const QString &def, bool resolve) const;
 
-  class SettingsTab
-  {
-  public:
-    SettingsTab(Settings *m_parent, SettingsDialog &m_dialog);
-    virtual ~SettingsTab();
-
-    virtual void update() = 0;
-
-  protected:
-    Settings *m_parent;
-    QSettings &m_Settings;
-    SettingsDialog &m_dialog;
-
-  };
-
-  /** Display/store the configuration in the 'general' tab of the settings dialogue */
-  class GeneralTab : public SettingsTab
-  {
-  public:
-    GeneralTab(Settings *m_parent, SettingsDialog &m_dialog);
-
-    void update();
-
-  private:
-    QComboBox *m_languageBox;
-    QComboBox *m_styleBox;
-    QCheckBox *m_compactBox;
-    QCheckBox *m_showMetaBox;
-    QCheckBox *m_usePrereleaseBox;
-    QPushButton *m_overwritingBtn;
-    QPushButton *m_overwrittenBtn;
-    QPushButton *m_overwritingArchiveBtn;
-    QPushButton *m_overwrittenArchiveBtn;
-    QPushButton *m_containsBtn;
-    QPushButton *m_containedBtn;
-    QCheckBox *m_colorSeparatorsBox;
-  };
 
   class PathsTab : public SettingsTab
   {
@@ -554,8 +539,6 @@ private:
 
 private slots:
 
-  void resetDialogs();
-
 signals:
 
   void languageChanged(const QString &newLanguage);
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 0dae31ac..f922cfb9 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -131,23 +131,6 @@ QString SettingsDialog::getColoredButtonStyleSheet() const
     "}");
 }
 
-void SettingsDialog::setButtonColor(QPushButton *button, const QColor &color)
-{
-  button->setStyleSheet(
-    QString("QPushButton {"
-      "background-color: rgba(%1, %2, %3, %4);"
-      "color: %5;"
-      "border: 1px solid;"
-      "padding: 3px;"
-      "}")
-    .arg(color.red())
-    .arg(color.green())
-    .arg(color.blue())
-    .arg(color.alpha())
-    .arg(Settings::getIdealTextColor(color).name())
-    );
-};
-
 void SettingsDialog::accept()
 {
   QString newModPath = ui->modDirEdit->text();
@@ -181,14 +164,6 @@ bool SettingsDialog::getApiKeyChanged()
   return m_keyChanged;
 }
 
-void SettingsDialog::on_categoriesBtn_clicked()
-{
-  CategoriesDialog dialog(this);
-  if (dialog.exec() == QDialog::Accepted) {
-    dialog.commitChanges();
-  }
-}
-
 void SettingsDialog::on_execBlacklistBtn_clicked()
 {
   bool ok = false;
@@ -299,86 +274,6 @@ void SettingsDialog::on_browseGameDirBtn_clicked()
   }
 }
 
-void SettingsDialog::on_containsBtn_clicked()
-{
-  QColor result = QColorDialog::getColor(m_ContainsColor, this, "Color Picker: Mod contains selected plugin", QColorDialog::ShowAlphaChannel);
-  if (result.isValid()) {
-    m_ContainsColor = result;
-    setButtonColor(ui->containsBtn, result);
-  }
-}
-
-void SettingsDialog::on_containedBtn_clicked()
-{
-  QColor result = QColorDialog::getColor(m_ContainedColor, this, "ColorPicker: Plugin is Contained in selected Mod", QColorDialog::ShowAlphaChannel);
-  if (result.isValid()) {
-    m_ContainedColor = result;
-    setButtonColor(ui->containedBtn, result);
-  }
-}
-
-void SettingsDialog::on_overwrittenBtn_clicked()
-{
-  QColor result = QColorDialog::getColor(m_OverwrittenColor, this, "ColorPicker: Is overwritten (loose files)", QColorDialog::ShowAlphaChannel);
-  if (result.isValid()) {
-    m_OverwrittenColor = result;
-    setButtonColor(ui->overwrittenBtn, result);
-  }
-}
-
-void SettingsDialog::on_overwritingBtn_clicked()
-{
-  QColor result = QColorDialog::getColor(m_OverwritingColor, this, "ColorPicker: Is overwriting (loose files)", QColorDialog::ShowAlphaChannel);
-  if (result.isValid()) {
-    m_OverwritingColor = result;
-    setButtonColor(ui->overwritingBtn, result);
-  }
-}
-
-void SettingsDialog::on_overwrittenArchiveBtn_clicked()
-{
-  QColor result = QColorDialog::getColor(m_OverwrittenArchiveColor, this, "ColorPicker: Is overwritten (archive files)", QColorDialog::ShowAlphaChannel);
-  if (result.isValid()) {
-    m_OverwrittenArchiveColor = result;
-    setButtonColor(ui->overwrittenArchiveBtn, result);
-  }
-}
-
-void SettingsDialog::on_overwritingArchiveBtn_clicked()
-{
-  QColor result = QColorDialog::getColor(m_OverwritingArchiveColor, this, "ColorPicker: Is overwriting (archive files)", QColorDialog::ShowAlphaChannel);
-  if (result.isValid()) {
-    m_OverwritingArchiveColor = result;
-    setButtonColor(ui->overwritingArchiveBtn, result);
-  }
-}
-
-void SettingsDialog::on_resetColorsBtn_clicked()
-{
-  m_OverwritingColor = QColor(255, 0, 0, 64);
-  m_OverwrittenColor = QColor(0, 255, 0, 64);
-  m_OverwritingArchiveColor = QColor(255, 0, 255, 64);
-  m_OverwrittenArchiveColor = QColor(0, 255, 255, 64);
-  m_ContainsColor = QColor(0, 0, 255, 64);
-  m_ContainedColor = QColor(0, 0, 255, 64);
-
-  setButtonColor(ui->overwritingBtn, m_OverwritingColor);
-  setButtonColor(ui->overwrittenBtn, m_OverwrittenColor);
-  setButtonColor(ui->overwritingArchiveBtn, m_OverwritingArchiveColor);
-  setButtonColor(ui->overwrittenArchiveBtn, m_OverwrittenArchiveColor);
-  setButtonColor(ui->containsBtn, m_ContainsColor);
-  setButtonColor(ui->containedBtn, m_ContainedColor);
-}
-
-void SettingsDialog::on_resetDialogsButton_clicked()
-{
-  if (QMessageBox::question(this, tr("Confirm?"),
-          tr("This will make all dialogs show up again where you checked the \"Remember selection\"-box. Continue?"),
-          QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
-    emit resetDialogs();
-  }
-}
-
 void SettingsDialog::on_nexusConnect_clicked()
 {
   if (m_nexusLogin && m_nexusLogin->isActive()) {
diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index c5f487fd..01a0afa2 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -54,7 +54,7 @@ public:
   */
   QString getColoredButtonStyleSheet() const;
 
-  void setButtonColor(QPushButton *button, const QColor &color);
+  Ui::SettingsDialog *ui;
 
 public slots:
 
@@ -62,7 +62,6 @@ public slots:
 
 signals:
 
-  void resetDialogs();
   void retryApiConnection();
 
 private:
@@ -71,73 +70,41 @@ private:
   void normalizePath(QLineEdit *lineEdit);
 
 public:
-
-  QColor getOverwritingColor() { return m_OverwritingColor; }
-  QColor getOverwrittenColor() { return m_OverwrittenColor; }
-  QColor getOverwritingArchiveColor() { return m_OverwritingArchiveColor; }
-  QColor getOverwrittenArchiveColor() { return m_OverwrittenArchiveColor; }
-  QColor getContainsColor() { return m_ContainsColor; }
-  QColor getContainedColor() { return m_ContainedColor; }
   QString getExecutableBlacklist() { return m_ExecutableBlacklist; }
+  void setExecutableBlacklist(QString blacklist) { m_ExecutableBlacklist = blacklist; }
   bool getResetGeometries();
   bool getApiKeyChanged();
 
-  void setOverwritingColor(QColor col) { m_OverwritingColor = col; }
-  void setOverwrittenColor(QColor col) { m_OverwrittenColor = col; }
-  void setOverwritingArchiveColor(QColor col) { m_OverwritingArchiveColor = col; }
-  void setOverwrittenArchiveColor(QColor col) { m_OverwrittenArchiveColor = col; }
-  void setContainsColor(QColor col) { m_ContainsColor = col; }
-  void setContainedColor(QColor col) { m_ContainedColor = col; }
-  void setExecutableBlacklist(QString blacklist) { m_ExecutableBlacklist = blacklist; }
-
-
 private slots:
-  void on_categoriesBtn_clicked();
-  void on_execBlacklistBtn_clicked();
-  void on_bsaDateBtn_clicked();
-  void on_browseDownloadDirBtn_clicked();
-  void on_browseModDirBtn_clicked();
-  void on_browseCacheDirBtn_clicked();
-  void on_resetDialogsButton_clicked();
-  void on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
   void on_associateButton_clicked();
-  void on_clearCacheButton_clicked();
-  void on_nexusDisconnect_clicked();
+  void on_baseDirEdit_editingFinished();
   void on_browseBaseDirBtn_clicked();
+  void on_browseCacheDirBtn_clicked();
+  void on_browseDownloadDirBtn_clicked();
+  void on_browseGameDirBtn_clicked();
+  void on_browseModDirBtn_clicked();
   void on_browseOverwriteDirBtn_clicked();
   void on_browseProfilesDirBtn_clicked();
-  void on_browseGameDirBtn_clicked();
-  void on_overwritingBtn_clicked();
-  void on_overwrittenBtn_clicked();
-  void on_overwritingArchiveBtn_clicked();
-  void on_overwrittenArchiveBtn_clicked();
-  void on_containsBtn_clicked();
-  void on_containedBtn_clicked();
-  void on_resetColorsBtn_clicked();
-  void on_baseDirEdit_editingFinished();
+  void on_bsaDateBtn_clicked();
+  void on_cacheDirEdit_editingFinished();
+  void on_clearCacheButton_clicked();
   void on_downloadDirEdit_editingFinished();
+  void on_execBlacklistBtn_clicked();
   void on_modDirEdit_editingFinished();
-  void on_cacheDirEdit_editingFinished();
-  void on_profilesDirEdit_editingFinished();
-  void on_overwriteDirEdit_editingFinished();
   void on_nexusConnect_clicked();
+  void on_nexusDisconnect_clicked();
   void on_nexusManualKey_clicked();
+  void on_overwriteDirEdit_editingFinished();
+  void on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
+  void on_profilesDirEdit_editingFinished();
   void on_resetGeometryBtn_clicked();
 
   void deleteBlacklistItem();
 
 private:
-  Ui::SettingsDialog *ui;
   Settings* m_settings;
   PluginContainer *m_PluginContainer;
 
-  QColor m_OverwritingColor;
-  QColor m_OverwrittenColor;
-  QColor m_OverwritingArchiveColor;
-  QColor m_OverwrittenArchiveColor;
-  QColor m_ContainsColor;
-  QColor m_ContainedColor;
-
   bool m_GeometriesReset;
   bool m_keyChanged;
 
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
new file mode 100644
index 00000000..b22b04fd
--- /dev/null
+++ b/src/settingsdialoggeneral.cpp
@@ -0,0 +1,274 @@
+#include "settingsdialoggeneral.h"
+#include "ui_settingsdialog.h"
+#include "appconfig.h"
+#include "categoriesdialog.h"
+#include <questionboxmemory.h>
+
+using MOBase::QuestionBoxMemory;
+
+GeneralTab::GeneralTab(Settings *m_parent, SettingsDialog &m_dialog)
+  : SettingsTab(m_parent, m_dialog)
+{
+  addLanguages();
+  {
+    QString languageCode = m_parent->language();
+    int currentID        = ui->languageBox->findData(languageCode);
+    // I made a mess. :( Most languages are stored with only the iso country
+    // code (2 characters like "de") but chinese
+    // with the exact language variant (zh_TW) so I have to search for both
+    // variants
+    if (currentID == -1) {
+      currentID = ui->languageBox->findData(languageCode.mid(0, 2));
+    }
+    if (currentID != -1) {
+      ui->languageBox->setCurrentIndex(currentID);
+    }
+  }
+
+  addStyles();
+  {
+    int currentID = ui->styleBox->findData(
+      m_Settings.value("Settings/style", "").toString());
+    if (currentID != -1) {
+      ui->styleBox->setCurrentIndex(currentID);
+    }
+  }
+  /* verision using palette only works with fusion theme for some stupid reason...
+  m_overwritingBtn->setAutoFillBackground(true);
+  m_overwrittenBtn->setAutoFillBackground(true);
+  m_containsBtn->setAutoFillBackground(true);
+  m_containedBtn->setAutoFillBackground(true);
+  m_overwritingBtn->setPalette(QPalette(m_parent->modlistOverwritingLooseColor()));
+  m_overwrittenBtn->setPalette(QPalette(m_parent->modlistOverwrittenLooseColor()));
+  m_containsBtn->setPalette(QPalette(m_parent->modlistContainsPluginColor()));
+  m_containedBtn->setPalette(QPalette(m_parent->pluginListContainedColor()));
+  QPalette palette1 = m_overwritingBtn->palette();
+  QPalette palette2 = m_overwrittenBtn->palette();
+  QPalette palette3 = m_containsBtn->palette();
+  QPalette palette4 = m_containedBtn->palette();
+  palette1.setColor(QPalette::Background, m_parent->modlistOverwritingLooseColor());
+  palette2.setColor(QPalette::Background, m_parent->modlistOverwrittenLooseColor());
+  palette3.setColor(QPalette::Background, m_parent->modlistContainsPluginColor());
+  palette4.setColor(QPalette::Background, m_parent->pluginListContainedColor());
+  m_overwritingBtn->setPalette(palette1);
+  m_overwrittenBtn->setPalette(palette2);
+  m_containsBtn->setPalette(palette3);
+  m_containedBtn->setPalette(palette4);
+  */
+
+  //version with stylesheet
+  setButtonColor(ui->overwritingBtn, m_parent->modlistOverwritingLooseColor());
+  setButtonColor(ui->overwrittenBtn, m_parent->modlistOverwrittenLooseColor());
+  setButtonColor(ui->overwritingArchiveBtn, m_parent->modlistOverwritingArchiveColor());
+  setButtonColor(ui->overwrittenArchiveBtn, m_parent->modlistOverwrittenArchiveColor());
+  setButtonColor(ui->containsBtn, m_parent->modlistContainsPluginColor());
+  setButtonColor(ui->containedBtn, m_parent->pluginListContainedColor());
+
+  setOverwritingColor(m_parent->modlistOverwritingLooseColor());
+  setOverwrittenColor(m_parent->modlistOverwrittenLooseColor());
+  setOverwritingArchiveColor(m_parent->modlistOverwritingArchiveColor());
+  setOverwrittenArchiveColor(m_parent->modlistOverwrittenArchiveColor());
+  setContainsColor(m_parent->modlistContainsPluginColor());
+  setContainedColor(m_parent->pluginListContainedColor());
+
+  ui->compactBox->setChecked(m_parent->compactDownloads());
+  ui->showMetaBox->setChecked(m_parent->metaDownloads());
+  ui->usePrereleaseBox->setChecked(m_parent->usePrereleases());
+  ui->colorSeparatorsBox->setChecked(m_parent->colorSeparatorScrollbar());
+
+  QObject::connect(ui->overwritingArchiveBtn, &QPushButton::clicked, [&]{ on_overwritingArchiveBtn_clicked(); });
+  QObject::connect(ui->overwritingBtn, &QPushButton::clicked, [&]{ on_overwritingBtn_clicked(); });
+  QObject::connect(ui->overwrittenArchiveBtn, &QPushButton::clicked, [&]{ on_overwrittenArchiveBtn_clicked(); });
+  QObject::connect(ui->overwrittenBtn, &QPushButton::clicked, [&]{ on_overwrittenBtn_clicked(); });
+  QObject::connect(ui->containedBtn, &QPushButton::clicked, [&]{ on_containedBtn_clicked(); });
+  QObject::connect(ui->containsBtn, &QPushButton::clicked, [&]{ on_containsBtn_clicked(); });
+  QObject::connect(ui->categoriesBtn, &QPushButton::clicked, [&]{ on_categoriesBtn_clicked(); });
+  QObject::connect(ui->resetColorsBtn, &QPushButton::clicked, [&]{ on_resetColorsBtn_clicked(); });
+  QObject::connect(ui->resetDialogsButton, &QPushButton::clicked, [&]{ on_resetDialogsButton_clicked(); });
+}
+
+void GeneralTab::update()
+{
+  QString oldLanguage = m_parent->language();
+  QString newLanguage = ui->languageBox->itemData(ui->languageBox->currentIndex()).toString();
+  if (newLanguage != oldLanguage) {
+    m_Settings.setValue("Settings/language", newLanguage);
+    emit m_parent->languageChanged(newLanguage);
+  }
+
+  QString oldStyle = m_Settings.value("Settings/style", "").toString();
+  QString newStyle = ui->styleBox->itemData(ui->styleBox->currentIndex()).toString();
+  if (oldStyle != newStyle) {
+    m_Settings.setValue("Settings/style", newStyle);
+    emit m_parent->styleChanged(newStyle);
+  }
+
+  m_Settings.setValue("Settings/overwritingLooseFilesColor", getOverwritingColor());
+  m_Settings.setValue("Settings/overwrittenLooseFilesColor", getOverwrittenColor());
+  m_Settings.setValue("Settings/overwritingArchiveFilesColor", getOverwritingArchiveColor());
+  m_Settings.setValue("Settings/overwrittenArchiveFilesColor", getOverwrittenArchiveColor());
+  m_Settings.setValue("Settings/containsPluginColor", getContainsColor());
+  m_Settings.setValue("Settings/containedColor", getContainedColor());
+  m_Settings.setValue("Settings/compact_downloads", ui->compactBox->isChecked());
+  m_Settings.setValue("Settings/meta_downloads", ui->showMetaBox->isChecked());
+  m_Settings.setValue("Settings/use_prereleases", ui->usePrereleaseBox->isChecked());
+  m_Settings.setValue("Settings/colorSeparatorScrollbars", ui->colorSeparatorsBox->isChecked());
+}
+
+void GeneralTab::addLanguages()
+{
+  std::vector<std::pair<QString, QString>> languages;
+
+  QDirIterator langIter(QCoreApplication::applicationDirPath() + "/translations", QDir::Files);
+  QString pattern = QString::fromStdWString(AppConfig::translationPrefix()) +  "_([a-z]{2,3}(_[A-Z]{2,2})?).qm";
+  QRegExp exp(pattern);
+  while (langIter.hasNext()) {
+    langIter.next();
+    QString file = langIter.fileName();
+    if (exp.exactMatch(file)) {
+      QString languageCode = exp.cap(1);
+      QLocale locale(languageCode);
+      QString languageString = QString("%1 (%2)").arg(locale.nativeLanguageName()).arg(locale.nativeCountryName());  //QLocale::languageToString(locale.language());
+      if (locale.language() == QLocale::Chinese) {
+        if (languageCode == "zh_TW") {
+          languageString = "Chinese (traditional)";
+        } else {
+          languageString = "Chinese (simplified)";
+        }
+      }
+      languages.push_back(std::make_pair(QString("%1").arg(languageString), exp.cap(1)));
+      //languageBox->addItem(QString("%1").arg(languageString), exp.cap(1));
+    }
+  }
+  if (!ui->languageBox->findText("English")) {
+    languages.push_back(std::make_pair(QString("English"), QString("en_US")));
+    //languageBox->addItem("English", "en_US");
+  }
+  std::sort(languages.begin(), languages.end());
+  for (const auto &lang : languages) {
+    ui->languageBox->addItem(lang.first, lang.second);
+  }
+}
+
+void GeneralTab::addStyles()
+{
+  ui->styleBox->addItem("None", "");
+  ui->styleBox->addItem("Fusion", "Fusion");
+
+  QDirIterator langIter(QCoreApplication::applicationDirPath() + "/" + QString::fromStdWString(AppConfig::stylesheetsPath()), QStringList("*.qss"), QDir::Files);
+  while (langIter.hasNext()) {
+    langIter.next();
+    QString style = langIter.fileName();
+    ui->styleBox->addItem(style, style);
+  }
+}
+
+void GeneralTab::resetDialogs()
+{
+  QuestionBoxMemory::resetDialogs();
+}
+
+void GeneralTab::setButtonColor(QPushButton *button, const QColor &color)
+{
+  button->setStyleSheet(
+    QString("QPushButton {"
+      "background-color: rgba(%1, %2, %3, %4);"
+      "color: %5;"
+      "border: 1px solid;"
+      "padding: 3px;"
+      "}")
+    .arg(color.red())
+    .arg(color.green())
+    .arg(color.blue())
+    .arg(color.alpha())
+    .arg(Settings::getIdealTextColor(color).name())
+  );
+};
+
+void GeneralTab::on_containsBtn_clicked()
+{
+  QColor result = QColorDialog::getColor(m_ContainsColor, parentWidget(), "Color Picker: Mod contains selected plugin", QColorDialog::ShowAlphaChannel);
+  if (result.isValid()) {
+    m_ContainsColor = result;
+    setButtonColor(ui->containsBtn, result);
+  }
+}
+
+void GeneralTab::on_containedBtn_clicked()
+{
+  QColor result = QColorDialog::getColor(m_ContainedColor, parentWidget(), "ColorPicker: Plugin is Contained in selected Mod", QColorDialog::ShowAlphaChannel);
+  if (result.isValid()) {
+    m_ContainedColor = result;
+    setButtonColor(ui->containedBtn, result);
+  }
+}
+
+void GeneralTab::on_overwrittenBtn_clicked()
+{
+  QColor result = QColorDialog::getColor(m_OverwrittenColor, parentWidget(), "ColorPicker: Is overwritten (loose files)", QColorDialog::ShowAlphaChannel);
+  if (result.isValid()) {
+    m_OverwrittenColor = result;
+    setButtonColor(ui->overwrittenBtn, result);
+  }
+}
+
+void GeneralTab::on_overwritingBtn_clicked()
+{
+  QColor result = QColorDialog::getColor(m_OverwritingColor, parentWidget(), "ColorPicker: Is overwriting (loose files)", QColorDialog::ShowAlphaChannel);
+  if (result.isValid()) {
+    m_OverwritingColor = result;
+    setButtonColor(ui->overwritingBtn, result);
+  }
+}
+
+void GeneralTab::on_overwrittenArchiveBtn_clicked()
+{
+  QColor result = QColorDialog::getColor(m_OverwrittenArchiveColor, parentWidget(), "ColorPicker: Is overwritten (archive files)", QColorDialog::ShowAlphaChannel);
+  if (result.isValid()) {
+    m_OverwrittenArchiveColor = result;
+    setButtonColor(ui->overwrittenArchiveBtn, result);
+  }
+}
+
+void GeneralTab::on_overwritingArchiveBtn_clicked()
+{
+  QColor result = QColorDialog::getColor(m_OverwritingArchiveColor, parentWidget(), "ColorPicker: Is overwriting (archive files)", QColorDialog::ShowAlphaChannel);
+  if (result.isValid()) {
+    m_OverwritingArchiveColor = result;
+    setButtonColor(ui->overwritingArchiveBtn, result);
+  }
+}
+
+void GeneralTab::on_resetColorsBtn_clicked()
+{
+  m_OverwritingColor = QColor(255, 0, 0, 64);
+  m_OverwrittenColor = QColor(0, 255, 0, 64);
+  m_OverwritingArchiveColor = QColor(255, 0, 255, 64);
+  m_OverwrittenArchiveColor = QColor(0, 255, 255, 64);
+  m_ContainsColor = QColor(0, 0, 255, 64);
+  m_ContainedColor = QColor(0, 0, 255, 64);
+
+  setButtonColor(ui->overwritingBtn, m_OverwritingColor);
+  setButtonColor(ui->overwrittenBtn, m_OverwrittenColor);
+  setButtonColor(ui->overwritingArchiveBtn, m_OverwritingArchiveColor);
+  setButtonColor(ui->overwrittenArchiveBtn, m_OverwrittenArchiveColor);
+  setButtonColor(ui->containsBtn, m_ContainsColor);
+  setButtonColor(ui->containedBtn, m_ContainedColor);
+}
+
+void GeneralTab::on_resetDialogsButton_clicked()
+{
+  if (QMessageBox::question(parentWidget(), QObject::tr("Confirm?"),
+    QObject::tr("This will make all dialogs show up again where you checked the \"Remember selection\"-box. Continue?"),
+    QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
+    resetDialogs();
+  }
+}
+
+void GeneralTab::on_categoriesBtn_clicked()
+{
+  CategoriesDialog dialog(parentWidget());
+  if (dialog.exec() == QDialog::Accepted) {
+    dialog.commitChanges();
+  }
+}
diff --git a/src/settingsdialoggeneral.h b/src/settingsdialoggeneral.h
new file mode 100644
index 00000000..1f1b4637
--- /dev/null
+++ b/src/settingsdialoggeneral.h
@@ -0,0 +1,53 @@
+#ifndef SETTINGSDIALOGGENERAL_H
+#define SETTINGSDIALOGGENERAL_H
+
+#include "settingsdialog.h"
+#include "settings.h"
+
+class GeneralTab : public SettingsTab
+{
+public:
+  GeneralTab(Settings *m_parent, SettingsDialog &m_dialog);
+
+  void update();
+
+private:
+  QColor m_OverwritingColor;
+  QColor m_OverwrittenColor;
+  QColor m_OverwritingArchiveColor;
+  QColor m_OverwrittenArchiveColor;
+  QColor m_ContainsColor;
+  QColor m_ContainedColor;
+
+  void addLanguages();
+  void addStyles();
+  void resetDialogs();
+  void setButtonColor(QPushButton *button, const QColor &color);
+
+  QColor getOverwritingColor() { return m_OverwritingColor; }
+  QColor getOverwrittenColor() { return m_OverwrittenColor; }
+  QColor getOverwritingArchiveColor() { return m_OverwritingArchiveColor; }
+  QColor getOverwrittenArchiveColor() { return m_OverwrittenArchiveColor; }
+  QColor getContainsColor() { return m_ContainsColor; }
+  QColor getContainedColor() { return m_ContainedColor; }
+
+  void setOverwritingColor(QColor col) { m_OverwritingColor = col; }
+  void setOverwrittenColor(QColor col) { m_OverwrittenColor = col; }
+  void setOverwritingArchiveColor(QColor col) { m_OverwritingArchiveColor = col; }
+  void setOverwrittenArchiveColor(QColor col) { m_OverwrittenArchiveColor = col; }
+  void setContainsColor(QColor col) { m_ContainsColor = col; }
+  void setContainedColor(QColor col) { m_ContainedColor = col; }
+
+  void on_overwritingArchiveBtn_clicked();
+  void on_overwritingBtn_clicked();
+  void on_overwrittenArchiveBtn_clicked();
+  void on_overwrittenBtn_clicked();
+  void on_containedBtn_clicked();
+  void on_containsBtn_clicked();
+
+  void on_categoriesBtn_clicked();
+  void on_resetColorsBtn_clicked();
+  void on_resetDialogsButton_clicked();
+};
+
+#endif // SETTINGSDIALOGGENERAL_H
-- 
cgit v1.3.1


From 0a5ce34b1a80694fbfe6a4d6b4f032b9c11a5376 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 20 Jul 2019 09:02:03 -0400
Subject: split paths tab

---
 src/CMakeLists.txt          |   3 +
 src/settings.cpp            |  81 +----------------
 src/settings.h              |  17 +---
 src/settingsdialog.cpp      | 113 ------------------------
 src/settingsdialog.h        |  14 ---
 src/settingsdialogpaths.cpp | 205 ++++++++++++++++++++++++++++++++++++++++++++
 src/settingsdialogpaths.h   |  33 +++++++
 7 files changed, 243 insertions(+), 223 deletions(-)
 create mode 100644 src/settingsdialogpaths.cpp
 create mode 100644 src/settingsdialogpaths.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 29c419b5..98d59996 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,6 +38,7 @@ SET(organizer_SRCS
     singleinstance.cpp
     settingsdialog.cpp
 	settingsdialoggeneral.cpp
+	settingsdialogpaths.cpp
     settings.cpp
     selfupdater.cpp
     selectiondialog.cpp
@@ -153,6 +154,7 @@ SET(organizer_HDRS
     singleinstance.h
     settingsdialog.h
 	settingsdialoggeneral.h
+	settingsdialogpaths.h
     settings.h
     selfupdater.h
     selectiondialog.h
@@ -434,6 +436,7 @@ set(settings
 	settings
 	settingsdialog
 	settingsdialoggeneral
+	settingsdialogpaths
 )
 
 set(utilities
diff --git a/src/settings.cpp b/src/settings.cpp
index 0911b155..bed8e789 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -23,6 +23,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "serverinfo.h"
 #include "settingsdialog.h"
 #include "settingsdialoggeneral.h"
+#include "settingsdialogpaths.h"
 #include "versioninfo.h"
 #include "appconfig.h"
 #include "organizercore.h"
@@ -752,86 +753,6 @@ void Settings::query(PluginContainer *pluginContainer, QWidget *parent)
 }
 
 
-Settings::PathsTab::PathsTab(Settings *parent, SettingsDialog &dialog)
-  : SettingsTab(parent, dialog)
-  , m_baseDirEdit(m_dialog.findChild<QLineEdit *>("baseDirEdit"))
-  , m_downloadDirEdit(m_dialog.findChild<QLineEdit *>("downloadDirEdit"))
-  , m_modDirEdit(m_dialog.findChild<QLineEdit *>("modDirEdit"))
-  , m_cacheDirEdit(m_dialog.findChild<QLineEdit *>("cacheDirEdit"))
-  , m_profilesDirEdit(m_dialog.findChild<QLineEdit *>("profilesDirEdit"))
-  , m_overwriteDirEdit(m_dialog.findChild<QLineEdit *>("overwriteDirEdit"))
-  , m_managedGameDirEdit(m_dialog.findChild<QLineEdit *>("managedGameDirEdit"))
-{
-  m_baseDirEdit->setText(m_parent->getBaseDirectory());
-  m_managedGameDirEdit->setText(m_parent->m_GamePlugin->gameDirectory().absoluteFilePath(m_parent->m_GamePlugin->binaryName()));
-  QString basePath = parent->getBaseDirectory();
-  QDir baseDir(basePath);
-  for (const auto &dir : {
-       std::make_pair(m_downloadDirEdit, m_parent->getDownloadDirectory(false)),
-       std::make_pair(m_modDirEdit, m_parent->getModDirectory(false)),
-       std::make_pair(m_cacheDirEdit, m_parent->getCacheDirectory(false)),
-       std::make_pair(m_profilesDirEdit, m_parent->getProfileDirectory(false)),
-       std::make_pair(m_overwriteDirEdit, m_parent->getOverwriteDirectory(false))
-      }) {
-    QString storePath = baseDir.relativeFilePath(dir.second);
-    storePath = dir.second;
-    dir.first->setText(storePath);
-  }
-}
-
-void Settings::PathsTab::update()
-{
-  typedef std::tuple<QString, QString, std::wstring> Directory;
-
-  QString basePath = m_parent->getBaseDirectory();
-
-  for (const Directory &dir :{
-       Directory{m_downloadDirEdit->text(), "download_directory", AppConfig::downloadPath()},
-       Directory{m_cacheDirEdit->text(), "cache_directory", AppConfig::cachePath()},
-       Directory{m_modDirEdit->text(), "mod_directory", AppConfig::modsPath()},
-       Directory{m_overwriteDirEdit->text(), "overwrite_directory", AppConfig::overwritePath()},
-       Directory{m_profilesDirEdit->text(), "profiles_directory", AppConfig::profilesPath()}
-      }) {
-    QString path, settingsKey;
-    std::wstring defaultName;
-    std::tie(path, settingsKey, defaultName) = dir;
-
-    settingsKey = QString("Settings/%1").arg(settingsKey);
-
-    QString realPath = path;
-    realPath.replace("%BASE_DIR%", m_baseDirEdit->text());
-
-    if (!QDir(realPath).exists()) {
-      if (!QDir().mkpath(realPath)) {
-        QMessageBox::warning(qApp->activeWindow(), tr("Error"),
-                             tr("Failed to create \"%1\", you may not have the "
-                                "necessary permission. path remains unchanged.")
-                                 .arg(realPath));
-      }
-    }
-
-    if (QFileInfo(realPath)
-        != QFileInfo(basePath + "/" + QString::fromStdWString(defaultName))) {
-      m_Settings.setValue(settingsKey, path);
-    } else {
-      m_Settings.remove(settingsKey);
-    }
-  }
-
-  if (QFileInfo(m_baseDirEdit->text()) !=
-      QFileInfo(qApp->property("dataPath").toString())) {
-    m_Settings.setValue("Settings/base_directory", m_baseDirEdit->text());
-  } else {
-    m_Settings.remove("Settings/base_directory");
-  }
-
-  QFileInfo oldGameExe(m_parent->m_GamePlugin->gameDirectory().absoluteFilePath(m_parent->m_GamePlugin->binaryName()));
-  QFileInfo newGameExe(m_managedGameDirEdit->text());
-  if (oldGameExe != newGameExe) {
-    m_Settings.setValue("gamePath", newGameExe.absolutePath());
-  }
-}
-
 Settings::DiagnosticsTab::DiagnosticsTab(Settings *m_parent, SettingsDialog &m_dialog)
   : SettingsTab(m_parent, m_dialog)
   , m_logLevelBox(m_dialog.findChild<QComboBox *>("logLevelBox"))
diff --git a/src/settings.h b/src/settings.h
index e88080ba..6f75562b 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -427,6 +427,7 @@ public:
   bool colorSeparatorScrollbar() const;
 
   QSettings& settingsRef() { return m_Settings; }
+  MOBase::IPluginGame const *gamePlugin() { return m_GamePlugin; }
 
 public slots:
 
@@ -443,22 +444,6 @@ private:
   QString getConfigurablePath(const QString &key, const QString &def, bool resolve) const;
 
 
-  class PathsTab : public SettingsTab
-  {
-  public:
-    PathsTab(Settings *parent, SettingsDialog &dialog);
-
-    void update();
-
-  private:
-    QLineEdit *m_baseDirEdit;
-    QLineEdit *m_downloadDirEdit;
-    QLineEdit *m_modDirEdit;
-    QLineEdit *m_cacheDirEdit;
-    QLineEdit *m_profilesDirEdit;
-    QLineEdit *m_overwriteDirEdit;
-    QLineEdit *m_managedGameDirEdit;
-  };
 
   class DiagnosticsTab : public SettingsTab
   {
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index f922cfb9..bfa285bf 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -200,80 +200,6 @@ void SettingsDialog::on_bsaDateBtn_clicked()
                        dir.absolutePath().toStdWString());
 }
 
-void SettingsDialog::on_browseBaseDirBtn_clicked()
-{
-  QString temp = QFileDialog::getExistingDirectory(
-      this, tr("Select base directory"), ui->baseDirEdit->text());
-  if (!temp.isEmpty()) {
-    ui->baseDirEdit->setText(temp);
-  }
-}
-
-void SettingsDialog::on_browseDownloadDirBtn_clicked()
-{
-  QString searchPath = ui->downloadDirEdit->text();
-  searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
-
-  QString temp = QFileDialog::getExistingDirectory(this, tr("Select download directory"), searchPath);
-  if (!temp.isEmpty()) {
-    ui->downloadDirEdit->setText(temp);
-  }
-}
-
-void SettingsDialog::on_browseModDirBtn_clicked()
-{
-  QString searchPath = ui->modDirEdit->text();
-  searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
-
-  QString temp = QFileDialog::getExistingDirectory(this, tr("Select mod directory"), searchPath);
-  if (!temp.isEmpty()) {
-    ui->modDirEdit->setText(temp);
-  }
-}
-
-void SettingsDialog::on_browseCacheDirBtn_clicked()
-{
-  QString searchPath = ui->cacheDirEdit->text();
-  searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
-
-  QString temp = QFileDialog::getExistingDirectory(this, tr("Select cache directory"), searchPath);
-  if (!temp.isEmpty()) {
-    ui->cacheDirEdit->setText(temp);
-  }
-}
-
-void SettingsDialog::on_browseProfilesDirBtn_clicked()
-{
-  QString searchPath = ui->profilesDirEdit->text();
-  searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
-
-  QString temp = QFileDialog::getExistingDirectory(this, tr("Select profiles directory"), searchPath);
-  if (!temp.isEmpty()) {
-    ui->profilesDirEdit->setText(temp);
-  }
-}
-
-void SettingsDialog::on_browseOverwriteDirBtn_clicked()
-{
-  QString searchPath = ui->overwriteDirEdit->text();
-  searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
-
-  QString temp = QFileDialog::getExistingDirectory(this, tr("Select overwrite directory"), searchPath);
-  if (!temp.isEmpty()) {
-    ui->overwriteDirEdit->setText(temp);
-  }
-}
-
-void SettingsDialog::on_browseGameDirBtn_clicked()
-{
-  QFileInfo oldGameExe(ui->managedGameDirEdit->text());
-
-  QString temp = QFileDialog::getOpenFileName(this, tr("Select game executable"), oldGameExe.absolutePath(), oldGameExe.fileName());
-  if (!temp.isEmpty()) {
-    ui->managedGameDirEdit->setText(temp);
-  }
-}
-
 void SettingsDialog::on_nexusConnect_clicked()
 {
   if (m_nexusLogin && m_nexusLogin->isActive()) {
@@ -555,45 +481,6 @@ void SettingsDialog::on_clearCacheButton_clicked()
   NexusInterface::instance(m_PluginContainer)->clearCache();
 }
 
-void SettingsDialog::normalizePath(QLineEdit *lineEdit)
-{
-  QString text = lineEdit->text();
-  while (text.endsWith('/') || text.endsWith('\\')) {
-    text.chop(1);
-  }
-  lineEdit->setText(text);
-}
-
-void SettingsDialog::on_baseDirEdit_editingFinished()
-{
-  normalizePath(ui->baseDirEdit);
-}
-
-void SettingsDialog::on_downloadDirEdit_editingFinished()
-{
-  normalizePath(ui->downloadDirEdit);
-}
-
-void SettingsDialog::on_modDirEdit_editingFinished()
-{
-  normalizePath(ui->modDirEdit);
-}
-
-void SettingsDialog::on_cacheDirEdit_editingFinished()
-{
-  normalizePath(ui->cacheDirEdit);
-}
-
-void SettingsDialog::on_profilesDirEdit_editingFinished()
-{
-  normalizePath(ui->profilesDirEdit);
-}
-
-void SettingsDialog::on_overwriteDirEdit_editingFinished()
-{
-  normalizePath(ui->overwriteDirEdit);
-}
-
 void SettingsDialog::on_resetGeometryBtn_clicked()
 {
   m_GeometriesReset = true;
diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index 01a0afa2..68e72529 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -67,7 +67,6 @@ signals:
 private:
 
   void storeSettings(QListWidgetItem *pluginItem);
-  void normalizePath(QLineEdit *lineEdit);
 
 public:
   QString getExecutableBlacklist() { return m_ExecutableBlacklist; }
@@ -77,26 +76,13 @@ public:
 
 private slots:
   void on_associateButton_clicked();
-  void on_baseDirEdit_editingFinished();
-  void on_browseBaseDirBtn_clicked();
-  void on_browseCacheDirBtn_clicked();
-  void on_browseDownloadDirBtn_clicked();
-  void on_browseGameDirBtn_clicked();
-  void on_browseModDirBtn_clicked();
-  void on_browseOverwriteDirBtn_clicked();
-  void on_browseProfilesDirBtn_clicked();
   void on_bsaDateBtn_clicked();
-  void on_cacheDirEdit_editingFinished();
   void on_clearCacheButton_clicked();
-  void on_downloadDirEdit_editingFinished();
   void on_execBlacklistBtn_clicked();
-  void on_modDirEdit_editingFinished();
   void on_nexusConnect_clicked();
   void on_nexusDisconnect_clicked();
   void on_nexusManualKey_clicked();
-  void on_overwriteDirEdit_editingFinished();
   void on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
-  void on_profilesDirEdit_editingFinished();
   void on_resetGeometryBtn_clicked();
 
   void deleteBlacklistItem();
diff --git a/src/settingsdialogpaths.cpp b/src/settingsdialogpaths.cpp
new file mode 100644
index 00000000..303d1562
--- /dev/null
+++ b/src/settingsdialogpaths.cpp
@@ -0,0 +1,205 @@
+#include "settingsdialogpaths.h"
+#include "ui_settingsdialog.h"
+#include "appconfig.h"
+#include <iplugingame.h>
+
+PathsTab::PathsTab(Settings *parent, SettingsDialog &dialog)
+  : SettingsTab(parent, dialog)
+{
+  ui->baseDirEdit->setText(m_parent->getBaseDirectory());
+  ui->managedGameDirEdit->setText(m_parent->gamePlugin()->gameDirectory().absoluteFilePath(m_parent->gamePlugin()->binaryName()));
+  QString basePath = parent->getBaseDirectory();
+  QDir baseDir(basePath);
+  for (const auto &dir : {
+    std::make_pair(ui->downloadDirEdit, m_parent->getDownloadDirectory(false)),
+    std::make_pair(ui->modDirEdit, m_parent->getModDirectory(false)),
+    std::make_pair(ui->cacheDirEdit, m_parent->getCacheDirectory(false)),
+    std::make_pair(ui->profilesDirEdit, m_parent->getProfileDirectory(false)),
+    std::make_pair(ui->overwriteDirEdit, m_parent->getOverwriteDirectory(false))
+    }) {
+    QString storePath = baseDir.relativeFilePath(dir.second);
+    storePath = dir.second;
+    dir.first->setText(storePath);
+  }
+
+  QObject::connect(ui->browseBaseDirBtn, &QPushButton::clicked, [&]{ on_browseBaseDirBtn_clicked(); });
+  QObject::connect(ui->browseCacheDirBtn, &QPushButton::clicked, [&]{ on_browseCacheDirBtn_clicked(); });
+  QObject::connect(ui->browseDownloadDirBtn, &QPushButton::clicked, [&]{ on_browseDownloadDirBtn_clicked(); });
+  QObject::connect(ui->browseGameDirBtn, &QPushButton::clicked, [&]{ on_browseGameDirBtn_clicked(); });
+  QObject::connect(ui->browseModDirBtn, &QPushButton::clicked, [&]{ on_browseModDirBtn_clicked(); });
+  QObject::connect(ui->browseOverwriteDirBtn, &QPushButton::clicked, [&]{ on_browseOverwriteDirBtn_clicked(); });
+  QObject::connect(ui->browseProfilesDirBtn, &QPushButton::clicked, [&]{ on_browseProfilesDirBtn_clicked(); });
+
+  QObject::connect(ui->baseDirEdit, &QLineEdit::editingFinished, [&]{ on_baseDirEdit_editingFinished(); });
+  QObject::connect(ui->cacheDirEdit, &QLineEdit::editingFinished, [&]{ on_cacheDirEdit_editingFinished(); });
+  QObject::connect(ui->downloadDirEdit, &QLineEdit::editingFinished, [&]{ on_downloadDirEdit_editingFinished(); });
+  QObject::connect(ui->modDirEdit, &QLineEdit::editingFinished, [&]{ on_modDirEdit_editingFinished(); });
+  QObject::connect(ui->overwriteDirEdit, &QLineEdit::editingFinished, [&]{ on_overwriteDirEdit_editingFinished(); });
+  QObject::connect(ui->profilesDirEdit, &QLineEdit::editingFinished, [&]{ on_profilesDirEdit_editingFinished(); });
+}
+
+void PathsTab::update()
+{
+  typedef std::tuple<QString, QString, std::wstring> Directory;
+
+  QString basePath = m_parent->getBaseDirectory();
+
+  for (const Directory &dir :{
+    Directory{ui->downloadDirEdit->text(), "download_directory", AppConfig::downloadPath()},
+    Directory{ui->cacheDirEdit->text(), "cache_directory", AppConfig::cachePath()},
+    Directory{ui->modDirEdit->text(), "mod_directory", AppConfig::modsPath()},
+    Directory{ui->overwriteDirEdit->text(), "overwrite_directory", AppConfig::overwritePath()},
+    Directory{ui->profilesDirEdit->text(), "profiles_directory", AppConfig::profilesPath()}
+    }) {
+    QString path, settingsKey;
+    std::wstring defaultName;
+    std::tie(path, settingsKey, defaultName) = dir;
+
+    settingsKey = QString("Settings/%1").arg(settingsKey);
+
+    QString realPath = path;
+    realPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
+
+    if (!QDir(realPath).exists()) {
+      if (!QDir().mkpath(realPath)) {
+        QMessageBox::warning(qApp->activeWindow(), QObject::tr("Error"),
+          QObject::tr("Failed to create \"%1\", you may not have the "
+            "necessary permission. path remains unchanged.")
+          .arg(realPath));
+      }
+    }
+
+    if (QFileInfo(realPath)
+      != QFileInfo(basePath + "/" + QString::fromStdWString(defaultName))) {
+      m_Settings.setValue(settingsKey, path);
+    } else {
+      m_Settings.remove(settingsKey);
+    }
+  }
+
+  if (QFileInfo(ui->baseDirEdit->text()) !=
+    QFileInfo(qApp->property("dataPath").toString())) {
+    m_Settings.setValue("Settings/base_directory", ui->baseDirEdit->text());
+  } else {
+    m_Settings.remove("Settings/base_directory");
+  }
+
+  QFileInfo oldGameExe(m_parent->gamePlugin()->gameDirectory().absoluteFilePath(m_parent->gamePlugin()->binaryName()));
+  QFileInfo newGameExe(ui->managedGameDirEdit->text());
+  if (oldGameExe != newGameExe) {
+    m_Settings.setValue("gamePath", newGameExe.absolutePath());
+  }
+}
+
+void PathsTab::on_browseBaseDirBtn_clicked()
+{
+  QString temp = QFileDialog::getExistingDirectory(
+    parentWidget(), QObject::tr("Select base directory"), ui->baseDirEdit->text());
+  if (!temp.isEmpty()) {
+    ui->baseDirEdit->setText(temp);
+  }
+}
+
+void PathsTab::on_browseDownloadDirBtn_clicked()
+{
+  QString searchPath = ui->downloadDirEdit->text();
+  searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
+
+  QString temp = QFileDialog::getExistingDirectory(parentWidget(), QObject::tr("Select download directory"), searchPath);
+  if (!temp.isEmpty()) {
+    ui->downloadDirEdit->setText(temp);
+  }
+}
+
+void PathsTab::on_browseModDirBtn_clicked()
+{
+  QString searchPath = ui->modDirEdit->text();
+  searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
+
+  QString temp = QFileDialog::getExistingDirectory(parentWidget(), QObject::tr("Select mod directory"), searchPath);
+  if (!temp.isEmpty()) {
+    ui->modDirEdit->setText(temp);
+  }
+}
+
+void PathsTab::on_browseCacheDirBtn_clicked()
+{
+  QString searchPath = ui->cacheDirEdit->text();
+  searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
+
+  QString temp = QFileDialog::getExistingDirectory(parentWidget(), QObject::tr("Select cache directory"), searchPath);
+  if (!temp.isEmpty()) {
+    ui->cacheDirEdit->setText(temp);
+  }
+}
+
+void PathsTab::on_browseProfilesDirBtn_clicked()
+{
+  QString searchPath = ui->profilesDirEdit->text();
+  searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
+
+  QString temp = QFileDialog::getExistingDirectory(parentWidget(), QObject::tr("Select profiles directory"), searchPath);
+  if (!temp.isEmpty()) {
+    ui->profilesDirEdit->setText(temp);
+  }
+}
+
+void PathsTab::on_browseOverwriteDirBtn_clicked()
+{
+  QString searchPath = ui->overwriteDirEdit->text();
+  searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
+
+  QString temp = QFileDialog::getExistingDirectory(parentWidget(), QObject::tr("Select overwrite directory"), searchPath);
+  if (!temp.isEmpty()) {
+    ui->overwriteDirEdit->setText(temp);
+  }
+}
+
+void PathsTab::on_browseGameDirBtn_clicked()
+{
+  QFileInfo oldGameExe(ui->managedGameDirEdit->text());
+
+  QString temp = QFileDialog::getOpenFileName(parentWidget(), QObject::tr("Select game executable"), oldGameExe.absolutePath(), oldGameExe.fileName());
+  if (!temp.isEmpty()) {
+    ui->managedGameDirEdit->setText(temp);
+  }
+}
+
+void PathsTab::on_baseDirEdit_editingFinished()
+{
+  normalizePath(ui->baseDirEdit);
+}
+
+void PathsTab::on_downloadDirEdit_editingFinished()
+{
+  normalizePath(ui->downloadDirEdit);
+}
+
+void PathsTab::on_modDirEdit_editingFinished()
+{
+  normalizePath(ui->modDirEdit);
+}
+
+void PathsTab::on_cacheDirEdit_editingFinished()
+{
+  normalizePath(ui->cacheDirEdit);
+}
+
+void PathsTab::on_profilesDirEdit_editingFinished()
+{
+  normalizePath(ui->profilesDirEdit);
+}
+
+void PathsTab::on_overwriteDirEdit_editingFinished()
+{
+  normalizePath(ui->overwriteDirEdit);
+}
+
+void PathsTab::normalizePath(QLineEdit *lineEdit)
+{
+  QString text = lineEdit->text();
+  while (text.endsWith('/') || text.endsWith('\\')) {
+    text.chop(1);
+  }
+  lineEdit->setText(text);
+}
diff --git a/src/settingsdialogpaths.h b/src/settingsdialogpaths.h
new file mode 100644
index 00000000..dac402b1
--- /dev/null
+++ b/src/settingsdialogpaths.h
@@ -0,0 +1,33 @@
+#ifndef SETTINGSDIALOGPATHS_H
+#define SETTINGSDIALOGPATHS_H
+
+#include "settings.h"
+#include "settingsdialog.h"
+
+class PathsTab : public SettingsTab
+{
+public:
+  PathsTab(Settings *parent, SettingsDialog &dialog);
+
+  void update();
+
+private:
+  void on_browseBaseDirBtn_clicked();
+  void on_browseCacheDirBtn_clicked();
+  void on_browseDownloadDirBtn_clicked();
+  void on_browseGameDirBtn_clicked();
+  void on_browseModDirBtn_clicked();
+  void on_browseOverwriteDirBtn_clicked();
+  void on_browseProfilesDirBtn_clicked();
+
+  void on_baseDirEdit_editingFinished();
+  void on_cacheDirEdit_editingFinished();
+  void on_downloadDirEdit_editingFinished();
+  void on_modDirEdit_editingFinished();
+  void on_overwriteDirEdit_editingFinished();
+  void on_profilesDirEdit_editingFinished();
+
+  void normalizePath(QLineEdit *lineEdit);
+};
+
+#endif // SETTINGSDIALOGPATHS_H
-- 
cgit v1.3.1


From af95b3b8637d28517f69a70f13b901cc7f43d121 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 20 Jul 2019 09:31:38 -0400
Subject: renamed tab classes, clashing with mod info dialog split nexus tab

---
 src/CMakeLists.txt            |   3 +
 src/settings.cpp              | 114 +------------
 src/settings.h                |  16 --
 src/settingsdialog.cpp        | 278 +------------------------------
 src/settingsdialog.h          |  34 +---
 src/settingsdialoggeneral.cpp |  30 ++--
 src/settingsdialoggeneral.h   |   4 +-
 src/settingsdialognexus.cpp   | 374 ++++++++++++++++++++++++++++++++++++++++++
 src/settingsdialognexus.h     |  40 +++++
 src/settingsdialogpaths.cpp   |  32 ++--
 src/settingsdialogpaths.h     |   4 +-
 11 files changed, 460 insertions(+), 469 deletions(-)
 create mode 100644 src/settingsdialognexus.cpp
 create mode 100644 src/settingsdialognexus.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 98d59996..b2407e17 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,6 +38,7 @@ SET(organizer_SRCS
     singleinstance.cpp
     settingsdialog.cpp
 	settingsdialoggeneral.cpp
+	settingsdialognexus.cpp
 	settingsdialogpaths.cpp
     settings.cpp
     selfupdater.cpp
@@ -154,6 +155,7 @@ SET(organizer_HDRS
     singleinstance.h
     settingsdialog.h
 	settingsdialoggeneral.h
+	settingsdialognexus.h
 	settingsdialogpaths.h
     settings.h
     selfupdater.h
@@ -436,6 +438,7 @@ set(settings
 	settings
 	settingsdialog
 	settingsdialoggeneral
+	settingsdialognexus
 	settingsdialogpaths
 )
 
diff --git a/src/settings.cpp b/src/settings.cpp
index bed8e789..bded470c 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -23,6 +23,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "serverinfo.h"
 #include "settingsdialog.h"
 #include "settingsdialoggeneral.h"
+#include "settingsdialognexus.h"
 #include "settingsdialogpaths.h"
 #include "versioninfo.h"
 #include "appconfig.h"
@@ -69,19 +70,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace MOBase;
 
-template <typename T>
-class QListWidgetItemEx : public QListWidgetItem {
-public:
-  QListWidgetItemEx(const QString &text, int sortRole = Qt::DisplayRole, QListWidget *parent = 0, int type = Type)
-    : QListWidgetItem(text, parent, type), m_SortRole(sortRole) {}
-
-  virtual bool operator< ( const QListWidgetItem & other ) const {
-    return this->data(m_SortRole).value<T>() < other.data(m_SortRole).value<T>();
-  }
-private:
-  int m_SortRole;
-};
-
 
 SettingsTab::SettingsTab(Settings *m_parent, SettingsDialog &m_dialog)
   : m_parent(m_parent)
@@ -688,10 +676,10 @@ void Settings::query(PluginContainer *pluginContainer, QWidget *parent)
 
   std::vector<std::unique_ptr<SettingsTab>> tabs;
 
-  tabs.push_back(std::unique_ptr<SettingsTab>(new GeneralTab(this, dialog)));
-  tabs.push_back(std::unique_ptr<SettingsTab>(new PathsTab(this, dialog)));
+  tabs.push_back(std::unique_ptr<SettingsTab>(new GeneralSettingsTab(this, dialog)));
+  tabs.push_back(std::unique_ptr<SettingsTab>(new PathsSettingsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new DiagnosticsTab(this, dialog)));
-  tabs.push_back(std::unique_ptr<SettingsTab>(new NexusTab(this, dialog)));
+  tabs.push_back(std::unique_ptr<SettingsTab>(new NexusSettingsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new SteamTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new PluginsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new WorkaroundsTab(this, dialog)));
@@ -781,100 +769,6 @@ void Settings::DiagnosticsTab::update()
   m_Settings.setValue("Settings/crash_dumps_max", m_dumpsMaxEdit->value());
 }
 
-void Settings::DiagnosticsTab::setLevelsBox()
-{
-  m_logLevelBox->clear();
-
-  m_logLevelBox->addItem(tr("Debug"), log::Debug);
-  m_logLevelBox->addItem(tr("Info (recommended)"), log::Info);
-  m_logLevelBox->addItem(tr("Warning"), log::Warning);
-  m_logLevelBox->addItem(tr("Error"), log::Error);
-
-  for (int i=0; i<m_logLevelBox->count(); ++i) {
-    if (m_logLevelBox->itemData(i) == m_parent->logLevel()) {
-      m_logLevelBox->setCurrentIndex(i);
-      break;
-    }
-  }
-}
-
-Settings::NexusTab::NexusTab(Settings *parent, SettingsDialog &dialog)
-  : SettingsTab(parent, dialog)
-  , m_offlineBox(dialog.findChild<QCheckBox *>("offlineBox"))
-  , m_proxyBox(dialog.findChild<QCheckBox *>("proxyBox"))
-  , m_knownServersList(dialog.findChild<QListWidget *>("knownServersList"))
-  , m_preferredServersList(
-        dialog.findChild<QListWidget *>("preferredServersList"))
-  , m_endorsementBox(dialog.findChild<QCheckBox *>("endorsementBox"))
-  , m_hideAPICounterBox(dialog.findChild<QCheckBox *>("hideAPICounterBox"))
-{
-  m_offlineBox->setChecked(parent->offlineMode());
-  m_proxyBox->setChecked(parent->useProxy());
-  m_endorsementBox->setChecked(parent->endorsementIntegration());
-  m_hideAPICounterBox->setChecked(parent->hideAPICounter());
-
-  // display server preferences
-  m_Settings.beginGroup("Servers");
-  for (const QString &key : m_Settings.childKeys()) {
-    QVariantMap val = m_Settings.value(key).toMap();
-    QString descriptor = key;
-    if (!descriptor.compare("CDN", Qt::CaseInsensitive)) {
-      descriptor += QStringLiteral(" (automatic)");
-    }
-    if (val.contains("downloadSpeed") && val.contains("downloadCount") && (val["downloadCount"].toInt() > 0)) {
-      int bps = static_cast<int>(val["downloadSpeed"].toDouble() / val["downloadCount"].toInt());
-      descriptor += QString(" (%1 kbps)").arg(bps / 1024);
-    }
-
-    QListWidgetItem *newItem = new QListWidgetItemEx<int>(descriptor, Qt::UserRole + 1);
-
-    newItem->setData(Qt::UserRole, key);
-    newItem->setData(Qt::UserRole + 1, val["preferred"].toInt());
-    if (val["preferred"].toInt() > 0) {
-      m_preferredServersList->addItem(newItem);
-    } else {
-      m_knownServersList->addItem(newItem);
-    }
-    m_preferredServersList->sortItems(Qt::DescendingOrder);
-  }
-  m_Settings.endGroup();
-}
-
-void Settings::NexusTab::update()
-{
-  /*
-  if (m_loginCheckBox->isChecked()) {
-    m_Settings.setValue("Settings/nexus_login", true);
-    m_Settings.setValue("Settings/nexus_username", m_usernameEdit->text());
-    m_Settings.setValue("Settings/nexus_password", obfuscate(m_passwordEdit->text()));
-  } else {
-    m_Settings.setValue("Settings/nexus_login", false);
-    m_Settings.remove("Settings/nexus_username");
-    m_Settings.remove("Settings/nexus_password");
-  }
-  */
-  m_Settings.setValue("Settings/offline_mode", m_offlineBox->isChecked());
-  m_Settings.setValue("Settings/use_proxy", m_proxyBox->isChecked());
-  m_Settings.setValue("Settings/endorsement_integration", m_endorsementBox->isChecked());
-  m_Settings.setValue("Settings/hide_api_counter", m_hideAPICounterBox->isChecked());
-
-  // store server preference
-  m_Settings.beginGroup("Servers");
-  for (int i = 0; i < m_knownServersList->count(); ++i) {
-    QString key = m_knownServersList->item(i)->data(Qt::UserRole).toString();
-    QVariantMap val = m_Settings.value(key).toMap();
-    val["preferred"] = 0;
-    m_Settings.setValue(key, val);
-  }
-  int count = m_preferredServersList->count();
-  for (int i = 0; i < count; ++i) {
-    QString key = m_preferredServersList->item(i)->data(Qt::UserRole).toString();
-    QVariantMap val = m_Settings.value(key).toMap();
-    val["preferred"] = count - i;
-    m_Settings.setValue(key, val);
-  }
-  m_Settings.endGroup();
-}
 
 Settings::SteamTab::SteamTab(Settings *m_parent, SettingsDialog &m_dialog)
   : SettingsTab(m_parent, m_dialog)
diff --git a/src/settings.h b/src/settings.h
index 6f75562b..b9383ce4 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -461,22 +461,6 @@ private:
     void setLevelsBox();
   };
 
-  /** Display/store the configuration in the 'nexus' tab of the settings dialogue */
-  class NexusTab : public SettingsTab
-  {
-  public:
-    NexusTab(Settings *m_parent, SettingsDialog &m_dialog);
-    void update();
-
-  private:
-    QCheckBox *m_offlineBox;
-    QCheckBox *m_proxyBox;
-    QListWidget *m_knownServersList;
-    QListWidget *m_preferredServersList;
-    QCheckBox *m_endorsementBox;
-    QCheckBox *m_hideAPICounterBox;
-  };
-
   /** Display/store the configuration in the 'steam' tab of the settings dialogue */
   class SteamTab : public SettingsTab
   {
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index bfa285bf..6d5a8cc0 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -20,7 +20,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "settingsdialog.h"
 
 #include "ui_settingsdialog.h"
-#include "ui_nexusmanualkey.h"
 #include "categoriesdialog.h"
 #include "helper.h"
 #include "noeditdelegate.h"
@@ -48,62 +47,14 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace MOBase;
 
-class NexusManualKeyDialog : public QDialog
-{
-public:
-  NexusManualKeyDialog(QWidget* parent)
-    : QDialog(parent), ui(new Ui::NexusManualKeyDialog)
-  {
-    ui->setupUi(this);
-    ui->key->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
-
-    connect(ui->openBrowser, &QPushButton::clicked, [&]{ openBrowser(); });
-    connect(ui->paste, &QPushButton::clicked, [&]{ paste(); });
-    connect(ui->clear, &QPushButton::clicked, [&]{ clear(); });
-  }
-
-  void accept() override
-  {
-    m_key = ui->key->toPlainText();
-    QDialog::accept();
-  }
-
-  const QString& key() const
-  {
-    return m_key;
-  }
-
-  void openBrowser()
-  {
-    shell::OpenLink(QUrl("https://www.nexusmods.com/users/myaccount?tab=api"));
-  }
-
-  void paste()
-  {
-    const auto text = QApplication::clipboard()->text();
-    if (!text.isEmpty()) {
-      ui->key->setPlainText(text);
-    }
-  }
-
-  void clear()
-  {
-    ui->key->clear();
-  }
-
-private:
-  std::unique_ptr<Ui::NexusManualKeyDialog> ui;
-  QString m_key;
-};
-
 
 SettingsDialog::SettingsDialog(PluginContainer *pluginContainer, Settings* settings, QWidget *parent)
   : TutorableDialog("SettingsDialog", parent)
   , ui(new Ui::SettingsDialog)
   , m_settings(settings)
   , m_PluginContainer(pluginContainer)
-  , m_keyChanged(false)
   , m_GeometriesReset(false)
+  , m_keyChanged(false)
 {
   ui->setupUi(this);
   ui->pluginSettingsList->setStyleSheet("QTreeWidget::item {padding-right: 10px;}");
@@ -111,8 +62,6 @@ SettingsDialog::SettingsDialog(PluginContainer *pluginContainer, Settings* setti
   QShortcut *delShortcut = new QShortcut(
     QKeySequence(Qt::Key_Delete), ui->pluginBlacklist);
   connect(delShortcut, SIGNAL(activated()), this, SLOT(deleteBlacklistItem()));
-
-  updateNexusState();
 }
 
 SettingsDialog::~SettingsDialog()
@@ -200,220 +149,6 @@ void SettingsDialog::on_bsaDateBtn_clicked()
                        dir.absolutePath().toStdWString());
 }
 
-void SettingsDialog::on_nexusConnect_clicked()
-{
-  if (m_nexusLogin && m_nexusLogin->isActive()) {
-    m_nexusLogin->cancel();
-    return;
-  }
-
-  if (!m_nexusLogin) {
-    m_nexusLogin.reset(new NexusSSOLogin);
-
-    m_nexusLogin->keyChanged = [&](auto&& s){
-      onSSOKeyChanged(s);
-    };
-
-    m_nexusLogin->stateChanged = [&](auto&& s, auto&& e){
-      onSSOStateChanged(s, e);
-    };
-  }
-
-  ui->nexusLog->clear();
-  m_nexusLogin->start();
-  updateNexusState();
-}
-
-void SettingsDialog::on_nexusManualKey_clicked()
-{
-  if (m_nexusValidator && m_nexusValidator->isActive()) {
-    m_nexusValidator->cancel();
-    return;
-  }
-
-  NexusManualKeyDialog dialog(this);
-  if (dialog.exec() != QDialog::Accepted) {
-    return;
-  }
-
-  const auto key = dialog.key();
-  if (key.isEmpty()) {
-    clearKey();
-    return;
-  }
-
-  ui->nexusLog->clear();
-  validateKey(key);
-}
-
-void SettingsDialog::on_nexusDisconnect_clicked()
-{
-  clearKey();
-  ui->nexusLog->clear();
-  addNexusLog(tr("Disconnected."));
-}
-
-void SettingsDialog::validateKey(const QString& key)
-{
-  if (!m_nexusValidator) {
-    m_nexusValidator.reset(new NexusKeyValidator(
-      *NexusInterface::instance(m_PluginContainer)->getAccessManager()));
-
-    m_nexusValidator->stateChanged = [&](auto&& s, auto&& e){
-      onValidatorStateChanged(s, e);
-    };
-
-    m_nexusValidator->finished = [&](auto&& user) {
-      onValidatorFinished(user);
-    };
-  }
-
-  addNexusLog(tr("Checking API key..."));
-  m_nexusValidator->start(key);
-}
-
-void SettingsDialog::onSSOKeyChanged(const QString& key)
-{
-  if (key.isEmpty()) {
-    clearKey();
-  } else {
-    addNexusLog(tr("Received API key."));
-    validateKey(key);
-  }
-}
-
-void SettingsDialog::onSSOStateChanged(NexusSSOLogin::States s, const QString& e)
-{
-  if (s != NexusSSOLogin::Finished) {
-    // finished state is handled in onSSOKeyChanged()
-    const auto log = NexusSSOLogin::stateToString(s, e);
-
-    for (auto&& line : log.split("\n")) {
-      addNexusLog(line);
-    }
-  }
-
-  updateNexusState();
-}
-
-void SettingsDialog::onValidatorStateChanged(
-  NexusKeyValidator::States s, const QString& e)
-{
-  if (s != NexusKeyValidator::Finished) {
-    // finished state is handled in onValidatorFinished()
-    const auto log = NexusKeyValidator::stateToString(s, e);
-
-    for (auto&& line : log.split("\n")) {
-      addNexusLog(line);
-    }
-  }
-
-  updateNexusState();
-}
-
-void SettingsDialog::onValidatorFinished(const APIUserAccount& user)
-{
-  NexusInterface::instance(m_PluginContainer)->setUserAccount(user);
-
-  if (!user.apiKey().isEmpty()) {
-    if (setKey(user.apiKey())) {
-      addNexusLog(tr("Linked with Nexus successfully."));
-    }
-  }
-}
-
-void SettingsDialog::addNexusLog(const QString& s)
-{
-  ui->nexusLog->addItem(s);
-  ui->nexusLog->scrollToBottom();
-}
-
-bool SettingsDialog::setKey(const QString& key)
-{
-  m_keyChanged = true;
-  const bool ret = m_settings->setNexusApiKey(key);
-  updateNexusState();
-  return ret;
-}
-
-bool SettingsDialog::clearKey()
-{
-  m_keyChanged = true;
-  const auto ret = m_settings->clearNexusApiKey();
-
-  NexusInterface::instance(m_PluginContainer)->getAccessManager()->clearApiKey();
-  updateNexusState();
-
-  return ret;
-}
-
-void SettingsDialog::updateNexusState()
-{
-  updateNexusButtons();
-  updateNexusData();
-}
-
-void SettingsDialog::updateNexusButtons()
-{
-  if (m_nexusLogin && m_nexusLogin->isActive()) {
-    // api key is in the process of being retrieved
-    ui->nexusConnect->setText(tr("Cancel"));
-    ui->nexusConnect->setEnabled(true);
-    ui->nexusDisconnect->setEnabled(false);
-    ui->nexusManualKey->setText(tr("Enter API Key Manually"));
-    ui->nexusManualKey->setEnabled(false);
-  }
-  else if (m_nexusValidator && m_nexusValidator->isActive()) {
-    // api key is in the process of being tested
-    ui->nexusConnect->setText(tr("Connect to Nexus"));
-    ui->nexusConnect->setEnabled(false);
-    ui->nexusDisconnect->setEnabled(false);
-    ui->nexusManualKey->setText(tr("Cancel"));
-    ui->nexusManualKey->setEnabled(true);
-  }
-  else if (m_settings->hasNexusApiKey()) {
-    // api key is present
-    ui->nexusConnect->setText(tr("Connect to Nexus"));
-    ui->nexusConnect->setEnabled(false);
-    ui->nexusDisconnect->setEnabled(true);
-    ui->nexusManualKey->setText(tr("Enter API Key Manually"));
-    ui->nexusManualKey->setEnabled(false);
-  } else {
-    // api key not present
-    ui->nexusConnect->setText(tr("Connect to Nexus"));
-    ui->nexusConnect->setEnabled(true);
-    ui->nexusDisconnect->setEnabled(false);
-    ui->nexusManualKey->setText(tr("Enter API Key Manually"));
-    ui->nexusManualKey->setEnabled(true);
-  }
-}
-
-void SettingsDialog::updateNexusData()
-{
-  const auto user = NexusInterface::instance(m_PluginContainer)
-    ->getAPIUserAccount();
-
-  if (user.isValid()) {
-    ui->nexusUserID->setText(user.id());
-    ui->nexusName->setText(user.name());
-    ui->nexusAccount->setText(localizedUserAccountType(user.type()));
-
-    ui->nexusDailyRequests->setText(QString("%1/%2")
-      .arg(user.limits().remainingDailyRequests)
-      .arg(user.limits().maxDailyRequests));
-
-    ui->nexusHourlyRequests->setText(QString("%1/%2")
-      .arg(user.limits().remainingHourlyRequests)
-      .arg(user.limits().maxHourlyRequests));
-  } else {
-    ui->nexusUserID->setText(tr("N/A"));
-    ui->nexusName->setText(tr("N/A"));
-    ui->nexusAccount->setText(tr("N/A"));
-    ui->nexusDailyRequests->setText(tr("N/A"));
-    ui->nexusHourlyRequests->setText(tr("N/A"));
-  }
-}
-
 void SettingsDialog::storeSettings(QListWidgetItem *pluginItem)
 {
   if (pluginItem != nullptr) {
@@ -470,17 +205,6 @@ void SettingsDialog::deleteBlacklistItem()
   ui->pluginBlacklist->takeItem(ui->pluginBlacklist->currentIndex().row());
 }
 
-void SettingsDialog::on_associateButton_clicked()
-{
-  Settings::instance().registerAsNXMHandler(true);
-}
-
-void SettingsDialog::on_clearCacheButton_clicked()
-{
-  QDir(Settings::instance().getCacheDirectory()).removeRecursively();
-  NexusInterface::instance(m_PluginContainer)->clearCache();
-}
-
 void SettingsDialog::on_resetGeometryBtn_clicked()
 {
   m_GeometriesReset = true;
diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index 68e72529..df5d0ad8 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -54,18 +54,15 @@ public:
   */
   QString getColoredButtonStyleSheet() const;
 
+  // temp
   Ui::SettingsDialog *ui;
+  bool m_keyChanged;
+  PluginContainer *m_PluginContainer;
 
 public slots:
-
   virtual void accept();
 
-signals:
-
-  void retryApiConnection();
-
 private:
-
   void storeSettings(QListWidgetItem *pluginItem);
 
 public:
@@ -75,13 +72,8 @@ public:
   bool getApiKeyChanged();
 
 private slots:
-  void on_associateButton_clicked();
   void on_bsaDateBtn_clicked();
-  void on_clearCacheButton_clicked();
   void on_execBlacklistBtn_clicked();
-  void on_nexusConnect_clicked();
-  void on_nexusDisconnect_clicked();
-  void on_nexusManualKey_clicked();
   void on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
   void on_resetGeometryBtn_clicked();
 
@@ -89,30 +81,10 @@ private slots:
 
 private:
   Settings* m_settings;
-  PluginContainer *m_PluginContainer;
 
   bool m_GeometriesReset;
-  bool m_keyChanged;
 
   QString m_ExecutableBlacklist;
-  std::unique_ptr<NexusSSOLogin> m_nexusLogin;
-  std::unique_ptr<NexusKeyValidator> m_nexusValidator;
-
-  void validateKey(const QString& key);
-  bool setKey(const QString& key);
-  bool clearKey();
-
-  void updateNexusState();
-  void updateNexusButtons();
-  void updateNexusData();
-
-  void onSSOKeyChanged(const QString& key);
-  void onSSOStateChanged(NexusSSOLogin::States s, const QString& e);
-
-  void onValidatorStateChanged(NexusKeyValidator::States s, const QString& e);
-  void onValidatorFinished(const APIUserAccount& user);
-
-  void addNexusLog(const QString& s);
 };
 
 #endif // SETTINGSDIALOG_H
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index b22b04fd..cd98dfdc 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -6,7 +6,7 @@
 
 using MOBase::QuestionBoxMemory;
 
-GeneralTab::GeneralTab(Settings *m_parent, SettingsDialog &m_dialog)
+GeneralSettingsTab::GeneralSettingsTab(Settings *m_parent, SettingsDialog &m_dialog)
   : SettingsTab(m_parent, m_dialog)
 {
   addLanguages();
@@ -87,7 +87,7 @@ GeneralTab::GeneralTab(Settings *m_parent, SettingsDialog &m_dialog)
   QObject::connect(ui->resetDialogsButton, &QPushButton::clicked, [&]{ on_resetDialogsButton_clicked(); });
 }
 
-void GeneralTab::update()
+void GeneralSettingsTab::update()
 {
   QString oldLanguage = m_parent->language();
   QString newLanguage = ui->languageBox->itemData(ui->languageBox->currentIndex()).toString();
@@ -115,7 +115,7 @@ void GeneralTab::update()
   m_Settings.setValue("Settings/colorSeparatorScrollbars", ui->colorSeparatorsBox->isChecked());
 }
 
-void GeneralTab::addLanguages()
+void GeneralSettingsTab::addLanguages()
 {
   std::vector<std::pair<QString, QString>> languages;
 
@@ -150,7 +150,7 @@ void GeneralTab::addLanguages()
   }
 }
 
-void GeneralTab::addStyles()
+void GeneralSettingsTab::addStyles()
 {
   ui->styleBox->addItem("None", "");
   ui->styleBox->addItem("Fusion", "Fusion");
@@ -163,12 +163,12 @@ void GeneralTab::addStyles()
   }
 }
 
-void GeneralTab::resetDialogs()
+void GeneralSettingsTab::resetDialogs()
 {
   QuestionBoxMemory::resetDialogs();
 }
 
-void GeneralTab::setButtonColor(QPushButton *button, const QColor &color)
+void GeneralSettingsTab::setButtonColor(QPushButton *button, const QColor &color)
 {
   button->setStyleSheet(
     QString("QPushButton {"
@@ -185,7 +185,7 @@ void GeneralTab::setButtonColor(QPushButton *button, const QColor &color)
   );
 };
 
-void GeneralTab::on_containsBtn_clicked()
+void GeneralSettingsTab::on_containsBtn_clicked()
 {
   QColor result = QColorDialog::getColor(m_ContainsColor, parentWidget(), "Color Picker: Mod contains selected plugin", QColorDialog::ShowAlphaChannel);
   if (result.isValid()) {
@@ -194,7 +194,7 @@ void GeneralTab::on_containsBtn_clicked()
   }
 }
 
-void GeneralTab::on_containedBtn_clicked()
+void GeneralSettingsTab::on_containedBtn_clicked()
 {
   QColor result = QColorDialog::getColor(m_ContainedColor, parentWidget(), "ColorPicker: Plugin is Contained in selected Mod", QColorDialog::ShowAlphaChannel);
   if (result.isValid()) {
@@ -203,7 +203,7 @@ void GeneralTab::on_containedBtn_clicked()
   }
 }
 
-void GeneralTab::on_overwrittenBtn_clicked()
+void GeneralSettingsTab::on_overwrittenBtn_clicked()
 {
   QColor result = QColorDialog::getColor(m_OverwrittenColor, parentWidget(), "ColorPicker: Is overwritten (loose files)", QColorDialog::ShowAlphaChannel);
   if (result.isValid()) {
@@ -212,7 +212,7 @@ void GeneralTab::on_overwrittenBtn_clicked()
   }
 }
 
-void GeneralTab::on_overwritingBtn_clicked()
+void GeneralSettingsTab::on_overwritingBtn_clicked()
 {
   QColor result = QColorDialog::getColor(m_OverwritingColor, parentWidget(), "ColorPicker: Is overwriting (loose files)", QColorDialog::ShowAlphaChannel);
   if (result.isValid()) {
@@ -221,7 +221,7 @@ void GeneralTab::on_overwritingBtn_clicked()
   }
 }
 
-void GeneralTab::on_overwrittenArchiveBtn_clicked()
+void GeneralSettingsTab::on_overwrittenArchiveBtn_clicked()
 {
   QColor result = QColorDialog::getColor(m_OverwrittenArchiveColor, parentWidget(), "ColorPicker: Is overwritten (archive files)", QColorDialog::ShowAlphaChannel);
   if (result.isValid()) {
@@ -230,7 +230,7 @@ void GeneralTab::on_overwrittenArchiveBtn_clicked()
   }
 }
 
-void GeneralTab::on_overwritingArchiveBtn_clicked()
+void GeneralSettingsTab::on_overwritingArchiveBtn_clicked()
 {
   QColor result = QColorDialog::getColor(m_OverwritingArchiveColor, parentWidget(), "ColorPicker: Is overwriting (archive files)", QColorDialog::ShowAlphaChannel);
   if (result.isValid()) {
@@ -239,7 +239,7 @@ void GeneralTab::on_overwritingArchiveBtn_clicked()
   }
 }
 
-void GeneralTab::on_resetColorsBtn_clicked()
+void GeneralSettingsTab::on_resetColorsBtn_clicked()
 {
   m_OverwritingColor = QColor(255, 0, 0, 64);
   m_OverwrittenColor = QColor(0, 255, 0, 64);
@@ -256,7 +256,7 @@ void GeneralTab::on_resetColorsBtn_clicked()
   setButtonColor(ui->containedBtn, m_ContainedColor);
 }
 
-void GeneralTab::on_resetDialogsButton_clicked()
+void GeneralSettingsTab::on_resetDialogsButton_clicked()
 {
   if (QMessageBox::question(parentWidget(), QObject::tr("Confirm?"),
     QObject::tr("This will make all dialogs show up again where you checked the \"Remember selection\"-box. Continue?"),
@@ -265,7 +265,7 @@ void GeneralTab::on_resetDialogsButton_clicked()
   }
 }
 
-void GeneralTab::on_categoriesBtn_clicked()
+void GeneralSettingsTab::on_categoriesBtn_clicked()
 {
   CategoriesDialog dialog(parentWidget());
   if (dialog.exec() == QDialog::Accepted) {
diff --git a/src/settingsdialoggeneral.h b/src/settingsdialoggeneral.h
index 1f1b4637..c7fcae36 100644
--- a/src/settingsdialoggeneral.h
+++ b/src/settingsdialoggeneral.h
@@ -4,10 +4,10 @@
 #include "settingsdialog.h"
 #include "settings.h"
 
-class GeneralTab : public SettingsTab
+class GeneralSettingsTab : public SettingsTab
 {
 public:
-  GeneralTab(Settings *m_parent, SettingsDialog &m_dialog);
+  GeneralSettingsTab(Settings *m_parent, SettingsDialog &m_dialog);
 
   void update();
 
diff --git a/src/settingsdialognexus.cpp b/src/settingsdialognexus.cpp
new file mode 100644
index 00000000..7d4414fd
--- /dev/null
+++ b/src/settingsdialognexus.cpp
@@ -0,0 +1,374 @@
+#include "settingsdialognexus.h"
+#include "ui_settingsdialog.h"
+#include "ui_nexusmanualkey.h"
+#include "nexusinterface.h"
+#include <utility.h>
+
+namespace shell = MOBase::shell;
+
+template <typename T>
+class ServerItem : public QListWidgetItem {
+public:
+  ServerItem(const QString &text, int sortRole = Qt::DisplayRole, QListWidget *parent = 0, int type = Type)
+    : QListWidgetItem(text, parent, type), m_SortRole(sortRole) {}
+
+  virtual bool operator< ( const QListWidgetItem & other ) const {
+    return this->data(m_SortRole).value<T>() < other.data(m_SortRole).value<T>();
+  }
+private:
+  int m_SortRole;
+};
+
+
+class NexusManualKeyDialog : public QDialog
+{
+public:
+  NexusManualKeyDialog(QWidget* parent)
+    : QDialog(parent), ui(new Ui::NexusManualKeyDialog)
+  {
+    ui->setupUi(this);
+    ui->key->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
+
+    connect(ui->openBrowser, &QPushButton::clicked, [&]{ openBrowser(); });
+    connect(ui->paste, &QPushButton::clicked, [&]{ paste(); });
+    connect(ui->clear, &QPushButton::clicked, [&]{ clear(); });
+  }
+
+  void accept() override
+  {
+    m_key = ui->key->toPlainText();
+    QDialog::accept();
+  }
+
+  const QString& key() const
+  {
+    return m_key;
+  }
+
+  void openBrowser()
+  {
+    shell::OpenLink(QUrl("https://www.nexusmods.com/users/myaccount?tab=api"));
+  }
+
+  void paste()
+  {
+    const auto text = QApplication::clipboard()->text();
+    if (!text.isEmpty()) {
+      ui->key->setPlainText(text);
+    }
+  }
+
+  void clear()
+  {
+    ui->key->clear();
+  }
+
+private:
+  std::unique_ptr<Ui::NexusManualKeyDialog> ui;
+  QString m_key;
+};
+
+
+NexusSettingsTab::NexusSettingsTab(Settings *parent, SettingsDialog &dialog)
+  : SettingsTab(parent, dialog)
+{
+  ui->offlineBox->setChecked(parent->offlineMode());
+  ui->proxyBox->setChecked(parent->useProxy());
+  ui->endorsementBox->setChecked(parent->endorsementIntegration());
+  ui->hideAPICounterBox->setChecked(parent->hideAPICounter());
+
+  // display server preferences
+  m_Settings.beginGroup("Servers");
+  for (const QString &key : m_Settings.childKeys()) {
+    QVariantMap val = m_Settings.value(key).toMap();
+    QString descriptor = key;
+    if (!descriptor.compare("CDN", Qt::CaseInsensitive)) {
+      descriptor += QStringLiteral(" (automatic)");
+    }
+    if (val.contains("downloadSpeed") && val.contains("downloadCount") && (val["downloadCount"].toInt() > 0)) {
+      int bps = static_cast<int>(val["downloadSpeed"].toDouble() / val["downloadCount"].toInt());
+      descriptor += QString(" (%1 kbps)").arg(bps / 1024);
+    }
+
+    QListWidgetItem *newItem = new ServerItem<int>(descriptor, Qt::UserRole + 1);
+
+    newItem->setData(Qt::UserRole, key);
+    newItem->setData(Qt::UserRole + 1, val["preferred"].toInt());
+    if (val["preferred"].toInt() > 0) {
+      ui->preferredServersList->addItem(newItem);
+    } else {
+      ui->knownServersList->addItem(newItem);
+    }
+    ui->preferredServersList->sortItems(Qt::DescendingOrder);
+  }
+  m_Settings.endGroup();
+
+  QObject::connect(ui->nexusConnect, &QPushButton::clicked, [&]{ on_nexusConnect_clicked(); });
+  QObject::connect(ui->nexusManualKey, &QPushButton::clicked, [&]{ on_nexusManualKey_clicked(); });
+  QObject::connect(ui->nexusDisconnect, &QPushButton::clicked, [&]{ on_nexusDisconnect_clicked(); });
+  QObject::connect(ui->clearCacheButton, &QPushButton::clicked, [&]{ on_clearCacheButton_clicked(); });
+  QObject::connect(ui->associateButton, &QPushButton::clicked, [&]{ on_associateButton_clicked(); });
+
+  updateNexusState();
+}
+
+void NexusSettingsTab::update()
+{
+  /*
+  if (m_loginCheckBox->isChecked()) {
+  m_Settings.setValue("Settings/nexus_login", true);
+  m_Settings.setValue("Settings/nexus_username", m_usernameEdit->text());
+  m_Settings.setValue("Settings/nexus_password", obfuscate(m_passwordEdit->text()));
+  } else {
+  m_Settings.setValue("Settings/nexus_login", false);
+  m_Settings.remove("Settings/nexus_username");
+  m_Settings.remove("Settings/nexus_password");
+  }
+  */
+  m_Settings.setValue("Settings/offline_mode", ui->offlineBox->isChecked());
+  m_Settings.setValue("Settings/use_proxy", ui->proxyBox->isChecked());
+  m_Settings.setValue("Settings/endorsement_integration", ui->endorsementBox->isChecked());
+  m_Settings.setValue("Settings/hide_api_counter", ui->hideAPICounterBox->isChecked());
+
+  // store server preference
+  m_Settings.beginGroup("Servers");
+  for (int i = 0; i < ui->knownServersList->count(); ++i) {
+    QString key = ui->knownServersList->item(i)->data(Qt::UserRole).toString();
+    QVariantMap val = m_Settings.value(key).toMap();
+    val["preferred"] = 0;
+    m_Settings.setValue(key, val);
+  }
+  int count = ui->preferredServersList->count();
+  for (int i = 0; i < count; ++i) {
+    QString key = ui->preferredServersList->item(i)->data(Qt::UserRole).toString();
+    QVariantMap val = m_Settings.value(key).toMap();
+    val["preferred"] = count - i;
+    m_Settings.setValue(key, val);
+  }
+  m_Settings.endGroup();
+}
+
+void NexusSettingsTab::on_nexusConnect_clicked()
+{
+  if (m_nexusLogin && m_nexusLogin->isActive()) {
+    m_nexusLogin->cancel();
+    return;
+  }
+
+  if (!m_nexusLogin) {
+    m_nexusLogin.reset(new NexusSSOLogin);
+
+    m_nexusLogin->keyChanged = [&](auto&& s){
+      onSSOKeyChanged(s);
+    };
+
+    m_nexusLogin->stateChanged = [&](auto&& s, auto&& e){
+      onSSOStateChanged(s, e);
+    };
+  }
+
+  ui->nexusLog->clear();
+  m_nexusLogin->start();
+  updateNexusState();
+}
+
+void NexusSettingsTab::on_nexusManualKey_clicked()
+{
+  if (m_nexusValidator && m_nexusValidator->isActive()) {
+    m_nexusValidator->cancel();
+    return;
+  }
+
+  NexusManualKeyDialog dialog(parentWidget());
+  if (dialog.exec() != QDialog::Accepted) {
+    return;
+  }
+
+  const auto key = dialog.key();
+  if (key.isEmpty()) {
+    clearKey();
+    return;
+  }
+
+  ui->nexusLog->clear();
+  validateKey(key);
+}
+
+void NexusSettingsTab::on_nexusDisconnect_clicked()
+{
+  clearKey();
+  ui->nexusLog->clear();
+  addNexusLog(QObject::tr("Disconnected."));
+}
+
+void NexusSettingsTab::on_clearCacheButton_clicked()
+{
+  QDir(Settings::instance().getCacheDirectory()).removeRecursively();
+  NexusInterface::instance(m_dialog.m_PluginContainer)->clearCache();
+}
+
+void NexusSettingsTab::on_associateButton_clicked()
+{
+  Settings::instance().registerAsNXMHandler(true);
+}
+
+void NexusSettingsTab::validateKey(const QString& key)
+{
+  if (!m_nexusValidator) {
+    m_nexusValidator.reset(new NexusKeyValidator(
+      *NexusInterface::instance(m_dialog.m_PluginContainer)->getAccessManager()));
+
+    m_nexusValidator->stateChanged = [&](auto&& s, auto&& e){
+      onValidatorStateChanged(s, e);
+    };
+
+    m_nexusValidator->finished = [&](auto&& user) {
+      onValidatorFinished(user);
+    };
+  }
+
+  addNexusLog(QObject::tr("Checking API key..."));
+  m_nexusValidator->start(key);
+}
+
+void NexusSettingsTab::onSSOKeyChanged(const QString& key)
+{
+  if (key.isEmpty()) {
+    clearKey();
+  } else {
+    addNexusLog(QObject::tr("Received API key."));
+    validateKey(key);
+  }
+}
+
+void NexusSettingsTab::onSSOStateChanged(NexusSSOLogin::States s, const QString& e)
+{
+  if (s != NexusSSOLogin::Finished) {
+    // finished state is handled in onSSOKeyChanged()
+    const auto log = NexusSSOLogin::stateToString(s, e);
+
+    for (auto&& line : log.split("\n")) {
+      addNexusLog(line);
+    }
+  }
+
+  updateNexusState();
+}
+
+void NexusSettingsTab::onValidatorStateChanged(
+  NexusKeyValidator::States s, const QString& e)
+{
+  if (s != NexusKeyValidator::Finished) {
+    // finished state is handled in onValidatorFinished()
+    const auto log = NexusKeyValidator::stateToString(s, e);
+
+    for (auto&& line : log.split("\n")) {
+      addNexusLog(line);
+    }
+  }
+
+  updateNexusState();
+}
+
+void NexusSettingsTab::onValidatorFinished(const APIUserAccount& user)
+{
+  NexusInterface::instance(m_dialog.m_PluginContainer)->setUserAccount(user);
+
+  if (!user.apiKey().isEmpty()) {
+    if (setKey(user.apiKey())) {
+      addNexusLog(QObject::tr("Linked with Nexus successfully."));
+    }
+  }
+}
+
+void NexusSettingsTab::addNexusLog(const QString& s)
+{
+  ui->nexusLog->addItem(s);
+  ui->nexusLog->scrollToBottom();
+}
+
+bool NexusSettingsTab::setKey(const QString& key)
+{
+  m_dialog.m_keyChanged = true;
+  const bool ret = m_parent->setNexusApiKey(key);
+  updateNexusState();
+  return ret;
+}
+
+bool NexusSettingsTab::clearKey()
+{
+  m_dialog.m_keyChanged = true;
+  const auto ret = m_parent->clearNexusApiKey();
+
+  NexusInterface::instance(m_dialog.m_PluginContainer)->getAccessManager()->clearApiKey();
+  updateNexusState();
+
+  return ret;
+}
+
+void NexusSettingsTab::updateNexusState()
+{
+  updateNexusButtons();
+  updateNexusData();
+}
+
+void NexusSettingsTab::updateNexusButtons()
+{
+  if (m_nexusLogin && m_nexusLogin->isActive()) {
+    // api key is in the process of being retrieved
+    ui->nexusConnect->setText(QObject::tr("Cancel"));
+    ui->nexusConnect->setEnabled(true);
+    ui->nexusDisconnect->setEnabled(false);
+    ui->nexusManualKey->setText(QObject::tr("Enter API Key Manually"));
+    ui->nexusManualKey->setEnabled(false);
+  }
+  else if (m_nexusValidator && m_nexusValidator->isActive()) {
+    // api key is in the process of being tested
+    ui->nexusConnect->setText(QObject::tr("Connect to Nexus"));
+    ui->nexusConnect->setEnabled(false);
+    ui->nexusDisconnect->setEnabled(false);
+    ui->nexusManualKey->setText(QObject::tr("Cancel"));
+    ui->nexusManualKey->setEnabled(true);
+  }
+  else if (m_parent->hasNexusApiKey()) {
+    // api key is present
+    ui->nexusConnect->setText(QObject::tr("Connect to Nexus"));
+    ui->nexusConnect->setEnabled(false);
+    ui->nexusDisconnect->setEnabled(true);
+    ui->nexusManualKey->setText(QObject::tr("Enter API Key Manually"));
+    ui->nexusManualKey->setEnabled(false);
+  } else {
+    // api key not present
+    ui->nexusConnect->setText(QObject::tr("Connect to Nexus"));
+    ui->nexusConnect->setEnabled(true);
+    ui->nexusDisconnect->setEnabled(false);
+    ui->nexusManualKey->setText(QObject::tr("Enter API Key Manually"));
+    ui->nexusManualKey->setEnabled(true);
+  }
+}
+
+void NexusSettingsTab::updateNexusData()
+{
+  const auto user = NexusInterface::instance(m_dialog.m_PluginContainer)
+    ->getAPIUserAccount();
+
+  if (user.isValid()) {
+    ui->nexusUserID->setText(user.id());
+    ui->nexusName->setText(user.name());
+    ui->nexusAccount->setText(localizedUserAccountType(user.type()));
+
+    ui->nexusDailyRequests->setText(QString("%1/%2")
+      .arg(user.limits().remainingDailyRequests)
+      .arg(user.limits().maxDailyRequests));
+
+    ui->nexusHourlyRequests->setText(QString("%1/%2")
+      .arg(user.limits().remainingHourlyRequests)
+      .arg(user.limits().maxHourlyRequests));
+  } else {
+    ui->nexusUserID->setText(QObject::tr("N/A"));
+    ui->nexusName->setText(QObject::tr("N/A"));
+    ui->nexusAccount->setText(QObject::tr("N/A"));
+    ui->nexusDailyRequests->setText(QObject::tr("N/A"));
+    ui->nexusHourlyRequests->setText(QObject::tr("N/A"));
+  }
+}
diff --git a/src/settingsdialognexus.h b/src/settingsdialognexus.h
new file mode 100644
index 00000000..5c01f61f
--- /dev/null
+++ b/src/settingsdialognexus.h
@@ -0,0 +1,40 @@
+#ifndef SETTINGSDIALOGNEXUS_H
+#define SETTINGSDIALOGNEXUS_H
+
+#include "settings.h"
+#include "settingsdialog.h"
+
+class NexusSettingsTab : public SettingsTab
+{
+public:
+  NexusSettingsTab(Settings *m_parent, SettingsDialog &m_dialog);
+  void update();
+
+private:
+  std::unique_ptr<NexusSSOLogin> m_nexusLogin;
+  std::unique_ptr<NexusKeyValidator> m_nexusValidator;
+
+  void on_nexusConnect_clicked();
+  void on_nexusManualKey_clicked();
+  void on_nexusDisconnect_clicked();
+  void on_clearCacheButton_clicked();
+  void on_associateButton_clicked();
+
+  void validateKey(const QString& key);
+  bool setKey(const QString& key);
+  bool clearKey();
+
+  void updateNexusState();
+  void updateNexusButtons();
+  void updateNexusData();
+
+  void onSSOKeyChanged(const QString& key);
+  void onSSOStateChanged(NexusSSOLogin::States s, const QString& e);
+
+  void onValidatorStateChanged(NexusKeyValidator::States s, const QString& e);
+  void onValidatorFinished(const APIUserAccount& user);
+
+  void addNexusLog(const QString& s);
+};
+
+#endif // SETTINGSDIALOGNEXUS_H
diff --git a/src/settingsdialogpaths.cpp b/src/settingsdialogpaths.cpp
index 303d1562..6e8fe994 100644
--- a/src/settingsdialogpaths.cpp
+++ b/src/settingsdialogpaths.cpp
@@ -3,7 +3,7 @@
 #include "appconfig.h"
 #include <iplugingame.h>
 
-PathsTab::PathsTab(Settings *parent, SettingsDialog &dialog)
+PathsSettingsTab::PathsSettingsTab(Settings *parent, SettingsDialog &dialog)
   : SettingsTab(parent, dialog)
 {
   ui->baseDirEdit->setText(m_parent->getBaseDirectory());
@@ -38,7 +38,7 @@ PathsTab::PathsTab(Settings *parent, SettingsDialog &dialog)
   QObject::connect(ui->profilesDirEdit, &QLineEdit::editingFinished, [&]{ on_profilesDirEdit_editingFinished(); });
 }
 
-void PathsTab::update()
+void PathsSettingsTab::update()
 {
   typedef std::tuple<QString, QString, std::wstring> Directory;
 
@@ -91,7 +91,7 @@ void PathsTab::update()
   }
 }
 
-void PathsTab::on_browseBaseDirBtn_clicked()
+void PathsSettingsTab::on_browseBaseDirBtn_clicked()
 {
   QString temp = QFileDialog::getExistingDirectory(
     parentWidget(), QObject::tr("Select base directory"), ui->baseDirEdit->text());
@@ -100,7 +100,7 @@ void PathsTab::on_browseBaseDirBtn_clicked()
   }
 }
 
-void PathsTab::on_browseDownloadDirBtn_clicked()
+void PathsSettingsTab::on_browseDownloadDirBtn_clicked()
 {
   QString searchPath = ui->downloadDirEdit->text();
   searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
@@ -111,7 +111,7 @@ void PathsTab::on_browseDownloadDirBtn_clicked()
   }
 }
 
-void PathsTab::on_browseModDirBtn_clicked()
+void PathsSettingsTab::on_browseModDirBtn_clicked()
 {
   QString searchPath = ui->modDirEdit->text();
   searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
@@ -122,7 +122,7 @@ void PathsTab::on_browseModDirBtn_clicked()
   }
 }
 
-void PathsTab::on_browseCacheDirBtn_clicked()
+void PathsSettingsTab::on_browseCacheDirBtn_clicked()
 {
   QString searchPath = ui->cacheDirEdit->text();
   searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
@@ -133,7 +133,7 @@ void PathsTab::on_browseCacheDirBtn_clicked()
   }
 }
 
-void PathsTab::on_browseProfilesDirBtn_clicked()
+void PathsSettingsTab::on_browseProfilesDirBtn_clicked()
 {
   QString searchPath = ui->profilesDirEdit->text();
   searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
@@ -144,7 +144,7 @@ void PathsTab::on_browseProfilesDirBtn_clicked()
   }
 }
 
-void PathsTab::on_browseOverwriteDirBtn_clicked()
+void PathsSettingsTab::on_browseOverwriteDirBtn_clicked()
 {
   QString searchPath = ui->overwriteDirEdit->text();
   searchPath.replace("%BASE_DIR%", ui->baseDirEdit->text());
@@ -155,7 +155,7 @@ void PathsTab::on_browseOverwriteDirBtn_clicked()
   }
 }
 
-void PathsTab::on_browseGameDirBtn_clicked()
+void PathsSettingsTab::on_browseGameDirBtn_clicked()
 {
   QFileInfo oldGameExe(ui->managedGameDirEdit->text());
 
@@ -165,37 +165,37 @@ void PathsTab::on_browseGameDirBtn_clicked()
   }
 }
 
-void PathsTab::on_baseDirEdit_editingFinished()
+void PathsSettingsTab::on_baseDirEdit_editingFinished()
 {
   normalizePath(ui->baseDirEdit);
 }
 
-void PathsTab::on_downloadDirEdit_editingFinished()
+void PathsSettingsTab::on_downloadDirEdit_editingFinished()
 {
   normalizePath(ui->downloadDirEdit);
 }
 
-void PathsTab::on_modDirEdit_editingFinished()
+void PathsSettingsTab::on_modDirEdit_editingFinished()
 {
   normalizePath(ui->modDirEdit);
 }
 
-void PathsTab::on_cacheDirEdit_editingFinished()
+void PathsSettingsTab::on_cacheDirEdit_editingFinished()
 {
   normalizePath(ui->cacheDirEdit);
 }
 
-void PathsTab::on_profilesDirEdit_editingFinished()
+void PathsSettingsTab::on_profilesDirEdit_editingFinished()
 {
   normalizePath(ui->profilesDirEdit);
 }
 
-void PathsTab::on_overwriteDirEdit_editingFinished()
+void PathsSettingsTab::on_overwriteDirEdit_editingFinished()
 {
   normalizePath(ui->overwriteDirEdit);
 }
 
-void PathsTab::normalizePath(QLineEdit *lineEdit)
+void PathsSettingsTab::normalizePath(QLineEdit *lineEdit)
 {
   QString text = lineEdit->text();
   while (text.endsWith('/') || text.endsWith('\\')) {
diff --git a/src/settingsdialogpaths.h b/src/settingsdialogpaths.h
index dac402b1..f661b624 100644
--- a/src/settingsdialogpaths.h
+++ b/src/settingsdialogpaths.h
@@ -4,10 +4,10 @@
 #include "settings.h"
 #include "settingsdialog.h"
 
-class PathsTab : public SettingsTab
+class PathsSettingsTab : public SettingsTab
 {
 public:
-  PathsTab(Settings *parent, SettingsDialog &dialog);
+  PathsSettingsTab(Settings *parent, SettingsDialog &dialog);
 
   void update();
 
-- 
cgit v1.3.1


From d91d0caba5fac3b2b27698a5e6ab4a9b60efbf53 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 20 Jul 2019 09:47:09 -0400
Subject: removed incorrect warning that steam password is unencrypted split
 steam tab

---
 src/CMakeLists.txt          |  3 +++
 src/settings.cpp            | 36 +++++-----------------------
 src/settings.h              | 13 ----------
 src/settingsdialog.ui       | 58 ++++++++++++++++-----------------------------
 src/settingsdialogsteam.cpp | 17 +++++++++++++
 src/settingsdialogsteam.h   | 17 +++++++++++++
 6 files changed, 64 insertions(+), 80 deletions(-)
 create mode 100644 src/settingsdialogsteam.cpp
 create mode 100644 src/settingsdialogsteam.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b2407e17..a1adf2db 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,6 +40,7 @@ SET(organizer_SRCS
 	settingsdialoggeneral.cpp
 	settingsdialognexus.cpp
 	settingsdialogpaths.cpp
+	settingsdialogsteam.cpp
     settings.cpp
     selfupdater.cpp
     selectiondialog.cpp
@@ -157,6 +158,7 @@ SET(organizer_HDRS
 	settingsdialoggeneral.h
 	settingsdialognexus.h
 	settingsdialogpaths.h
+	settingsdialogsteam.h
     settings.h
     selfupdater.h
     selectiondialog.h
@@ -440,6 +442,7 @@ set(settings
 	settingsdialoggeneral
 	settingsdialognexus
 	settingsdialogpaths
+	settingsdialogsteam
 )
 
 set(utilities
diff --git a/src/settings.cpp b/src/settings.cpp
index bded470c..26c9720a 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -25,6 +25,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "settingsdialoggeneral.h"
 #include "settingsdialognexus.h"
 #include "settingsdialogpaths.h"
+#include "settingsdialogsteam.h"
 #include "versioninfo.h"
 #include "appconfig.h"
 #include "organizercore.h"
@@ -391,15 +392,10 @@ bool Settings::hasNexusApiKey() const
 
 bool Settings::getSteamLogin(QString &username, QString &password) const
 {
-  if (m_Settings.contains("Settings/steam_username")) {
-    QString tempPass = deObfuscate("steam_password");
-    if (!tempPass.isEmpty()) {
-      username = m_Settings.value("Settings/steam_username").toString();
-      password = tempPass;
-      return true;
-    }
-  }
-  return false;
+  username = m_Settings.value("Settings/steam_username", "").toString();
+  password = deObfuscate("steam_password");
+
+  return !username.isEmpty() && !password.isEmpty();
 }
 bool Settings::compactDownloads() const
 {
@@ -680,7 +676,7 @@ void Settings::query(PluginContainer *pluginContainer, QWidget *parent)
   tabs.push_back(std::unique_ptr<SettingsTab>(new PathsSettingsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new DiagnosticsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new NexusSettingsTab(this, dialog)));
-  tabs.push_back(std::unique_ptr<SettingsTab>(new SteamTab(this, dialog)));
+  tabs.push_back(std::unique_ptr<SettingsTab>(new SteamSettingsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new PluginsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new WorkaroundsTab(this, dialog)));
 
@@ -770,26 +766,6 @@ void Settings::DiagnosticsTab::update()
 }
 
 
-Settings::SteamTab::SteamTab(Settings *m_parent, SettingsDialog &m_dialog)
-  : SettingsTab(m_parent, m_dialog)
-  , m_steamUserEdit(m_dialog.findChild<QLineEdit *>("steamUserEdit"))
-  , m_steamPassEdit(m_dialog.findChild<QLineEdit *>("steamPassEdit"))
-{
-  if (m_Settings.contains("Settings/steam_username")) {
-    m_steamUserEdit->setText(m_Settings.value("Settings/steam_username", "").toString());
-    QString password = deObfuscate("steam_password");
-    if (!password.isEmpty()) {
-      m_steamPassEdit->setText(password);
-    }
-  }
-}
-
-void Settings::SteamTab::update()
-{
-  //FIXME this should be inlined here?
-  m_parent->setSteamLogin(m_steamUserEdit->text(), m_steamPassEdit->text());
-}
-
 Settings::PluginsTab::PluginsTab(Settings *m_parent, SettingsDialog &m_dialog)
   : SettingsTab(m_parent, m_dialog)
   , m_pluginsList(m_dialog.findChild<QListWidget *>("pluginsList"))
diff --git a/src/settings.h b/src/settings.h
index b9383ce4..5bf705d1 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -461,19 +461,6 @@ private:
     void setLevelsBox();
   };
 
-  /** Display/store the configuration in the 'steam' tab of the settings dialogue */
-  class SteamTab : public SettingsTab
-  {
-  public:
-    SteamTab(Settings *m_parent, SettingsDialog &m_dialog);
-
-    void update();
-
-  private:
-    QLineEdit *m_steamUserEdit;
-    QLineEdit *m_steamPassEdit;
-  };
-
   /** Display/store the configuration in the 'plugins' tab of the settings dialogue */
   class PluginsTab : public SettingsTab
   {
diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 1e94bcde..3ad525e1 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -828,71 +828,55 @@ If you use pre-releases, never contact me directly by e-mail or via private mess
        <string>Steam</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3">
-       <item row="0" column="0">
+       <item row="1" column="0">
         <widget class="QLabel" name="label_19">
          <property name="text">
           <string>Username</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="QLineEdit" name="steamUserEdit"/>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_20">
-         <property name="text">
-          <string>Password</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="steamPassEdit">
-         <property name="echoMode">
-          <enum>QLineEdit::Password</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0">
-        <spacer name="verticalSpacer_5">
+       <item row="4" column="0">
+        <spacer name="verticalSpacer_4">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
-          <enum>QSizePolicy::Minimum</enum>
+          <enum>QSizePolicy::Expanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>40</height>
+           <height>232</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="3" column="0" colspan="2">
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="steamUserEdit"/>
+       </item>
+       <item row="0" column="0" colspan="2">
         <widget class="QLabel" name="label_21">
          <property name="text">
-          <string>If you save your steam user ID and password here, they will be used when logging into steam. Note, however, your password will be stored unencrypted, so make sure your computer is secure.</string>
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you save your steam user ID and password here, they will be used when logging into steam.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
-        <spacer name="verticalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Expanding</enum>
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_20">
+         <property name="text">
+          <string>Password</string>
          </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>232</height>
-          </size>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="steamPassEdit">
+         <property name="echoMode">
+          <enum>QLineEdit::Password</enum>
          </property>
-        </spacer>
+        </widget>
        </item>
       </layout>
      </widget>
diff --git a/src/settingsdialogsteam.cpp b/src/settingsdialogsteam.cpp
new file mode 100644
index 00000000..34c2d76b
--- /dev/null
+++ b/src/settingsdialogsteam.cpp
@@ -0,0 +1,17 @@
+#include "settingsdialogsteam.h"
+#include "ui_settingsdialog.h"
+
+SteamSettingsTab::SteamSettingsTab(Settings *m_parent, SettingsDialog &m_dialog)
+  : SettingsTab(m_parent, m_dialog)
+{
+  QString username, password;
+  m_parent->getSteamLogin(username, password);
+
+  ui->steamUserEdit->setText(username);
+  ui->steamPassEdit->setText(password);
+}
+
+void SteamSettingsTab::update()
+{
+  m_parent->setSteamLogin(ui->steamUserEdit->text(), ui->steamPassEdit->text());
+}
diff --git a/src/settingsdialogsteam.h b/src/settingsdialogsteam.h
new file mode 100644
index 00000000..dbd85151
--- /dev/null
+++ b/src/settingsdialogsteam.h
@@ -0,0 +1,17 @@
+#ifndef SETTINGSDIALOGSTEAM_H
+#define SETTINGSDIALOGSTEAM_H
+
+#include "settings.h"
+#include "settingsdialog.h"
+
+class SteamSettingsTab : public SettingsTab
+{
+public:
+  SteamSettingsTab(Settings *m_parent, SettingsDialog &m_dialog);
+
+  void update();
+
+private:
+};
+
+#endif // SETTINGSDIALOGSTEAM_H
-- 
cgit v1.3.1


From 55eafd62dd3c96f363cde4537061e7f03ae8fd0a Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 20 Jul 2019 10:10:49 -0400
Subject: split plugins tab

---
 src/CMakeLists.txt            |   3 ++
 src/settings.cpp              |  54 +++------------------
 src/settings.h                |  25 +++-------
 src/settingsdialog.cpp        |  52 --------------------
 src/settingsdialog.h          |   4 --
 src/settingsdialogplugins.cpp | 110 ++++++++++++++++++++++++++++++++++++++++++
 src/settingsdialogplugins.h   |  20 ++++++++
 7 files changed, 146 insertions(+), 122 deletions(-)
 create mode 100644 src/settingsdialogplugins.cpp
 create mode 100644 src/settingsdialogplugins.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a1adf2db..a8ded510 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -40,6 +40,7 @@ SET(organizer_SRCS
 	settingsdialoggeneral.cpp
 	settingsdialognexus.cpp
 	settingsdialogpaths.cpp
+	settingsdialogplugins.cpp
 	settingsdialogsteam.cpp
     settings.cpp
     selfupdater.cpp
@@ -158,6 +159,7 @@ SET(organizer_HDRS
 	settingsdialoggeneral.h
 	settingsdialognexus.h
 	settingsdialogpaths.h
+	settingsdialogplugins.h
 	settingsdialogsteam.h
     settings.h
     selfupdater.h
@@ -442,6 +444,7 @@ set(settings
 	settingsdialoggeneral
 	settingsdialognexus
 	settingsdialogpaths
+	settingsdialogplugins
 	settingsdialogsteam
 )
 
diff --git a/src/settings.cpp b/src/settings.cpp
index 26c9720a..bc45b720 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -25,6 +25,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "settingsdialoggeneral.h"
 #include "settingsdialognexus.h"
 #include "settingsdialogpaths.h"
+#include "settingsdialogplugins.h"
 #include "settingsdialogsteam.h"
 #include "versioninfo.h"
 #include "appconfig.h"
@@ -677,7 +678,7 @@ void Settings::query(PluginContainer *pluginContainer, QWidget *parent)
   tabs.push_back(std::unique_ptr<SettingsTab>(new DiagnosticsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new NexusSettingsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new SteamSettingsTab(this, dialog)));
-  tabs.push_back(std::unique_ptr<SettingsTab>(new PluginsTab(this, dialog)));
+  tabs.push_back(std::unique_ptr<SettingsTab>(new PluginsSettingsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new WorkaroundsTab(this, dialog)));
 
 
@@ -687,6 +688,11 @@ void Settings::query(PluginContainer *pluginContainer, QWidget *parent)
   }
 
   if (dialog.exec() == QDialog::Accepted) {
+
+    for (auto&& tab : tabs) {
+      tab->closing();
+    }
+
     // remember settings before change
     QMap<QString, QString> before;
     m_Settings.beginGroup("Settings");
@@ -766,52 +772,6 @@ void Settings::DiagnosticsTab::update()
 }
 
 
-Settings::PluginsTab::PluginsTab(Settings *m_parent, SettingsDialog &m_dialog)
-  : SettingsTab(m_parent, m_dialog)
-  , m_pluginsList(m_dialog.findChild<QListWidget *>("pluginsList"))
-  , m_pluginBlacklistList(m_dialog.findChild<QListWidget *>("pluginBlacklist"))
-{
-  // display plugin settings
-  QSet<QString> handledNames;
-  for (IPlugin *plugin : m_parent->m_Plugins) {
-    if (handledNames.contains(plugin->name()))
-      continue;
-    QListWidgetItem *listItem = new QListWidgetItem(plugin->name(), m_pluginsList);
-    listItem->setData(Qt::UserRole, QVariant::fromValue((void*)plugin));
-    listItem->setData(Qt::UserRole + 1, m_parent->m_PluginSettings[plugin->name()]);
-    listItem->setData(Qt::UserRole + 2, m_parent->m_PluginDescriptions[plugin->name()]);
-    m_pluginsList->addItem(listItem);
-    handledNames.insert(plugin->name());
-  }
-
-  // display plugin blacklist
-  for (const QString &pluginName : m_parent->m_PluginBlacklist) {
-    m_pluginBlacklistList->addItem(pluginName);
-  }
-}
-
-void Settings::PluginsTab::update()
-{
-  // transfer plugin settings to in-memory structure
-  for (int i = 0; i < m_pluginsList->count(); ++i) {
-    QListWidgetItem *item = m_pluginsList->item(i);
-    m_parent->m_PluginSettings[item->text()] = item->data(Qt::UserRole + 1).toMap();
-  }
-  // store plugin settings on disc
-  for (auto iterPlugins = m_parent->m_PluginSettings.begin(); iterPlugins != m_parent->m_PluginSettings.end(); ++iterPlugins) {
-    for (auto iterSettings = iterPlugins->begin(); iterSettings != iterPlugins->end(); ++iterSettings) {
-      m_Settings.setValue("Plugins/" + iterPlugins.key() + "/" + iterSettings.key(), iterSettings.value());
-    }
-  }
-
-  // store plugin blacklist
-  m_parent->m_PluginBlacklist.clear();
-  for (QListWidgetItem *item : m_pluginBlacklistList->findItems("*", Qt::MatchWildcard)) {
-    m_parent->m_PluginBlacklist.insert(item->text());
-  }
-  m_parent->writePluginBlacklist();
-}
-
 Settings::WorkaroundsTab::WorkaroundsTab(Settings *m_parent,
                                          SettingsDialog &m_dialog)
   : SettingsTab(m_parent, m_dialog)
diff --git a/src/settings.h b/src/settings.h
index 5bf705d1..5298103a 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -70,6 +70,7 @@ public:
   virtual ~SettingsTab();
 
   virtual void update() = 0;
+  virtual void closing() {}
 
 protected:
   Settings *m_parent;
@@ -426,8 +427,13 @@ public:
    */
   bool colorSeparatorScrollbar() const;
 
+  // temp
   QSettings& settingsRef() { return m_Settings; }
   MOBase::IPluginGame const *gamePlugin() { return m_GamePlugin; }
+  QMap<QString, QVariantMap> m_PluginSettings;
+  QMap<QString, QVariantMap> m_PluginDescriptions;
+  QSet<QString> m_PluginBlacklist;
+  void writePluginBlacklist();
 
 public slots:
 
@@ -440,7 +446,6 @@ private:
   static QString deObfuscate(const QString key);
 
   void readPluginBlacklist();
-  void writePluginBlacklist();
   QString getConfigurablePath(const QString &key, const QString &def, bool resolve) const;
 
 
@@ -461,19 +466,6 @@ private:
     void setLevelsBox();
   };
 
-  /** Display/store the configuration in the 'plugins' tab of the settings dialogue */
-  class PluginsTab : public SettingsTab
-  {
-  public:
-    PluginsTab(Settings *m_parent, SettingsDialog &m_dialog);
-
-    void update();
-
-  private:
-    QListWidget *m_pluginsList;
-    QListWidget *m_pluginBlacklistList;
-  };
-
   /** Display/store the configuration in the 'workarounds' tab of the settings dialogue */
   class WorkaroundsTab : public SettingsTab
   {
@@ -512,11 +504,6 @@ private:
 
   std::vector<MOBase::IPlugin*> m_Plugins;
 
-  QMap<QString, QVariantMap> m_PluginSettings;
-  QMap<QString, QVariantMap> m_PluginDescriptions;
-
-  QSet<QString> m_PluginBlacklist;
-
 };
 
 #endif // SETTINGS_H
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 6d5a8cc0..f43f7ae8 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -99,7 +99,6 @@ void SettingsDialog::accept()
     return;
   }
 
-  storeSettings(ui->pluginsList->currentItem());
   TutorableDialog::accept();
 }
 
@@ -149,57 +148,6 @@ void SettingsDialog::on_bsaDateBtn_clicked()
                        dir.absolutePath().toStdWString());
 }
 
-void SettingsDialog::storeSettings(QListWidgetItem *pluginItem)
-{
-  if (pluginItem != nullptr) {
-    QVariantMap settings = pluginItem->data(Qt::UserRole + 1).toMap();
-
-    for (int i = 0; i < ui->pluginSettingsList->topLevelItemCount(); ++i) {
-      const QTreeWidgetItem *item = ui->pluginSettingsList->topLevelItem(i);
-      settings[item->text(0)] = item->data(1, Qt::DisplayRole);
-    }
-
-    pluginItem->setData(Qt::UserRole + 1, settings);
-  }
-}
-
-void SettingsDialog::on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous)
-{
-  storeSettings(previous);
-
-  ui->pluginSettingsList->clear();
-  IPlugin *plugin = static_cast<IPlugin*>(current->data(Qt::UserRole).value<void*>());
-  ui->authorLabel->setText(plugin->author());
-  ui->versionLabel->setText(plugin->version().canonicalString());
-  ui->descriptionLabel->setText(plugin->description());
-
-  QVariantMap settings = current->data(Qt::UserRole + 1).toMap();
-  QVariantMap descriptions = current->data(Qt::UserRole + 2).toMap();
-  ui->pluginSettingsList->setEnabled(settings.count() != 0);
-  for (auto iter = settings.begin(); iter != settings.end(); ++iter) {
-    QTreeWidgetItem *newItem = new QTreeWidgetItem(QStringList(iter.key()));
-    QVariant value = *iter;
-    QString description;
-    {
-      auto descriptionIter = descriptions.find(iter.key());
-      if (descriptionIter != descriptions.end()) {
-        description = descriptionIter->toString();
-      }
-    }
-
-    ui->pluginSettingsList->setItemDelegateForColumn(0, new NoEditDelegate());
-    newItem->setData(1, Qt::DisplayRole, value);
-    newItem->setData(1, Qt::EditRole, value);
-    newItem->setToolTip(1, description);
-
-    newItem->setFlags(newItem->flags() | Qt::ItemIsEditable);
-    ui->pluginSettingsList->addTopLevelItem(newItem);
-  }
-
-  ui->pluginSettingsList->resizeColumnToContents(0);
-  ui->pluginSettingsList->resizeColumnToContents(1);
-}
-
 void SettingsDialog::deleteBlacklistItem()
 {
   ui->pluginBlacklist->takeItem(ui->pluginBlacklist->currentIndex().row());
diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index df5d0ad8..319e6ed8 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -62,9 +62,6 @@ public:
 public slots:
   virtual void accept();
 
-private:
-  void storeSettings(QListWidgetItem *pluginItem);
-
 public:
   QString getExecutableBlacklist() { return m_ExecutableBlacklist; }
   void setExecutableBlacklist(QString blacklist) { m_ExecutableBlacklist = blacklist; }
@@ -74,7 +71,6 @@ public:
 private slots:
   void on_bsaDateBtn_clicked();
   void on_execBlacklistBtn_clicked();
-  void on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
   void on_resetGeometryBtn_clicked();
 
   void deleteBlacklistItem();
diff --git a/src/settingsdialogplugins.cpp b/src/settingsdialogplugins.cpp
new file mode 100644
index 00000000..32269344
--- /dev/null
+++ b/src/settingsdialogplugins.cpp
@@ -0,0 +1,110 @@
+#include "settingsdialogplugins.h"
+#include "ui_settingsdialog.h"
+#include "noeditdelegate.h"
+#include <iplugin.h>
+
+using MOBase::IPlugin;
+
+PluginsSettingsTab::PluginsSettingsTab(Settings *m_parent, SettingsDialog &m_dialog)
+  : SettingsTab(m_parent, m_dialog)
+{
+  // display plugin settings
+  QSet<QString> handledNames;
+  for (IPlugin *plugin : m_parent->plugins()) {
+    if (handledNames.contains(plugin->name()))
+      continue;
+    QListWidgetItem *listItem = new QListWidgetItem(plugin->name(), ui->pluginsList);
+    listItem->setData(Qt::UserRole, QVariant::fromValue((void*)plugin));
+    listItem->setData(Qt::UserRole + 1, m_parent->m_PluginSettings[plugin->name()]);
+    listItem->setData(Qt::UserRole + 2, m_parent->m_PluginDescriptions[plugin->name()]);
+    ui->pluginsList->addItem(listItem);
+    handledNames.insert(plugin->name());
+  }
+
+  // display plugin blacklist
+  for (const QString &pluginName : m_parent->m_PluginBlacklist) {
+    ui->pluginBlacklist->addItem(pluginName);
+  }
+
+  QObject::connect(
+    ui->pluginsList, &QListWidget::currentItemChanged,
+    [&](auto* current, auto* previous) { on_pluginsList_currentItemChanged(current, previous); });
+}
+
+void PluginsSettingsTab::update()
+{
+  // transfer plugin settings to in-memory structure
+  for (int i = 0; i < ui->pluginsList->count(); ++i) {
+    QListWidgetItem *item = ui->pluginsList->item(i);
+    m_parent->m_PluginSettings[item->text()] = item->data(Qt::UserRole + 1).toMap();
+  }
+  // store plugin settings on disc
+  for (auto iterPlugins = m_parent->m_PluginSettings.begin(); iterPlugins != m_parent->m_PluginSettings.end(); ++iterPlugins) {
+    for (auto iterSettings = iterPlugins->begin(); iterSettings != iterPlugins->end(); ++iterSettings) {
+      m_Settings.setValue("Plugins/" + iterPlugins.key() + "/" + iterSettings.key(), iterSettings.value());
+    }
+  }
+
+  // store plugin blacklist
+  m_parent->m_PluginBlacklist.clear();
+  for (QListWidgetItem *item : ui->pluginBlacklist->findItems("*", Qt::MatchWildcard)) {
+    m_parent->m_PluginBlacklist.insert(item->text());
+  }
+  m_parent->writePluginBlacklist();
+}
+
+void PluginsSettingsTab::closing()
+{
+  storeSettings(ui->pluginsList->currentItem());
+}
+
+void PluginsSettingsTab::on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous)
+{
+  storeSettings(previous);
+
+  ui->pluginSettingsList->clear();
+  IPlugin *plugin = static_cast<IPlugin*>(current->data(Qt::UserRole).value<void*>());
+  ui->authorLabel->setText(plugin->author());
+  ui->versionLabel->setText(plugin->version().canonicalString());
+  ui->descriptionLabel->setText(plugin->description());
+
+  QVariantMap settings = current->data(Qt::UserRole + 1).toMap();
+  QVariantMap descriptions = current->data(Qt::UserRole + 2).toMap();
+  ui->pluginSettingsList->setEnabled(settings.count() != 0);
+  for (auto iter = settings.begin(); iter != settings.end(); ++iter) {
+    QTreeWidgetItem *newItem = new QTreeWidgetItem(QStringList(iter.key()));
+    QVariant value = *iter;
+    QString description;
+    {
+      auto descriptionIter = descriptions.find(iter.key());
+      if (descriptionIter != descriptions.end()) {
+        description = descriptionIter->toString();
+      }
+    }
+
+    ui->pluginSettingsList->setItemDelegateForColumn(0, new NoEditDelegate());
+    newItem->setData(1, Qt::DisplayRole, value);
+    newItem->setData(1, Qt::EditRole, value);
+    newItem->setToolTip(1, description);
+
+    newItem->setFlags(newItem->flags() | Qt::ItemIsEditable);
+    ui->pluginSettingsList->addTopLevelItem(newItem);
+  }
+
+  ui->pluginSettingsList->resizeColumnToContents(0);
+  ui->pluginSettingsList->resizeColumnToContents(1);
+}
+
+void PluginsSettingsTab::storeSettings(QListWidgetItem *pluginItem)
+{
+  if (pluginItem != nullptr) {
+    QVariantMap settings = pluginItem->data(Qt::UserRole + 1).toMap();
+
+    for (int i = 0; i < ui->pluginSettingsList->topLevelItemCount(); ++i) {
+      const QTreeWidgetItem *item = ui->pluginSettingsList->topLevelItem(i);
+      settings[item->text(0)] = item->data(1, Qt::DisplayRole);
+    }
+
+    pluginItem->setData(Qt::UserRole + 1, settings);
+  }
+}
diff --git a/src/settingsdialogplugins.h b/src/settingsdialogplugins.h
new file mode 100644
index 00000000..48d61858
--- /dev/null
+++ b/src/settingsdialogplugins.h
@@ -0,0 +1,20 @@
+#ifndef SETTINGSDIALOGPLUGINS_H
+#define SETTINGSDIALOGPLUGINS_H
+
+#include "settings.h"
+#include "settingsdialog.h"
+
+class PluginsSettingsTab : public SettingsTab
+{
+public:
+  PluginsSettingsTab(Settings *m_parent, SettingsDialog &m_dialog);
+
+  void update();
+  void closing() override;
+
+private:
+  void on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
+  void storeSettings(QListWidgetItem *pluginItem);
+};
+
+#endif // SETTINGSDIALOGPLUGINS_H
-- 
cgit v1.3.1


From e4dcdb01ac2e3f99fea76b21e1acfd21d0de89c7 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 20 Jul 2019 10:45:59 -0400
Subject: split workarounds tab

---
 src/CMakeLists.txt                |   3 ++
 src/loadmechanism.cpp             |   6 +--
 src/loadmechanism.h               |   6 +--
 src/settings.cpp                  |  73 +-------------------------
 src/settings.h                    |  20 +------
 src/settingsdialog.cpp            |  51 ------------------
 src/settingsdialog.h              |  14 +----
 src/settingsdialogplugins.cpp     |   9 ++++
 src/settingsdialogplugins.h       |   1 +
 src/settingsdialogworkarounds.cpp | 108 ++++++++++++++++++++++++++++++++++++++
 src/settingsdialogworkarounds.h   |  25 +++++++++
 11 files changed, 157 insertions(+), 159 deletions(-)
 create mode 100644 src/settingsdialogworkarounds.cpp
 create mode 100644 src/settingsdialogworkarounds.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a8ded510..86ef9721 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,6 +42,7 @@ SET(organizer_SRCS
 	settingsdialogpaths.cpp
 	settingsdialogplugins.cpp
 	settingsdialogsteam.cpp
+	settingsdialogworkarounds.cpp
     settings.cpp
     selfupdater.cpp
     selectiondialog.cpp
@@ -161,6 +162,7 @@ SET(organizer_HDRS
 	settingsdialogpaths.h
 	settingsdialogplugins.h
 	settingsdialogsteam.h
+	settingsdialogworkarounds.h
     settings.h
     selfupdater.h
     selectiondialog.h
@@ -446,6 +448,7 @@ set(settings
 	settingsdialogpaths
 	settingsdialogplugins
 	settingsdialogsteam
+	settingsdialogworkarounds
 )
 
 set(utilities
diff --git a/src/loadmechanism.cpp b/src/loadmechanism.cpp
index 4d6cebd4..2d01562d 100644
--- a/src/loadmechanism.cpp
+++ b/src/loadmechanism.cpp
@@ -63,7 +63,7 @@ void LoadMechanism::removeHintFile(QDir targetDirectory)
 }
 
 
-bool LoadMechanism::isDirectLoadingSupported()
+bool LoadMechanism::isDirectLoadingSupported() const
 {
   //FIXME: Seriously? isn't there a 'do i need steam' thing?
   IPluginGame const *game = qApp->property("managed_game").value<IPluginGame*>();
@@ -76,7 +76,7 @@ bool LoadMechanism::isDirectLoadingSupported()
   }
 }
 
-bool LoadMechanism::isScriptExtenderSupported()
+bool LoadMechanism::isScriptExtenderSupported() const
 {
   IPluginGame const *game = qApp->property("managed_game").value<IPluginGame*>();
   ScriptExtender *extender = game->feature<ScriptExtender>();
@@ -85,7 +85,7 @@ bool LoadMechanism::isScriptExtenderSupported()
   return extender != nullptr && extender->isInstalled();
 }
 
-bool LoadMechanism::isProxyDLLSupported()
+bool LoadMechanism::isProxyDLLSupported() const
 {
   // using steam_api.dll as the proxy is way too game specific as many games will have different
   // versions of that dll.
diff --git a/src/loadmechanism.h b/src/loadmechanism.h
index c04473ab..51fefaf9 100644
--- a/src/loadmechanism.h
+++ b/src/loadmechanism.h
@@ -68,21 +68,21 @@ public:
    *
    * @return true if the load mechanism is supported
    **/
-  bool isDirectLoadingSupported();
+  bool isDirectLoadingSupported() const;
 
   /**
    * @brief test whether the "Script Extender" load mechanism is supported for the current game
    *
    * @return true if the load mechanism is supported
    **/
-  bool isScriptExtenderSupported();
+  bool isScriptExtenderSupported() const;
 
   /**
    * @brief test whether the "Proxy DLL" load mechanism is supported for the current game
    *
    * @return true if the load mechanism is supported
    **/
-  bool isProxyDLLSupported();
+  bool isProxyDLLSupported() const;
 
 private:
 
diff --git a/src/settings.cpp b/src/settings.cpp
index bc45b720..515ff907 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -27,6 +27,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "settingsdialogpaths.h"
 #include "settingsdialogplugins.h"
 #include "settingsdialogsteam.h"
+#include "settingsdialogworkarounds.h"
 #include "versioninfo.h"
 #include "appconfig.h"
 #include "organizercore.h"
@@ -679,7 +680,7 @@ void Settings::query(PluginContainer *pluginContainer, QWidget *parent)
   tabs.push_back(std::unique_ptr<SettingsTab>(new NexusSettingsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new SteamSettingsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new PluginsSettingsTab(this, dialog)));
-  tabs.push_back(std::unique_ptr<SettingsTab>(new WorkaroundsTab(this, dialog)));
+  tabs.push_back(std::unique_ptr<SettingsTab>(new WorkaroundsSettingsTab(this, dialog)));
 
 
   QString key = QString("geometry/%1").arg(dialog.objectName());
@@ -770,73 +771,3 @@ void Settings::DiagnosticsTab::update()
   m_Settings.setValue("Settings/crash_dumps_type", m_dumpsTypeBox->currentIndex());
   m_Settings.setValue("Settings/crash_dumps_max", m_dumpsMaxEdit->value());
 }
-
-
-Settings::WorkaroundsTab::WorkaroundsTab(Settings *m_parent,
-                                         SettingsDialog &m_dialog)
-  : SettingsTab(m_parent, m_dialog)
-  , m_appIDEdit(m_dialog.findChild<QLineEdit *>("appIDEdit"))
-  , m_mechanismBox(m_dialog.findChild<QComboBox *>("mechanismBox"))
-  , m_hideUncheckedBox(m_dialog.findChild<QCheckBox *>("hideUncheckedBox"))
-  , m_forceEnableBox(m_dialog.findChild<QCheckBox *>("forceEnableBox"))
-  , m_displayForeignBox(m_dialog.findChild<QCheckBox *>("displayForeignBox"))
-  , m_lockGUIBox(m_dialog.findChild<QCheckBox *>("lockGUIBox"))
-  , m_enableArchiveParsingBox(m_dialog.findChild<QCheckBox *>("enableArchiveParsingBox"))
-  , m_resetGeometriesBtn(m_dialog.findChild<QPushButton *>("resetGeometryBtn"))
-{
-  m_appIDEdit->setText(m_parent->getSteamAppID());
-
-  LoadMechanism::EMechanism mechanismID = m_parent->getLoadMechanism();
-  int index = 0;
-
-  if (m_parent->m_LoadMechanism.isDirectLoadingSupported()) {
-    m_mechanismBox->addItem(QObject::tr("Mod Organizer"), LoadMechanism::LOAD_MODORGANIZER);
-    if (mechanismID == LoadMechanism::LOAD_MODORGANIZER) {
-      index = m_mechanismBox->count() - 1;
-    }
-  }
-
-  if (m_parent->m_LoadMechanism.isScriptExtenderSupported()) {
-    m_mechanismBox->addItem(QObject::tr("Script Extender"), LoadMechanism::LOAD_SCRIPTEXTENDER);
-    if (mechanismID == LoadMechanism::LOAD_SCRIPTEXTENDER) {
-      index = m_mechanismBox->count() - 1;
-    }
-  }
-
-  if (m_parent->m_LoadMechanism.isProxyDLLSupported()) {
-    m_mechanismBox->addItem(QObject::tr("Proxy DLL"), LoadMechanism::LOAD_PROXYDLL);
-    if (mechanismID == LoadMechanism::LOAD_PROXYDLL) {
-      index = m_mechanismBox->count() - 1;
-    }
-  }
-
-  m_mechanismBox->setCurrentIndex(index);
-
-  m_hideUncheckedBox->setChecked(m_parent->hideUncheckedPlugins());
-  m_forceEnableBox->setChecked(m_parent->forceEnableCoreFiles());
-  m_displayForeignBox->setChecked(m_parent->displayForeign());
-  m_lockGUIBox->setChecked(m_parent->lockGUI());
-  m_enableArchiveParsingBox->setChecked(m_parent->archiveParsing());
-
-  m_resetGeometriesBtn->setChecked(m_parent->directInterface().value("reset_geometry", false).toBool());
-
-  m_dialog.setExecutableBlacklist(m_parent->executablesBlacklist());
-
-}
-
-void Settings::WorkaroundsTab::update()
-{
-  if (m_appIDEdit->text() != m_parent->m_GamePlugin->steamAPPId()) {
-    m_Settings.setValue("Settings/app_id", m_appIDEdit->text());
-  } else {
-    m_Settings.remove("Settings/app_id");
-  }
-  m_Settings.setValue("Settings/load_mechanism", m_mechanismBox->itemData(m_mechanismBox->currentIndex()).toInt());
-  m_Settings.setValue("Settings/hide_unchecked_plugins", m_hideUncheckedBox->isChecked());
-  m_Settings.setValue("Settings/force_enable_core_files", m_forceEnableBox->isChecked());
-  m_Settings.setValue("Settings/display_foreign", m_displayForeignBox->isChecked());
-  m_Settings.setValue("Settings/lock_gui", m_lockGUIBox->isChecked());
-  m_Settings.setValue("Settings/archive_parsing_experimental", m_enableArchiveParsingBox->isChecked());
-
-  m_Settings.setValue("Settings/executable_blacklist", m_dialog.getExecutableBlacklist());
-}
diff --git a/src/settings.h b/src/settings.h
index 5298103a..64068173 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -434,6 +434,7 @@ public:
   QMap<QString, QVariantMap> m_PluginDescriptions;
   QSet<QString> m_PluginBlacklist;
   void writePluginBlacklist();
+  const LoadMechanism& loadMechanism() const { return m_LoadMechanism; }
 
 public slots:
 
@@ -466,25 +467,6 @@ private:
     void setLevelsBox();
   };
 
-  /** Display/store the configuration in the 'workarounds' tab of the settings dialogue */
-  class WorkaroundsTab : public SettingsTab
-  {
-  public:
-    WorkaroundsTab(Settings *m_parent, SettingsDialog &m_dialog);
-
-    void update();
-
-  private:
-    QLineEdit *m_appIDEdit;
-    QComboBox *m_mechanismBox;
-    QCheckBox *m_hideUncheckedBox;
-    QCheckBox *m_forceEnableBox;
-    QCheckBox *m_displayForeignBox;
-    QCheckBox *m_lockGUIBox;
-    QCheckBox *m_enableArchiveParsingBox;
-    QPushButton *m_resetGeometriesBtn;
-  };
-
 private slots:
 
 signals:
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index f43f7ae8..76b0a146 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -58,10 +58,6 @@ SettingsDialog::SettingsDialog(PluginContainer *pluginContainer, Settings* setti
 {
   ui->setupUi(this);
   ui->pluginSettingsList->setStyleSheet("QTreeWidget::item {padding-right: 10px;}");
-
-  QShortcut *delShortcut = new QShortcut(
-    QKeySequence(Qt::Key_Delete), ui->pluginBlacklist);
-  connect(delShortcut, SIGNAL(activated()), this, SLOT(deleteBlacklistItem()));
 }
 
 SettingsDialog::~SettingsDialog()
@@ -111,50 +107,3 @@ bool SettingsDialog::getApiKeyChanged()
 {
   return m_keyChanged;
 }
-
-void SettingsDialog::on_execBlacklistBtn_clicked()
-{
-  bool ok = false;
-  QString result = QInputDialog::getMultiLineText(
-    this,
-    tr("Executables Blacklist"),
-    tr("Enter one executable per line to be blacklisted from the virtual file system.\n"
-       "Mods and other virtualized files will not be visible to these executables and\n"
-       "any executables launched by them.\n\n"
-       "Example:\n"
-       "    Chrome.exe\n"
-       "    Firefox.exe"),
-    m_ExecutableBlacklist.split(";").join("\n"),
-    &ok
-    );
-  if (ok) {
-    QStringList blacklist;
-    for (auto exec : result.split("\n")) {
-      if (exec.trimmed().endsWith(".exe", Qt::CaseInsensitive)) {
-        blacklist << exec.trimmed();
-      }
-    }
-    m_ExecutableBlacklist = blacklist.join(";");
-  }
-}
-
-void SettingsDialog::on_bsaDateBtn_clicked()
-{
-  IPluginGame const *game
-      = qApp->property("managed_game").value<IPluginGame *>();
-  QDir dir = game->dataDirectory();
-
-  Helper::backdateBSAs(qApp->applicationDirPath().toStdWString(),
-                       dir.absolutePath().toStdWString());
-}
-
-void SettingsDialog::deleteBlacklistItem()
-{
-  ui->pluginBlacklist->takeItem(ui->pluginBlacklist->currentIndex().row());
-}
-
-void SettingsDialog::on_resetGeometryBtn_clicked()
-{
-  m_GeometriesReset = true;
-  ui->resetGeometryBtn->setChecked(true);
-}
diff --git a/src/settingsdialog.h b/src/settingsdialog.h
index 319e6ed8..81c17f44 100644
--- a/src/settingsdialog.h
+++ b/src/settingsdialog.h
@@ -57,30 +57,20 @@ public:
   // temp
   Ui::SettingsDialog *ui;
   bool m_keyChanged;
+  bool m_GeometriesReset;
   PluginContainer *m_PluginContainer;
 
 public slots:
   virtual void accept();
 
 public:
-  QString getExecutableBlacklist() { return m_ExecutableBlacklist; }
-  void setExecutableBlacklist(QString blacklist) { m_ExecutableBlacklist = blacklist; }
-  bool getResetGeometries();
   bool getApiKeyChanged();
-
-private slots:
-  void on_bsaDateBtn_clicked();
-  void on_execBlacklistBtn_clicked();
-  void on_resetGeometryBtn_clicked();
-
-  void deleteBlacklistItem();
+  bool getResetGeometries();
 
 private:
   Settings* m_settings;
 
-  bool m_GeometriesReset;
 
-  QString m_ExecutableBlacklist;
 };
 
 #endif // SETTINGSDIALOG_H
diff --git a/src/settingsdialogplugins.cpp b/src/settingsdialogplugins.cpp
index 32269344..33bc1563 100644
--- a/src/settingsdialogplugins.cpp
+++ b/src/settingsdialogplugins.cpp
@@ -29,6 +29,10 @@ PluginsSettingsTab::PluginsSettingsTab(Settings *m_parent, SettingsDialog &m_dia
   QObject::connect(
     ui->pluginsList, &QListWidget::currentItemChanged,
     [&](auto* current, auto* previous) { on_pluginsList_currentItemChanged(current, previous); });
+
+  QShortcut *delShortcut = new QShortcut(
+    QKeySequence(Qt::Key_Delete), ui->pluginBlacklist);
+  QObject::connect(delShortcut, &QShortcut::activated, parentWidget(), [&]{ deleteBlacklistItem(); });
 }
 
 void PluginsSettingsTab::update()
@@ -95,6 +99,11 @@ void PluginsSettingsTab::on_pluginsList_currentItemChanged(QListWidgetItem *curr
   ui->pluginSettingsList->resizeColumnToContents(1);
 }
 
+void PluginsSettingsTab::deleteBlacklistItem()
+{
+  ui->pluginBlacklist->takeItem(ui->pluginBlacklist->currentIndex().row());
+}
+
 void PluginsSettingsTab::storeSettings(QListWidgetItem *pluginItem)
 {
   if (pluginItem != nullptr) {
diff --git a/src/settingsdialogplugins.h b/src/settingsdialogplugins.h
index 48d61858..9d21daa6 100644
--- a/src/settingsdialogplugins.h
+++ b/src/settingsdialogplugins.h
@@ -14,6 +14,7 @@ public:
 
 private:
   void on_pluginsList_currentItemChanged(QListWidgetItem *current, QListWidgetItem *previous);
+  void deleteBlacklistItem();
   void storeSettings(QListWidgetItem *pluginItem);
 };
 
diff --git a/src/settingsdialogworkarounds.cpp b/src/settingsdialogworkarounds.cpp
new file mode 100644
index 00000000..4cca5fd4
--- /dev/null
+++ b/src/settingsdialogworkarounds.cpp
@@ -0,0 +1,108 @@
+#include "settingsdialogworkarounds.h"
+#include "ui_settingsdialog.h"
+#include "helper.h"
+#include <iplugingame.h>
+
+WorkaroundsSettingsTab::WorkaroundsSettingsTab(Settings *m_parent, SettingsDialog &m_dialog)
+  : SettingsTab(m_parent, m_dialog)
+{
+  ui->appIDEdit->setText(m_parent->getSteamAppID());
+
+  LoadMechanism::EMechanism mechanismID = m_parent->getLoadMechanism();
+  int index = 0;
+
+  if (m_parent->loadMechanism().isDirectLoadingSupported()) {
+    ui->mechanismBox->addItem(QObject::tr("Mod Organizer"), LoadMechanism::LOAD_MODORGANIZER);
+    if (mechanismID == LoadMechanism::LOAD_MODORGANIZER) {
+      index = ui->mechanismBox->count() - 1;
+    }
+  }
+
+  if (m_parent->loadMechanism().isScriptExtenderSupported()) {
+    ui->mechanismBox->addItem(QObject::tr("Script Extender"), LoadMechanism::LOAD_SCRIPTEXTENDER);
+    if (mechanismID == LoadMechanism::LOAD_SCRIPTEXTENDER) {
+      index = ui->mechanismBox->count() - 1;
+    }
+  }
+
+  if (m_parent->loadMechanism().isProxyDLLSupported()) {
+    ui->mechanismBox->addItem(QObject::tr("Proxy DLL"), LoadMechanism::LOAD_PROXYDLL);
+    if (mechanismID == LoadMechanism::LOAD_PROXYDLL) {
+      index = ui->mechanismBox->count() - 1;
+    }
+  }
+
+  ui->mechanismBox->setCurrentIndex(index);
+
+  ui->hideUncheckedBox->setChecked(m_parent->hideUncheckedPlugins());
+  ui->forceEnableBox->setChecked(m_parent->forceEnableCoreFiles());
+  ui->displayForeignBox->setChecked(m_parent->displayForeign());
+  ui->lockGUIBox->setChecked(m_parent->lockGUI());
+  ui->enableArchiveParsingBox->setChecked(m_parent->archiveParsing());
+
+  ui->resetGeometryBtn->setChecked(m_parent->directInterface().value("reset_geometry", false).toBool());
+
+  setExecutableBlacklist(m_parent->executablesBlacklist());
+
+  QObject::connect(ui->bsaDateBtn, &QPushButton::clicked, [&]{ on_bsaDateBtn_clicked(); });
+  QObject::connect(ui->execBlacklistBtn, &QPushButton::clicked, [&]{ on_execBlacklistBtn_clicked(); });
+  QObject::connect(ui->resetGeometryBtn, &QPushButton::clicked, [&]{ on_resetGeometryBtn_clicked(); });
+}
+
+void WorkaroundsSettingsTab::update()
+{
+  if (ui->appIDEdit->text() != m_parent->gamePlugin()->steamAPPId()) {
+    m_Settings.setValue("Settings/app_id", ui->appIDEdit->text());
+  } else {
+    m_Settings.remove("Settings/app_id");
+  }
+  m_Settings.setValue("Settings/load_mechanism", ui->mechanismBox->itemData(ui->mechanismBox->currentIndex()).toInt());
+  m_Settings.setValue("Settings/hide_unchecked_plugins", ui->hideUncheckedBox->isChecked());
+  m_Settings.setValue("Settings/force_enable_core_files", ui->forceEnableBox->isChecked());
+  m_Settings.setValue("Settings/display_foreign", ui->displayForeignBox->isChecked());
+  m_Settings.setValue("Settings/lock_gui", ui->lockGUIBox->isChecked());
+  m_Settings.setValue("Settings/archive_parsing_experimental", ui->enableArchiveParsingBox->isChecked());
+
+  m_Settings.setValue("Settings/executable_blacklist", getExecutableBlacklist());
+}
+
+void WorkaroundsSettingsTab::on_execBlacklistBtn_clicked()
+{
+  bool ok = false;
+  QString result = QInputDialog::getMultiLineText(
+    parentWidget(),
+    QObject::tr("Executables Blacklist"),
+    QObject::tr("Enter one executable per line to be blacklisted from the virtual file system.\n"
+      "Mods and other virtualized files will not be visible to these executables and\n"
+      "any executables launched by them.\n\n"
+      "Example:\n"
+      "    Chrome.exe\n"
+      "    Firefox.exe"),
+    m_ExecutableBlacklist.split(";").join("\n"),
+    &ok
+  );
+  if (ok) {
+    QStringList blacklist;
+    for (auto exec : result.split("\n")) {
+      if (exec.trimmed().endsWith(".exe", Qt::CaseInsensitive)) {
+        blacklist << exec.trimmed();
+      }
+    }
+    m_ExecutableBlacklist = blacklist.join(";");
+  }
+}
+
+void WorkaroundsSettingsTab::on_bsaDateBtn_clicked()
+{
+  const auto* game = qApp->property("managed_game").value<MOBase::IPluginGame*>();
+  QDir dir = game->dataDirectory();
+
+  Helper::backdateBSAs(qApp->applicationDirPath().toStdWString(),
+    dir.absolutePath().toStdWString());
+}
+
+void WorkaroundsSettingsTab::on_resetGeometryBtn_clicked()
+{
+  m_dialog.m_GeometriesReset = true;
+  ui->resetGeometryBtn->setChecked(true);
+}
diff --git a/src/settingsdialogworkarounds.h b/src/settingsdialogworkarounds.h
new file mode 100644
index 00000000..1687624b
--- /dev/null
+++ b/src/settingsdialogworkarounds.h
@@ -0,0 +1,25 @@
+#ifndef SETTINGSDIALOGWORKAROUNDS_H
+#define SETTINGSDIALOGWORKAROUNDS_H
+
+#include "settings.h"
+#include "settingsdialog.h"
+
+class WorkaroundsSettingsTab : public SettingsTab
+{
+public:
+  WorkaroundsSettingsTab(Settings *m_parent, SettingsDialog &m_dialog);
+
+  void update();
+
+private:
+  QString m_ExecutableBlacklist;
+
+  void on_bsaDateBtn_clicked();
+  void on_execBlacklistBtn_clicked();
+  void on_resetGeometryBtn_clicked();
+
+  QString getExecutableBlacklist() { return m_ExecutableBlacklist; }
+  void setExecutableBlacklist(QString blacklist) { m_ExecutableBlacklist = blacklist; }
+};
+
+#endif // SETTINGSDIALOGWORKAROUNDS_H
-- 
cgit v1.3.1


From e8d7930edacdc04a4607ecd59fc402f2f04ea39d Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 20 Jul 2019 10:59:07 -0400
Subject: split diagnostics tab fixed log and crash dump directory links in
 label not working

---
 src/CMakeLists.txt                |  3 +++
 src/settings.cpp                  | 32 ++------------------------------
 src/settings.h                    | 18 ------------------
 src/settingsdialog.ui             |  3 +++
 src/settingsdialogdiagnostics.cpp | 28 ++++++++++++++++++++++++++++
 src/settingsdialogdiagnostics.h   | 17 +++++++++++++++++
 6 files changed, 53 insertions(+), 48 deletions(-)
 create mode 100644 src/settingsdialogdiagnostics.cpp
 create mode 100644 src/settingsdialogdiagnostics.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 86ef9721..d8316e7e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,6 +37,7 @@ SET(organizer_SRCS
     spawn.cpp
     singleinstance.cpp
     settingsdialog.cpp
+	settingsdialogdiagnostics.cpp
 	settingsdialoggeneral.cpp
 	settingsdialognexus.cpp
 	settingsdialogpaths.cpp
@@ -157,6 +158,7 @@ SET(organizer_HDRS
     spawn.h
     singleinstance.h
     settingsdialog.h
+	settingsdialogdiagnostics.h
 	settingsdialoggeneral.h
 	settingsdialognexus.h
 	settingsdialogpaths.h
@@ -443,6 +445,7 @@ set(profiles
 set(settings
 	settings
 	settingsdialog
+	settingsdialogdiagnostics
 	settingsdialoggeneral
 	settingsdialognexus
 	settingsdialogpaths
diff --git a/src/settings.cpp b/src/settings.cpp
index 515ff907..725b7e06 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -22,6 +22,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "pluginsetting.h"
 #include "serverinfo.h"
 #include "settingsdialog.h"
+#include "settingsdialogdiagnostics.h"
 #include "settingsdialoggeneral.h"
 #include "settingsdialognexus.h"
 #include "settingsdialogpaths.h"
@@ -676,7 +677,7 @@ void Settings::query(PluginContainer *pluginContainer, QWidget *parent)
 
   tabs.push_back(std::unique_ptr<SettingsTab>(new GeneralSettingsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new PathsSettingsTab(this, dialog)));
-  tabs.push_back(std::unique_ptr<SettingsTab>(new DiagnosticsTab(this, dialog)));
+  tabs.push_back(std::unique_ptr<SettingsTab>(new DiagnosticsSettingsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new NexusSettingsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new SteamSettingsTab(this, dialog)));
   tabs.push_back(std::unique_ptr<SettingsTab>(new PluginsSettingsTab(this, dialog)));
@@ -742,32 +743,3 @@ void Settings::query(PluginContainer *pluginContainer, QWidget *parent)
   }
 
 }
-
-
-Settings::DiagnosticsTab::DiagnosticsTab(Settings *m_parent, SettingsDialog &m_dialog)
-  : SettingsTab(m_parent, m_dialog)
-  , m_logLevelBox(m_dialog.findChild<QComboBox *>("logLevelBox"))
-  , m_dumpsTypeBox(m_dialog.findChild<QComboBox *>("dumpsTypeBox"))
-  , m_dumpsMaxEdit(m_dialog.findChild<QSpinBox *>("dumpsMaxEdit"))
-  , m_diagnosticsExplainedLabel(m_dialog.findChild<QLabel *>("diagnosticsExplainedLabel"))
-{
-  setLevelsBox();
-  m_dumpsTypeBox->setCurrentIndex(m_parent->crashDumpsType());
-  m_dumpsMaxEdit->setValue(m_parent->crashDumpsMax());
-  QString logsPath = qApp->property("dataPath").toString()
-    + "/" + QString::fromStdWString(AppConfig::logPath());
-  m_diagnosticsExplainedLabel->setText(
-    m_diagnosticsExplainedLabel->text()
-    .replace("LOGS_FULL_PATH", logsPath)
-    .replace("LOGS_DIR", QString::fromStdWString(AppConfig::logPath()))
-    .replace("DUMPS_FULL_PATH", QString::fromStdWString(OrganizerCore::crashDumpsPath()))
-    .replace("DUMPS_DIR", QString::fromStdWString(AppConfig::dumpsDir()))
-  );
-}
-
-void Settings::DiagnosticsTab::update()
-{
-  m_Settings.setValue("Settings/log_level", m_logLevelBox->currentData().toInt());
-  m_Settings.setValue("Settings/crash_dumps_type", m_dumpsTypeBox->currentIndex());
-  m_Settings.setValue("Settings/crash_dumps_max", m_dumpsMaxEdit->value());
-}
diff --git a/src/settings.h b/src/settings.h
index 64068173..71fbcbc1 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -449,24 +449,6 @@ private:
   void readPluginBlacklist();
   QString getConfigurablePath(const QString &key, const QString &def, bool resolve) const;
 
-
-
-  class DiagnosticsTab : public SettingsTab
-  {
-  public:
-    DiagnosticsTab(Settings *parent, SettingsDialog &dialog);
-
-    void update();
-
-  private:
-    QComboBox *m_logLevelBox;
-    QComboBox *m_dumpsTypeBox;
-    QSpinBox *m_dumpsMaxEdit;
-    QLabel *m_diagnosticsExplainedLabel;
-
-    void setLevelsBox();
-  };
-
 private slots:
 
 signals:
diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 3ad525e1..1deac400 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -1325,6 +1325,9 @@ programs you are intentionally running.</string>
          <property name="wordWrap">
           <bool>true</bool>
          </property>
+         <property name="openExternalLinks">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="1" column="0">
diff --git a/src/settingsdialogdiagnostics.cpp b/src/settingsdialogdiagnostics.cpp
new file mode 100644
index 00000000..2ea4d478
--- /dev/null
+++ b/src/settingsdialogdiagnostics.cpp
@@ -0,0 +1,28 @@
+#include "settingsdialogdiagnostics.h"
+#include "ui_settingsdialog.h"
+#include "appconfig.h"
+#include "organizercore.h"
+
+DiagnosticsSettingsTab::DiagnosticsSettingsTab(Settings *m_parent, SettingsDialog &m_dialog)
+  : SettingsTab(m_parent, m_dialog)
+{
+  ui->logLevelBox->setCurrentIndex(m_parent->logLevel());
+  ui->dumpsTypeBox->setCurrentIndex(m_parent->crashDumpsType());
+  ui->dumpsMaxEdit->setValue(m_parent->crashDumpsMax());
+  QString logsPath = qApp->property("dataPath").toString()
+    + "/" + QString::fromStdWString(AppConfig::logPath());
+  ui->diagnosticsExplainedLabel->setText(
+    ui->diagnosticsExplainedLabel->text()
+    .replace("LOGS_FULL_PATH", logsPath)
+    .replace("LOGS_DIR", QString::fromStdWString(AppConfig::logPath()))
+    .replace("DUMPS_FULL_PATH", QString::fromStdWString(OrganizerCore::crashDumpsPath()))
+    .replace("DUMPS_DIR", QString::fromStdWString(AppConfig::dumpsDir()))
+  );
+}
+
+void DiagnosticsSettingsTab::update()
+{
+  m_Settings.setValue("Settings/log_level", ui->logLevelBox->currentIndex());
+  m_Settings.setValue("Settings/crash_dumps_type", ui->dumpsTypeBox->currentIndex());
+  m_Settings.setValue("Settings/crash_dumps_max", ui->dumpsMaxEdit->value());
+}
diff --git a/src/settingsdialogdiagnostics.h b/src/settingsdialogdiagnostics.h
new file mode 100644
index 00000000..2341c253
--- /dev/null
+++ b/src/settingsdialogdiagnostics.h
@@ -0,0 +1,17 @@
+#ifndef SETTINGSDIALOGDIAGNOSTICS_H
+#define SETTINGSDIALOGDIAGNOSTICS_H
+
+#include "settings.h"
+#include "settingsdialog.h"
+
+class DiagnosticsSettingsTab : public SettingsTab
+{
+public:
+  DiagnosticsSettingsTab(Settings *parent, SettingsDialog &dialog);
+
+  void update();
+
+private:
+};
+
+#endif // SETTINGSDIALOGDIAGNOSTICS_H
-- 
cgit v1.3.1


From 3757aa3f532c943f8a47e997d0a4f250d9dacdd3 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 2 Sep 2019 15:07:35 -0400
Subject: split into settingsutilities

---
 src/CMakeLists.txt        |   9 +-
 src/settings.cpp          | 452 +---------------------------------------------
 src/settings.h            |   3 -
 src/settingsutilities.cpp | 247 +++++++++++++++++++++++++
 src/settingsutilities.h   | 266 +++++++++++++++++++++++++++
 5 files changed, 522 insertions(+), 455 deletions(-)
 create mode 100644 src/settingsutilities.cpp
 create mode 100644 src/settingsutilities.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d8316e7e..ea27184b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,6 +45,7 @@ SET(organizer_SRCS
 	settingsdialogsteam.cpp
 	settingsdialogworkarounds.cpp
     settings.cpp
+	settingsutilities.cpp
     selfupdater.cpp
     selectiondialog.cpp
     queryoverwritedialog.cpp
@@ -166,6 +167,7 @@ SET(organizer_HDRS
 	settingsdialogsteam.h
 	settingsdialogworkarounds.h
     settings.h
+	settingsutilities.h
     selfupdater.h
     selectiondialog.h
     queryoverwritedialog.h
@@ -444,6 +446,10 @@ set(profiles
 
 set(settings
 	settings
+	settingsutilities
+)
+
+set(settingsdialog
 	settingsdialog
 	settingsdialogdiagnostics
 	settingsdialoggeneral
@@ -490,7 +496,8 @@ set(widgets
 
 set(src_filters
 	application core browser dialogs downloads env executables locking modinfo
-	modinfo\\dialog modlist plugins previews profiles settings utilities widgets
+	modinfo\\dialog modlist plugins previews profiles settings settingsdialog
+	utilities widgets
 )
 
 foreach(filter in list ${src_filters})
diff --git a/src/settings.cpp b/src/settings.cpp
index 8b063efb..14189be3 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -18,6 +18,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "settings.h"
+#include "settingsutilities.h"
 #include "serverinfo.h"
 #include "executableslist.h"
 #include "appconfig.h"
@@ -27,310 +28,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace MOBase;
 
-template <class T, class=void>
-struct ValueConverter
-{
-  static const T& convert(const T& t)
-  {
-    return t;
-  }
-};
-
-template <class T>
-struct ValueConverter<T, std::enable_if_t<std::is_enum_v<T>>>
-{
-  static QString convert(const T& t)
-  {
-    return QString("%1").arg(static_cast<std::underlying_type_t<T>>(t));
-  }
-};
-
-
-template <class T>
-void logChange(
-  const QString& displayName, std::optional<T> oldValue, const T& newValue)
-{
-  using VC = ValueConverter<T>;
-
-  if (oldValue) {
-    log::debug(
-      "setting '{}' changed from '{}' to '{}'",
-      displayName, VC::convert(*oldValue), VC::convert(newValue));
-  } else {
-    log::debug(
-      "setting '{}' set to '{}'",
-      displayName, VC::convert(newValue));
-  }
-}
-
-void logRemoval(const QString& name)
-{
-  log::debug("setting '{}' removed", name);
-}
-
-
-QString settingName(const QString& section, const QString& key)
-{
-  if (section.isEmpty()) {
-    return key;
-  } else if (key.isEmpty()) {
-    return section;
-  } else {
-    if (section.compare("General", Qt::CaseInsensitive) == 0) {
-      return key;
-    } else {
-      return section + "/" + key;
-    }
-  }
-}
-
-template <class T>
-void setImpl(
-  QSettings& settings, const QString& displayName,
-  const QString& section, const QString& key, const T& value)
-{
-  const auto current = getOptional<T>(settings, section, key);
-
-  if (current && *current == value) {
-    // no change
-    return;
-  }
-
-  const auto name = settingName(section, key);
-
-  logChange(displayName, current, value);
-
-  if constexpr (std::is_enum_v<T>) {
-    settings.setValue(
-      name, static_cast<std::underlying_type_t<T>>(value));
-  } else {
-    settings.setValue(name, value);
-  }
-}
-
-void removeImpl(
-  QSettings& settings, const QString& displayName,
-  const QString& section, const QString& key)
-{
-  if (key.isEmpty()) {
-    if (!settings.childGroups().contains(section, Qt::CaseInsensitive)) {
-      // not there
-      return;
-    }
-  } else {
-    if (!settings.contains(settingName(section, key))) {
-      // not there
-      return;
-    }
-  }
-
-  logRemoval(displayName);
-  settings.remove(settingName(section, key));
-}
-
-
-template <class T>
-std::optional<T> getOptional(
-  const QSettings& settings,
-  const QString& section, const QString& key, std::optional<T> def={})
-{
-  if (settings.contains(settingName(section, key))) {
-    const auto v = settings.value(settingName(section, key));
-
-    if constexpr (std::is_enum_v<T>) {
-      return static_cast<T>(v.value<std::underlying_type_t<T>>());
-    } else {
-      return v.value<T>();
-    }
-  }
-
-  return def;
-}
-
-template <class T>
-T get(
-  const QSettings& settings,
-  const QString& section, const QString& key, T def)
-{
-  if (auto v=getOptional<T>(settings, section, key)) {
-    return *v;
-  } else {
-    return def;
-  }
-}
-
-template <class T>
-void set(
-  QSettings& settings,
-  const QString& section, const QString& key, const T& value)
-{
-  setImpl(settings, settingName(section, key), section, key, value);
-}
-
-void remove(QSettings& settings, const QString& section, const QString& key)
-{
-  removeImpl(settings, settingName(section, key), section, key);
-}
-
-void removeSection(QSettings& settings, const QString& section)
-{
-  removeImpl(settings, section, section, "");
-}
-
-
-class ScopedGroup
-{
-public:
-  ScopedGroup(QSettings& s, const QString& name)
-    : m_settings(s), m_name(name)
-  {
-    m_settings.beginGroup(m_name);
-  }
-
-  ~ScopedGroup()
-  {
-    m_settings.endGroup();
-  }
-
-  ScopedGroup(const ScopedGroup&) = delete;
-  ScopedGroup& operator=(const ScopedGroup&) = delete;
-
-  template <class T>
-  void set(const QString& key, const T& value)
-  {
-    setImpl(m_settings, settingName(m_name, key), "", key, value);
-  }
-
-  void remove(const QString& key)
-  {
-    removeImpl(m_settings, settingName(m_name, key), "", key);
-  }
-
-  QStringList keys() const
-  {
-    return m_settings.childKeys();
-  }
-
-  template <class F>
-  void for_each(F&& f) const
-  {
-    for (const QString& key : keys()) {
-      f(key);
-    }
-  }
-
-  template <class T>
-  std::optional<T> getOptional(const QString& key, std::optional<T> def={}) const
-  {
-    return ::getOptional<T>(m_settings, "", key, def);
-  }
-
-  template <class T>
-  T get(const QString& key, T def={}) const
-  {
-    return ::get<T>(m_settings, "", key, def);
-  }
-
-private:
-  QSettings& m_settings;
-  QString m_name;
-};
-
-
-class ScopedReadArray
-{
-public:
-  ScopedReadArray(QSettings& s, const QString& section)
-    : m_settings(s), m_count(0)
-  {
-    m_count = m_settings.beginReadArray(section);
-  }
-
-  ~ScopedReadArray()
-  {
-    m_settings.endArray();
-  }
-
-  ScopedReadArray(const ScopedReadArray&) = delete;
-  ScopedReadArray& operator=(const ScopedReadArray&) = delete;
-
-  template <class F>
-  void for_each(F&& f) const
-  {
-    for (int i=0; i<count(); ++i) {
-      m_settings.setArrayIndex(i);
-      f();
-    }
-  }
-
-  template <class T>
-  std::optional<T> getOptional(const QString& key, std::optional<T> def={}) const
-  {
-    return ::getOptional<T>(m_settings, "", key, def);
-  }
-
-  template <class T>
-  T get(const QString& key, T def={}) const
-  {
-    return ::get<T>(m_settings, "", key, def);
-  }
-
-  int count() const
-  {
-    return m_count;
-  }
-
-  QStringList keys() const
-  {
-    return m_settings.childKeys();
-  }
-
-private:
-  QSettings& m_settings;
-  int m_count;
-};
-
-
-class ScopedWriteArray
-{
-public:
-  ScopedWriteArray(QSettings& s, const QString& section)
-    : m_settings(s), m_section(section), m_i(0)
-  {
-    m_settings.beginWriteArray(section);
-  }
-
-  ~ScopedWriteArray()
-  {
-    m_settings.endArray();
-  }
-
-  ScopedWriteArray(const ScopedWriteArray&) = delete;
-  ScopedWriteArray& operator=(const ScopedWriteArray&) = delete;
-
-  void next()
-  {
-    m_settings.setArrayIndex(m_i);
-    ++m_i;
-  }
-
-  template <class T>
-  void set(const QString& key, const T& value)
-  {
-    const auto displayName = QString("%1/%2\\%3")
-      .arg(m_section)
-      .arg(m_i)
-      .arg(key);
-
-    setImpl(m_settings, displayName, "", key, value);
-  }
-
-private:
-  QSettings& m_settings;
-  QString m_section;
-  int m_i;
-};
-
 
 EndorsementState endorsementStateFromString(const QString& s)
 {
@@ -360,153 +57,6 @@ QString toString(EndorsementState s)
 }
 
 
-QString widgetNameWithTopLevel(const QWidget* widget)
-{
-  QStringList components;
-
-  auto* tl = widget->window();
-
-  if (tl == widget) {
-    // this is a top level widget, such as a dialog
-    components.push_back(widget->objectName());
-  } else {
-    // this is a widget
-    const auto toplevelName = tl->objectName();
-    if (!toplevelName.isEmpty()) {
-      components.push_back(toplevelName);
-    }
-
-    const auto widgetName = widget->objectName();
-    if (!widgetName.isEmpty()) {
-      components.push_back(widgetName);
-    }
-  }
-
-  if (components.isEmpty()) {
-    // can't do much
-    return "unknown_widget";
-  }
-
-  return components.join("_");
-}
-
-QString widgetName(const QMainWindow* w)
-{
-  return w->objectName();
-}
-
-QString widgetName(const QHeaderView* w)
-{
-  return widgetNameWithTopLevel(w->parentWidget());
-}
-
-QString widgetName(const ExpanderWidget* w)
-{
-  return widgetNameWithTopLevel(w->button());
-}
-
-QString widgetName(const QWidget* w)
-{
-  return widgetNameWithTopLevel(w);
-}
-
-template <class Widget>
-QString geoSettingName(const Widget* widget)
-{
-  return widgetName(widget) + "_geometry";
-}
-
-template <class Widget>
-QString stateSettingName(const Widget* widget)
-{
-  return widgetName(widget) + "_state";
-}
-
-template <class Widget>
-QString visibilitySettingName(const Widget* widget)
-{
-  return widgetName(widget) + "_visibility";
-}
-
-QString dockSettingName(const QDockWidget* dock)
-{
-  return "MainWindow_docks_" + dock->objectName() + "_size";
-}
-
-QString indexSettingName(const QWidget* widget)
-{
-  return widgetNameWithTopLevel(widget) + "_index";
-}
-
-QString checkedSettingName(const QAbstractButton* b)
-{
-  return widgetNameWithTopLevel(b) + "_checked";
-}
-
-void warnIfNotCheckable(const QAbstractButton* b)
-{
-  if (!b->isCheckable()) {
-    log::warn(
-      "button '{}' used in the settings as a checkbox or radio button "
-      "but is not checkable", b->objectName());
-  }
-}
-
-
-bool setWindowsCredential(const QString key, const QString data)
-{
-  QString finalKey("ModOrganizer2_" + key);
-  wchar_t* keyData = new wchar_t[finalKey.size()+1];
-  finalKey.toWCharArray(keyData);
-  keyData[finalKey.size()] = L'\0';
-  bool result = false;
-  if (data.isEmpty()) {
-    result = CredDeleteW(keyData, CRED_TYPE_GENERIC, 0);
-    if (!result)
-      if (GetLastError() == ERROR_NOT_FOUND)
-        result = true;
-  } else {
-    wchar_t* charData = new wchar_t[data.size()];
-    data.toWCharArray(charData);
-
-    CREDENTIALW cred = {};
-    cred.Flags = 0;
-    cred.Type = CRED_TYPE_GENERIC;
-    cred.TargetName = keyData;
-    cred.CredentialBlob = (LPBYTE)charData;
-    cred.CredentialBlobSize = sizeof(wchar_t) * data.size();
-    cred.Persist = CRED_PERSIST_LOCAL_MACHINE;
-
-    result = CredWriteW(&cred, 0);
-    delete[] charData;
-  }
-  delete[] keyData;
-  return result;
-}
-
-QString getWindowsCredential(const QString key)
-{
-  QString result;
-  QString finalKey("ModOrganizer2_" + key);
-  wchar_t* keyData = new wchar_t[finalKey.size()+1];
-  finalKey.toWCharArray(keyData);
-  keyData[finalKey.size()] = L'\0';
-  PCREDENTIALW creds;
-  if (CredReadW(keyData, 1, 0, &creds)) {
-    wchar_t *charData = (wchar_t *)creds->CredentialBlob;
-    result = QString::fromWCharArray(charData, creds->CredentialBlobSize / sizeof(wchar_t));
-    CredFree(creds);
-  } else {
-    const auto e = GetLastError();
-    if (e != ERROR_NOT_FOUND) {
-      log::error("Retrieving encrypted data failed: {}", formatSystemMessage(e));
-    }
-  }
-  delete[] keyData;
-  return result;
-}
-
-
 Settings *Settings::s_Instance = nullptr;
 
 Settings::Settings(const QString& path) :
diff --git a/src/settings.h b/src/settings.h
index 5c0a2542..68cfb9b7 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -36,8 +36,6 @@ namespace MOBase {
 
 class QSplitter;
 
-class PluginContainer;
-class ServerInfo;
 class ServerList;
 class Settings;
 class ExpanderWidget;
@@ -505,7 +503,6 @@ private:
 };
 
 
-
 /**
  * manages the settings for Mod Organizer. The settings are not cached
  * inside the class but read/written directly from/to disc
diff --git a/src/settingsutilities.cpp b/src/settingsutilities.cpp
new file mode 100644
index 00000000..7ac95b5f
--- /dev/null
+++ b/src/settingsutilities.cpp
@@ -0,0 +1,247 @@
+#include "settingsutilities.h"
+#include "expanderwidget.h"
+#include <utility.h>
+
+using namespace MOBase;
+
+void logRemoval(const QString& name)
+{
+  log::debug("setting '{}' removed", name);
+}
+
+
+QString settingName(const QString& section, const QString& key)
+{
+  if (section.isEmpty()) {
+    return key;
+  } else if (key.isEmpty()) {
+    return section;
+  } else {
+    if (section.compare("General", Qt::CaseInsensitive) == 0) {
+      return key;
+    } else {
+      return section + "/" + key;
+    }
+  }
+}
+
+void removeImpl(
+  QSettings& settings, const QString& displayName,
+  const QString& section, const QString& key)
+{
+  if (key.isEmpty()) {
+    if (!settings.childGroups().contains(section, Qt::CaseInsensitive)) {
+      // not there
+      return;
+    }
+  } else {
+    if (!settings.contains(settingName(section, key))) {
+      // not there
+      return;
+    }
+  }
+
+  logRemoval(displayName);
+  settings.remove(settingName(section, key));
+}
+
+void remove(QSettings& settings, const QString& section, const QString& key)
+{
+  removeImpl(settings, settingName(section, key), section, key);
+}
+
+void removeSection(QSettings& settings, const QString& section)
+{
+  removeImpl(settings, section, section, "");
+}
+
+
+ScopedGroup::ScopedGroup(QSettings& s, const QString& name)
+  : m_settings(s), m_name(name)
+{
+  m_settings.beginGroup(m_name);
+}
+
+ScopedGroup::~ScopedGroup()
+{
+  m_settings.endGroup();
+}
+
+void ScopedGroup::remove(const QString& key)
+{
+  removeImpl(m_settings, settingName(m_name, key), "", key);
+}
+
+QStringList ScopedGroup::keys() const
+{
+  return m_settings.childKeys();
+}
+
+
+ScopedReadArray::ScopedReadArray(QSettings& s, const QString& section)
+  : m_settings(s), m_count(0)
+{
+  m_count = m_settings.beginReadArray(section);
+}
+
+ScopedReadArray::~ScopedReadArray()
+{
+  m_settings.endArray();
+}
+
+int ScopedReadArray::count() const
+{
+  return m_count;
+}
+
+QStringList ScopedReadArray::keys() const
+{
+  return m_settings.childKeys();
+}
+
+
+ScopedWriteArray::ScopedWriteArray(QSettings& s, const QString& section)
+  : m_settings(s), m_section(section), m_i(0)
+{
+  m_settings.beginWriteArray(section);
+}
+
+ScopedWriteArray::~ScopedWriteArray()
+{
+  m_settings.endArray();
+}
+
+void ScopedWriteArray::next()
+{
+  m_settings.setArrayIndex(m_i);
+  ++m_i;
+}
+
+
+QString widgetNameWithTopLevel(const QWidget* widget)
+{
+  QStringList components;
+
+  auto* tl = widget->window();
+
+  if (tl == widget) {
+    // this is a top level widget, such as a dialog
+    components.push_back(widget->objectName());
+  } else {
+    // this is a widget
+    const auto toplevelName = tl->objectName();
+    if (!toplevelName.isEmpty()) {
+      components.push_back(toplevelName);
+    }
+
+    const auto widgetName = widget->objectName();
+    if (!widgetName.isEmpty()) {
+      components.push_back(widgetName);
+    }
+  }
+
+  if (components.isEmpty()) {
+    // can't do much
+    return "unknown_widget";
+  }
+
+  return components.join("_");
+}
+
+QString widgetName(const QMainWindow* w)
+{
+  return w->objectName();
+}
+
+QString widgetName(const QHeaderView* w)
+{
+  return widgetNameWithTopLevel(w->parentWidget());
+}
+
+QString widgetName(const ExpanderWidget* w)
+{
+  return widgetNameWithTopLevel(w->button());
+}
+
+QString widgetName(const QWidget* w)
+{
+  return widgetNameWithTopLevel(w);
+}
+
+QString dockSettingName(const QDockWidget* dock)
+{
+  return "MainWindow_docks_" + dock->objectName() + "_size";
+}
+
+QString indexSettingName(const QWidget* widget)
+{
+  return widgetNameWithTopLevel(widget) + "_index";
+}
+
+QString checkedSettingName(const QAbstractButton* b)
+{
+  return widgetNameWithTopLevel(b) + "_checked";
+}
+
+void warnIfNotCheckable(const QAbstractButton* b)
+{
+  if (!b->isCheckable()) {
+    log::warn(
+      "button '{}' used in the settings as a checkbox or radio button "
+      "but is not checkable", b->objectName());
+  }
+}
+
+
+bool setWindowsCredential(const QString key, const QString data)
+{
+  QString finalKey("ModOrganizer2_" + key);
+  wchar_t* keyData = new wchar_t[finalKey.size()+1];
+  finalKey.toWCharArray(keyData);
+  keyData[finalKey.size()] = L'\0';
+  bool result = false;
+  if (data.isEmpty()) {
+    result = CredDeleteW(keyData, CRED_TYPE_GENERIC, 0);
+    if (!result)
+      if (GetLastError() == ERROR_NOT_FOUND)
+        result = true;
+  } else {
+    wchar_t* charData = new wchar_t[data.size()];
+    data.toWCharArray(charData);
+
+    CREDENTIALW cred = {};
+    cred.Flags = 0;
+    cred.Type = CRED_TYPE_GENERIC;
+    cred.TargetName = keyData;
+    cred.CredentialBlob = (LPBYTE)charData;
+    cred.CredentialBlobSize = sizeof(wchar_t) * data.size();
+    cred.Persist = CRED_PERSIST_LOCAL_MACHINE;
+
+    result = CredWriteW(&cred, 0);
+    delete[] charData;
+  }
+  delete[] keyData;
+  return result;
+}
+
+QString getWindowsCredential(const QString key)
+{
+  QString result;
+  QString finalKey("ModOrganizer2_" + key);
+  wchar_t* keyData = new wchar_t[finalKey.size()+1];
+  finalKey.toWCharArray(keyData);
+  keyData[finalKey.size()] = L'\0';
+  PCREDENTIALW creds;
+  if (CredReadW(keyData, 1, 0, &creds)) {
+    wchar_t *charData = (wchar_t *)creds->CredentialBlob;
+    result = QString::fromWCharArray(charData, creds->CredentialBlobSize / sizeof(wchar_t));
+    CredFree(creds);
+  } else {
+    const auto e = GetLastError();
+    if (e != ERROR_NOT_FOUND) {
+      log::error("Retrieving encrypted data failed: {}", formatSystemMessage(e));
+    }
+  }
+  delete[] keyData;
+  return result;
+}
diff --git a/src/settingsutilities.h b/src/settingsutilities.h
new file mode 100644
index 00000000..b70e55ef
--- /dev/null
+++ b/src/settingsutilities.h
@@ -0,0 +1,266 @@
+#ifndef SETTINGSUTILITIES_H
+#define SETTINGSUTILITIES_H
+
+#include <log.h>
+
+class ExpanderWidget;
+
+template <class T, class=void>
+struct ValueConverter
+{
+  static const T& convert(const T& t)
+  {
+    return t;
+  }
+};
+
+template <class T>
+struct ValueConverter<T, std::enable_if_t<std::is_enum_v<T>>>
+{
+  static QString convert(const T& t)
+  {
+    return QString("%1").arg(static_cast<std::underlying_type_t<T>>(t));
+  }
+};
+
+
+template <class T>
+void logChange(
+  const QString& displayName, std::optional<T> oldValue, const T& newValue)
+{
+  using VC = ValueConverter<T>;
+
+  if (oldValue) {
+    log::debug(
+      "setting '{}' changed from '{}' to '{}'",
+      displayName, VC::convert(*oldValue), VC::convert(newValue));
+  } else {
+    log::debug(
+      "setting '{}' set to '{}'",
+      displayName, VC::convert(newValue));
+  }
+}
+
+void logRemoval(const QString& name);
+
+
+QString settingName(const QString& section, const QString& key);
+
+template <class T>
+void setImpl(
+  QSettings& settings, const QString& displayName,
+  const QString& section, const QString& key, const T& value)
+{
+  const auto current = getOptional<T>(settings, section, key);
+
+  if (current && *current == value) {
+    // no change
+    return;
+  }
+
+  const auto name = settingName(section, key);
+
+  logChange(displayName, current, value);
+
+  if constexpr (std::is_enum_v<T>) {
+    settings.setValue(
+      name, static_cast<std::underlying_type_t<T>>(value));
+  } else {
+    settings.setValue(name, value);
+  }
+}
+
+void removeImpl(
+  QSettings& settings, const QString& displayName,
+  const QString& section, const QString& key);
+
+
+template <class T>
+std::optional<T> getOptional(
+  const QSettings& settings,
+  const QString& section, const QString& key, std::optional<T> def={})
+{
+  if (settings.contains(settingName(section, key))) {
+    const auto v = settings.value(settingName(section, key));
+
+    if constexpr (std::is_enum_v<T>) {
+      return static_cast<T>(v.value<std::underlying_type_t<T>>());
+    } else {
+      return v.value<T>();
+    }
+  }
+
+  return def;
+}
+
+template <class T>
+T get(
+  const QSettings& settings,
+  const QString& section, const QString& key, T def)
+{
+  if (auto v=getOptional<T>(settings, section, key)) {
+    return *v;
+  } else {
+    return def;
+  }
+}
+
+template <class T>
+void set(
+  QSettings& settings,
+  const QString& section, const QString& key, const T& value)
+{
+  setImpl(settings, settingName(section, key), section, key, value);
+}
+
+void remove(QSettings& settings, const QString& section, const QString& key);
+void removeSection(QSettings& settings, const QString& section);
+
+
+class ScopedGroup
+{
+public:
+  ScopedGroup(QSettings& s, const QString& name);
+  ~ScopedGroup();
+
+  ScopedGroup(const ScopedGroup&) = delete;
+  ScopedGroup& operator=(const ScopedGroup&) = delete;
+
+  template <class T>
+  void set(const QString& key, const T& value)
+  {
+    setImpl(m_settings, settingName(m_name, key), "", key, value);
+  }
+
+  void remove(const QString& key);
+
+  QStringList keys() const;
+
+  template <class F>
+  void for_each(F&& f) const
+  {
+    for (const QString& key : keys()) {
+      f(key);
+    }
+  }
+
+  template <class T>
+  std::optional<T> getOptional(const QString& key, std::optional<T> def={}) const
+  {
+    return ::getOptional<T>(m_settings, "", key, def);
+  }
+
+  template <class T>
+  T get(const QString& key, T def={}) const
+  {
+    return ::get<T>(m_settings, "", key, def);
+  }
+
+private:
+  QSettings& m_settings;
+  QString m_name;
+};
+
+
+class ScopedReadArray
+{
+public:
+  ScopedReadArray(QSettings& s, const QString& section);
+  ~ScopedReadArray();
+
+  ScopedReadArray(const ScopedReadArray&) = delete;
+  ScopedReadArray& operator=(const ScopedReadArray&) = delete;
+
+  template <class F>
+  void for_each(F&& f) const
+  {
+    for (int i=0; i<count(); ++i) {
+      m_settings.setArrayIndex(i);
+      f();
+    }
+  }
+
+  template <class T>
+  std::optional<T> getOptional(const QString& key, std::optional<T> def={}) const
+  {
+    return ::getOptional<T>(m_settings, "", key, def);
+  }
+
+  template <class T>
+  T get(const QString& key, T def={}) const
+  {
+    return ::get<T>(m_settings, "", key, def);
+  }
+
+  int count() const;
+  QStringList keys() const;
+
+private:
+  QSettings& m_settings;
+  int m_count;
+};
+
+
+class ScopedWriteArray
+{
+public:
+  ScopedWriteArray(QSettings& s, const QString& section);
+  ~ScopedWriteArray();
+
+  ScopedWriteArray(const ScopedWriteArray&) = delete;
+  ScopedWriteArray& operator=(const ScopedWriteArray&) = delete;
+
+  void next();
+
+  template <class T>
+  void set(const QString& key, const T& value)
+  {
+    const auto displayName = QString("%1/%2\\%3")
+      .arg(m_section)
+      .arg(m_i)
+      .arg(key);
+
+    setImpl(m_settings, displayName, "", key, value);
+  }
+
+private:
+  QSettings& m_settings;
+  QString m_section;
+  int m_i;
+};
+
+
+QString widgetNameWithTopLevel(const QWidget* widget);
+QString widgetName(const QMainWindow* w);
+QString widgetName(const QHeaderView* w);
+QString widgetName(const ExpanderWidget* w);
+QString widgetName(const QWidget* w);
+
+template <class Widget>
+QString geoSettingName(const Widget* widget)
+{
+  return widgetName(widget) + "_geometry";
+}
+
+template <class Widget>
+QString stateSettingName(const Widget* widget)
+{
+  return widgetName(widget) + "_state";
+}
+
+template <class Widget>
+QString visibilitySettingName(const Widget* widget)
+{
+  return widgetName(widget) + "_visibility";
+}
+
+QString dockSettingName(const QDockWidget* dock);
+QString indexSettingName(const QWidget* widget);
+QString checkedSettingName(const QAbstractButton* b);
+
+void warnIfNotCheckable(const QAbstractButton* b);
+
+bool setWindowsCredential(const QString key, const QString data);
+QString getWindowsCredential(const QString key);
+
+#endif // SETTINGSUTILITIES_H
-- 
cgit v1.3.1


From 06218502ed5379555eda1504e6b05f2ef6dfb292 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 11 Sep 2019 23:34:54 -0400
Subject: fixes for ExpanderWidget removed dead code in MainWindow

---
 src/CMakeLists.txt           |  3 ---
 src/mainwindow.cpp           | 11 -----------
 src/mainwindow.h             |  3 ---
 src/modinfodialogconflicts.h |  2 +-
 src/settings.h               |  6 +++---
 src/settingsutilities.h      |  6 ++++--
 6 files changed, 8 insertions(+), 23 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ea27184b..60822834 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -136,7 +136,6 @@ SET(organizer_SRCS
 	apiuseraccount.cpp
 	filerenamer.cpp
 	texteditor.cpp
-	expanderwidget.cpp
 	env.cpp
 	envmetrics.cpp
 	envmodule.cpp
@@ -260,7 +259,6 @@ SET(organizer_HDRS
 	apiuseraccount.h
 	filerenamer.h
 	texteditor.h
-	expanderwidget.h
 	env.h
 	envmetrics.h
 	envmodule.h
@@ -478,7 +476,6 @@ set(utilities
 )
 
 set(widgets
-	expanderwidget
 	genericicondelegate
 	filerenamer
 	filterwidget
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 657c1a27..054262e9 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2561,17 +2561,6 @@ void MainWindow::modInstalled(const QString &modName)
   modUpdateCheck(IDs);
 }
 
-void MainWindow::procError(QProcess::ProcessError error)
-{
-  reportError(tr("failed to spawn notepad.exe: %1").arg(error));
-  this->sender()->deleteLater();
-}
-
-void MainWindow::procFinished(int, QProcess::ExitStatus)
-{
-  this->sender()->deleteLater();
-}
-
 void MainWindow::showMessage(const QString &message)
 {
   MessageDialog::showMessage(message, this);
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 6f06b9d5..1f997ab1 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -489,9 +489,6 @@ private slots:
   void doMoveOverwriteContentToMod(const QString &modAbsolutePath);
   void clearOverwrite();
 
-  void procError(QProcess::ProcessError error);
-  void procFinished(int exitCode, QProcess::ExitStatus exitStatus);
-
   // nexus related
   void checkModsForUpdates();
 
diff --git a/src/modinfodialogconflicts.h b/src/modinfodialogconflicts.h
index a77c2ac9..ad305dfc 100644
--- a/src/modinfodialogconflicts.h
+++ b/src/modinfodialogconflicts.h
@@ -33,7 +33,7 @@ signals:
 private:
   struct Expanders
   {
-    ExpanderWidget overwrite, overwritten, nonconflict;
+    MOBase::ExpanderWidget overwrite, overwritten, nonconflict;
   };
 
   ConflictsTab* m_tab;
diff --git a/src/settings.h b/src/settings.h
index 91b87e29..815ed160 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -32,13 +32,13 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 namespace MOBase {
   class IPlugin;
   class IPluginGame;
+  class ExpanderWidget;
 }
 
 class QSplitter;
 
 class ServerList;
 class Settings;
-class ExpanderWidget;
 
 
 // helper class that calls restoreGeometry() in the constructor and
@@ -153,8 +153,8 @@ public:
   void saveState(const QSplitter* splitter);
   bool restoreState(QSplitter* splitter) const;
 
-  void saveState(const ExpanderWidget* expander);
-  bool restoreState(ExpanderWidget* expander) const;
+  void saveState(const MOBase::ExpanderWidget* expander);
+  bool restoreState(MOBase::ExpanderWidget* expander) const;
 
   void saveVisibility(const QWidget* w);
   bool restoreVisibility(QWidget* w, std::optional<bool> def={}) const;
diff --git a/src/settingsutilities.h b/src/settingsutilities.h
index d99abb06..c3eef12f 100644
--- a/src/settingsutilities.h
+++ b/src/settingsutilities.h
@@ -3,7 +3,9 @@
 
 #include <log.h>
 
-class ExpanderWidget;
+namespace MOBase {
+  class ExpanderWidget;
+}
 
 template <class T, class=void>
 struct ValueConverter
@@ -241,7 +243,7 @@ private:
 QString widgetNameWithTopLevel(const QWidget* widget);
 QString widgetName(const QMainWindow* w);
 QString widgetName(const QHeaderView* w);
-QString widgetName(const ExpanderWidget* w);
+QString widgetName(const MOBase::ExpanderWidget* w);
 QString widgetName(const QWidget* w);
 
 template <class Widget>
-- 
cgit v1.3.1


From c50722100c485d2945082d573158a7083efe2f23 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Thu, 19 Sep 2019 10:11:56 -0400
Subject: removed helper.h and helper.cpp, merged into spawn

---
 src/CMakeLists.txt                |  3 ---
 src/helper.cpp                    | 20 --------------------
 src/helper.h                      | 26 --------------------------
 src/main.cpp                      |  1 -
 src/organizercore.cpp             |  1 -
 src/settingsdialogworkarounds.cpp |  2 +-
 src/spawn.cpp                     |  1 -
 7 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 src/helper.cpp
 delete mode 100644 src/helper.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 60822834..7c29ff48 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -87,7 +87,6 @@ SET(organizer_SRCS
     waitingonclosedialog.cpp
     loadmechanism.cpp
     installationmanager.cpp
-    helper.cpp
     filedialogmemory.cpp
     executableslist.cpp
     editexecutablesdialog.cpp
@@ -208,7 +207,6 @@ SET(organizer_HDRS
     waitingonclosedialog.h
     loadmechanism.h
     installationmanager.h
-    helper.h
     filedialogmemory.h
     executableslist.h
     editexecutablesdialog.h
@@ -464,7 +462,6 @@ set(utilities
 	csvbuilder
 	shared/error_report
 	eventfilter
-	helper
 	shared/leaktrace
 	persistentcookiejar
 	serverinfo
diff --git a/src/helper.cpp b/src/helper.cpp
deleted file mode 100644
index 24446cb8..00000000
--- a/src/helper.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// moved to spawn.cpp
diff --git a/src/helper.h b/src/helper.h
deleted file mode 100644
index 335b8647..00000000
--- a/src/helper.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef HELPER_H
-#define HELPER_H
-
-// all helper code moved to spawn.h and spawn.cpp
-#include "spawn.h"
-
-#endif // HELPER_H
diff --git a/src/main.cpp b/src/main.cpp
index 74b04970..ba988ae3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -38,7 +38,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "executableslist.h"
 #include "singleinstance.h"
 #include "utility.h"
-#include "helper.h"
 #include "loglist.h"
 #include "selectiondialog.h"
 #include "moapplication.h"
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index fbc9083b..0da5b604 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -33,7 +33,6 @@
 #include "lockeddialog.h"
 #include "instancemanager.h"
 #include <scriptextender.h>
-#include "helper.h"
 #include "previewdialog.h"
 
 #include <QApplication>
diff --git a/src/settingsdialogworkarounds.cpp b/src/settingsdialogworkarounds.cpp
index f89b021c..ccbfcbfe 100644
--- a/src/settingsdialogworkarounds.cpp
+++ b/src/settingsdialogworkarounds.cpp
@@ -1,6 +1,6 @@
 #include "settingsdialogworkarounds.h"
 #include "ui_settingsdialog.h"
-#include "helper.h"
+#include "spawn.h"
 #include <iplugingame.h>
 
 WorkaroundsSettingsTab::WorkaroundsSettingsTab(Settings& s, SettingsDialog& d)
diff --git a/src/spawn.cpp b/src/spawn.cpp
index 6c524681..64766adf 100644
--- a/src/spawn.cpp
+++ b/src/spawn.cpp
@@ -33,7 +33,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <Shellapi.h>
 #include <appconfig.h>
 #include <windows_error.h>
-#include "helper.h"
 #include <QApplication>
 #include <QMessageBox>
 #include <QtDebug>
-- 
cgit v1.3.1


From 51d664d76ce6b611e7a7585b209bad9d68fe65d7 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 27 Sep 2019 15:20:02 -0400
Subject: moved color stuff to ColorTable, now shows sample text and icons

---
 src/CMakeLists.txt            |   3 +
 src/colortable.cpp            | 278 ++++++++++++++++++++++++++++++++++++++++++
 src/colortable.h              |  28 +++++
 src/icondelegate.cpp          |  15 ++-
 src/icondelegate.h            |  18 +--
 src/modflagicondelegate.cpp   | 114 +++++++++--------
 src/modflagicondelegate.h     |  11 +-
 src/settingsdialog.ui         |   9 +-
 src/settingsdialoggeneral.cpp | 235 +++--------------------------------
 src/settingsdialoggeneral.h   |   9 --
 10 files changed, 421 insertions(+), 299 deletions(-)
 create mode 100644 src/colortable.cpp
 create mode 100644 src/colortable.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7c29ff48..b21d1a8b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -141,6 +141,7 @@ SET(organizer_SRCS
 	envsecurity.cpp
 	envshortcut.cpp
 	envwindows.cpp
+	colortable.cpp
 
     shared/windows_error.cpp
     shared/error_report.cpp
@@ -263,6 +264,7 @@ SET(organizer_HDRS
 	envsecurity.h
 	envshortcut.h
 	envwindows.h
+	colortable.h
 
     shared/windows_error.h
     shared/error_report.h
@@ -473,6 +475,7 @@ set(utilities
 )
 
 set(widgets
+	colortable
 	genericicondelegate
 	filerenamer
 	filterwidget
diff --git a/src/colortable.cpp b/src/colortable.cpp
new file mode 100644
index 00000000..7546abe5
--- /dev/null
+++ b/src/colortable.cpp
@@ -0,0 +1,278 @@
+#include "colortable.h"
+#include "modflagicondelegate.h"
+#include "settings.h"
+
+class ColorItem;
+ColorItem* colorItemForRow(QTableWidget* table, int row);
+
+void paintBackground(
+  QTableWidget* table, QPainter* p, const QStyleOptionViewItem& option,
+  const QModelIndex& index);
+
+
+class ColoredBackgroundDelegate : public QStyledItemDelegate
+{
+public:
+  ColoredBackgroundDelegate(QTableWidget* table)
+    : m_table(table)
+  {
+  }
+
+  void paint(
+    QPainter* p, const QStyleOptionViewItem& option,
+    const QModelIndex& index) const override
+  {
+    paintBackground(m_table, p, option, index);
+
+    QStyleOptionViewItem itemOption(option);
+    initStyleOption(&itemOption, index);
+    itemOption.state = QStyle::State_Enabled;
+
+    QStyledItemDelegate::paint(p, itemOption, index);
+  }
+
+private:
+  QTableWidget* m_table;
+};
+
+
+class FakeModFlagIconDelegate : public ModFlagIconDelegate
+{
+public:
+  explicit FakeModFlagIconDelegate(QTableWidget* table)
+    : m_table(table)
+  {
+  }
+
+  void paint(
+    QPainter *painter, const QStyleOptionViewItem &option,
+    const QModelIndex &index) const override
+  {
+    paintBackground(m_table, painter, option, index);
+    ModFlagIconDelegate::paintIcons(painter, option, index, getIcons(index));
+  }
+
+protected:
+  QList<QString> getIcons(const QModelIndex &index) const override
+  {
+    const auto flags = {
+      ModInfo::FLAG_CONFLICT_MIXED,
+      ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE,
+      ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN,
+      ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED,
+      ModInfo::FLAG_BACKUP,
+      ModInfo::FLAG_NOTENDORSED,
+      ModInfo::FLAG_NOTES,
+      ModInfo::FLAG_ALTERNATE_GAME
+    };
+
+    return getIconsForFlags(flags, false);
+  }
+
+  size_t getNumIcons(const QModelIndex &index) const override
+  {
+    return getIcons(index).size();
+  }
+
+private:
+  QTableWidget* m_table;
+};
+
+
+class ColorItem : public QTableWidgetItem
+{
+public:
+  ColorItem(
+    QString caption, QColor defaultColor,
+    std::function<QColor ()> get,
+    std::function<void (const QColor&)> commit) :
+      m_caption(std::move(caption)), m_default(defaultColor),
+      m_get(get), m_commit(commit)
+  {
+    setText(m_caption);
+    set(get());
+  }
+
+  const QString& caption() const
+  {
+    return m_caption;
+  }
+
+  QColor get() const
+  {
+    return m_temp;
+  }
+
+  bool set(const QColor& c)
+  {
+    if (m_temp != c) {
+      m_temp = c;
+      return true;
+    }
+
+    return false;
+  }
+
+  void commit()
+  {
+    m_commit(m_temp);
+  }
+
+  bool reset()
+  {
+    return set(m_default);
+  }
+
+private:
+  const QString m_caption;
+  const QColor m_default;
+  std::function<QColor ()> m_get;
+  std::function<void (const QColor&)> m_commit;
+  QColor m_temp;
+};
+
+
+ColorItem* colorItemForRow(QTableWidget* table, int row)
+{
+  return dynamic_cast<ColorItem*>(table->item(row, 0));
+}
+
+template <class F>
+void forEachColorItem(QTableWidget* table, F&& f)
+{
+  const auto rowCount = table->rowCount();
+
+  for (int i=0; i<rowCount; ++i) {
+    if (auto* ci=colorItemForRow(table, i)) {
+      f(ci);
+    }
+  }
+}
+
+void paintBackground(
+  QTableWidget* table, QPainter* p, const QStyleOptionViewItem& option,
+  const QModelIndex& index)
+{
+  if (auto* ci=colorItemForRow(table, index.row())) {
+    p->save();
+    p->fillRect(option.rect, ci->get());
+    p->restore();
+  }
+}
+
+
+ColorTable::ColorTable(QWidget* parent)
+  : QTableWidget(parent), m_settings(nullptr)
+{
+  setColumnCount(3);
+  setHorizontalHeaderLabels({"", "", ""});
+
+  setItemDelegateForColumn(1, new ColoredBackgroundDelegate(this));
+  setItemDelegateForColumn(2, new FakeModFlagIconDelegate(this));
+
+  connect(
+    this, &QTableWidget::cellActivated,
+    [&]{ onColorActivated(); });
+}
+
+void ColorTable::load(Settings& s)
+{
+  m_settings = &s;
+
+  addColor(
+    QObject::tr("Is overwritten (loose files)"),
+    QColor(0, 255, 0, 64),
+    [this]{ return m_settings->colors().modlistOverwrittenLoose(); },
+    [this](auto&& v){ m_settings->colors().setModlistOverwrittenLoose(v); });
+
+  addColor(
+    QObject::tr("Is overwriting (loose files)"),
+    QColor(255, 0, 0, 64),
+    [this]{ return m_settings->colors().modlistOverwritingLoose(); },
+    [this](auto&& v){ m_settings->colors().setModlistOverwritingLoose(v); });
+
+  addColor(
+    QObject::tr("Is overwritten (archives)"),
+    QColor(0, 255, 255, 64),
+    [this]{ return m_settings->colors().modlistOverwrittenArchive(); },
+    [this](auto&& v){ m_settings->colors().setModlistOverwrittenArchive(v); });
+
+  addColor(
+    QObject::tr("Is overwriting (archives)"),
+    QColor(255, 0, 255, 64),
+    [this]{ return m_settings->colors().modlistOverwritingArchive(); },
+    [this](auto&& v){ m_settings->colors().setModlistOverwritingArchive(v); });
+
+  addColor(
+    QObject::tr("Mod contains selected plugin"),
+    QColor(0, 0, 255, 64),
+    [this]{ return m_settings->colors().modlistContainsPlugin(); },
+    [this](auto&& v){ m_settings->colors().setModlistContainsPlugin(v); });
+
+  addColor(
+    QObject::tr("Plugin is contained in selected mod"),
+    QColor(0, 0, 255, 64),
+    [this]{ return m_settings->colors().pluginListContained(); },
+    [this](auto&& v){ m_settings->colors().setPluginListContained(v); });
+}
+
+void ColorTable::resetColors()
+{
+  bool changed = false;
+
+  forEachColorItem(this, [&](auto* item) {
+    if (item->reset()) {
+      changed = true;
+    }
+  });
+
+  if (changed) {
+    update();
+  }
+}
+
+void ColorTable::commitColors()
+{
+  forEachColorItem(this, [](auto* item) {
+    item->commit();
+  });
+}
+
+void ColorTable::addColor(
+  const QString& text, const QColor& defaultColor,
+  std::function<QColor ()> get,
+  std::function<void (const QColor&)> commit)
+{
+  const auto r = rowCount();
+  setRowCount(r + 1);
+
+  auto* item = new ColorItem(text, defaultColor, get, commit);
+
+  setItem(r, 0, item);
+  setItem(r, 1, new QTableWidgetItem("Text"));
+  setItem(r, 2, new QTableWidgetItem);
+
+  resizeColumnsToContents();
+}
+
+void ColorTable::onColorActivated()
+{
+  const auto rows = selectionModel()->selectedRows();
+  if (rows.isEmpty()) {
+    return;
+  }
+
+  const auto row = rows[0].row();
+  auto* ci = colorItemForRow(this, row);
+  if (!ci) {
+    return;
+  }
+
+  const QColor result = QColorDialog::getColor(
+    ci->get(), topLevelWidget(), ci->caption(), QColorDialog::ShowAlphaChannel);
+
+  if (result.isValid()) {
+    ci->set(result);
+    update(model()->index(row, 1));
+  }
+}
diff --git a/src/colortable.h b/src/colortable.h
new file mode 100644
index 00000000..c2b64a4d
--- /dev/null
+++ b/src/colortable.h
@@ -0,0 +1,28 @@
+#ifndef COLORTABLE_H
+#define COLORTABLE_H
+
+#include <QTableWidget>
+
+class Settings;
+
+class ColorTable : public QTableWidget
+{
+public:
+  ColorTable(QWidget* parent=nullptr);
+
+  void load(Settings& s);
+  void resetColors();
+  void commitColors();
+
+private:
+  Settings* m_settings;
+
+  void addColor(
+    const QString& text, const QColor& defaultColor,
+    std::function<QColor ()> get,
+    std::function<void (const QColor&)> commit);
+
+  void onColorActivated();
+};
+
+#endif // COLORTABLE_H
diff --git a/src/icondelegate.cpp b/src/icondelegate.cpp
index 39038f3c..03964263 100644
--- a/src/icondelegate.cpp
+++ b/src/icondelegate.cpp
@@ -32,13 +32,10 @@ IconDelegate::IconDelegate(QObject *parent)
 {
 }
 
-
-void IconDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+void IconDelegate::paintIcons(
+  QPainter *painter, const QStyleOptionViewItem &option,
+  const QModelIndex &index, const QList<QString>& icons)
 {
-  QStyledItemDelegate::paint(painter, option, index);
-
-  QList<QString> icons = getIcons(index);
-
   int x = 4;
   painter->save();
 
@@ -67,3 +64,9 @@ void IconDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
   painter->restore();
 }
 
+void IconDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+  QStyledItemDelegate::paint(painter, option, index);
+  paintIcons(painter, option, index, getIcons(index));
+}
+
diff --git a/src/icondelegate.h b/src/icondelegate.h
index 39694481..bac71a62 100644
--- a/src/icondelegate.h
+++ b/src/icondelegate.h
@@ -27,25 +27,19 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 class IconDelegate : public QStyledItemDelegate
 {
-  Q_OBJECT
-public:
+  Q_OBJECT;
 
+public:
   explicit IconDelegate(QObject *parent = 0);
-
   virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
-signals:
-  
-public slots:
-
-private:
+  static void paintIcons(
+    QPainter *painter, const QStyleOptionViewItem &option,
+    const QModelIndex &index, const QList<QString>& icons);
 
+protected:
   virtual QList<QString> getIcons(const QModelIndex &index) const = 0;
   virtual size_t getNumIcons(const QModelIndex &index) const = 0;
-
-
-private:
-
 };
 
 #endif // ICONDELEGATE_H
diff --git a/src/modflagicondelegate.cpp b/src/modflagicondelegate.cpp
index 7110a590..a5e9aa22 100644
--- a/src/modflagicondelegate.cpp
+++ b/src/modflagicondelegate.cpp
@@ -31,72 +31,82 @@ void ModFlagIconDelegate::columnResized(int logicalIndex, int, int newSize)
   }
 }
 
-QList<QString> ModFlagIconDelegate::getIcons(const QModelIndex &index) const {
+QList<QString> ModFlagIconDelegate::getIconsForFlags(
+  std::vector<ModInfo::EFlag> flags, bool compact)
+{
   QList<QString> result;
-  QVariant modid = index.data(Qt::UserRole + 1);
-  if (modid.isValid()) {
-    ModInfo::Ptr info = ModInfo::getByIndex(modid.toInt());
-    std::vector<ModInfo::EFlag> flags = info->getFlags();
 
-    // Don't do flags for overwrite
-    if (std::find(flags.begin(), flags.end(),ModInfo::FLAG_OVERWRITE) != flags.end())
-      return result;
-
-    // insert conflict icons to provide nicer alignment
-    { // insert loose file conflicts first
-      auto iter = std::find_first_of(flags.begin(), flags.end(),
-                                     m_ConflictFlags, m_ConflictFlags + 4);
-      if (iter != flags.end()) {
-        result.append(getFlagIcon(*iter));
-        flags.erase(iter);
-      } else if (!m_Compact) {
-        result.append(QString());
-      }
+  // Don't do flags for overwrite
+  if (std::find(flags.begin(), flags.end(),ModInfo::FLAG_OVERWRITE) != flags.end())
+    return result;
+
+  // insert conflict icons to provide nicer alignment
+  { // insert loose file conflicts first
+    auto iter = std::find_first_of(flags.begin(), flags.end(),
+                                    m_ConflictFlags, m_ConflictFlags + 4);
+    if (iter != flags.end()) {
+      result.append(getFlagIcon(*iter));
+      flags.erase(iter);
+    } else if (!compact) {
+      result.append(QString());
     }
+  }
 
-    { // insert loose vs archive overwrite second
-      auto iter = std::find(flags.begin(), flags.end(),
-        ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE);
-      if (iter != flags.end()) {
-        result.append(getFlagIcon(*iter));
-        flags.erase(iter);
-      } else if (!m_Compact) {
-        result.append(QString());
-      }
+  { // insert loose vs archive overwrite second
+    auto iter = std::find(flags.begin(), flags.end(),
+      ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE);
+    if (iter != flags.end()) {
+      result.append(getFlagIcon(*iter));
+      flags.erase(iter);
+    } else if (!compact) {
+      result.append(QString());
     }
+  }
 
-    { // insert loose vs archive overwritten third
-      auto iter = std::find_first_of(flags.begin(), flags.end(),
-        m_ArchiveLooseConflictFlags + 1, m_ArchiveLooseConflictFlags + 2);
-      if (iter != flags.end()) {
-        result.append(getFlagIcon(*iter));
-        flags.erase(iter);
-      } else if (!m_Compact) {
-        result.append(QString());
-      }
+  { // insert loose vs archive overwritten third
+    auto iter = std::find_first_of(flags.begin(), flags.end(),
+      m_ArchiveLooseConflictFlags + 1, m_ArchiveLooseConflictFlags + 2);
+    if (iter != flags.end()) {
+      result.append(getFlagIcon(*iter));
+      flags.erase(iter);
+    } else if (!compact) {
+      result.append(QString());
     }
+  }
 
-    { // insert archive conflicts last
-      auto iter = std::find_first_of(flags.begin(), flags.end(),
-        m_ArchiveConflictFlags, m_ArchiveConflictFlags + 3);
-      if (iter != flags.end()) {
-        result.append(getFlagIcon(*iter));
-        flags.erase(iter);
-      } else if (!m_Compact) {
-        result.append(QString());
-      }
+  { // insert archive conflicts last
+    auto iter = std::find_first_of(flags.begin(), flags.end(),
+      m_ArchiveConflictFlags, m_ArchiveConflictFlags + 3);
+    if (iter != flags.end()) {
+      result.append(getFlagIcon(*iter));
+      flags.erase(iter);
+    } else if (!compact) {
+      result.append(QString());
     }
+  }
 
-    for (auto iter = flags.begin(); iter != flags.end(); ++iter) {
-      auto iconPath = getFlagIcon(*iter);
-      if (!iconPath.isEmpty())
-        result.append(iconPath);
-    }
+  for (auto iter = flags.begin(); iter != flags.end(); ++iter) {
+    auto iconPath = getFlagIcon(*iter);
+    if (!iconPath.isEmpty())
+      result.append(iconPath);
   }
+
   return result;
 }
 
-QString ModFlagIconDelegate::getFlagIcon(ModInfo::EFlag flag) const
+QList<QString> ModFlagIconDelegate::getIcons(const QModelIndex &index) const
+{
+  QVariant modid = index.data(Qt::UserRole + 1);
+
+  if (modid.isValid()) {
+    ModInfo::Ptr info = ModInfo::getByIndex(modid.toInt());
+    return getIconsForFlags(info->getFlags(), m_Compact);
+  }
+
+  return {};
+}
+
+QString ModFlagIconDelegate::getFlagIcon(ModInfo::EFlag flag)
 {
   switch (flag) {
     case ModInfo::FLAG_BACKUP: return QStringLiteral(":/MO/gui/emblem_backup");
diff --git a/src/modflagicondelegate.h b/src/modflagicondelegate.h
index eb6a76ab..4f22dd90 100644
--- a/src/modflagicondelegate.h
+++ b/src/modflagicondelegate.h
@@ -5,21 +5,24 @@
 
 class ModFlagIconDelegate : public IconDelegate
 {
-Q_OBJECT
+  Q_OBJECT;
 
 public:
   explicit ModFlagIconDelegate(QObject *parent = 0, int logicalIndex = -1, int compactSize = 120);
   virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
+  static QList<QString> getIconsForFlags(
+    std::vector<ModInfo::EFlag> flags, bool compact);
+
+  static QString getFlagIcon(ModInfo::EFlag flag);
+
 public slots:
   void columnResized(int logicalIndex, int oldSize, int newSize);
 
-private:
+protected:
   virtual QList<QString> getIcons(const QModelIndex &index) const;
   virtual size_t getNumIcons(const QModelIndex &index) const;
 
-  QString getFlagIcon(ModInfo::EFlag flag) const;
-
 private:
   static ModInfo::EFlag m_ConflictFlags[4];
   static ModInfo::EFlag m_ArchiveLooseConflictFlags[2];
diff --git a/src/settingsdialog.ui b/src/settingsdialog.ui
index 704e4134..fba65545 100644
--- a/src/settingsdialog.ui
+++ b/src/settingsdialog.ui
@@ -211,7 +211,7 @@
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_13">
           <item>
-           <widget class="QTableWidget" name="colorTable">
+           <widget class="ColorTable" name="colorTable">
             <property name="editTriggers">
              <set>QAbstractItemView::NoEditTriggers</set>
             </property>
@@ -1527,6 +1527,13 @@ programs you are intentionally running.</string>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ColorTable</class>
+   <extends>QTableWidget</extends>
+   <header>colortable.h</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>logLevelBox</tabstop>
   <tabstop>baseDirEdit</tabstop>
diff --git a/src/settingsdialoggeneral.cpp b/src/settingsdialoggeneral.cpp
index 0dfd3a08..a9ec5cae 100644
--- a/src/settingsdialoggeneral.cpp
+++ b/src/settingsdialoggeneral.cpp
@@ -2,114 +2,9 @@
 #include "ui_settingsdialog.h"
 #include "appconfig.h"
 #include "categoriesdialog.h"
+#include "colortable.h"
 #include <questionboxmemory.h>
 
-using MOBase::QuestionBoxMemory;
-
-
-class ColorItem : public QTableWidgetItem
-{
-public:
-  ColorItem(
-    const QColor& defaultColor,
-    std::function<QColor ()> get,
-    std::function<void (const QColor&)> commit)
-     : m_default(defaultColor), m_get(get), m_commit(commit)
-  {
-    set(get());
-  }
-
-  QColor get() const
-  {
-    return m_temp;
-  }
-
-  bool set(const QColor& c)
-  {
-    if (m_temp != c) {
-      m_temp = c;
-      return true;
-    }
-
-    return false;
-  }
-
-  void commit()
-  {
-    m_commit(m_temp);
-  }
-
-  bool reset()
-  {
-    return set(m_default);
-  }
-
-private:
-  const QColor m_default;
-  std::function<QColor ()> m_get;
-  std::function<void (const QColor&)> m_commit;
-  QColor m_temp;
-};
-
-
-class ColorDelegate : public QStyledItemDelegate
-{
-public:
-  ColorDelegate(QTableWidget* table)
-    : m_table(table)
-  {
-  }
-
-protected:
-  void paint(
-    QPainter* p, const QStyleOptionViewItem& option,
-    const QModelIndex& index) const override
-  {
-    if (!paintColor(p, option, index)) {
-      QStyledItemDelegate::paint(p, option, index);
-    }
-  }
-
-private:
-  QTableWidget* m_table;
-
-  bool paintColor(
-    QPainter* p, const QStyleOptionViewItem& option,
-    const QModelIndex& index) const
-  {
-    if (index.column() != 1) {
-      return false;
-    }
-
-    const auto* item = dynamic_cast<ColorItem*>(
-      m_table->item(index.row(), index.column()));
-
-    if (!item) {
-      return false;
-    }
-
-    p->save();
-    p->fillRect(option.rect, item->get());
-    p->restore();
-
-    return true;
-  }
-};
-
-
-template <class F>
-void forEachColorItem(QTableWidget* table, F&& f)
-{
-  const auto rowCount = table->rowCount();
-
-  for (int i=0; i<rowCount; ++i) {
-    if (auto* item=dynamic_cast<ColorItem*>(table->item(i, 1))) {
-      f(item);
-    }
-  }
-}
-
-
 GeneralSettingsTab::GeneralSettingsTab(Settings& s, SettingsDialog& d)
   : SettingsTab(s, d)
 {
@@ -119,17 +14,26 @@ GeneralSettingsTab::GeneralSettingsTab(Settings& s, SettingsDialog& d)
   addStyles();
   selectStyle();
 
-  setColorTable();
+  ui->colorTable->load(s);
 
-  QObject::connect(ui->categoriesBtn, &QPushButton::clicked, [&]{ on_categoriesBtn_clicked(); });
-  QObject::connect(ui->resetColorsBtn, &QPushButton::clicked, [&]{ on_resetColorsBtn_clicked(); });
-  QObject::connect(ui->resetDialogsButton, &QPushButton::clicked, [&]{ on_resetDialogsButton_clicked(); });
+  QObject::connect(
+    ui->categoriesBtn, &QPushButton::clicked,
+    [&]{ on_categoriesBtn_clicked(); });
+
+  QObject::connect(
+    ui->resetColorsBtn, &QPushButton::clicked,
+    [&]{ on_resetColorsBtn_clicked(); });
+
+  QObject::connect(
+    ui->resetDialogsButton, &QPushButton::clicked,
+    [&]{ on_resetDialogsButton_clicked(); });
 }
 
 void GeneralSettingsTab::update()
 {
   const QString oldLanguage = settings().interface().language();
-  const QString newLanguage = ui->languageBox->itemData(ui->languageBox->currentIndex()).toString();
+  const QString newLanguage = ui->languageBox->itemData(
+    ui->languageBox->currentIndex()).toString();
 
   if (newLanguage != oldLanguage) {
     settings().interface().setLanguage(newLanguage);
@@ -137,7 +41,9 @@ void GeneralSettingsTab::update()
   }
 
   const QString oldStyle = settings().interface().styleName().value_or("");
-  const QString newStyle = ui->styleBox->itemData(ui->styleBox->currentIndex()).toString();
+  const QString newStyle = ui->styleBox->itemData(
+    ui->styleBox->currentIndex()).toString();
+
   if (oldStyle != newStyle) {
     settings().interface().setStyleName(newStyle);
     emit settings().styleChanged(newStyle);
@@ -149,9 +55,7 @@ void GeneralSettingsTab::update()
   settings().setCheckForUpdates(ui->checkForUpdates->isChecked());
   settings().setUsePrereleases(ui->usePrereleaseBox->isChecked());
 
-  forEachColorItem(ui->colorTable, [](auto* item) {
-    item->commit();
-  });
+  ui->colorTable->commitColors();
 
   settings().colors().setColorSeparatorScrollbar(ui->colorSeparatorsBox->isChecked());
 }
@@ -258,113 +162,14 @@ void GeneralSettingsTab::selectStyle()
   }
 }
 
-void GeneralSettingsTab::setColorTable()
-{
-  ui->colorTable->setColumnCount(2);
-  ui->colorTable->setHorizontalHeaderLabels({
-    QObject::tr("Item"), QObject::tr("Color")
-    });
-
-  ui->colorTable->setItemDelegate(new ColorDelegate(ui->colorTable));
-
-  addColor(
-    QObject::tr("Is overwritten (loose files)"),
-    QColor(0, 255, 0, 64),
-    [this]{ return settings().colors().modlistOverwrittenLoose(); },
-    [this](auto&& v){ settings().colors().setModlistOverwrittenLoose(v); });
-
-  addColor(
-    QObject::tr("Is overwriting (loose files)"),
-    QColor(255, 0, 0, 64),
-    [this]{ return settings().colors().modlistOverwritingLoose(); },
-    [this](auto&& v){ settings().colors().setModlistOverwritingLoose(v); });
-
-  addColor(
-    QObject::tr("Is overwritten (archives)"),
-    QColor(0, 255, 255, 64),
-    [this]{ return settings().colors().modlistOverwrittenArchive(); },
-    [this](auto&& v){ settings().colors().setModlistOverwrittenArchive(v); });
-
-  addColor(
-    QObject::tr("Is overwriting (archives)"),
-    QColor(255, 0, 255, 64),
-    [this]{ return settings().colors().modlistOverwritingArchive(); },
-    [this](auto&& v){ settings().colors().setModlistOverwritingArchive(v); });
-
-  addColor(
-    QObject::tr("Mod contains selected plugin"),
-    QColor(0, 0, 255, 64),
-    [this]{ return settings().colors().modlistContainsPlugin(); },
-    [this](auto&& v){ settings().colors().setModlistContainsPlugin(v); });
-
-  addColor(
-    QObject::tr("Plugin is contained in selected mod"),
-    QColor(0, 0, 255, 64),
-    [this]{ return settings().colors().pluginListContained(); },
-    [this](auto&& v){ settings().colors().setPluginListContained(v); });
-
-  QObject::connect(
-    ui->colorTable, &QTableWidget::cellActivated,
-    [&]{ onColorActivated(); });
-}
-
-void GeneralSettingsTab::addColor(
-  const QString& text, const QColor& defaultColor,
-  std::function<QColor ()> get,
-  std::function<void (const QColor&)> commit)
-{
-  const auto r = ui->colorTable->rowCount();
-  ui->colorTable->setRowCount(r + 1);
-
-  ui->colorTable->setItem(r, 0, new QTableWidgetItem(text));
-  ui->colorTable->setItem(r, 1, new ColorItem(defaultColor, get, commit));
-
-  ui->colorTable->resizeColumnsToContents();
-}
-
 void GeneralSettingsTab::resetDialogs()
 {
   settings().widgets().resetQuestionButtons();
 }
 
-void GeneralSettingsTab::onColorActivated()
-{
-  const auto rows = ui->colorTable->selectionModel()->selectedRows();
-  if (rows.isEmpty()) {
-    return;
-  }
-
-  const auto row = rows[0].row();
-
-  const auto text = ui->colorTable->item(row, 0)->text();
-  auto* item = dynamic_cast<ColorItem*>(ui->colorTable->item(row, 1));
-
-  if (!item) {
-    return;
-  }
-
-  const QColor result = QColorDialog::getColor(
-    item->get(), &dialog(), text, QColorDialog::ShowAlphaChannel);
-
-  if (result.isValid()) {
-    item->set(result);
-    ui->colorTable->update(ui->colorTable->model()->index(row, 1));
-  }
-}
-
 void GeneralSettingsTab::on_resetColorsBtn_clicked()
 {
-  bool changed = false;
-
-  forEachColorItem(ui->colorTable, [&](auto* item) {
-    if (item->reset()) {
-      changed = true;
-    }
-  });
-
-  if (changed) {
-    ui->colorTable->update();
-  }
+  ui->colorTable->resetColors();
 }
 
 void GeneralSettingsTab::on_resetDialogsButton_clicked()
diff --git a/src/settingsdialoggeneral.h b/src/settingsdialoggeneral.h
index 1f7fafff..706ba9ef 100644
--- a/src/settingsdialoggeneral.h
+++ b/src/settingsdialoggeneral.h
@@ -18,17 +18,8 @@ private:
   void addStyles();
   void selectStyle();
 
-  void setColorTable();
-
   void resetDialogs();
 
-  void addColor(
-    const QString& text, const QColor& defaultColor,
-    std::function<QColor ()> get,
-    std::function<void (const QColor&)> commit);
-
-  void onColorActivated();
-
   void on_categoriesBtn_clicked();
   void on_resetColorsBtn_clicked();
   void on_resetDialogsButton_clicked();
-- 
cgit v1.3.1


From 633ef81972139f3c082429ada10ffb27d9f07898 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 27 Sep 2019 17:07:04 -0400
Subject: moved checks to sanitychecks.cpp added check for blocked files, only
 logs

---
 src/CMakeLists.txt   |   2 +
 src/main.cpp         |  46 +-------------
 src/sanitychecks.cpp | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 179 insertions(+), 43 deletions(-)
 create mode 100644 src/sanitychecks.cpp

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b21d1a8b..180422ef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -142,6 +142,7 @@ SET(organizer_SRCS
 	envshortcut.cpp
 	envwindows.cpp
 	colortable.cpp
+	sanitychecks.cpp
 
     shared/windows_error.cpp
     shared/error_report.cpp
@@ -324,6 +325,7 @@ set(application
 	mainwindow
 	moapplication
 	moshortcut
+	sanitychecks
 	selfupdater
 	singleinstance
 	statusbar
diff --git a/src/main.cpp b/src/main.cpp
index ba988ae3..fe5fd87a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -91,6 +91,9 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 using namespace MOBase;
 using namespace MOShared;
 
+
+void sanityChecks(const env::Environment& env);
+
 bool createAndMakeWritable(const std::wstring &subPath) {
   QString const dataPath = qApp->property("dataPath").toString();
   QString fullPath = dataPath + "/" + QString::fromStdWString(subPath);
@@ -496,49 +499,6 @@ static QString getVersionDisplayString()
   return createVersionInfo().displayString(3);
 }
 
-void checkMissingFiles()
-{
-  // files that are likely to be eaten
-  static const QStringList files({
-    "helper.exe", "nxmhandler.exe",
-    "usvfs_proxy_x64.exe", "usvfs_proxy_x86.exe",
-    "usvfs_x64.dll", "usvfs_x86.dll"
-  });
-
-  const auto dir = QCoreApplication::applicationDirPath();
-
-  for (const auto& name : files) {
-    const QFileInfo file(dir + QDir::separator() + name);
-    if (!file.exists()) {
-      log::warn(
-        "'{}' seems to be missing, an antivirus may have deleted it",
-        file.absoluteFilePath());
-    }
-  }
-}
-
-void checkNahimic(const env::Environment& e)
-{
-  for (auto&& m : e.loadedModules()) {
-    const QFileInfo file(m.path());
-
-    if (file.fileName().compare("NahimicOSD.dll", Qt::CaseInsensitive) == 0) {
-      log::warn(
-        "NahimicOSD.dll is loaded. Nahimic is known to cause issues with "
-        "Mod Organizer, such as freezing or blank windows. Consider "
-        "uninstalling it.");
-
-      break;
-    }
-  }
-}
-
-void sanityChecks(const env::Environment& e)
-{
-  checkMissingFiles();
-  checkNahimic(e);
-}
-
 
 int runApplication(MOApplication &application, SingleInstance &instance,
                    const QString &splashPath)
diff --git a/src/sanitychecks.cpp b/src/sanitychecks.cpp
new file mode 100644
index 00000000..5f9705b8
--- /dev/null
+++ b/src/sanitychecks.cpp
@@ -0,0 +1,174 @@
+#include "env.h"
+#include "envmodule.h"
+#include <log.h>
+
+using namespace MOBase;
+
+enum class SecurityZone
+{
+  NoZone = -1,
+  MyComputer = 0,
+  Intranet = 1,
+  Trusted = 2,
+  Internet = 3,
+  Untrusted = 4,
+};
+
+QString toString(SecurityZone z)
+{
+  switch (z)
+  {
+    case SecurityZone::NoZone: return "NoZone";
+    case SecurityZone::MyComputer: return "MyComputer";
+    case SecurityZone::Intranet: return "Intranet";
+    case SecurityZone::Trusted: return "Trusted";
+    case SecurityZone::Internet: return "Internet";
+    case SecurityZone::Untrusted: return "Untrusted";
+    default: return QString("unknown (%1)").arg(static_cast<int>(z));
+  }
+}
+
+bool isZoneBlocked(SecurityZone z)
+{
+  return (z == SecurityZone::Internet || z == SecurityZone::Untrusted);
+}
+
+bool isFileBlocked(const QFileInfo& fi)
+{
+  const QString ads = "Zone.Identifier";
+  const auto key = "ZoneTransfer/ZoneId";
+
+  const auto path = fi.absoluteFilePath();
+  const auto adsPath = path + ":" + ads;
+
+  QFile f(adsPath);
+  if (!f.exists()) {
+    return false;
+  }
+
+  log::debug("file '{}' has an ADS for {}", path, adsPath);
+
+  QSettings qs(adsPath, QSettings::IniFormat);
+
+  if (!qs.contains(key)) {
+    log::debug("but key '{}' is not found", key);
+    return false;
+  }
+
+  const auto v = qs.value(key);
+  if (v.isNull()) {
+    log::debug("but key '{}' is null", key);
+    return false;
+  }
+
+  bool ok = false;
+  const auto z = static_cast<SecurityZone>(v.toInt(&ok));
+
+  if (!ok) {
+    log::debug(
+      "but key '{}' is not an int (value is '{}')",
+      key, v);
+
+    return false;
+  }
+
+  if (!isZoneBlocked(z)) {
+    log::debug(
+      "but zone id is {}, {}, which is fine",
+      static_cast<int>(z), toString(z));
+
+    return false;
+  }
+
+  log::warn(
+    "file '{}' is blocked (zone id is {}, {})",
+    path, static_cast<int>(z), toString(z));
+
+  return true;
+}
+
+void checkBlockedFiles(const QDir& dir)
+{
+  if (!dir.exists()) {
+    log::error(
+      "while checking for blocked files, directory '{}' not found",
+      dir.absolutePath());
+
+    return;
+  }
+
+  const auto files = dir.entryInfoList({"*.dll", "*.exe"}, QDir::Files);
+  if (files.empty()) {
+    log::error(
+      "while checking for blocked files, directory '{}' is empty",
+      dir.absolutePath());
+
+    return;
+  }
+
+  for (auto&& fi : files) {
+    isFileBlocked(fi);
+  }
+}
+
+void checkBlocked()
+{
+  const QString appDir = QCoreApplication::applicationDirPath();
+
+  const QDir dirs[] = {
+    appDir,
+    appDir + "/dlls",
+    appDir + "/loot",
+    appDir + "/NCC",
+    appDir + "/platforms",
+    appDir + "/plugins"
+  };
+
+  for (const auto& d : dirs) {
+    checkBlockedFiles(d);
+  }
+}
+
+void checkMissingFiles()
+{
+  // files that are likely to be eaten
+  static const QStringList files({
+    "helper.exe", "nxmhandler.exe",
+    "usvfs_proxy_x64.exe", "usvfs_proxy_x86.exe",
+    "usvfs_x64.dll", "usvfs_x86.dll"
+    });
+
+  const auto dir = QCoreApplication::applicationDirPath();
+
+  for (const auto& name : files) {
+    const QFileInfo file(dir + QDir::separator() + name);
+    if (!file.exists()) {
+      log::warn(
+        "'{}' seems to be missing, an antivirus may have deleted it",
+        file.absoluteFilePath());
+    }
+  }
+}
+
+void checkNahimic(const env::Environment& e)
+{
+  for (auto&& m : e.loadedModules()) {
+    const QFileInfo file(m.path());
+
+    if (file.fileName().compare("NahimicOSD.dll", Qt::CaseInsensitive) == 0) {
+      log::warn(
+        "NahimicOSD.dll is loaded. Nahimic is known to cause issues with "
+        "Mod Organizer, such as freezing or blank windows. Consider "
+        "uninstalling it.");
+
+      break;
+    }
+  }
+}
+
+void sanityChecks(const env::Environment& e)
+{
+  checkBlocked();
+  checkMissingFiles();
+  checkNahimic(e);
+}
-- 
cgit v1.3.1


From 4d269c2e1a625e6d50b7e6272b4f474a921c6bfa Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 29 Oct 2019 11:34:06 -0400
Subject: split to processrunner added IUserInterface::qtWidget() put back
 IUserInterface in OrganizerCore now that there's a way to get the widget

---
 src/CMakeLists.txt             |   3 +
 src/iuserinterface.h           |   2 +
 src/main.cpp                   |   4 +-
 src/mainwindow.cpp             |  13 +-
 src/mainwindow.h               |   5 +-
 src/modinfodialogconflicts.cpp |   2 +-
 src/organizercore.cpp          | 601 ++++++++------------------------------
 src/organizercore.h            |  60 +---
 src/organizerproxy.cpp         |   4 +-
 src/processrunner.cpp          | 634 +++++++++++++++++++++++++++++++++++++++++
 src/processrunner.h            | 104 +++++++
 src/spawn.cpp                  | 198 -------------
 src/spawn.h                    |  48 ----
 13 files changed, 892 insertions(+), 786 deletions(-)
 create mode 100644 src/processrunner.cpp
 create mode 100644 src/processrunner.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 180422ef..5e909760 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -143,6 +143,7 @@ SET(organizer_SRCS
 	envwindows.cpp
 	colortable.cpp
 	sanitychecks.cpp
+	processrunner.cpp
 
     shared/windows_error.cpp
     shared/error_report.cpp
@@ -266,6 +267,7 @@ SET(organizer_HDRS
 	envshortcut.h
 	envwindows.h
 	colortable.h
+	processrunner.h
 
     shared/windows_error.h
     shared/error_report.h
@@ -348,6 +350,7 @@ set(core
 	organizercore
 	organizerproxy
 	apiuseraccount
+	processrunner
 )
 
 set(dialogs
diff --git a/src/iuserinterface.h b/src/iuserinterface.h
index a309ed9b..91487aee 100644
--- a/src/iuserinterface.h
+++ b/src/iuserinterface.h
@@ -33,6 +33,8 @@ public:
 
   virtual ILockedWaitingForProcess* lock() = 0;
   virtual void unlock() = 0;
+
+  virtual QWidget* qtWidget() = 0;
 };
 
 #endif // IUSERINTERFACE_H
diff --git a/src/main.cpp b/src/main.cpp
index 49ecc084..5ed7da5d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -632,7 +632,7 @@ int runApplication(MOApplication &application, SingleInstance &instance,
 		  if (MOShortcut shortcut{ arguments.at(1) }) {
 			  if (shortcut.hasExecutable()) {
 				  try {
-					  organizer.runShortcut(shortcut);
+					  organizer.processRunner().runShortcut(shortcut);
 					  return 0;
 				  }
 				  catch (const std::exception &e) {
@@ -653,7 +653,7 @@ int runApplication(MOApplication &application, SingleInstance &instance,
 			  arguments.removeFirst(); // remove binary name
 			  // pass the remaining parameters to the binary
 			  try {
-				  organizer.runExecutableOrExecutableFile(
+				  organizer.processRunner().runExecutableOrExecutableFile(
             exeName, arguments, QString(), QString());
 				  return 0;
 			  }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index bbb63333..ce5280a6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1312,7 +1312,7 @@ bool MainWindow::canExit()
   }
 
   m_exitAfterWait = true;
-  m_OrganizerCore.waitForAllUSVFSProcessesWithLock();
+  m_OrganizerCore.processRunner().waitForAllUSVFSProcessesWithLock();
   if (!m_exitAfterWait) { // if operation cancelled
     return false;
   }
@@ -1536,7 +1536,7 @@ void MainWindow::startExeAction()
   }
 
   action->setEnabled(false);
-  m_OrganizerCore.runExecutable(*itor);
+  m_OrganizerCore.processRunner().runExecutable(*itor);
   action->setEnabled(true);
 }
 
@@ -2294,6 +2294,11 @@ void MainWindow::unlock()
   }
 }
 
+QWidget* MainWindow::qtWidget()
+{
+  return this;
+}
+
 void MainWindow::on_btnRefreshData_clicked()
 {
   m_OrganizerCore.refreshDirectoryStructure();
@@ -2363,7 +2368,7 @@ void MainWindow::on_startButton_clicked()
       forcedLibraries.clear();
     }
 
-    m_OrganizerCore.runExecutableFile(
+    m_OrganizerCore.processRunner().runExecutableFile(
       selectedExecutable->binaryInfo(),
       selectedExecutable->arguments(),
       selectedExecutable->workingDirectory().length() != 0 ?
@@ -5453,7 +5458,7 @@ void MainWindow::openDataFile()
 
   const QString path = m_ContextItem->data(0, Qt::UserRole).toString();
   const QFileInfo targetInfo(path);
-  m_OrganizerCore.runFile(this, targetInfo);
+  m_OrganizerCore.processRunner().runFile(this, targetInfo);
 }
 
 void MainWindow::openDataOriginExplorer_clicked()
diff --git a/src/mainwindow.h b/src/mainwindow.h
index dbbd0bd9..19723480 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -118,8 +118,9 @@ public:
 
   void processUpdates(Settings& settings);
 
-  virtual ILockedWaitingForProcess* lock() override;
-  virtual void unlock() override;
+  ILockedWaitingForProcess* lock() override;
+  void unlock() override;
+  QWidget* qtWidget() override;
 
   bool addProfile();
   void updateBSAList(const QStringList &defaultArchives, const QStringList &activeArchives);
diff --git a/src/modinfodialogconflicts.cpp b/src/modinfodialogconflicts.cpp
index 68b1be6b..758112cc 100644
--- a/src/modinfodialogconflicts.cpp
+++ b/src/modinfodialogconflicts.cpp
@@ -527,7 +527,7 @@ void ConflictsTab::openItems(QTreeView* tree)
   // the menu item is only shown for a single selection, but handle all of them
   // in case this changes
   for_each_in_selection(tree, [&](const ConflictItem* item) {
-    core().runFile(parentWidget(), item->fileName());
+    core().processRunner().runFile(parentWidget(), item->fileName());
     return true;
   });
 }
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index eda64c1d..0f767f46 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -1,5 +1,4 @@
 #include "organizercore.h"
-#include "mainwindow.h"
 #include "delayedfilewriter.h"
 #include "guessedvalue.h"
 #include "imodinterface.h"
@@ -86,51 +85,13 @@ QStringList toStringList(InputIterator current, InputIterator end)
   return result;
 }
 
-env::Process* getInterestingProcess(std::vector<env::Process>& processes)
-{
-  if (processes.empty()) {
-    return nullptr;
-  }
-
-  // Certain process names we wish to "hide" for aesthetic reason:
-  const std::vector<QString> hiddenList = {
-    QFileInfo(QCoreApplication::applicationFilePath()).fileName()
-  };
-
-  auto isHidden = [&](auto&& p) {
-    for (auto h : hiddenList) {
-      if (p.name().contains(h, Qt::CaseInsensitive)) {
-        return true;
-      }
-    }
-
-    return false;
-  };
-
-
-  for (auto&& root : processes) {
-    if (!isHidden(root)) {
-      return &root;
-    }
-
-    for (auto&& child : root.children()) {
-      if (!isHidden(child)) {
-        return &child;
-      }
-    }
-  }
-
-
-  // everything is hidden, just pick the first one
-  return &processes[0];
-}
-
 
 OrganizerCore::OrganizerCore(Settings &settings)
-  : m_MainWindow(nullptr)
+  : m_UserInterface(nullptr)
   , m_PluginContainer(nullptr)
   , m_GameName()
   , m_CurrentProfile(nullptr)
+  , m_Runner(*this)
   , m_Settings(settings)
   , m_Updater(NexusInterface::instance(m_PluginContainer))
   , m_AboutToRun()
@@ -190,7 +151,7 @@ OrganizerCore::~OrganizerCore()
   m_RefresherThread.exit();
   m_RefresherThread.wait();
 
-  prepareStart();
+  saveCurrentProfile();
 
   // profile has to be cleaned up before the modinfo-buffer is cleared
   delete m_CurrentProfile;
@@ -249,43 +210,49 @@ void OrganizerCore::updateExecutablesList()
     m_PluginContainer, m_Settings.interface().displayForeign(), managedGame());
 }
 
-void OrganizerCore::setUserInterface(MainWindow* mainWindow)
+void OrganizerCore::setUserInterface(IUserInterface* ui)
 {
   storeSettings();
 
-  m_MainWindow = mainWindow;
+  m_UserInterface = ui;
+
+  QWidget* w = nullptr;
+  if (m_UserInterface) {
+    w = m_UserInterface->qtWidget();
+  }
 
-  if (m_MainWindow != nullptr) {
-    connect(&m_ModList, SIGNAL(modlistChanged(QModelIndex, int)), m_MainWindow,
+  if (w) {
+    connect(&m_ModList, SIGNAL(modlistChanged(QModelIndex, int)), w,
             SLOT(modlistChanged(QModelIndex, int)));
-    connect(&m_ModList, SIGNAL(modlistChanged(QModelIndexList, int)), m_MainWindow,
+    connect(&m_ModList, SIGNAL(modlistChanged(QModelIndexList, int)), w,
             SLOT(modlistChanged(QModelIndexList, int)));
-    connect(&m_ModList, SIGNAL(showMessage(QString)), m_MainWindow,
+    connect(&m_ModList, SIGNAL(showMessage(QString)), w,
             SLOT(showMessage(QString)));
-    connect(&m_ModList, SIGNAL(modRenamed(QString, QString)), m_MainWindow,
+    connect(&m_ModList, SIGNAL(modRenamed(QString, QString)), w,
             SLOT(modRenamed(QString, QString)));
-    connect(&m_ModList, SIGNAL(modUninstalled(QString)), m_MainWindow,
+    connect(&m_ModList, SIGNAL(modUninstalled(QString)), w,
             SLOT(modRemoved(QString)));
-    connect(&m_ModList, SIGNAL(removeSelectedMods()), m_MainWindow,
+    connect(&m_ModList, SIGNAL(removeSelectedMods()), w,
             SLOT(removeMod_clicked()));
-    connect(&m_ModList, SIGNAL(clearOverwrite()), m_MainWindow,
+    connect(&m_ModList, SIGNAL(clearOverwrite()), w,
       SLOT(clearOverwrite()));
-    connect(&m_ModList, SIGNAL(requestColumnSelect(QPoint)), m_MainWindow,
+    connect(&m_ModList, SIGNAL(requestColumnSelect(QPoint)), w,
             SLOT(displayColumnSelection(QPoint)));
-    connect(&m_ModList, SIGNAL(fileMoved(QString, QString, QString)), m_MainWindow,
+    connect(&m_ModList, SIGNAL(fileMoved(QString, QString, QString)), w,
             SLOT(fileMoved(QString, QString, QString)));
-    connect(&m_ModList, SIGNAL(modorder_changed()), m_MainWindow,
+    connect(&m_ModList, SIGNAL(modorder_changed()), w,
             SLOT(modorder_changed()));
-    connect(&m_PluginList, SIGNAL(writePluginsList()), m_MainWindow,
+    connect(&m_PluginList, SIGNAL(writePluginsList()), w,
       SLOT(esplist_changed()));
-    connect(&m_PluginList, SIGNAL(esplist_changed()), m_MainWindow,
+    connect(&m_PluginList, SIGNAL(esplist_changed()), w,
       SLOT(esplist_changed()));
-    connect(&m_DownloadManager, SIGNAL(showMessage(QString)), m_MainWindow,
+    connect(&m_DownloadManager, SIGNAL(showMessage(QString)), w,
             SLOT(showMessage(QString)));
   }
 
-  m_InstallationManager.setParentWidget(m_MainWindow);
-  m_Updater.setUserInterface(m_MainWindow);
+  m_InstallationManager.setParentWidget(w);
+  m_Updater.setUserInterface(w);
+  m_Runner.setUserInterface(ui);
 
   checkForUpdates();
 }
@@ -294,7 +261,7 @@ void OrganizerCore::checkForUpdates()
 {
   // this currently wouldn't work reliably if the ui isn't initialized yet to
   // display the result
-  if (m_MainWindow != nullptr) {
+  if (m_UserInterface != nullptr) {
     m_Updater.testForUpdate(m_Settings);
   }
 }
@@ -390,7 +357,7 @@ void OrganizerCore::externalMessage(const QString &message)
 {
   if (MOShortcut moshortcut{ message } ) {
     if(moshortcut.hasExecutable())
-      runShortcut(moshortcut);
+      m_Runner.runShortcut(moshortcut);
   }
   else if (isNxmLink(message)) {
     MessageDialog::showMessage(tr("Download started"), qApp->activeWindow());
@@ -754,13 +721,13 @@ MOBase::IModInterface *OrganizerCore::installMod(const QString &fileName,
     int modIndex = ModInfo::getIndex(modName);
     if (modIndex != UINT_MAX) {
       ModInfo::Ptr modInfo = ModInfo::getByIndex(modIndex);
-      if (hasIniTweaks && (m_MainWindow != nullptr)
+      if (hasIniTweaks && (m_UserInterface != nullptr)
           && (QMessageBox::question(qApp->activeWindow(), tr("Configure Mod"),
                                     tr("This mod contains ini tweaks. Do you "
                                        "want to configure them now?"),
                                     QMessageBox::Yes | QMessageBox::No)
               == QMessageBox::Yes)) {
-        m_MainWindow->displayModInformation(
+        m_UserInterface->displayModInformation(
           modInfo, modIndex, ModInfoTabIDs::IniFiles);
       }
       m_ModInstalled(modName);
@@ -821,13 +788,13 @@ void OrganizerCore::installDownload(int index)
         ModInfo::Ptr modInfo = ModInfo::getByIndex(modIndex);
         modInfo->addInstalledFile(modID, fileID);
 
-        if (hasIniTweaks && m_MainWindow != nullptr
+        if (hasIniTweaks && m_UserInterface != nullptr
             && (QMessageBox::question(qApp->activeWindow(), tr("Configure Mod"),
                                       tr("This mod contains ini tweaks. Do you "
                                          "want to configure them now?"),
                                       QMessageBox::Yes | QMessageBox::No)
                 == QMessageBox::Yes)) {
-          m_MainWindow->displayModInformation(
+          m_UserInterface->displayModInformation(
             modInfo, modIndex, ModInfoTabIDs::IniFiles);
         }
 
@@ -1104,412 +1071,6 @@ bool OrganizerCore::previewFile(
   return true;
 }
 
-bool OrganizerCore::runFile(
-  QWidget* parent, const QFileInfo& targetInfo)
-{
-  const auto fec = spawn::getFileExecutionContext(parent, targetInfo);
-
-  switch (fec.type)
-  {
-    case spawn::FileExecutionTypes::Executable:
-    {
-      runExecutableFile(fec.binary, fec.arguments, targetInfo.absoluteDir());
-      return true;
-    }
-
-    case spawn::FileExecutionTypes::Other:  // fall-through
-    default:
-    {
-      auto r = shell::Open(targetInfo.absoluteFilePath());
-      if (!r.success()) {
-        return false;
-      }
-
-      // not all files will return a valid handle even if opening them was
-      // successful, such as inproc handlers (like the photo viewer)
-      if (r.processHandle() != INVALID_HANDLE_VALUE) {
-        // steal because it gets closed after the wait
-        return waitForProcessCompletionWithLock(r.stealProcessHandle(), nullptr);
-      }
-
-      return true;
-    }
-  }
-}
-
-bool OrganizerCore::runExecutableFile(
-  const QFileInfo &binary, const QString &arguments,
-  const QDir &currentDirectory, const QString &steamAppID,
-  const QString &customOverwrite,
-  const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries,
-  bool refresh)
-{
-  DWORD processExitCode = 0;
-  HANDLE processHandle = spawnAndWait(
-    binary, arguments, m_CurrentProfile->name(), currentDirectory, steamAppID,
-    customOverwrite, forcedLibraries, &processExitCode);
-
-  if (processHandle == INVALID_HANDLE_VALUE) {
-    // failed
-    return false;
-  }
-
-  if (refresh) {
-    refreshDirectoryStructure();
-
-    // need to remove our stored load order because it may be outdated if a foreign tool changed the
-    // file time. After removing that file, refreshESPList will use the file time as the order
-    if (managedGame()->loadOrderMechanism() == IPluginGame::LoadOrderMechanism::FileTime) {
-      log::debug("removing loadorder.txt");
-      QFile::remove(m_CurrentProfile->getLoadOrderFileName());
-    }
-
-    refreshDirectoryStructure();
-
-    refreshESPList(true);
-    savePluginList();
-
-    //These callbacks should not fiddle with directoy structure and ESPs.
-    m_FinishedRun(binary.absoluteFilePath(), processExitCode);
-  }
-
-  return true;
-}
-
-bool OrganizerCore::runExecutable(const Executable& exe, bool refresh)
-{
-  const QString customOverwrite = m_CurrentProfile->setting(
-    "custom_overwrites", exe.title()).toString();
-
-  QList<MOBase::ExecutableForcedLoadSetting> forcedLibraries;
-
-  if (m_CurrentProfile->forcedLibrariesEnabled(exe.title())) {
-    forcedLibraries = m_CurrentProfile->determineForcedLibraries(exe.title());
-  }
-
-  return runExecutableFile(
-    exe.binaryInfo(),
-    exe.arguments(),
-    exe.workingDirectory().length() != 0 ? exe.workingDirectory() : exe.binaryInfo().absolutePath(),
-    exe.steamAppID(),
-    customOverwrite,
-    forcedLibraries,
-    refresh);
-}
-
-bool OrganizerCore::runShortcut(const MOShortcut& shortcut)
-{
-  if (shortcut.hasInstance() && shortcut.instance() != InstanceManager::instance().currentInstance()) {
-    throw std::runtime_error(
-      QString("Refusing to run executable from different instance %1:%2")
-      .arg(shortcut.instance(),shortcut.executable())
-      .toLocal8Bit().constData());
-  }
-
-  const Executable& exe = m_ExecutablesList.get(shortcut.executable());
-  return runExecutable(exe, false);
-}
-
-HANDLE OrganizerCore::runExecutableOrExecutableFile(
-  const QString &executable, const QStringList &args, const QString &cwd,
-  const QString &profile, const QString &forcedCustomOverwrite,
-  bool ignoreCustomOverwrite)
-{
-  QString profileName = profile;
-  if (profile == "") {
-    if (m_CurrentProfile != nullptr) {
-      profileName = m_CurrentProfile->name();
-    } else {
-      throw MyException(tr("No profile set"));
-    }
-  }
-
-  QFileInfo binary;
-  QString arguments = args.join(" ");
-  QString currentDirectory = cwd;
-  QString steamAppID;
-  QString customOverwrite;
-  QList<ExecutableForcedLoadSetting> forcedLibraries;
-
-  if (executable.contains('\\') || executable.contains('/')) {
-    // file path
-
-    binary = QFileInfo(executable);
-    if (binary.isRelative()) {
-      // relative path, should be relative to game directory
-      binary = managedGame()->gameDirectory().absoluteFilePath(executable);
-    }
-
-    if (currentDirectory == "") {
-      currentDirectory = binary.absolutePath();
-    }
-
-    try {
-      const Executable& exe = m_ExecutablesList.getByBinary(binary);
-      steamAppID = exe.steamAppID();
-      customOverwrite = m_CurrentProfile->setting("custom_overwrites", exe.title()).toString();
-      if (m_CurrentProfile->forcedLibrariesEnabled(exe.title())) {
-        forcedLibraries = m_CurrentProfile->determineForcedLibraries(exe.title());
-      }
-    } catch (const std::runtime_error &) {
-      // nop
-    }
-  } else {
-    // only a file name, search executables list
-    try {
-      const Executable &exe = m_ExecutablesList.get(executable);
-      steamAppID = exe.steamAppID();
-      customOverwrite = m_CurrentProfile->setting("custom_overwrites", exe.title()).toString();
-      if (m_CurrentProfile->forcedLibrariesEnabled(exe.title())) {
-        forcedLibraries = m_CurrentProfile->determineForcedLibraries(exe.title());
-      }
-      if (arguments == "") {
-        arguments = exe.arguments();
-      }
-      binary = exe.binaryInfo();
-      if (currentDirectory == "") {
-        currentDirectory = exe.workingDirectory();
-      }
-    } catch (const std::runtime_error &) {
-      log::warn("\"{}\" not set up as executable", executable);
-      binary = QFileInfo(executable);
-    }
-  }
-
-  if (!forcedCustomOverwrite.isEmpty())
-    customOverwrite = forcedCustomOverwrite;
-
-  if (ignoreCustomOverwrite)
-    customOverwrite.clear();
-
-  return spawnAndWait(binary,
-    arguments,
-    profileName,
-    currentDirectory,
-    steamAppID,
-    customOverwrite,
-    forcedLibraries);
-}
-
-HANDLE OrganizerCore::spawnAndWait(
-  const QFileInfo &binary, const QString &arguments, const QString &profileName,
-  const QDir &currentDirectory, const QString &steamAppID,
-  const QString &customOverwrite,
-  const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries,
-  LPDWORD exitCode)
-{
-  spawn::SpawnParameters sp;
-  sp.binary = binary;
-  sp.arguments = arguments;
-  sp.currentDirectory = currentDirectory;
-  sp.steamAppID = steamAppID;
-  sp.hooked = true;
-
-  prepareStart();
-
-  while (m_DirectoryUpdate) {
-    ::Sleep(100);
-    QCoreApplication::processEvents();
-  }
-
-  // need to make sure all data is saved before we start the application
-  if (m_CurrentProfile != nullptr) {
-    m_CurrentProfile->writeModlistNow(true);
-  }
-
-  // TODO: should also pass arguments
-  if (!m_AboutToRun(binary.absoluteFilePath())) {
-    log::debug("start of \"{}\" canceled by plugin", binary.absoluteFilePath());
-    return INVALID_HANDLE_VALUE;
-  }
-
-  try {
-    m_USVFS.updateMapping(fileMapping(profileName, customOverwrite));
-    m_USVFS.updateForcedLibraries(forcedLibraries);
-
-  } catch (const UsvfsConnectorException &e) {
-    log::debug(e.what());
-    return INVALID_HANDLE_VALUE;
-  } catch (const std::exception &e) {
-    QMessageBox::warning(m_MainWindow, tr("Error"), e.what());
-    return INVALID_HANDLE_VALUE;
-  }
-
-  HANDLE handle = spawn::Spawner()
-    .spawn(m_MainWindow, m_GamePlugin, sp, m_Settings)
-    .releaseHandle();
-
-  if (handle == INVALID_HANDLE_VALUE) {
-    // failed
-    return INVALID_HANDLE_VALUE;
-  }
-
-  waitForProcessCompletionWithLock(handle, exitCode);
-  return handle;
-}
-
-void OrganizerCore::withLock(std::function<void (ILockedWaitingForProcess*)> f)
-{
-  std::unique_ptr<LockedDialog> dlg;
-  ILockedWaitingForProcess* uilock = nullptr;
-
-  if (m_MainWindow != nullptr) {
-    uilock = m_MainWindow->lock();
-  }
-  else {
-    // i.e. when running command line shortcuts there is no user interface
-    dlg.reset(new LockedDialog);
-    dlg->show();
-    dlg->setEnabled(true);
-    uilock = dlg.get();
-  }
-
-  ON_BLOCK_EXIT([&]() {
-    if (m_MainWindow != nullptr) {
-      m_MainWindow->unlock();
-    } });
-
-  f(uilock);
-}
-
-bool OrganizerCore::waitForProcessCompletionWithLock(
-  HANDLE handle, LPDWORD exitCode)
-{
-  if (!Settings::instance().interface().lockGUI()) {
-    return true;
-  }
-
-  bool r = false;
-
-  withLock([&](auto* uilock) {
-    DWORD ignoreExitCode;
-    r = waitForProcessCompletion(handle, exitCode ? exitCode : &ignoreExitCode, uilock);
-    cycleDiagnostics();
-  });
-
-  return r;
-}
-
-bool OrganizerCore::waitForApplication(HANDLE handle, LPDWORD exitCode)
-{
-  if (!Settings::instance().interface().lockGUI())
-    return true;
-
-  bool r = false;
-
-  withLock([&](auto* uilock) {
-    r = waitForProcessCompletion(handle, exitCode, uilock);
-  });
-
-  return r;
-}
-
-bool OrganizerCore::waitForProcessCompletion(
-  HANDLE handle, LPDWORD exitCode, ILockedWaitingForProcess* uilock)
-{
-  const auto tree = env::getProcessTree(handle);
-  std::vector<env::Process> processes = {tree};
-
-  const auto* interesting = getInterestingProcess(processes);
-  if (!interesting) {
-    return true;
-  }
-
-  if (uilock) {
-    uilock->setProcessInformation(interesting->pid(), interesting->name());
-  }
-
-  auto interestingHandle = interesting->openHandleForWait();
-  if (!interestingHandle) {
-    return true;
-  }
-
-  auto progress = [&]{ return uilock->unlockForced(); };
-  const auto r = spawn::waitForProcess(
-    interestingHandle.get(), exitCode, progress);
-
-  switch (r)
-  {
-    case spawn::WaitResults::Completed:  // fall-through
-    case spawn::WaitResults::Cancelled:
-      return true;
-
-    case spawn::WaitResults::Error:  // fall-through
-    default:
-      return false;
-  }
-}
-
-bool OrganizerCore::waitForAllUSVFSProcessesWithLock()
-{
-  if (!Settings::instance().interface().lockGUI())
-    return true;
-
-  bool r = false;
-
-  withLock([&](auto* uilock) {
-    r = waitForAllUSVFSProcesses(uilock);
-  });
-
-  return r;
-}
-
-bool OrganizerCore::waitForAllUSVFSProcesses(ILockedWaitingForProcess* uilock)
-{
-  for (;;) {
-    const auto handles = getRunningUSVFSProcesses();
-    if (handles.empty()) {
-      break;
-    }
-
-    std::vector<env::Process> processes;
-    for (auto&& h : handles) {
-      auto p = env::getProcessTree(h);
-      if (p.isValid()) {
-        processes.emplace_back(std::move(p));
-      }
-    }
-
-    const auto* interesting = getInterestingProcess(processes);
-    if (!interesting) {
-      break;
-    }
-
-    if (uilock) {
-      uilock->setProcessInformation(interesting->pid(), interesting->name());
-    }
-
-    auto interestingHandle = interesting->openHandleForWait();
-    if (!interestingHandle) {
-      break;
-    }
-
-    auto progress = [&]{ return uilock->unlockForced(); };
-    const auto r = spawn::waitForProcess(
-      interestingHandle.get(), nullptr, progress);
-
-    switch (r)
-    {
-      case spawn::WaitResults::Completed:
-        // this process is completed, check for others
-        break;
-
-      case spawn::WaitResults::Cancelled:
-        // force unlocked
-        log::debug("waiting for process completion aborted by UI");
-        return true;
-
-      case spawn::WaitResults::Error:  // fall-through
-      default:
-        log::debug("waiting for process completion not successful");
-        return false;
-    }
-  }
-
-  log::debug("waiting for process completion successful");
-  return true;
-}
-
 bool OrganizerCore::onAboutToRun(
     const std::function<bool(const QString &)> &func)
 {
@@ -1594,8 +1155,8 @@ void OrganizerCore::refreshBSAList()
       m_ActiveArchives = m_DefaultArchives;
     }
 
-    if (m_MainWindow != nullptr) {
-      m_MainWindow->updateBSAList(m_DefaultArchives, m_ActiveArchives);
+    if (m_UserInterface != nullptr) {
+      m_UserInterface->updateBSAList(m_DefaultArchives, m_ActiveArchives);
     }
 
     m_ArchivesInit = true;
@@ -1711,8 +1272,8 @@ void OrganizerCore::updateModsInDirectoryStructure(QMap<unsigned int, ModInfo::P
   // now we need to refresh the bsa list and save it so there is no confusion
   // about what archives are available and active
   refreshBSAList();
-  if (m_MainWindow != nullptr) {
-    m_MainWindow->archivesWriter().writeImmediately(false);
+  if (m_UserInterface != nullptr) {
+    m_UserInterface->archivesWriter().writeImmediately(false);
   }
 
   std::vector<QString> archives = enabledArchives();
@@ -1896,8 +1457,8 @@ void OrganizerCore::modStatusChanged(unsigned int index)
             = m_DirectoryStructure->getOriginByName(ToWString(modInfo->name()));
         origin.enable(false);
       }
-      if (m_MainWindow != nullptr) {
-        m_MainWindow->archivesWriter().write();
+      if (m_UserInterface != nullptr) {
+        m_UserInterface->archivesWriter().write();
       }
     }
     modInfo->clearCaches();
@@ -1946,8 +1507,8 @@ void OrganizerCore::modStatusChanged(QList<unsigned int> index) {
           origin.enable(false);
         }
       }
-      if (m_MainWindow != nullptr) {
-        m_MainWindow->archivesWriter().write();
+      if (m_UserInterface != nullptr) {
+        m_UserInterface->archivesWriter().write();
       }
     }
 
@@ -2122,8 +1683,8 @@ bool OrganizerCore::saveCurrentLists()
 
   try {
     savePluginList();
-    if (m_MainWindow != nullptr) {
-      m_MainWindow->archivesWriter().write();
+    if (m_UserInterface != nullptr) {
+      m_UserInterface->archivesWriter().write();
     }
   } catch (const std::exception &e) {
     reportError(tr("failed to save load order: %1").arg(e.what()));
@@ -2147,11 +1708,12 @@ void OrganizerCore::savePluginList()
   m_PluginList.saveLoadOrder(*m_DirectoryStructure);
 }
 
-void OrganizerCore::prepareStart()
+void OrganizerCore::saveCurrentProfile()
 {
   if (m_CurrentProfile == nullptr) {
     return;
   }
+
   m_CurrentProfile->writeModlist();
   m_CurrentProfile->createTweakedIniFile();
   saveCurrentLists();
@@ -2159,6 +1721,79 @@ void OrganizerCore::prepareStart()
   storeSettings();
 }
 
+ProcessRunner& OrganizerCore::processRunner()
+{
+  return m_Runner;
+}
+
+bool OrganizerCore::beforeRun(
+  const QFileInfo& binary, const QString& profileName,
+  const QString& customOverwrite,
+  const QList<MOBase::ExecutableForcedLoadSetting>& forcedLibraries)
+{
+  saveCurrentProfile();
+
+  while (m_DirectoryUpdate) {
+    ::Sleep(100);
+    QCoreApplication::processEvents();
+  }
+
+  // need to make sure all data is saved before we start the application
+  if (m_CurrentProfile != nullptr) {
+    m_CurrentProfile->writeModlistNow(true);
+  }
+
+  // TODO: should also pass arguments
+  if (!m_AboutToRun(binary.absoluteFilePath())) {
+    log::debug("start of \"{}\" cancelled by plugin", binary.absoluteFilePath());
+    return false;
+  }
+
+  try
+  {
+    m_USVFS.updateMapping(fileMapping(profileName, customOverwrite));
+    m_USVFS.updateForcedLibraries(forcedLibraries);
+  }
+  catch (const UsvfsConnectorException &e)
+  {
+    log::debug(e.what());
+    return false;
+  }
+  catch (const std::exception &e)
+  {
+    QWidget* w = nullptr;
+    if (m_UserInterface) {
+      w = m_UserInterface->qtWidget();
+    }
+    QMessageBox::warning(w, tr("Error"), e.what());
+    return false;
+  }
+
+  return true;
+}
+
+void OrganizerCore::afterRun(const QFileInfo& binary, DWORD exitCode)
+{
+  refreshDirectoryStructure();
+
+  // need to remove our stored load order because it may be outdated if a
+  // foreign tool changed the file time. After removing that file,
+  // refreshESPList will use the file time as the order
+  if (managedGame()->loadOrderMechanism() == IPluginGame::LoadOrderMechanism::FileTime) {
+    log::debug("removing loadorder.txt");
+    QFile::remove(m_CurrentProfile->getLoadOrderFileName());
+  }
+
+  refreshDirectoryStructure();
+
+  refreshESPList(true);
+  savePluginList();
+  cycleDiagnostics();
+
+  //These callbacks should not fiddle with directoy structure and ESPs.
+  m_FinishedRun(binary.absoluteFilePath(), exitCode);
+}
+
 std::vector<Mapping> OrganizerCore::fileMapping(const QString &profileName,
                                                 const QString &customOverwrite)
 {
diff --git a/src/organizercore.h b/src/organizercore.h
index ffdb6830..2252c118 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -3,7 +3,6 @@
 
 
 #include "selfupdater.h"
-#include "ilockedwaitingforprocess.h"
 #include "settings.h"
 #include "modlist.h"
 #include "modinfo.h"
@@ -14,6 +13,7 @@
 #include "executableslist.h"
 #include "usvfsconnector.h"
 #include "moshortcut.h"
+#include "processrunner.h"
 #include <directoryentry.h>
 #include <imoinfo.h>
 #include <iplugindiagnose.h>
@@ -26,7 +26,7 @@
 class ModListSortProxy;
 class PluginListSortProxy;
 class Profile;
-class MainWindow;
+class IUserInterface;
 
 namespace MOBase {
   template <typename T> class GuessedValue;
@@ -97,7 +97,7 @@ public:
 
   ~OrganizerCore();
 
-  void setUserInterface(MainWindow* mainWindow);
+  void setUserInterface(IUserInterface* ui);
   void connectPlugins(PluginContainer *container);
   void disconnectPlugins();
 
@@ -134,7 +134,14 @@ public:
 
   bool saveCurrentLists();
 
-  void prepareStart();
+  ProcessRunner& processRunner();
+
+  bool beforeRun(
+    const QFileInfo& binary, const QString& profileName,
+    const QString& customOverwrite,
+    const QList<MOBase::ExecutableForcedLoadSetting>& forcedLibraries);
+
+  void afterRun(const QFileInfo& binary, DWORD exitCode);
 
   void refreshESPList(bool force = false);
   void refreshBSAList();
@@ -149,27 +156,6 @@ public:
   bool previewFileWithAlternatives(QWidget* parent, QString filename, int selectedOrigin=-1);
   bool previewFile(QWidget* parent, const QString& originName, const QString& path);
 
-  bool runFile(QWidget* parent, const QFileInfo& targetInfo);
-
-  bool runExecutableFile(
-    const QFileInfo &binary, const QString &arguments,
-    const QDir &currentDirectory, const QString &steamAppID={},
-    const QString &customOverwrite={},
-    const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries={},
-    bool refresh=true);
-
-  bool runExecutable(const Executable& exe, bool refresh=true);
-
-  bool runShortcut(const MOShortcut& shortcut);
-
-  HANDLE runExecutableOrExecutableFile(
-    const QString &executable, const QStringList &args, const QString &cwd,
-    const QString &profile, const QString &forcedCustomOverwrite = "",
-    bool ignoreCustomOverwrite = false);
-
-  bool waitForApplication(HANDLE processHandle, LPDWORD exitCode = nullptr);
-  bool waitForAllUSVFSProcessesWithLock();
-
   void loginSuccessfulUpdate(bool necessary);
   void loginFailedUpdate(const QString &message);
 
@@ -273,6 +259,7 @@ signals:
 
 private:
 
+  void saveCurrentProfile();
   void storeSettings();
 
   bool queryApi(QString &apiKey);
@@ -298,26 +285,6 @@ private:
               const MOShared::DirectoryEntry *directoryEntry,
               int createDestination);
 
-  HANDLE spawnAndWait(const QFileInfo &binary, const QString &arguments,
-    const QString &profileName,
-    const QDir &currentDirectory,
-    const QString &steamAppID,
-    const QString &customOverwrite,
-    const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries = QList<MOBase::ExecutableForcedLoadSetting>(),
-    LPDWORD exitCode = nullptr);
-
-  bool waitForProcessCompletionWithLock(HANDLE handle, LPDWORD exitCode);
-
-  bool waitForProcessCompletion(
-    HANDLE handle, LPDWORD exitCode, ILockedWaitingForProcess* uilock);
-
-  bool waitForAllUSVFSProcesses(ILockedWaitingForProcess* uilock);
-
-  void withLock(std::function<void (ILockedWaitingForProcess*)> f);
-
-  HANDLE findAndOpenAUSVFSProcess(
-    const std::vector<QString>& hiddenList, DWORD preferedParentPid);
-
 private slots:
 
   void directory_refreshed();
@@ -331,13 +298,14 @@ private:
   static const unsigned int PROBLEM_MO1SCRIPTEXTENDERWORKAROUND = 1;
 
 private:
-  MainWindow* m_MainWindow;
+  IUserInterface* m_UserInterface;
   PluginContainer *m_PluginContainer;
   QString m_GameName;
   MOBase::IPluginGame *m_GamePlugin;
 
   Profile *m_CurrentProfile;
 
+  ProcessRunner m_Runner;
   Settings& m_Settings;
 
   SelfUpdater m_Updater;
diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp
index 2ea1761a..75b3ea41 100644
--- a/src/organizerproxy.cpp
+++ b/src/organizerproxy.cpp
@@ -112,14 +112,14 @@ HANDLE OrganizerProxy::startApplication(
   const QString &profile, const QString &forcedCustomOverwrite,
   bool ignoreCustomOverwrite)
 {
-  return m_Proxied->runExecutableOrExecutableFile(
+  return m_Proxied->processRunner().runExecutableOrExecutableFile(
     executable, args, cwd, profile,
     forcedCustomOverwrite, ignoreCustomOverwrite);
 }
 
 bool OrganizerProxy::waitForApplication(HANDLE handle, LPDWORD exitCode) const
 {
-  return m_Proxied->waitForApplication(handle, exitCode);
+  return m_Proxied->processRunner().waitForApplication(handle, exitCode);
 }
 
 bool OrganizerProxy::onAboutToRun(const std::function<bool (const QString &)> &func)
diff --git a/src/processrunner.cpp b/src/processrunner.cpp
new file mode 100644
index 00000000..81c4b99e
--- /dev/null
+++ b/src/processrunner.cpp
@@ -0,0 +1,634 @@
+#include "processrunner.h"
+#include "organizercore.h"
+#include "instancemanager.h"
+#include "lockeddialog.h"
+#include "iuserinterface.h"
+#include "envmodule.h"
+#include <log.h>
+
+using namespace MOBase;
+
+void adjustForVirtualized(
+  const IPluginGame* game, spawn::SpawnParameters& sp, const Settings& settings)
+{
+  const 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:
+  // (i.e. mods\FNIS\path\exe => game\data\path\exe)
+  QString cwdPath = sp.currentDirectory.absolutePath();
+  bool virtualizedCwd = cwdPath.startsWith(modsPath, Qt::CaseInsensitive);
+  QString binPath = sp.binary.absoluteFilePath();
+  bool virtualizedBin = binPath.startsWith(modsPath, Qt::CaseInsensitive);
+  if (virtualizedCwd || virtualizedBin) {
+    if (virtualizedCwd) {
+      int cwdOffset = cwdPath.indexOf('/', modsPath.length() + 1);
+      QString adjustedCwd = cwdPath.mid(cwdOffset, -1);
+      cwdPath = game->dataDirectory().absolutePath();
+      if (cwdOffset >= 0)
+        cwdPath += adjustedCwd;
+
+    }
+
+    if (virtualizedBin) {
+      int binOffset = binPath.indexOf('/', modsPath.length() + 1);
+      QString adjustedBin = binPath.mid(binOffset, -1);
+      binPath = game->dataDirectory().absolutePath();
+      if (binOffset >= 0)
+        binPath += adjustedBin;
+    }
+
+    QString cmdline
+      = QString("launch \"%1\" \"%2\" %3")
+      .arg(QDir::toNativeSeparators(cwdPath),
+        QDir::toNativeSeparators(binPath), sp.arguments);
+
+    sp.binary = QFileInfo(QCoreApplication::applicationFilePath());
+    sp.arguments = cmdline;
+    sp.currentDirectory.setPath(QCoreApplication::applicationDirPath());
+  }
+}
+
+env::Process* getInterestingProcess(std::vector<env::Process>& processes)
+{
+  if (processes.empty()) {
+    return nullptr;
+  }
+
+  // Certain process names we wish to "hide" for aesthetic reason:
+  const std::vector<QString> hiddenList = {
+    QFileInfo(QCoreApplication::applicationFilePath()).fileName()
+  };
+
+  auto isHidden = [&](auto&& p) {
+    for (auto h : hiddenList) {
+      if (p.name().contains(h, Qt::CaseInsensitive)) {
+        return true;
+      }
+    }
+
+    return false;
+  };
+
+
+  for (auto&& root : processes) {
+    if (!isHidden(root)) {
+      return &root;
+    }
+
+    for (auto&& child : root.children()) {
+      if (!isHidden(child)) {
+        return &child;
+      }
+    }
+  }
+
+
+  // everything is hidden, just pick the first one
+  return &processes[0];
+}
+
+
+SpawnedProcess::SpawnedProcess(HANDLE handle, spawn::SpawnParameters sp)
+  : m_handle(handle), m_parameters(std::move(sp))
+{
+}
+
+SpawnedProcess::SpawnedProcess(SpawnedProcess&& other)
+  : m_handle(other.m_handle), m_parameters(std::move(other.m_parameters))
+{
+  other.m_handle = INVALID_HANDLE_VALUE;
+}
+
+SpawnedProcess& SpawnedProcess::operator=(SpawnedProcess&& other)
+{
+  if (this != &other) {
+    destroy();
+
+    m_handle = other.m_handle;
+    other.m_handle = INVALID_HANDLE_VALUE;
+
+    m_parameters = std::move(other.m_parameters);
+  }
+
+  return *this;
+}
+
+SpawnedProcess::~SpawnedProcess()
+{
+  destroy();
+}
+
+HANDLE SpawnedProcess::releaseHandle()
+{
+  const auto h = m_handle;
+  m_handle = INVALID_HANDLE_VALUE;
+  return h;
+}
+
+void SpawnedProcess::destroy()
+{
+  if (m_handle != INVALID_HANDLE_VALUE) {
+    ::CloseHandle(m_handle);
+    m_handle = INVALID_HANDLE_VALUE;
+  }
+}
+
+
+ProcessRunner::ProcessRunner(OrganizerCore& core)
+  : m_core(core), m_ui(nullptr)
+{
+}
+
+void ProcessRunner::setUserInterface(IUserInterface* ui)
+{
+  m_ui = ui;
+}
+
+bool ProcessRunner::runFile(QWidget* parent, const QFileInfo& targetInfo)
+{
+  if (!parent && m_ui) {
+    parent = m_ui->qtWidget();
+  }
+
+  const auto fec = spawn::getFileExecutionContext(parent, targetInfo);
+
+  switch (fec.type)
+  {
+    case spawn::FileExecutionTypes::Executable:
+    {
+      runExecutableFile(fec.binary, fec.arguments, targetInfo.absoluteDir());
+      return true;
+    }
+
+    case spawn::FileExecutionTypes::Other:  // fall-through
+    default:
+    {
+      auto r = shell::Open(targetInfo.absoluteFilePath());
+      if (!r.success()) {
+        return false;
+      }
+
+      // not all files will return a valid handle even if opening them was
+      // successful, such as inproc handlers (like the photo viewer)
+      if (r.processHandle() != INVALID_HANDLE_VALUE) {
+        // steal because it gets closed after the wait
+        return waitForProcessCompletionWithLock(r.stealProcessHandle(), nullptr);
+      }
+
+      return true;
+    }
+  }
+}
+
+bool ProcessRunner::runExecutableFile(
+  const QFileInfo &binary, const QString &arguments,
+  const QDir &currentDirectory, const QString &steamAppID,
+  const QString &customOverwrite,
+  const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries,
+  bool refresh)
+{
+  DWORD processExitCode = 0;
+  HANDLE processHandle = spawnAndWait(
+    binary, arguments, m_core.currentProfile()->name(),
+    currentDirectory, steamAppID, customOverwrite, forcedLibraries,
+    &processExitCode);
+
+  if (processHandle == INVALID_HANDLE_VALUE) {
+    // failed
+    return false;
+  }
+
+  if (refresh) {
+    m_core.afterRun(binary, processExitCode);
+  }
+
+  return true;
+}
+
+bool ProcessRunner::runExecutable(const Executable& exe, bool refresh)
+{
+  const auto* profile = m_core.currentProfile();
+  if (!profile) {
+    throw MyException(QObject::tr("No profile set"));
+  }
+
+  const QString customOverwrite = profile->setting(
+    "custom_overwrites", exe.title()).toString();
+
+  QList<MOBase::ExecutableForcedLoadSetting> forcedLibraries;
+
+  if (profile->forcedLibrariesEnabled(exe.title())) {
+    forcedLibraries = profile->determineForcedLibraries(exe.title());
+  }
+
+  return runExecutableFile(
+    exe.binaryInfo(),
+    exe.arguments(),
+    exe.workingDirectory().length() != 0 ? exe.workingDirectory() : exe.binaryInfo().absolutePath(),
+    exe.steamAppID(),
+    customOverwrite,
+    forcedLibraries,
+    refresh);
+}
+
+bool ProcessRunner::runShortcut(const MOShortcut& shortcut)
+{
+  if (shortcut.hasInstance() && shortcut.instance() != InstanceManager::instance().currentInstance()) {
+    throw std::runtime_error(
+      QString("Refusing to run executable from different instance %1:%2")
+      .arg(shortcut.instance(),shortcut.executable())
+      .toLocal8Bit().constData());
+  }
+
+  const Executable& exe = m_core.executablesList()->get(shortcut.executable());
+  return runExecutable(exe, false);
+}
+
+HANDLE ProcessRunner::runExecutableOrExecutableFile(
+  const QString& executable, const QStringList &args, const QString &cwd,
+  const QString& profileOverride, const QString &forcedCustomOverwrite,
+  bool ignoreCustomOverwrite)
+{
+  const auto* profile = m_core.currentProfile();
+  if (!profile) {
+    throw MyException(QObject::tr("No profile set"));
+  }
+
+  QString profileName = profileOverride;
+  if (profileName == "") {
+      profileName = profile->name();
+  }
+
+  QFileInfo binary;
+  QString arguments = args.join(" ");
+  QString currentDirectory = cwd;
+  QString steamAppID;
+  QString customOverwrite;
+  QList<ExecutableForcedLoadSetting> forcedLibraries;
+
+  if (executable.contains('\\') || executable.contains('/')) {
+    // file path
+
+    binary = QFileInfo(executable);
+    if (binary.isRelative()) {
+      // relative path, should be relative to game directory
+      binary = m_core.managedGame()->gameDirectory().absoluteFilePath(executable);
+    }
+
+    if (currentDirectory == "") {
+      currentDirectory = binary.absolutePath();
+    }
+
+    try {
+      const Executable& exe = m_core.executablesList()->getByBinary(binary);
+      steamAppID = exe.steamAppID();
+      customOverwrite = profile->setting("custom_overwrites", exe.title()).toString();
+      if (profile->forcedLibrariesEnabled(exe.title())) {
+        forcedLibraries = profile->determineForcedLibraries(exe.title());
+      }
+    } catch (const std::runtime_error &) {
+      // nop
+    }
+  } else {
+    // only a file name, search executables list
+    try {
+      const Executable &exe = m_core.executablesList()->get(executable);
+      steamAppID = exe.steamAppID();
+      customOverwrite = profile->setting("custom_overwrites", exe.title()).toString();
+      if (profile->forcedLibrariesEnabled(exe.title())) {
+        forcedLibraries = profile->determineForcedLibraries(exe.title());
+      }
+      if (arguments == "") {
+        arguments = exe.arguments();
+      }
+      binary = exe.binaryInfo();
+      if (currentDirectory == "") {
+        currentDirectory = exe.workingDirectory();
+      }
+    } catch (const std::runtime_error &) {
+      log::warn("\"{}\" not set up as executable", executable);
+      binary = QFileInfo(executable);
+    }
+  }
+
+  if (!forcedCustomOverwrite.isEmpty())
+    customOverwrite = forcedCustomOverwrite;
+
+  if (ignoreCustomOverwrite)
+    customOverwrite.clear();
+
+  return spawnAndWait(
+    binary,
+    arguments,
+    profileName,
+    currentDirectory,
+    steamAppID,
+    customOverwrite,
+    forcedLibraries);
+}
+
+HANDLE ProcessRunner::spawnAndWait(
+  const QFileInfo &binary, const QString &arguments, const QString &profileName,
+  const QDir &currentDirectory, const QString &steamAppID,
+  const QString &customOverwrite,
+  const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries,
+  LPDWORD exitCode)
+{
+  spawn::SpawnParameters sp;
+  sp.binary = binary;
+  sp.arguments = arguments;
+  sp.currentDirectory = currentDirectory;
+  sp.steamAppID = steamAppID;
+  sp.hooked = true;
+
+  if (!m_core.beforeRun(binary, profileName, customOverwrite, forcedLibraries)) {
+    return INVALID_HANDLE_VALUE;
+  }
+
+  HANDLE handle = spawn(sp).releaseHandle();
+
+  if (handle == INVALID_HANDLE_VALUE) {
+    // failed
+    return INVALID_HANDLE_VALUE;
+  }
+
+  waitForProcessCompletionWithLock(handle, exitCode);
+  return handle;
+}
+
+SpawnedProcess ProcessRunner::spawn(spawn::SpawnParameters sp)
+{
+  QWidget* parent = nullptr;
+  if (m_ui) {
+    parent = m_ui->qtWidget();
+  }
+
+  if (!checkBinary(parent, sp)) {
+    return {INVALID_HANDLE_VALUE, sp};
+  }
+
+  const auto* game = m_core.managedGame();
+  auto& settings = m_core.settings();
+
+  if (!checkSteam(parent, sp, game->gameDirectory(), sp.steamAppID, settings)) {
+    return {INVALID_HANDLE_VALUE, sp};
+  }
+
+  if (!checkEnvironment(parent, sp)) {
+    return {INVALID_HANDLE_VALUE, sp};
+  }
+
+  if (!checkBlacklist(parent, sp, settings)) {
+    return {INVALID_HANDLE_VALUE, sp};
+  }
+
+  adjustForVirtualized(game, sp, settings);
+
+  return {startBinary(parent, sp), sp};
+}
+
+void ProcessRunner::withLock(std::function<void (ILockedWaitingForProcess*)> f)
+{
+  std::unique_ptr<LockedDialog> dlg;
+  ILockedWaitingForProcess* uilock = nullptr;
+
+  if (m_ui != nullptr) {
+    uilock = m_ui->lock();
+  }
+  else {
+    // i.e. when running command line shortcuts there is no user interface
+    dlg.reset(new LockedDialog);
+    dlg->show();
+    dlg->setEnabled(true);
+    uilock = dlg.get();
+  }
+
+  Guard g([&]() {
+    if (m_ui != nullptr) {
+      m_ui->unlock();
+    }
+  });
+
+  f(uilock);
+}
+
+bool ProcessRunner::waitForProcessCompletionWithLock(
+  HANDLE handle, LPDWORD exitCode)
+{
+  if (!Settings::instance().interface().lockGUI()) {
+    return true;
+  }
+
+  bool r = false;
+
+  withLock([&](auto* uilock) {
+    DWORD ignoreExitCode;
+    r = waitForProcessCompletion(handle, exitCode ? exitCode : &ignoreExitCode, uilock);
+  });
+
+  return r;
+}
+
+bool ProcessRunner::waitForApplication(HANDLE handle, LPDWORD exitCode)
+{
+  if (!Settings::instance().interface().lockGUI())
+    return true;
+
+  bool r = false;
+
+  withLock([&](auto* uilock) {
+    r = waitForProcessCompletion(handle, exitCode, uilock);
+  });
+
+  return r;
+}
+
+bool ProcessRunner::waitForProcessCompletion(
+  HANDLE handle, LPDWORD exitCode, ILockedWaitingForProcess* uilock)
+{
+  const auto tree = env::getProcessTree(handle);
+  std::vector<env::Process> processes = {tree};
+
+  const auto* interesting = getInterestingProcess(processes);
+  if (!interesting) {
+    return true;
+  }
+
+  if (uilock) {
+    uilock->setProcessInformation(interesting->pid(), interesting->name());
+  }
+
+  auto interestingHandle = interesting->openHandleForWait();
+  if (!interestingHandle) {
+    return true;
+  }
+
+  auto progress = [&]{ return uilock->unlockForced(); };
+  const auto r = waitForProcess(
+    interestingHandle.get(), exitCode, progress);
+
+  switch (r)
+  {
+    case WaitResults::Completed:  // fall-through
+    case WaitResults::Cancelled:
+      return true;
+
+    case WaitResults::Error:  // fall-through
+    default:
+      return false;
+  }
+}
+
+bool ProcessRunner::waitForAllUSVFSProcessesWithLock()
+{
+  if (!Settings::instance().interface().lockGUI())
+    return true;
+
+  bool r = false;
+
+  withLock([&](auto* uilock) {
+    r = waitForAllUSVFSProcesses(uilock);
+  });
+
+  return r;
+}
+
+bool ProcessRunner::waitForAllUSVFSProcesses(ILockedWaitingForProcess* uilock)
+{
+  for (;;) {
+    const auto handles = getRunningUSVFSProcesses();
+    if (handles.empty()) {
+      break;
+    }
+
+    std::vector<env::Process> processes;
+    for (auto&& h : handles) {
+      auto p = env::getProcessTree(h);
+      if (p.isValid()) {
+        processes.emplace_back(std::move(p));
+      }
+    }
+
+    const auto* interesting = getInterestingProcess(processes);
+    if (!interesting) {
+      break;
+    }
+
+    if (uilock) {
+      uilock->setProcessInformation(interesting->pid(), interesting->name());
+    }
+
+    auto interestingHandle = interesting->openHandleForWait();
+    if (!interestingHandle) {
+      break;
+    }
+
+    auto progress = [&]{ return uilock->unlockForced(); };
+    const auto r = waitForProcess(
+      interestingHandle.get(), nullptr, progress);
+
+    switch (r)
+    {
+      case WaitResults::Completed:
+        // this process is completed, check for others
+        break;
+
+      case WaitResults::Cancelled:
+        // force unlocked
+        log::debug("waiting for process completion aborted by UI");
+        return true;
+
+      case WaitResults::Error:  // fall-through
+      default:
+        log::debug("waiting for process completion not successful");
+        return false;
+    }
+  }
+
+  log::debug("waiting for process completion successful");
+  return true;
+}
+
+
+
+WaitResults waitForProcess(
+  HANDLE handle, DWORD* exitCode, std::function<bool ()> progress)
+{
+  if (handle == INVALID_HANDLE_VALUE) {
+    return WaitResults::Error;
+  }
+
+  log::debug("waiting for completion on pid {}", ::GetProcessId(handle));
+
+  std::vector<HANDLE> handles;
+  handles.push_back(handle);
+
+  std::vector<DWORD> exitCodes;
+
+  const auto r = waitForProcesses(handles, exitCodes, progress);
+
+  if (r == WaitResults::Completed) {
+    if (exitCode && !exitCodes.empty()) {
+      *exitCode = exitCodes[0];
+    }
+  }
+
+  return r;
+}
+
+WaitResults waitForProcesses(
+  const std::vector<HANDLE>& handles, std::vector<DWORD>& exitCodes,
+  std::function<bool ()> progress)
+{
+  if (handles.empty()) {
+    return WaitResults::Completed;
+  }
+
+  const auto WAIT_OBJECT_N = static_cast<DWORD>(WAIT_OBJECT_0 + handles.size());
+
+  for (;;) {
+    // Wait for a an event on the handle, a key press, mouse click or timeout
+    const auto res = MsgWaitForMultipleObjects(
+      static_cast<DWORD>(handles.size()), &handles[0],
+      TRUE, 50, QS_KEY | QS_MOUSEBUTTON);
+
+    if (res == WAIT_FAILED) {
+      // error
+      const auto e = ::GetLastError();
+
+      log::error(
+        "failed waiting for process completion, {}", formatSystemMessage(e));
+
+      return WaitResults::Error;
+    } else if (res >= WAIT_OBJECT_0 && res < WAIT_OBJECT_N) {
+      // completed
+      exitCodes.resize(handles.size());
+      std::fill(exitCodes.begin(), exitCodes.end(), 0);
+
+      for (std::size_t i=0; i<handles.size(); ++i) {
+        DWORD exitCode = 0;
+
+        if (::GetExitCodeProcess(handles[i], &exitCode)) {
+          exitCodes[i] = exitCode;
+        } else {
+          const auto e = ::GetLastError();
+          log::warn(
+            "failed to get exit code of process, {}",
+            formatSystemMessage(e));
+        }
+      }
+
+      return WaitResults::Completed;
+    }
+
+    // keep processing events so the app doesn't appear dead
+    QCoreApplication::sendPostedEvents();
+    QCoreApplication::processEvents();
+
+    if (progress && progress()) {
+      return WaitResults::Cancelled;
+    }
+  }
+}
diff --git a/src/processrunner.h b/src/processrunner.h
new file mode 100644
index 00000000..38e79ca8
--- /dev/null
+++ b/src/processrunner.h
@@ -0,0 +1,104 @@
+#ifndef PROCESSRUNNER_H
+#define PROCESSRUNNER_H
+
+#include "spawn.h"
+#include <executableinfo.h>
+
+class OrganizerCore;
+class ILockedWaitingForProcess;
+class IUserInterface;
+class Executable;
+class MOShortcut;
+
+class SpawnedProcess
+{
+public:
+  SpawnedProcess(HANDLE handle, spawn::SpawnParameters sp);
+
+  SpawnedProcess(const SpawnedProcess&) = delete;
+  SpawnedProcess& operator=(const SpawnedProcess&) = delete;
+  SpawnedProcess(SpawnedProcess&& other);
+  SpawnedProcess& operator=(SpawnedProcess&& other);
+  ~SpawnedProcess();
+
+  HANDLE releaseHandle();
+  void wait();
+
+private:
+  HANDLE m_handle;
+  spawn::SpawnParameters m_parameters;
+
+  void destroy();
+};
+
+
+class ProcessRunner
+{
+public:
+  ProcessRunner(OrganizerCore& core);
+
+  void setUserInterface(IUserInterface* ui);
+
+  bool runFile(QWidget* parent, const QFileInfo& targetInfo);
+
+  bool runExecutableFile(
+    const QFileInfo &binary, const QString &arguments,
+    const QDir &currentDirectory, const QString &steamAppID={},
+    const QString &customOverwrite={},
+    const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries={},
+    bool refresh=true);
+
+  bool runExecutable(const Executable& exe, bool refresh=true);
+
+  bool runShortcut(const MOShortcut& shortcut);
+
+  HANDLE runExecutableOrExecutableFile(
+    const QString &executable, const QStringList &args, const QString &cwd,
+    const QString &profile, const QString &forcedCustomOverwrite = "",
+    bool ignoreCustomOverwrite = false);
+
+  bool waitForApplication(HANDLE processHandle, LPDWORD exitCode = nullptr);
+
+  bool waitForAllUSVFSProcessesWithLock();
+
+private:
+  OrganizerCore& m_core;
+  IUserInterface* m_ui;
+
+  HANDLE spawnAndWait(
+    const QFileInfo &binary, const QString &arguments,
+    const QString &profileName,
+    const QDir &currentDirectory,
+    const QString &steamAppID,
+    const QString &customOverwrite,
+    const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries={},
+    LPDWORD exitCode = nullptr);
+
+  SpawnedProcess spawn(spawn::SpawnParameters sp);
+
+  void withLock(std::function<void (ILockedWaitingForProcess*)> f);
+
+  bool waitForProcessCompletionWithLock(HANDLE handle, LPDWORD exitCode);
+
+  bool waitForProcessCompletion(
+    HANDLE handle, LPDWORD exitCode, ILockedWaitingForProcess* uilock);
+
+  bool waitForAllUSVFSProcesses(ILockedWaitingForProcess* uilock);
+};
+
+
+enum class WaitResults
+{
+  Completed = 1,
+  Error,
+  Cancelled
+};
+
+WaitResults waitForProcess(
+  HANDLE handle, DWORD* exitCode, std::function<bool ()> progress);
+
+WaitResults waitForProcesses(
+  const std::vector<HANDLE>& handles, std::vector<DWORD>& exitCodes,
+  std::function<bool ()> progress);
+
+#endif // PROCESSRUNNER_H
diff --git a/src/spawn.cpp b/src/spawn.cpp
index 0ea60641..c8d7c76a 100644
--- a/src/spawn.cpp
+++ b/src/spawn.cpp
@@ -772,50 +772,6 @@ bool checkBlacklist(
   }
 }
 
-
-void adjustForVirtualized(
-  const IPluginGame* game, SpawnParameters& sp, const Settings& settings)
-{
-  const 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:
-  // (i.e. mods\FNIS\path\exe => game\data\path\exe)
-  QString cwdPath = sp.currentDirectory.absolutePath();
-  bool virtualizedCwd = cwdPath.startsWith(modsPath, Qt::CaseInsensitive);
-  QString binPath = sp.binary.absoluteFilePath();
-  bool virtualizedBin = binPath.startsWith(modsPath, Qt::CaseInsensitive);
-  if (virtualizedCwd || virtualizedBin) {
-    if (virtualizedCwd) {
-      int cwdOffset = cwdPath.indexOf('/', modsPath.length() + 1);
-      QString adjustedCwd = cwdPath.mid(cwdOffset, -1);
-      cwdPath = game->dataDirectory().absolutePath();
-      if (cwdOffset >= 0)
-        cwdPath += adjustedCwd;
-
-    }
-
-    if (virtualizedBin) {
-      int binOffset = binPath.indexOf('/', modsPath.length() + 1);
-      QString adjustedBin = binPath.mid(binOffset, -1);
-      binPath = game->dataDirectory().absolutePath();
-      if (binOffset >= 0)
-        binPath += adjustedBin;
-    }
-
-    QString cmdline
-      = QString("launch \"%1\" \"%2\" %3")
-      .arg(QDir::toNativeSeparators(cwdPath),
-        QDir::toNativeSeparators(binPath), sp.arguments);
-
-    sp.binary = QFileInfo(QCoreApplication::applicationFilePath());
-    sp.arguments = cmdline;
-    sp.currentDirectory.setPath(QCoreApplication::applicationDirPath());
-  }
-}
-
-
 HANDLE startBinary(QWidget* parent, const SpawnParameters& sp)
 {
   HANDLE handle = INVALID_HANDLE_VALUE;
@@ -842,80 +798,6 @@ HANDLE startBinary(QWidget* parent, const SpawnParameters& sp)
   }
 }
 
-
-
-SpawnedProcess::SpawnedProcess(HANDLE handle, SpawnParameters sp)
-  : m_handle(handle), m_parameters(std::move(sp))
-{
-}
-
-SpawnedProcess::SpawnedProcess(SpawnedProcess&& other)
-  : m_handle(other.m_handle), m_parameters(std::move(other.m_parameters))
-{
-  other.m_handle = INVALID_HANDLE_VALUE;
-}
-
-SpawnedProcess& SpawnedProcess::operator=(SpawnedProcess&& other)
-{
-  if (this != &other) {
-    destroy();
-
-    m_handle = other.m_handle;
-    other.m_handle = INVALID_HANDLE_VALUE;
-
-    m_parameters = std::move(other.m_parameters);
-  }
-
-  return *this;
-}
-
-SpawnedProcess::~SpawnedProcess()
-{
-  destroy();
-}
-
-HANDLE SpawnedProcess::releaseHandle()
-{
-  const auto h = m_handle;
-  m_handle = INVALID_HANDLE_VALUE;
-  return h;
-}
-
-void SpawnedProcess::destroy()
-{
-  if (m_handle != INVALID_HANDLE_VALUE) {
-    ::CloseHandle(m_handle);
-    m_handle = INVALID_HANDLE_VALUE;
-  }
-}
-
-
-SpawnedProcess Spawner::spawn(
-  QWidget* parent, const IPluginGame* game,
-  SpawnParameters sp, Settings& settings)
-{
-  if (!checkBinary(parent, sp)) {
-    return {INVALID_HANDLE_VALUE, sp};
-  }
-
-  if (!checkSteam(parent, sp, game->gameDirectory(), sp.steamAppID, settings)) {
-    return {INVALID_HANDLE_VALUE, sp};
-  }
-
-  if (!checkEnvironment(parent, sp)) {
-    return {INVALID_HANDLE_VALUE, sp};
-  }
-
-  if (!checkBlacklist(parent, sp, settings)) {
-    return {INVALID_HANDLE_VALUE, sp};
-  }
-
-  adjustForVirtualized(game, sp, settings);
-
-  return {startBinary(parent, sp), sp};
-}
-
-
 QString getExecutableForJarFile(const QString& jarFile)
 {
   const std::wstring jarFileW = jarFile.toStdWString();
@@ -1094,86 +976,6 @@ FileExecutionContext getFileExecutionContext(
   return {{}, {}, FileExecutionTypes::Other};
 }
 
-WaitResults waitForProcess(
-  HANDLE handle, DWORD* exitCode, std::function<bool ()> progress)
-{
-  if (handle == INVALID_HANDLE_VALUE) {
-    return WaitResults::Error;
-  }
-
-  log::debug("waiting for completion on pid {}", ::GetProcessId(handle));
-
-  std::vector<HANDLE> handles;
-  handles.push_back(handle);
-
-  std::vector<DWORD> exitCodes;
-
-  const auto r = waitForProcesses(handles, exitCodes, progress);
-
-  if (r == WaitResults::Completed) {
-    if (exitCode && !exitCodes.empty()) {
-      *exitCode = exitCodes[0];
-    }
-  }
-
-  return r;
-}
-
-WaitResults waitForProcesses(
-  const std::vector<HANDLE>& handles, std::vector<DWORD>& exitCodes,
-  std::function<bool ()> progress)
-{
-  if (handles.empty()) {
-    return WaitResults::Completed;
-  }
-
-  const auto WAIT_OBJECT_N = static_cast<DWORD>(WAIT_OBJECT_0 + handles.size());
-
-  for (;;) {
-    // Wait for a an event on the handle, a key press, mouse click or timeout
-    const auto res = MsgWaitForMultipleObjects(
-      static_cast<DWORD>(handles.size()), &handles[0],
-      TRUE, 50, QS_KEY | QS_MOUSEBUTTON);
-
-    if (res == WAIT_FAILED) {
-      // error
-      const auto e = ::GetLastError();
-
-      log::error(
-        "failed waiting for process completion, {}", formatSystemMessage(e));
-
-      return WaitResults::Error;
-    } else if (res >= WAIT_OBJECT_0 && res < WAIT_OBJECT_N) {
-      // completed
-      exitCodes.resize(handles.size());
-      std::fill(exitCodes.begin(), exitCodes.end(), 0);
-
-      for (std::size_t i=0; i<handles.size(); ++i) {
-        DWORD exitCode = 0;
-
-        if (::GetExitCodeProcess(handles[i], &exitCode)) {
-          exitCodes[i] = exitCode;
-        } else {
-          const auto e = ::GetLastError();
-          log::warn(
-            "failed to get exit code of process, {}",
-            formatSystemMessage(e));
-        }
-      }
-
-      return WaitResults::Completed;
-    }
-
-    // keep processing events so the app doesn't appear dead
-    QCoreApplication::sendPostedEvents();
-    QCoreApplication::processEvents();
-
-    if (progress && progress()) {
-      return WaitResults::Cancelled;
-    }
-  }
-}
-
 } // namespace
 
 
diff --git a/src/spawn.h b/src/spawn.h
index ad50bde6..0464ffd6 100644
--- a/src/spawn.h
+++ b/src/spawn.h
@@ -73,39 +73,6 @@ bool checkBlacklist(
 HANDLE startBinary(QWidget* parent, const SpawnParameters& sp);
 
 
-class SpawnedProcess
-{
-public:
-  SpawnedProcess(HANDLE handle, SpawnParameters sp);
-
-  SpawnedProcess(const SpawnedProcess&) = delete;
-  SpawnedProcess& operator=(const SpawnedProcess&) = delete;
-  SpawnedProcess(SpawnedProcess&& other);
-  SpawnedProcess& operator=(SpawnedProcess&& other);
-  ~SpawnedProcess();
-
-  HANDLE releaseHandle();
-  void wait();
-
-private:
-  HANDLE m_handle;
-  SpawnParameters m_parameters;
-
-  void destroy();
-};
-
-
-class Spawner
-{
-public:
-  SpawnedProcess spawn(
-    QWidget* parent, const MOBase::IPluginGame* game,
-    SpawnParameters sp, Settings& settings);
-
-private:
-};
-
-
 enum class FileExecutionTypes
 {
   Executable = 1,
@@ -124,21 +91,6 @@ QString findJavaInstallation(const QString& jarFile);
 FileExecutionContext getFileExecutionContext(
   QWidget* parent, const QFileInfo& target);
 
-
-enum class WaitResults
-{
-  Completed = 1,
-  Error,
-  Cancelled
-};
-
-WaitResults waitForProcess(
-  HANDLE handle, DWORD* exitCode, std::function<bool ()> progress);
-
-WaitResults waitForProcesses(
-  const std::vector<HANDLE>& handles, std::vector<DWORD>& exitCodes,
-  std::function<bool ()> progress);
-
 } // namespace
 
 
-- 
cgit v1.3.1


From db0b92776b5c9a34ebb1a5ce5c3f0b105844ee16 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 30 Oct 2019 23:42:59 -0400
Subject: added lockwidget to replace all the other dialogs rewrote
 ProcessRunner to have a bunch of setters and then a run() fixed bad exit code
 when waiting on a process that's already completed removed lock()/unlock()
 from main window, ProcessRunner is in charge of that now

---
 src/CMakeLists.txt     |   3 +
 src/envmodule.cpp      |   1 -
 src/iuserinterface.h   |   6 +-
 src/lockwidget.cpp     | 224 ++++++++++++++++
 src/lockwidget.h       |  68 +++++
 src/mainwindow.cpp     |  44 +---
 src/mainwindow.h       |   7 -
 src/organizercore.cpp  |   8 +-
 src/organizercore.h    |   3 +-
 src/organizerproxy.cpp |  19 +-
 src/pch.h              |  47 ++--
 src/processrunner.cpp  | 687 ++++++++++++++++++++++++++++---------------------
 src/processrunner.h    |  70 ++++-
 13 files changed, 806 insertions(+), 381 deletions(-)
 create mode 100644 src/lockwidget.cpp
 create mode 100644 src/lockwidget.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5e909760..168b79dc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -144,6 +144,7 @@ SET(organizer_SRCS
 	colortable.cpp
 	sanitychecks.cpp
 	processrunner.cpp
+	lockwidget.cpp
 
     shared/windows_error.cpp
     shared/error_report.cpp
@@ -268,6 +269,7 @@ SET(organizer_HDRS
 	envwindows.h
 	colortable.h
 	processrunner.h
+	lockwidget.h
 
     shared/windows_error.h
     shared/error_report.h
@@ -486,6 +488,7 @@ set(widgets
 	filterwidget
 	icondelegate
 	lcdnumber
+	lockwidget
 	loglist
 	loghighlighter
 	modflagicondelegate
diff --git a/src/envmodule.cpp b/src/envmodule.cpp
index 0e2e8ec7..09593e61 100644
--- a/src/envmodule.cpp
+++ b/src/envmodule.cpp
@@ -545,7 +545,6 @@ Process getProcessTree(HANDLE parent)
   }
 
   if (root.pid() == 0) {
-    log::error("process {} is not running", parentPID);
     return {};
   }
 
diff --git a/src/iuserinterface.h b/src/iuserinterface.h
index 91487aee..e5755f03 100644
--- a/src/iuserinterface.h
+++ b/src/iuserinterface.h
@@ -4,12 +4,13 @@
 
 #include "modinfodialogfwd.h"
 #include "ilockedwaitingforprocess.h"
+#include "lockwidget.h"
 #include <iplugintool.h>
 #include <ipluginmodpage.h>
 #include <delayedfilewriter.h>
-
 #include <QMenu>
 
+
 class IUserInterface
 {
 public:
@@ -31,9 +32,6 @@ public:
 
   virtual MOBase::DelayedFileWriterBase &archivesWriter() = 0;
 
-  virtual ILockedWaitingForProcess* lock() = 0;
-  virtual void unlock() = 0;
-
   virtual QWidget* qtWidget() = 0;
 };
 
diff --git a/src/lockwidget.cpp b/src/lockwidget.cpp
new file mode 100644
index 00000000..720cac36
--- /dev/null
+++ b/src/lockwidget.cpp
@@ -0,0 +1,224 @@
+#include "lockwidget.h"
+#include "mainwindow.h"
+#include <QGraphicsDropShadowEffect>
+#include <QMenuBar>
+#include <QStatusBar>
+
+QWidget* createTransparentWidget(QWidget* parent=nullptr)
+{
+  auto* w = new QWidget(parent);
+
+  w->setWindowOpacity(0);
+  w->setAttribute(Qt::WA_NoSystemBackground);
+  w->setAttribute(Qt::WA_TranslucentBackground);
+
+  return w;
+}
+
+
+LockWidget::LockWidget(QWidget* parent, Reasons reason) :
+  m_parent(parent), m_overlay(nullptr), m_info(nullptr), m_result(NoResult),
+  m_filter(nullptr)
+{
+  if (reason != NoReason) {
+    lock(reason);
+  }
+}
+
+LockWidget::~LockWidget()
+{
+  unlock();
+}
+
+void LockWidget::lock(Reasons reason)
+{
+  m_result = StillLocked;
+  createUi(reason);
+}
+
+void LockWidget::unlock()
+{
+  m_overlay.reset();
+
+  if (m_filter && m_parent) {
+    m_parent->removeEventFilter(m_filter.get());
+  }
+
+  enableAll();
+}
+
+void LockWidget::setInfo(DWORD pid, const QString& name)
+{
+  m_info->setText(QString("%1 (%2)").arg(name).arg(pid));
+}
+
+LockWidget::Results LockWidget::result() const
+{
+  return m_result;
+}
+
+void LockWidget::createUi(Reasons reason)
+{
+  if (m_parent) {
+    m_overlay.reset(createTransparentWidget(m_parent));
+    m_overlay->setWindowFlags(m_overlay->windowFlags() & Qt::FramelessWindowHint);
+    m_overlay->setGeometry(m_parent->rect());
+  } else {
+    m_overlay.reset(new QDialog);
+  }
+
+  auto* center = new QFrame;
+
+  if (m_parent) {
+    center->setFrameStyle(QFrame::StyledPanel);
+    center->setLineWidth(1);
+    center->setAutoFillBackground(true);
+
+    auto* shadow = new QGraphicsDropShadowEffect;
+    shadow->setBlurRadius(50);
+    shadow->setOffset(0);
+    shadow->setColor(QColor(0, 0, 0, 100));
+    center->setGraphicsEffect(shadow);
+  }
+
+  m_info = new QLabel(" ");
+  m_info->setAlignment(Qt::AlignCenter | Qt::AlignHCenter);
+
+  auto* ly = new QVBoxLayout(center);
+
+  if (!m_parent) {
+    ly->setContentsMargins(0, 0, 0, 0);
+  }
+
+  auto* message = new QLabel;
+  ly->addWidget(message);
+  ly->addWidget(m_info);
+
+  auto* buttons = new QWidget;
+  auto* buttonsLayout = new QHBoxLayout(buttons);
+  ly->addWidget(buttons);
+
+  switch (reason)
+  {
+    case LockUI:
+    {
+      message->setText(QObject::tr(
+        "Mod Organizer is locked while the executable is running."));
+
+      auto* unlockButton = new QPushButton(QObject::tr("Unlock"));
+      QObject::connect(unlockButton, &QPushButton::clicked, [&]{ onForceUnlock(); });
+      buttonsLayout->addWidget(unlockButton);
+
+      break;
+    }
+
+    case OutputRequired:
+    {
+      message->setText(QObject::tr(
+        "The executable must run to completion because a its output is "
+        "required."));
+
+      auto* unlockButton = new QPushButton(QObject::tr("Unlock"));
+      QObject::connect(unlockButton, &QPushButton::clicked, [&]{ onForceUnlock(); });
+      buttonsLayout->addWidget(unlockButton);
+
+      break;
+    }
+
+    case PreventExit:
+    {
+      message->setText(QObject::tr(
+        "Mod Organizer is waiting on processes to finish before exiting."));
+
+      auto* exit = new QPushButton(QObject::tr("Exit Now"));
+      QObject::connect(exit, &QPushButton::clicked, [&]{ onForceUnlock(); });
+      buttonsLayout->addWidget(exit);
+
+      auto* cancel = new QPushButton(QObject::tr("Cancel"));
+      QObject::connect(cancel, &QPushButton::clicked, [&]{ onCancel(); });
+      buttonsLayout->addWidget(cancel);
+
+      break;
+    }
+  }
+
+  auto* grid = new QGridLayout(m_overlay.get());
+  grid->addWidget(createTransparentWidget(), 0, 1);
+  grid->addWidget(createTransparentWidget(), 2, 1);
+  grid->addWidget(createTransparentWidget(), 1, 0);
+  grid->addWidget(createTransparentWidget(), 1, 2);
+  grid->addWidget(center, 1, 1);
+
+  if (!m_parent) {
+    grid->setContentsMargins(0, 0, 0, 0);
+  }
+
+  grid->setRowStretch(0, 1);
+  grid->setRowStretch(2, 1);
+  grid->setColumnStretch(0, 1);
+  grid->setColumnStretch(2, 1);
+
+  disableAll();
+
+  if (m_parent) {
+    m_filter.reset(new Filter);
+    m_filter->resized = [=]{ m_overlay->setGeometry(m_parent->rect()); };
+    m_parent->installEventFilter(m_filter.get());
+  }
+
+  m_overlay->setFocusPolicy(Qt::TabFocus);
+  m_overlay->setFocus();
+  m_overlay->show();
+  m_overlay->setEnabled(true);
+}
+
+void LockWidget::onForceUnlock()
+{
+  m_result = ForceUnlocked;
+  unlock();
+}
+
+void LockWidget::onCancel()
+{
+  m_result = Cancelled;
+  unlock();
+}
+
+void LockWidget::disableAll()
+{
+  if (!m_parent) {
+    // nothing to disable without a main window
+    return;
+  }
+
+  if (auto* mw=dynamic_cast<QMainWindow*>(m_parent)) {
+    disable(mw->centralWidget());
+    disable(mw->menuBar());
+    disable(mw->statusBar());
+  }
+
+  for (auto* tb : m_parent->findChildren<QToolBar*>()) {
+    disable(tb);
+  }
+
+  for (auto* d : m_parent->findChildren<QDockWidget*>()) {
+    disable(d);
+  }
+}
+
+void LockWidget::enableAll()
+{
+  for (auto* w : m_disabled) {
+    w->setEnabled(true);
+  }
+
+  m_disabled.clear();
+}
+
+void LockWidget::disable(QWidget* w)
+{
+  if (w->isEnabled()) {
+    w->setEnabled(false);
+    m_disabled.push_back(w);
+  }
+}
diff --git a/src/lockwidget.h b/src/lockwidget.h
new file mode 100644
index 00000000..bfb0b30f
--- /dev/null
+++ b/src/lockwidget.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include <QMainWindow>
+
+class LockWidget
+{
+public:
+  enum Reasons
+  {
+    NoReason = 0,
+    LockUI,
+    OutputRequired,
+    PreventExit
+  };
+
+  enum Results
+  {
+    NoResult = 0,
+    StillLocked,
+    ForceUnlocked,
+    Cancelled
+  };
+
+  LockWidget(QWidget* parent, Reasons reason=NoReason);
+  ~LockWidget();
+
+  void lock(Reasons reason);
+  void unlock();
+
+  void setInfo(DWORD pid, const QString& name);
+  Results result() const;
+
+private:
+  class Filter : public QObject
+  {
+  public:
+    std::function<void ()> resized;
+
+  protected:
+    bool eventFilter(QObject* o, QEvent* e) override
+    {
+      if (e->type() == QEvent::Resize) {
+        if (resized) {
+          resized();
+        }
+      }
+
+      return QObject::eventFilter(o, e);
+    }
+  };
+
+
+  QWidget* m_parent;
+  std::unique_ptr<QWidget> m_overlay;
+  QLabel* m_info;
+  Results m_result;
+  std::unique_ptr<Filter> m_filter;
+  std::vector<QWidget*> m_disabled;
+
+  void createUi(Reasons reason);
+
+  void onForceUnlock();
+  void onCancel();
+
+  void disableAll();
+  void enableAll();
+  void disable(QWidget* w);
+};
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ce5280a6..7d3d20b3 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -57,7 +57,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "downloadlistwidget.h"
 #include "messagedialog.h"
 #include "installationmanager.h"
-#include "lockeddialog.h"
 #include "waitingonclosedialog.h"
 #include "downloadlistsortproxy.h"
 #include "motddialog.h"
@@ -1311,9 +1310,10 @@ bool MainWindow::canExit()
     }
   }
 
-  m_exitAfterWait = true;
-  m_OrganizerCore.processRunner().waitForAllUSVFSProcessesWithLock();
-  if (!m_exitAfterWait) { // if operation cancelled
+  const auto r = m_OrganizerCore.processRunner()
+    .waitForAllUSVFSProcessesWithLock(LockWidget::PreventExit);
+
+  if (r == ProcessRunner::Cancelled) {
     return false;
   }
 
@@ -2258,42 +2258,6 @@ void MainWindow::storeSettings()
   s.widgets().saveIndex(ui->executablesListBox);
 }
 
-ILockedWaitingForProcess* MainWindow::lock()
-{
-  if (m_LockDialog != nullptr) {
-    ++m_LockCount;
-    return m_LockDialog;
-  }
-  if (m_exitAfterWait)
-    m_LockDialog = new WaitingOnCloseDialog(this);
-  else
-    m_LockDialog = new LockedDialog(this, true);
-  m_LockDialog->setModal(true);
-  m_LockDialog->show();
-  setEnabled(false);
-  m_LockDialog->setEnabled(true); //What's the point otherwise?
-  ++m_LockCount;
-  return m_LockDialog;
-}
-
-void MainWindow::unlock()
-{
-  //If you come through here with a null lock pointer, it's a bug!
-  if (m_LockDialog == nullptr) {
-    log::debug("Unlocking main window when already unlocked");
-    return;
-  }
-  --m_LockCount;
-  if (m_LockCount == 0) {
-    if (m_exitAfterWait && m_LockDialog->canceled())
-      m_exitAfterWait = false;
-    m_LockDialog->hide();
-    m_LockDialog->deleteLater();
-    m_LockDialog = nullptr;
-    setEnabled(true);
-  }
-}
-
 QWidget* MainWindow::qtWidget()
 {
   return this;
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 19723480..c80287b2 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -38,7 +38,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 //when I get round to cleaning up main.cpp
 class Executable;
 class CategoryFactory;
-class LockedDialogBase;
 class OrganizerCore;
 
 class PluginListSortProxy;
@@ -118,8 +117,6 @@ public:
 
   void processUpdates(Settings& settings);
 
-  ILockedWaitingForProcess* lock() override;
-  void unlock() override;
   QWidget* qtWidget() override;
 
   bool addProfile();
@@ -381,11 +378,7 @@ private:
 
   bool m_DidUpdateMasterList;
 
-  LockedDialogBase *m_LockDialog { nullptr };
-  uint64_t m_LockCount { 0 };
-
   bool m_showArchiveData{ true };
-  bool m_exitAfterWait{ false };
 
   MOBase::DelayedFileWriter m_ArchiveListWriter;
 
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 0f767f46..89e8bd9e 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -91,7 +91,6 @@ OrganizerCore::OrganizerCore(Settings &settings)
   , m_PluginContainer(nullptr)
   , m_GameName()
   , m_CurrentProfile(nullptr)
-  , m_Runner(*this)
   , m_Settings(settings)
   , m_Updater(NexusInterface::instance(m_PluginContainer))
   , m_AboutToRun()
@@ -252,7 +251,6 @@ void OrganizerCore::setUserInterface(IUserInterface* ui)
 
   m_InstallationManager.setParentWidget(w);
   m_Updater.setUserInterface(w);
-  m_Runner.setUserInterface(ui);
 
   checkForUpdates();
 }
@@ -357,7 +355,7 @@ void OrganizerCore::externalMessage(const QString &message)
 {
   if (MOShortcut moshortcut{ message } ) {
     if(moshortcut.hasExecutable())
-      m_Runner.runShortcut(moshortcut);
+      processRunner().runShortcut(moshortcut);
   }
   else if (isNxmLink(message)) {
     MessageDialog::showMessage(tr("Download started"), qApp->activeWindow());
@@ -1721,9 +1719,9 @@ void OrganizerCore::saveCurrentProfile()
   storeSettings();
 }
 
-ProcessRunner& OrganizerCore::processRunner()
+ProcessRunner OrganizerCore::processRunner()
 {
-  return m_Runner;
+  return ProcessRunner(*this, m_UserInterface);
 }
 
 bool OrganizerCore::beforeRun(
diff --git a/src/organizercore.h b/src/organizercore.h
index 2252c118..d4882b92 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -134,7 +134,7 @@ public:
 
   bool saveCurrentLists();
 
-  ProcessRunner& processRunner();
+  ProcessRunner processRunner();
 
   bool beforeRun(
     const QFileInfo& binary, const QString& profileName,
@@ -305,7 +305,6 @@ private:
 
   Profile *m_CurrentProfile;
 
-  ProcessRunner m_Runner;
   Settings& m_Settings;
 
   SelfUpdater m_Updater;
diff --git a/src/organizerproxy.cpp b/src/organizerproxy.cpp
index 75b3ea41..3ee35fe2 100644
--- a/src/organizerproxy.cpp
+++ b/src/organizerproxy.cpp
@@ -119,7 +119,24 @@ HANDLE OrganizerProxy::startApplication(
 
 bool OrganizerProxy::waitForApplication(HANDLE handle, LPDWORD exitCode) const
 {
-  return m_Proxied->processRunner().waitForApplication(handle, exitCode);
+  const auto r = m_Proxied->processRunner().waitForApplication(
+    handle, exitCode, LockWidget::OutputRequired);
+
+  switch (r)
+  {
+    case ProcessRunner::Completed:
+      return true;
+
+    case ProcessRunner::Cancelled:     // fall-through
+    case ProcessRunner::ForceUnlocked:
+      // this is always an error because the application should have run to
+      // completion
+      return false;
+
+    case ProcessRunner::Error: // fall-through
+    default:
+      return false;
+  }
 }
 
 bool OrganizerProxy::onAboutToRun(const std::function<bool (const QString &)> &func)
diff --git a/src/pch.h b/src/pch.h
index 01a97357..b7c5d695 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -100,9 +100,9 @@
 #include <QDropEvent>
 #include <QElapsedTimer>
 #include <QEvent>
+#include <QFIleIconProvider>
 #include <QFile>
 #include <QFileDialog>
-#include <QFIleIconProvider>
 #include <QFileInfo>
 #include <QFileSystemModel>
 #include <QFileSystemWatcher>
@@ -111,13 +111,14 @@
 #include <QFontDatabase>
 #include <QFuture>
 #include <QFutureWatcher>
-#include <QHash>
+#include <QGraphicsDropShadowEffect>
 #include <QHBoxLayout>
+#include <QHash>
 #include <QHeaderView>
+#include <QIODevice>
 #include <QIcon>
 #include <QImageReader>
 #include <QInputDialog>
-#include <QIODevice>
 #include <QItemDelegate>
 #include <QItemSelection>
 #include <QItemSelectionModel>
@@ -126,20 +127,21 @@
 #include <QJsonObject>
 #include <QJsonValueRef>
 #include <QKeyEvent>
-#include <QLabel>
 #include <QLCDNumber>
+#include <QLabel>
 #include <QLibrary>
 #include <QLibraryInfo>
 #include <QLineEdit>
 #include <QList>
 #include <QListWidget>
 #include <QListWidgetItem>
-#include <QLocale>
 #include <QLocalServer>
 #include <QLocalSocket>
+#include <QLocale>
 #include <QMainWindow>
 #include <QMap>
 #include <QMenu>
+#include <QMenuBar>
 #include <QMessageBox>
 #include <QMetaType>
 #include <QMimeData>
@@ -190,53 +192,42 @@
 #include <QSize>
 #include <QSizePolicy>
 #include <QSortFilterProxyModel>
-#include <QSplitter>
 #include <QSpinBox>
 #include <QSplashScreen>
+#include <QSplitter>
 #include <QSslSocket>
 #include <QStandardItemModel>
-#include <qstandardpaths.h>
 #include <QStandardPaths>
+#include <QStatusBar>
+#include <QStorageInfo>
 #include <QString>
 #include <QStringList>
 #include <QStringListModel>
 #include <QStyle>
-#include <QStyledItemDelegate>
 #include <QStyleFactory>
 #include <QStyleOption>
 #include <QStyleOptionSlider>
+#include <QStyledItemDelegate>
 #include <QSyntaxHighlighter>
-#include <Qt>
-#include <QTableWidget>
 #include <QTabWidget>
-#include <QtAlgorithms>
-#include <QtConcurrent/QtConcurrentRun>
-#include <QtCore/QAbstractItemModel>
-#include <QtCore/QObject>
-#include <QtCore/QStack>
-#include <QtDebug>
+#include <QTableWidget>
 #include <QTemporaryFile>
 #include <QTextBrowser>
 #include <QTextCodec>
 #include <QTextDocument>
 #include <QTextEdit>
 #include <QTextStream>
-#include <QtGlobal>
-#include <QtGui/QtGui>
 #include <QThread>
 #include <QTime>
 #include <QTimer>
 #include <QToolBar>
 #include <QToolButton>
 #include <QToolTip>
-#include <QtPlatformHeaders/QWindowsWindowFunctions>
-#include <QtPlugin>
 #include <QTranslator>
 #include <QTreeView>
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
 #include <QTreeWidgetItemIterator>
-#include <QtTest/QtTest>
 #include <QUrl>
 #include <QUrlQuery>
 #include <QVariant>
@@ -255,4 +246,16 @@
 #include <QWhatsThisClickedEvent>
 #include <QWidget>
 #include <QWidgetAction>
-#include <QStorageInfo>
+#include <Qt>
+#include <QtAlgorithms>
+#include <QtConcurrent/QtConcurrentRun>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QObject>
+#include <QtCore/QStack>
+#include <QtDebug>
+#include <QtGlobal>
+#include <QtGui/QtGui>
+#include <QtPlatformHeaders/QWindowsWindowFunctions>
+#include <QtPlugin>
+#include <QtTest/QtTest>
+#include <QStandardPaths>
diff --git a/src/processrunner.cpp b/src/processrunner.cpp
index 5d4a9fde..62c77efc 100644
--- a/src/processrunner.cpp
+++ b/src/processrunner.cpp
@@ -1,26 +1,58 @@
 #include "processrunner.h"
 #include "organizercore.h"
 #include "instancemanager.h"
-#include "lockeddialog.h"
 #include "iuserinterface.h"
 #include "envmodule.h"
 #include <log.h>
 
 using namespace MOBase;
 
-enum class WaitResults
+void adjustForVirtualized(
+  const IPluginGame* game, spawn::SpawnParameters& sp, const Settings& settings)
 {
-  Completed = 1,
-  Error,
-  Cancelled,
-  StillRunning
-};
+  const 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:
+  // (i.e. mods\FNIS\path\exe => game\data\path\exe)
+  QString cwdPath = sp.currentDirectory.absolutePath();
+  bool virtualizedCwd = cwdPath.startsWith(modsPath, Qt::CaseInsensitive);
+  QString binPath = sp.binary.absoluteFilePath();
+  bool virtualizedBin = binPath.startsWith(modsPath, Qt::CaseInsensitive);
+  if (virtualizedCwd || virtualizedBin) {
+    if (virtualizedCwd) {
+      int cwdOffset = cwdPath.indexOf('/', modsPath.length() + 1);
+      QString adjustedCwd = cwdPath.mid(cwdOffset, -1);
+      cwdPath = game->dataDirectory().absolutePath();
+      if (cwdOffset >= 0)
+        cwdPath += adjustedCwd;
+
+    }
+
+    if (virtualizedBin) {
+      int binOffset = binPath.indexOf('/', modsPath.length() + 1);
+      QString adjustedBin = binPath.mid(binOffset, -1);
+      binPath = game->dataDirectory().absolutePath();
+      if (binOffset >= 0)
+        binPath += adjustedBin;
+    }
+
+    QString cmdline
+      = QString("launch \"%1\" \"%2\" %3")
+      .arg(QDir::toNativeSeparators(cwdPath),
+        QDir::toNativeSeparators(binPath), sp.arguments);
 
+    sp.binary = QFileInfo(QCoreApplication::applicationFilePath());
+    sp.arguments = cmdline;
+    sp.currentDirectory.setPath(QCoreApplication::applicationDirPath());
+  }
+}
 
-WaitResults singleWait(HANDLE handle, DWORD* exitCode)
+std::optional<ProcessRunner::Results> singleWait(HANDLE handle, DWORD pid)
 {
   if (handle == INVALID_HANDLE_VALUE) {
-    return WaitResults::Error;
+    return ProcessRunner::Error;
   }
 
   const DWORD WAIT_EVENT = WAIT_OBJECT_0 + 1;
@@ -33,23 +65,15 @@ WaitResults singleWait(HANDLE handle, DWORD* exitCode)
   {
     case WAIT_OBJECT_0:
     {
-      // completed
-      if (exitCode) {
-        if (!::GetExitCodeProcess(handle, exitCode)) {
-          const auto e = ::GetLastError();
-          log::warn(
-            "failed to get exit code of process, {}",
-            formatSystemMessage(e));
-        }
-      }
-
-      return WaitResults::Completed;
+      log::debug("process {} completed", pid);
+      return ProcessRunner::Completed;
     }
 
     case WAIT_TIMEOUT:
     case WAIT_EVENT:
     {
-      return WaitResults::StillRunning;
+      // still running
+      return {};
     }
 
     case WAIT_FAILED:  // fall-through
@@ -57,11 +81,8 @@ WaitResults singleWait(HANDLE handle, DWORD* exitCode)
     {
       // error
       const auto e = ::GetLastError();
-
-      log::error(
-        "failed waiting for process completion, {}", formatSystemMessage(e));
-
-      return WaitResults::Error;
+      log::error("failed waiting for {}, {}", pid, formatSystemMessage(e));
+      return ProcessRunner::Error;
     }
   }
 }
@@ -132,6 +153,11 @@ std::pair<env::Process, Interest> findInterestingProcessInTrees(
 std::pair<env::Process, Interest> getInterestingProcess(
   const std::vector<HANDLE>& initialProcesses)
 {
+  if (initialProcesses.empty()) {
+    log::debug("nothing to wait for");
+    return {{}, Interest::None};
+  }
+
   std::vector<env::Process> processes;
 
   log::debug("getting process tree for {} processes", initialProcesses.size());
@@ -143,7 +169,7 @@ std::pair<env::Process, Interest> getInterestingProcess(
   }
 
   if (processes.empty()) {
-    log::debug("nothing to wait for");
+    log::debug("processes are already completed");
     return {{}, Interest::None};
   }
 
@@ -158,9 +184,8 @@ std::pair<env::Process, Interest> getInterestingProcess(
 
 const std::chrono::milliseconds Infinite(-1);
 
-WaitResults timedWait(
-  HANDLE handle, DWORD* exitCode, ILockedWaitingForProcess* uilock,
-  std::chrono::milliseconds wait)
+std::optional<ProcessRunner::Results> timedWait(
+  HANDLE handle, DWORD pid, LockWidget& lock, std::chrono::milliseconds wait)
 {
   using namespace std::chrono;
 
@@ -170,37 +195,66 @@ WaitResults timedWait(
   }
 
   for (;;) {
-    const auto r = singleWait(handle, exitCode);
+    const auto r = singleWait(handle, pid);
 
-    if (r != WaitResults::StillRunning) {
-      return r;
+    if (r) {
+      return *r;
     }
 
+    // still running
+
     // keep processing events so the app doesn't appear dead
     QCoreApplication::sendPostedEvents();
     QCoreApplication::processEvents();
 
-    if (uilock && uilock->unlockForced()) {
-      return WaitResults::Cancelled;
+    switch (lock.result())
+    {
+      case LockWidget::StillLocked:
+      {
+        break;
+      }
+
+      case LockWidget::ForceUnlocked:
+      {
+        log::debug("waiting for {} force unlocked by user", pid);
+        return ProcessRunner::ForceUnlocked;
+      }
+
+      case LockWidget::Cancelled:
+      {
+        log::debug("waiting for {} cancelled by user", pid);
+        return ProcessRunner::Cancelled;
+      }
+
+      case LockWidget::NoResult:  // fall-through
+      default:
+      {
+        // shouldn't happen
+        log::debug(
+          "unexpected result {} while waiting for {}",
+          static_cast<int>(lock.result()), pid);
+
+        return ProcessRunner::Error;
+      }
     }
 
     if (wait != Infinite) {
       const auto now = high_resolution_clock::now();
       if (duration_cast<milliseconds>(now - start) >= wait) {
-        return WaitResults::StillRunning;
+        return {};
       }
     }
   }
 }
 
-WaitResults waitForProcesses(
-  const std::vector<HANDLE>& initialProcesses,
-  LPDWORD exitCode, ILockedWaitingForProcess* uilock)
+ProcessRunner::Results waitForProcesses(
+  const std::vector<HANDLE>& initialProcesses, LockWidget& lock)
 {
   using namespace std::chrono;
 
   if (initialProcesses.empty()) {
-    return WaitResults::Completed;
+    // shouldn't happen
+    return ProcessRunner::Completed;
   }
 
   DWORD currentPID = 0;
@@ -208,14 +262,16 @@ WaitResults waitForProcesses(
 
   for (;;) {
     auto [p, interest] = getInterestingProcess(initialProcesses);
-
-    if (uilock) {
-      uilock->setProcessInformation(p.pid(), p.name());
+    if (!p.isValid()) {
+      // nothing to wait on
+      return ProcessRunner::Completed;
     }
 
+    lock.setInfo(p.pid(), p.name());
+
     auto interestingHandle = p.openHandleForWait();
     if (!interestingHandle) {
-      return WaitResults::Error;
+      return ProcessRunner::Error;
     }
 
     if (p.pid() != currentPID) {
@@ -230,9 +286,9 @@ WaitResults waitForProcesses(
       wait = Infinite;
     }
 
-    const auto r = timedWait(interestingHandle.get(), exitCode, uilock, wait);
-    if (r != WaitResults::StillRunning) {
-      return r;
+    const auto r = timedWait(interestingHandle.get(), p.pid(), lock, wait);
+    if (r) {
+      return *r;
     }
 
     wait = std::min(wait * 2, milliseconds(2000));
@@ -243,11 +299,24 @@ WaitResults waitForProcesses(
   }
 }
 
-WaitResults waitForProcess(
-  HANDLE initialProcess, LPDWORD exitCode, ILockedWaitingForProcess* uilock)
+ProcessRunner::Results waitForProcess(
+  HANDLE initialProcess, LPDWORD exitCode, LockWidget& lock)
 {
   std::vector<HANDLE> processes = {initialProcess};
-  return waitForProcesses(processes, exitCode, uilock);
+
+  const auto r = waitForProcesses(processes, lock);
+
+  // as long as it's not running anymore, try to get the exit code
+  if (exitCode && r != ProcessRunner::Running) {
+    if (!::GetExitCodeProcess(initialProcess, exitCode)) {
+      const auto e = ::GetLastError();
+      log::warn(
+        "failed to get exit code of process, {}",
+        formatSystemMessage(e));
+    }
+  }
+
+  return r;
 }
 
 
@@ -298,17 +367,64 @@ void SpawnedProcess::destroy()
 }
 
 
-ProcessRunner::ProcessRunner(OrganizerCore& core)
-  : m_core(core), m_ui(nullptr)
+ProcessRunner::ProcessRunner(OrganizerCore& core, IUserInterface* ui) :
+  m_core(core), m_ui(ui), m_lock(LockWidget::NoReason), m_refresh(false),
+  m_handle(INVALID_HANDLE_VALUE), m_exitCode(-1)
 {
+  m_sp.hooked = true;
 }
 
-void ProcessRunner::setUserInterface(IUserInterface* ui)
+ProcessRunner& ProcessRunner::setBinary(const QFileInfo &binary)
 {
-  m_ui = ui;
+  m_sp.binary = binary;
+  return *this;
 }
 
-bool ProcessRunner::runFile(QWidget* parent, const QFileInfo& targetInfo)
+ProcessRunner& ProcessRunner::setArguments(const QString& arguments)
+{
+  m_sp.arguments = arguments;
+  return *this;
+}
+
+ProcessRunner& ProcessRunner::setCurrentDirectory(const QDir& directory)
+{
+  m_sp.currentDirectory = directory;
+  return *this;
+}
+
+ProcessRunner& ProcessRunner::setSteamID(const QString& steamID)
+{
+  m_sp.steamAppID = steamID;
+  return *this;
+}
+
+ProcessRunner& ProcessRunner::setCustomOverwrite(const QString& customOverwrite)
+{
+  m_customOverwrite = customOverwrite;
+  return *this;
+}
+
+ProcessRunner& ProcessRunner::setForcedLibraries(const ForcedLibraries& forcedLibraries)
+{
+  m_forcedLibraries = forcedLibraries;
+  return *this;
+}
+
+ProcessRunner& ProcessRunner::setProfileName(const QString& profileName)
+{
+  m_profileName = profileName;
+  return *this;
+}
+
+ProcessRunner& ProcessRunner::setWaitForCompletion(
+  LockWidget::Reasons reason, bool refresh)
+{
+  m_lock = reason;
+  m_refresh = refresh;
+  return *this;
+}
+
+ProcessRunner& ProcessRunner::setFromFile(QWidget* parent, const QFileInfo& targetInfo)
 {
   if (!parent && m_ui) {
     parent = m_ui->qtWidget();
@@ -320,56 +436,24 @@ bool ProcessRunner::runFile(QWidget* parent, const QFileInfo& targetInfo)
   {
     case spawn::FileExecutionTypes::Executable:
     {
-      runExecutableFile(fec.binary, fec.arguments, targetInfo.absoluteDir());
-      return true;
+      setBinary(fec.binary);
+      setArguments(fec.arguments);
+      setCurrentDirectory(targetInfo.absoluteDir());
+      break;
     }
 
     case spawn::FileExecutionTypes::Other:  // fall-through
     default:
     {
-      auto r = shell::Open(targetInfo.absoluteFilePath());
-      if (!r.success()) {
-        return false;
-      }
-
-      // not all files will return a valid handle even if opening them was
-      // successful, such as inproc handlers (like the photo viewer)
-      if (r.processHandle() != INVALID_HANDLE_VALUE) {
-        // steal because it gets closed after the wait
-        return waitForProcessCompletionWithLock(r.stealProcessHandle(), nullptr);
-      }
-
-      return true;
+      m_shellOpen = targetInfo.absoluteFilePath();
+      break;
     }
   }
-}
 
-bool ProcessRunner::runExecutableFile(
-  const QFileInfo &binary, const QString &arguments,
-  const QDir &currentDirectory, const QString &steamAppID,
-  const QString &customOverwrite,
-  const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries,
-  bool refresh)
-{
-  DWORD processExitCode = 0;
-  HANDLE processHandle = spawnAndWait(
-    binary, arguments, m_core.currentProfile()->name(),
-    currentDirectory, steamAppID, customOverwrite, forcedLibraries,
-    &processExitCode);
-
-  if (processHandle == INVALID_HANDLE_VALUE) {
-    // failed
-    return false;
-  }
-
-  if (refresh) {
-    m_core.afterRun(binary, processExitCode);
-  }
-
-  return true;
+  return *this;
 }
 
-bool ProcessRunner::runExecutable(const Executable& exe, bool refresh)
+ProcessRunner& ProcessRunner::setFromExecutable(const Executable& exe)
 {
   const auto* profile = m_core.currentProfile();
   if (!profile) {
@@ -379,25 +463,31 @@ bool ProcessRunner::runExecutable(const Executable& exe, bool refresh)
   const QString customOverwrite = profile->setting(
     "custom_overwrites", exe.title()).toString();
 
-  QList<MOBase::ExecutableForcedLoadSetting> forcedLibraries;
-
+  ForcedLibraries forcedLibraries;
   if (profile->forcedLibrariesEnabled(exe.title())) {
     forcedLibraries = profile->determineForcedLibraries(exe.title());
   }
 
-  return runExecutableFile(
-    exe.binaryInfo(),
-    exe.arguments(),
-    exe.workingDirectory().length() != 0 ? exe.workingDirectory() : exe.binaryInfo().absolutePath(),
-    exe.steamAppID(),
-    customOverwrite,
-    forcedLibraries,
-    refresh);
+  QDir currentDirectory = exe.workingDirectory();
+  if (currentDirectory.isEmpty()) {
+    currentDirectory.setPath(exe.binaryInfo().absolutePath());
+  }
+
+  setBinary(exe.binaryInfo());
+  setArguments(exe.arguments());
+  setCurrentDirectory(currentDirectory);
+  setSteamID(exe.steamAppID());
+  setCustomOverwrite(customOverwrite);
+  setForcedLibraries(forcedLibraries);
+
+  return *this;
 }
 
-bool ProcessRunner::runShortcut(const MOShortcut& shortcut)
+ProcessRunner& ProcessRunner::setFromShortcut(const MOShortcut& shortcut)
 {
-  if (shortcut.hasInstance() && shortcut.instance() != InstanceManager::instance().currentInstance()) {
+  const auto currentInstance = InstanceManager::instance().currentInstance();
+
+  if (shortcut.hasInstance() && shortcut.instance() != currentInstance) {
     throw std::runtime_error(
       QString("Refusing to run executable from different instance %1:%2")
       .arg(shortcut.instance(),shortcut.executable())
@@ -405,12 +495,17 @@ bool ProcessRunner::runShortcut(const MOShortcut& shortcut)
   }
 
   const Executable& exe = m_core.executablesList()->get(shortcut.executable());
-  return runExecutable(exe, false);
+  setFromExecutable(exe);
+
+  return *this;
 }
 
-HANDLE ProcessRunner::runExecutableOrExecutableFile(
-  const QString& executable, const QStringList &args, const QString &cwd,
-  const QString& profileOverride, const QString &forcedCustomOverwrite,
+ProcessRunner& ProcessRunner::setFromFileOrExecutable(
+  const QString &executable,
+  const QStringList &args,
+  const QString &cwd,
+  const QString &profileOverride,
+  const QString &forcedCustomOverwrite,
   bool ignoreCustomOverwrite)
 {
   const auto* profile = m_core.currentProfile();
@@ -418,37 +513,41 @@ HANDLE ProcessRunner::runExecutableOrExecutableFile(
     throw MyException(QObject::tr("No profile set"));
   }
 
-  QString profileName = profileOverride;
-  if (profileName == "") {
-      profileName = profile->name();
-  }
+  setProfileName(profileOverride);
 
-  QFileInfo binary;
-  QString arguments = args.join(" ");
-  QString currentDirectory = cwd;
-  QString steamAppID;
-  QString customOverwrite;
-  QList<ExecutableForcedLoadSetting> forcedLibraries;
+  //QFileInfo binary;
+  //QString arguments = args.join(" ");
+  //QString currentDirectory = cwd;
+  //QString steamAppID;
+  //QString customOverwrite;
+  //QList<ExecutableForcedLoadSetting> forcedLibraries;
 
   if (executable.contains('\\') || executable.contains('/')) {
     // file path
 
-    binary = QFileInfo(executable);
+    auto binary = QFileInfo(executable);
+
     if (binary.isRelative()) {
       // relative path, should be relative to game directory
       binary = m_core.managedGame()->gameDirectory().absoluteFilePath(executable);
     }
 
-    if (currentDirectory == "") {
-      currentDirectory = binary.absolutePath();
+    setBinary(binary);
+
+    if (cwd == "") {
+      setCurrentDirectory(binary.absolutePath());
+    } else {
+      setCurrentDirectory(cwd);
     }
 
     try {
       const Executable& exe = m_core.executablesList()->getByBinary(binary);
-      steamAppID = exe.steamAppID();
-      customOverwrite = profile->setting("custom_overwrites", exe.title()).toString();
+
+      setSteamID(exe.steamAppID());
+      setCustomOverwrite(profile->setting("custom_overwrites", exe.title()).toString());
+
       if (profile->forcedLibrariesEnabled(exe.title())) {
-        forcedLibraries = profile->determineForcedLibraries(exe.title());
+        setForcedLibraries(profile->determineForcedLibraries(exe.title()));
       }
     } catch (const std::runtime_error &) {
       // nop
@@ -457,223 +556,244 @@ HANDLE ProcessRunner::runExecutableOrExecutableFile(
     // only a file name, search executables list
     try {
       const Executable &exe = m_core.executablesList()->get(executable);
-      steamAppID = exe.steamAppID();
-      customOverwrite = profile->setting("custom_overwrites", exe.title()).toString();
+
+      setSteamID(exe.steamAppID());
+      setCustomOverwrite(profile->setting("custom_overwrites", exe.title()).toString());
+
       if (profile->forcedLibrariesEnabled(exe.title())) {
-        forcedLibraries = profile->determineForcedLibraries(exe.title());
+        setForcedLibraries(profile->determineForcedLibraries(exe.title()));
       }
-      if (arguments == "") {
-        arguments = exe.arguments();
+
+      if (args.isEmpty()) {
+        setArguments(exe.arguments());
+      } else {
+        setArguments(args.join(" "));
       }
-      binary = exe.binaryInfo();
-      if (currentDirectory == "") {
-        currentDirectory = exe.workingDirectory();
+
+      setBinary(exe.binaryInfo());
+
+      if (cwd == "") {
+        setCurrentDirectory(exe.workingDirectory());
+      } else {
+        setCurrentDirectory(cwd);
       }
     } catch (const std::runtime_error &) {
       log::warn("\"{}\" not set up as executable", executable);
-      binary = QFileInfo(executable);
+      setBinary(QFileInfo(executable));
     }
   }
 
-  if (!forcedCustomOverwrite.isEmpty())
-    customOverwrite = forcedCustomOverwrite;
-
-  if (ignoreCustomOverwrite)
-    customOverwrite.clear();
+  if (ignoreCustomOverwrite) {
+    setCustomOverwrite("");
+  } else if (!forcedCustomOverwrite.isEmpty()) {
+    setCustomOverwrite(forcedCustomOverwrite);
+  }
 
-  return spawnAndWait(
-    binary,
-    arguments,
-    profileName,
-    currentDirectory,
-    steamAppID,
-    customOverwrite,
-    forcedLibraries);
+  return *this;
 }
 
-HANDLE ProcessRunner::spawnAndWait(
-  const QFileInfo &binary, const QString &arguments, const QString &profileName,
-  const QDir &currentDirectory, const QString &steamAppID,
-  const QString &customOverwrite,
-  const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries,
-  LPDWORD exitCode)
+ProcessRunner::Results ProcessRunner::run()
 {
-  spawn::SpawnParameters sp;
-  sp.binary = binary;
-  sp.arguments = arguments;
-  sp.currentDirectory = currentDirectory;
-  sp.steamAppID = steamAppID;
-  sp.hooked = true;
+  if (!m_shellOpen.isEmpty()) {
+    auto r = shell::Open(m_shellOpen);
+    if (!r.success()) {
+      return Error;
+    }
 
-  if (!m_core.beforeRun(binary, profileName, customOverwrite, forcedLibraries)) {
-    return INVALID_HANDLE_VALUE;
-  }
+    // not all files will return a valid handle even if opening them was
+    // successful, such as inproc handlers (like the photo viewer)
+    m_handle = r.stealProcessHandle();
+  } else {
+    if (m_profileName.isEmpty()) {
+      const auto* profile = m_core.currentProfile();
+      if (!profile) {
+        throw MyException(QObject::tr("No profile set"));
+      }
 
-  HANDLE handle = spawn(sp).releaseHandle();
+      m_profileName = profile->name();
+    }
 
-  if (handle == INVALID_HANDLE_VALUE) {
-    // failed
-    return INVALID_HANDLE_VALUE;
-  }
+    if (!m_core.beforeRun(m_sp.binary, m_profileName, m_customOverwrite, m_forcedLibraries)) {
+      return Error;
+    }
 
-  waitForProcessCompletionWithLock(handle, exitCode);
-  return handle;
-}
+    QWidget* parent = nullptr;
+    if (m_ui) {
+      parent = m_ui->qtWidget();
+    }
 
-void adjustForVirtualized(
-  const IPluginGame* game, spawn::SpawnParameters& sp, const Settings& settings)
-{
-  const QString modsPath = settings.paths().mods();
+    if (!checkBinary(parent, m_sp)) {
+      return Error;
+    }
 
-  // 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:
-  // (i.e. mods\FNIS\path\exe => game\data\path\exe)
-  QString cwdPath = sp.currentDirectory.absolutePath();
-  bool virtualizedCwd = cwdPath.startsWith(modsPath, Qt::CaseInsensitive);
-  QString binPath = sp.binary.absoluteFilePath();
-  bool virtualizedBin = binPath.startsWith(modsPath, Qt::CaseInsensitive);
-  if (virtualizedCwd || virtualizedBin) {
-    if (virtualizedCwd) {
-      int cwdOffset = cwdPath.indexOf('/', modsPath.length() + 1);
-      QString adjustedCwd = cwdPath.mid(cwdOffset, -1);
-      cwdPath = game->dataDirectory().absolutePath();
-      if (cwdOffset >= 0)
-        cwdPath += adjustedCwd;
+    const auto* game = m_core.managedGame();
+    auto& settings = m_core.settings();
 
+    if (!checkSteam(parent, m_sp, game->gameDirectory(), m_sp.steamAppID, settings)) {
+      return Error;
     }
 
-    if (virtualizedBin) {
-      int binOffset = binPath.indexOf('/', modsPath.length() + 1);
-      QString adjustedBin = binPath.mid(binOffset, -1);
-      binPath = game->dataDirectory().absolutePath();
-      if (binOffset >= 0)
-        binPath += adjustedBin;
+    if (!checkEnvironment(parent, m_sp)) {
+      return Error;
     }
 
-    QString cmdline
-      = QString("launch \"%1\" \"%2\" %3")
-      .arg(QDir::toNativeSeparators(cwdPath),
-        QDir::toNativeSeparators(binPath), sp.arguments);
+    if (!checkBlacklist(parent, m_sp, settings)) {
+      return Error;
+    }
 
-    sp.binary = QFileInfo(QCoreApplication::applicationFilePath());
-    sp.arguments = cmdline;
-    sp.currentDirectory.setPath(QCoreApplication::applicationDirPath());
+    adjustForVirtualized(game, m_sp, settings);
+
+    m_handle = startBinary(parent, m_sp);
+    if (m_handle == INVALID_HANDLE_VALUE) {
+      return Error;
+    }
+  }
+
+  if (m_handle == INVALID_HANDLE_VALUE || m_lock == LockWidget::NoReason) {
+    return Running;
+  } else {
+    const auto r = waitForProcessCompletionWithLock(
+      m_handle, &m_exitCode, m_lock);
+
+    if (r == Completed && m_refresh) {
+      m_core.afterRun(m_sp.binary, m_exitCode);
+    }
+
+    return r;
   }
 }
 
-SpawnedProcess ProcessRunner::spawn(spawn::SpawnParameters sp)
+DWORD ProcessRunner::exitCode()
 {
-  QWidget* parent = nullptr;
-  if (m_ui) {
-    parent = m_ui->qtWidget();
-  }
+  return m_exitCode;
+}
 
-  if (!checkBinary(parent, sp)) {
-    return {INVALID_HANDLE_VALUE, sp};
-  }
 
-  const auto* game = m_core.managedGame();
-  auto& settings = m_core.settings();
+bool ProcessRunner::runFile(QWidget* parent, const QFileInfo& targetInfo)
+{
+  setFromFile(parent, targetInfo);
+  setWaitForCompletion(LockWidget::LockUI, true);
 
-  if (!checkSteam(parent, sp, game->gameDirectory(), sp.steamAppID, settings)) {
-    return {INVALID_HANDLE_VALUE, sp};
-  }
+  const auto r = run();
+  return (r != Error);
+}
 
-  if (!checkEnvironment(parent, sp)) {
-    return {INVALID_HANDLE_VALUE, sp};
-  }
+bool ProcessRunner::runExecutableFile(
+  const QFileInfo &binary, const QString &arguments,
+  const QDir &currentDirectory, const QString &steamAppID,
+  const QString &customOverwrite,
+  const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries,
+  bool refresh)
+{
+  setBinary(binary);
+  setArguments(arguments);
+  setCurrentDirectory(currentDirectory);
+  setSteamID(steamAppID);
+  setCustomOverwrite(customOverwrite);
+  setForcedLibraries(forcedLibraries);
+  setWaitForCompletion(LockWidget::LockUI, refresh);
+
+  const auto r = run();
+  return (r != Error);
+}
 
-  if (!checkBlacklist(parent, sp, settings)) {
-    return {INVALID_HANDLE_VALUE, sp};
-  }
+bool ProcessRunner::runExecutable(const Executable& exe, bool refresh)
+{
+  setFromExecutable(exe);
+  setWaitForCompletion(LockWidget::LockUI, refresh);
+
+  const auto r = run();
+  return (r != Error);
+}
 
-  adjustForVirtualized(game, sp, settings);
+bool ProcessRunner::runShortcut(const MOShortcut& shortcut)
+{
+  setFromShortcut(shortcut);
+  setWaitForCompletion(LockWidget::LockUI, false);
 
-  return {startBinary(parent, sp), sp};
+  const auto r = run();
+  return (r != Error);
 }
 
-void ProcessRunner::withLock(std::function<void (ILockedWaitingForProcess*)> f)
+HANDLE ProcessRunner::runExecutableOrExecutableFile(
+  const QString& executable, const QStringList &args, const QString &cwd,
+  const QString& profileOverride, const QString &forcedCustomOverwrite,
+  bool ignoreCustomOverwrite)
 {
-  std::unique_ptr<LockedDialog> dlg;
-  ILockedWaitingForProcess* uilock = nullptr;
+  setFromFileOrExecutable(
+    executable, args, cwd, profileOverride, forcedCustomOverwrite,
+    ignoreCustomOverwrite);
 
-  if (m_ui != nullptr) {
-    uilock = m_ui->lock();
-  } else {
-    // i.e. when running command line shortcuts there is no user interface
-    dlg.reset(new LockedDialog);
-    dlg->show();
-    dlg->setEnabled(true);
-    uilock = dlg.get();
-  }
+  setWaitForCompletion(LockWidget::LockUI, true);
 
-  Guard g([&]() {
-    if (m_ui != nullptr) {
-      m_ui->unlock();
-    }
-  });
+  run();
+  return m_handle;
+}
 
-  f(uilock);
+void ProcessRunner::withLock(
+  LockWidget::Reasons reason, std::function<void (LockWidget&)> f)
+{
+  auto lock = std::make_unique<LockWidget>(
+    m_ui ? m_ui->qtWidget() : nullptr, reason);
+
+  f(*lock);
 }
 
-bool ProcessRunner::waitForProcessCompletionWithLock(
-  HANDLE handle, LPDWORD exitCode)
+ProcessRunner::Results ProcessRunner::waitForProcessCompletionWithLock(
+  HANDLE handle, LPDWORD exitCode, LockWidget::Reasons reason)
 {
   if (!Settings::instance().interface().lockGUI()) {
     log::debug("not waiting for process because user has disabled locking");
-    return true;
+    return ForceUnlocked;
   }
 
-  auto r = WaitResults::Error;
-
-  withLock([&](auto* uilock) {
-    r = waitForProcess(handle, exitCode, uilock);
-  });
-
-  // completed/unlocked is fine
-  return (r != WaitResults::Error);
+  return waitForApplication(handle, exitCode, reason);
 }
 
-bool ProcessRunner::waitForApplication(HANDLE handle, LPDWORD exitCode)
+ProcessRunner::Results ProcessRunner::waitForApplication(
+  HANDLE handle, LPDWORD exitCode, LockWidget::Reasons reason)
 {
   // don't check for lockGUI() setting; this _always_ locks the ui and waits
   // for completion
   //
-  // this is typically called only from OrganizerProxy, which allows plugins
-  // to wait on applications until they're finished
+  // this is typically called only from:
+  //  1) OrganizerProxy, which allows plugins to wait on applications until
+  //     they're finished
+  //
+  //     the check_fnis plugin for example will start FNIS, wait for it to
+  //     complete, and then check the exit code; this has to work regardless of
+  //     the locking setting;
   //
-  // the check_fnis plugin for example will start FNIS, wait for it to complete,
-  // and then check the exit code; this has to work regardless of the locking
-  // setting
+  // 2) waitForProcessCompletionWithLock() above, which has already checked the
+  //    lock setting
 
-  auto r = WaitResults::Error;
+  auto r = Error;
 
-  withLock([&](auto* uilock) {
-    r = waitForProcess(handle, exitCode, uilock);
+  withLock(reason, [&](auto& lock) {
+    r = waitForProcess(handle, exitCode, lock);
   });
 
-  // treat unlocked as an error since this should always wait for completion
-  return (r == WaitResults::Completed);
+  return r;
 }
 
-bool ProcessRunner::waitForAllUSVFSProcessesWithLock()
+ProcessRunner::Results ProcessRunner::waitForAllUSVFSProcessesWithLock(
+  LockWidget::Reasons reason)
 {
   if (!Settings::instance().interface().lockGUI()) {
     log::debug("not waiting for usvfs processes because user has disabled locking");
-    return true;
+    return ForceUnlocked;
   }
 
-  bool r = false;
+  auto r = Error;
 
-  withLock([&](auto* uilock) {
-    r = waitForAllUSVFSProcesses(uilock);
+  withLock(reason, [&](auto& lock) {
+    r = waitForAllUSVFSProcesses(lock);
   });
 
   return r;
 }
 
-bool ProcessRunner::waitForAllUSVFSProcesses(ILockedWaitingForProcess* uilock)
+ProcessRunner::Results ProcessRunner::waitForAllUSVFSProcesses(LockWidget& lock)
 {
   for (;;) {
     const auto processes = getRunningUSVFSProcesses();
@@ -681,26 +801,15 @@ bool ProcessRunner::waitForAllUSVFSProcesses(ILockedWaitingForProcess* uilock)
       break;
     }
 
-    const auto r = waitForProcesses(processes, nullptr, uilock);
+    const auto r = waitForProcesses(processes, lock);
 
-    switch (r)
-    {
-      case WaitResults::Completed:
-        // this process is completed, check for others
-        break;
-
-      case WaitResults::Cancelled:
-        // force unlocked
-        log::debug("waiting for process completion aborted by UI");
-        return true;
-
-      case WaitResults::Error:  // fall-through
-      default:
-        log::debug("waiting for process completion not successful");
-        return false;
+    if (r != Completed) {
+      // error, cancelled, or unlocked
+      return r;
     }
+
+    // this process is completed, check for others
   }
 
-  log::debug("waiting for process completion successful");
-  return true;
+  return Completed;
 }
diff --git a/src/processrunner.h b/src/processrunner.h
index 28f4da75..b7895903 100644
--- a/src/processrunner.h
+++ b/src/processrunner.h
@@ -2,10 +2,10 @@
 #define PROCESSRUNNER_H
 
 #include "spawn.h"
+#include "lockwidget.h"
 #include <executableinfo.h>
 
 class OrganizerCore;
-class ILockedWaitingForProcess;
 class IUserInterface;
 class Executable;
 class MOShortcut;
@@ -35,9 +35,43 @@ private:
 class ProcessRunner
 {
 public:
-  ProcessRunner(OrganizerCore& core);
+  enum Results
+  {
+    Running = 1,
+    Completed,
+    Error,
+    Cancelled,
+    ForceUnlocked
+  };
+
+  using ForcedLibraries = QList<MOBase::ExecutableForcedLoadSetting>;
+
+  ProcessRunner(OrganizerCore& core, IUserInterface* ui);
+
+  ProcessRunner& setBinary(const QFileInfo &binary);
+  ProcessRunner& setArguments(const QString& arguments);
+  ProcessRunner& setCurrentDirectory(const QDir& directory);
+  ProcessRunner& setSteamID(const QString& steamID);
+  ProcessRunner& setCustomOverwrite(const QString& customOverwrite);
+  ProcessRunner& setForcedLibraries(const ForcedLibraries& forcedLibraries);
+  ProcessRunner& setProfileName(const QString& profileName);
+  ProcessRunner& setWaitForCompletion(LockWidget::Reasons reason, bool refresh);
+
+  ProcessRunner& setFromFile(QWidget* parent, const QFileInfo& targetInfo);
+  ProcessRunner& setFromExecutable(const Executable& exe);
+  ProcessRunner& setFromShortcut(const MOShortcut& shortcut);
+
+  ProcessRunner& setFromFileOrExecutable(
+    const QString &executable,
+    const QStringList &args,
+    const QString &cwd,
+    const QString &profile,
+    const QString &forcedCustomOverwrite = "",
+    bool ignoreCustomOverwrite = false);
+
+  Results run();
+  DWORD exitCode();
 
-  void setUserInterface(IUserInterface* ui);
 
   bool runFile(QWidget* parent, const QFileInfo& targetInfo);
 
@@ -53,17 +87,31 @@ public:
   bool runShortcut(const MOShortcut& shortcut);
 
   HANDLE runExecutableOrExecutableFile(
-    const QString &executable, const QStringList &args, const QString &cwd,
-    const QString &profile, const QString &forcedCustomOverwrite = "",
+    const QString &executable,
+    const QStringList &args,
+    const QString &cwd,
+    const QString &profile,
+    const QString &forcedCustomOverwrite = "",
     bool ignoreCustomOverwrite = false);
 
-  bool waitForApplication(HANDLE processHandle, LPDWORD exitCode = nullptr);
 
-  bool waitForAllUSVFSProcessesWithLock();
+  Results waitForApplication(
+    HANDLE processHandle, LPDWORD exitCode, LockWidget::Reasons reason);
+
+  Results waitForAllUSVFSProcessesWithLock(LockWidget::Reasons reason);
 
 private:
   OrganizerCore& m_core;
   IUserInterface* m_ui;
+  spawn::SpawnParameters m_sp;
+  QString m_customOverwrite;
+  ForcedLibraries m_forcedLibraries;
+  QString m_profileName;
+  LockWidget::Reasons m_lock;
+  bool m_refresh;
+  QString m_shellOpen;
+  HANDLE m_handle;
+  DWORD m_exitCode;
 
   HANDLE spawnAndWait(
     const QFileInfo &binary, const QString &arguments,
@@ -76,11 +124,13 @@ private:
 
   SpawnedProcess spawn(spawn::SpawnParameters sp);
 
-  void withLock(std::function<void (ILockedWaitingForProcess*)> f);
+  void withLock(
+    LockWidget::Reasons reason, std::function<void (LockWidget&)> f);
 
-  bool waitForProcessCompletionWithLock(HANDLE handle, LPDWORD exitCode);
+  Results waitForProcessCompletionWithLock(
+    HANDLE handle, LPDWORD exitCode, LockWidget::Reasons reason);
 
-  bool waitForAllUSVFSProcesses(ILockedWaitingForProcess* uilock);
+  Results waitForAllUSVFSProcesses(LockWidget& lock);
 };
 
 #endif // PROCESSRUNNER_H
-- 
cgit v1.3.1


From 72dd230cdc60e74446caceb5cfb4c6d32e4f6f68 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Thu, 31 Oct 2019 05:58:41 -0400
Subject: removed unused files fixed handle leak when starting steam

---
 src/CMakeLists.txt             |  17 +-----
 src/ilockedwaitingforprocess.h |  14 -----
 src/iuserinterface.h           |   1 -
 src/lockeddialog.cpp           |  71 ------------------------
 src/lockeddialog.h             |  57 --------------------
 src/lockeddialog.ui            |  98 ---------------------------------
 src/lockeddialogbase.cpp       |  78 ---------------------------
 src/lockeddialogbase.h         |  64 ----------------------
 src/mainwindow.cpp             |   1 -
 src/organizercore.cpp          |   1 -
 src/spawn.cpp                  |   3 +-
 src/spawn.h                    |   2 -
 src/waitingonclosedialog.cpp   |  71 ------------------------
 src/waitingonclosedialog.h     |  56 -------------------
 src/waitingonclosedialog.ui    | 119 -----------------------------------------
 15 files changed, 2 insertions(+), 651 deletions(-)
 delete mode 100644 src/ilockedwaitingforprocess.h
 delete mode 100644 src/lockeddialog.cpp
 delete mode 100644 src/lockeddialog.h
 delete mode 100644 src/lockeddialog.ui
 delete mode 100644 src/lockeddialogbase.cpp
 delete mode 100644 src/lockeddialogbase.h
 delete mode 100644 src/waitingonclosedialog.cpp
 delete mode 100644 src/waitingonclosedialog.h
 delete mode 100644 src/waitingonclosedialog.ui

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 168b79dc..06f2cd1e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,9 +82,6 @@ SET(organizer_SRCS
     main.cpp
     loghighlighter.cpp
     loglist.cpp
-    lockeddialogbase.cpp
-    lockeddialog.cpp
-    waitingonclosedialog.cpp
     loadmechanism.cpp
     installationmanager.cpp
     filedialogmemory.cpp
@@ -206,9 +203,6 @@ SET(organizer_HDRS
     mainwindow.h
     loghighlighter.h
     loglist.h
-    lockeddialogbase.h
-    lockeddialog.h
-    waitingonclosedialog.h
     loadmechanism.h
     installationmanager.h
     filedialogmemory.h
@@ -246,7 +240,6 @@ SET(organizer_HDRS
     viewmarkingscrollbar.h
     plugincontainer.h
     organizercore.h
-    ilockedwaitingforprocess.h
     iuserinterface.h
     instancemanager.h
     usvfsconnector.h
@@ -293,8 +286,6 @@ SET(organizer_UIS
     modinfodialog.ui
     messagedialog.ui
     mainwindow.ui
-    lockeddialog.ui
-    waitingonclosedialog.ui
     editexecutablesdialog.ui
     credentialsdialog.ui
     categoriesdialog.ui
@@ -397,12 +388,6 @@ set(executables
 	editexecutablesdialog
 )
 
-set(locking
-	ilockedwaitingforprocess
-	lockeddialog
-	lockeddialogbase
-)
-
 set(modinfo
 	modinfo
 	modinfobackup
@@ -500,7 +485,7 @@ set(widgets
 )
 
 set(src_filters
-	application core browser dialogs downloads env executables locking modinfo
+	application core browser dialogs downloads env executables modinfo
 	modinfo\\dialog modlist plugins previews profiles settings settingsdialog
 	utilities widgets
 )
diff --git a/src/ilockedwaitingforprocess.h b/src/ilockedwaitingforprocess.h
deleted file mode 100644
index 4d1e786f..00000000
--- a/src/ilockedwaitingforprocess.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef ILOCKEDWAITINGFORPROCESS_H
-#define ILOCKEDWAITINGFORPROCESS_H
-
-class QString;
-
-class ILockedWaitingForProcess
-{
-public:
-  virtual bool unlockForced() const = 0;
-  virtual void setProcessName(QString const &) = 0;
-  virtual void setProcessInformation(DWORD pid, const QString& name) = 0;
-};
-
-#endif // ILOCKEDWAITINGFORPROCESS_H
diff --git a/src/iuserinterface.h b/src/iuserinterface.h
index e5755f03..99caceb1 100644
--- a/src/iuserinterface.h
+++ b/src/iuserinterface.h
@@ -3,7 +3,6 @@
 
 
 #include "modinfodialogfwd.h"
-#include "ilockedwaitingforprocess.h"
 #include "lockwidget.h"
 #include <iplugintool.h>
 #include <ipluginmodpage.h>
diff --git a/src/lockeddialog.cpp b/src/lockeddialog.cpp
deleted file mode 100644
index 143d5838..00000000
--- a/src/lockeddialog.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "lockeddialog.h"
-#include "ui_lockeddialog.h"
-
-#include <QPoint>
-#include <QResizeEvent>
-#include <QWidget>
-#include <Qt>                 // for Qt::FramelessWindowHint, etc
-
-LockedDialog::LockedDialog(QWidget *parent, bool unlockByButton)
-  : LockedDialogBase(parent, !unlockByButton)
-  , ui(new Ui::LockedDialog)
-{
-  ui->setupUi(this);
-
-  // Supposedly the Qt::CustomizeWindowHint should use a customized window
-  // allowing us to select if there is a close button. In practice this doesn't
-  // seem to work. We will ignore pressing the close button if unlockByButton == true
-  Qt::WindowFlags flags =
-    this->windowFlags() | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint;
-  if (m_allowClose)
-    flags |= Qt::WindowCloseButtonHint;
-  this->setWindowFlags(flags);
-
-  if (!unlockByButton)
-  {
-    ui->unlockButton->hide();
-    ui->verticalLayout->addItem(
-      new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding));
-  }
-}
-
-LockedDialog::~LockedDialog()
-{
-    delete ui;
-}
-
-
-void LockedDialog::setProcessName(const QString &name)
-{
-  ui->processLabel->setText(name);
-}
-
-void LockedDialog::on_unlockButton_clicked()
-{
-  unlock();
-}
-
-void LockedDialog::unlock() {
-  LockedDialogBase::unlock();
-  ui->label->setText("unlocking may take a few seconds");
-  ui->unlockButton->setEnabled(false);
-}
diff --git a/src/lockeddialog.h b/src/lockeddialog.h
deleted file mode 100644
index 36c16429..00000000
--- a/src/lockeddialog.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "lockeddialogbase.h"
-
-namespace Ui {
-    class LockedDialog;
-}
-
-/**
- * a small borderless dialog displayed while the Mod Organizer UI is locked
- * The dialog contains only a label and a button to force the UI to be unlocked
- * 
- * The UI gets locked while running external applications since they may modify the
- * data on which Mod Organizer works. After the UI is unlocked (manually or after the
- * external application closed) MO will refresh all of its data sources
- **/
-class LockedDialog : public LockedDialogBase
-{
-    Q_OBJECT
-
-public:
-  explicit LockedDialog(QWidget *parent = 0, bool unlockByButton = false);
-  ~LockedDialog();
-
-  void setProcessName(const QString &name) override;
-
-protected:
-
-  void unlock() override;
-
-private slots:
-
-  void on_unlockButton_clicked();
-
-private:
-
-  Ui::LockedDialog *ui;
-};
diff --git a/src/lockeddialog.ui b/src/lockeddialog.ui
deleted file mode 100644
index 0ec2e467..00000000
--- a/src/lockeddialog.ui
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>LockedDialog</class>
- <widget class="QDialog" name="LockedDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>317</width>
-    <height>151</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Running virtualized processes</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0,0">
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="toolTip">
-      <string>This dialog should disappear automatically if the application/game is done. Click unlock if it didn't.</string>
-     </property>
-     <property name="text">
-      <string>MO is locked while the executable is running.</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-    <item>
-      <spacer name="verticalSpacer1">
-        <property name="orientation">
-          <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-          <size>
-            <height>10</height>
-          </size>
-        </property>
-      </spacer>
-    </item>
-    <item>
-    <widget class="QLabel" name="processLabel">
-     <property name="font">
-      <font>
-       <italic>true</italic>
-      </font>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">color: grey;</string>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-    <item>
-      <spacer name="verticalSpacer2">
-        <property name="orientation">
-          <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-          <size>
-            <height>10</height>
-          </size>
-        </property>
-      </spacer>
-    </item>
-    <item>
-    <widget class="QPushButton" name="unlockButton">
-     <property name="text">
-      <string>Unlock</string>
-     </property>
-    </widget>
-   </item>
-    <item>
-      <spacer name="verticalSpacer3">
-        <property name="orientation">
-          <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-          <size>
-            <height>10</height>
-          </size>
-        </property>
-      </spacer>
-    </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/lockeddialogbase.cpp b/src/lockeddialogbase.cpp
deleted file mode 100644
index 0876a511..00000000
--- a/src/lockeddialogbase.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "lockeddialogbase.h"
-#include "envmodule.h"
-#include <QPoint>
-#include <QResizeEvent>
-#include <QWidget>
-#include <Qt>                 // for Qt::FramelessWindowHint, etc
-
-LockedDialogBase::LockedDialogBase(QWidget *parent, bool allowClose)
-  : QDialog(parent)
-  , m_Unlocked(false)
-  , m_Canceled(false)
-  , m_allowClose(allowClose)
-{
-  if (parent != nullptr) {
-    QPoint position = parent->mapToGlobal(QPoint(parent->width() / 2, parent->height() / 2));
-    position.rx() -= this->width() / 2;
-    position.ry() -= this->height() / 2;
-    move(position);
-  }
-}
-
-void LockedDialogBase::resizeEvent(QResizeEvent *event)
-{
-  QWidget *par = parentWidget();
-  if (par != nullptr) {
-    QPoint position = par->mapToGlobal(QPoint(par->width() / 2, par->height() / 2));
-    position.rx() -= event->size().width() / 2;
-    position.ry() -= event->size().height() / 2;
-    move(position);
-  }
-}
-
-void LockedDialogBase::reject()
-{
-  if (m_allowClose)
-    unlock();
-}
-
-bool LockedDialogBase::unlockForced() const {
-  return m_Unlocked;
-}
-
-bool LockedDialogBase::canceled() const {
-  return m_Canceled;
-}
-
-void LockedDialogBase::setProcessInformation(DWORD pid, const QString& name)
-{
-  setProcessName(QString("%1 (%2)").arg(name).arg(pid));
-}
-
-void LockedDialogBase::unlock() {
-  m_Unlocked = true;
-}
-
-void LockedDialogBase::cancel() {
-  m_Canceled = true;
-}
-
diff --git a/src/lockeddialogbase.h b/src/lockeddialogbase.h
deleted file mode 100644
index 4ebad4c7..00000000
--- a/src/lockeddialogbase.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "ilockedwaitingforprocess.h"
-#include <QDialog>  // for QDialog
-#include <QObject>  // for Q_OBJECT, slots
-#include <QString>  // for QString
-
-class QResizeEvent;
-class QWidget;
-
-/**
- * a small borderless dialog displayed while the Mod Organizer UI is locked
- * The dialog contains only a label and a button to force the UI to be unlocked
- *
- * The UI gets locked while running external applications since they may modify the
- * data on which Mod Organizer works. After the UI is unlocked (manually or after the
- * external application closed) MO will refresh all of its data sources
- **/
-class LockedDialogBase : public QDialog, public ILockedWaitingForProcess
-{
-    Q_OBJECT
-
-public:
-  explicit LockedDialogBase(QWidget *parent, bool allowClose);
-
-  bool unlockForced() const override;
-
-  virtual bool canceled() const;
-
-  void setProcessInformation(DWORD pid, const QString& name) override;
-
-protected:
-
-  virtual void resizeEvent(QResizeEvent *event);
-
-  virtual void reject();
-
-  virtual void unlock();
-
-  virtual void cancel();
-
-  bool m_Unlocked;
-  bool m_Canceled;
-  bool m_allowClose;
-};
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 631a31d8..9453f07c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -57,7 +57,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "downloadlistwidget.h"
 #include "messagedialog.h"
 #include "installationmanager.h"
-#include "waitingonclosedialog.h"
 #include "downloadlistsortproxy.h"
 #include "motddialog.h"
 #include "filedialogmemory.h"
diff --git a/src/organizercore.cpp b/src/organizercore.cpp
index 3c535868..dda60f76 100644
--- a/src/organizercore.cpp
+++ b/src/organizercore.cpp
@@ -29,7 +29,6 @@
 #include "appconfig.h"
 #include <report.h>
 #include <questionboxmemory.h>
-#include "lockeddialog.h"
 #include "instancemanager.h"
 #include <scriptextender.h>
 #include "previewdialog.h"
diff --git a/src/spawn.cpp b/src/spawn.cpp
index b331db01..62745542 100644
--- a/src/spawn.cpp
+++ b/src/spawn.cpp
@@ -27,8 +27,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "envmodule.h"
 #include "settings.h"
 #include "settingsdialogworkarounds.h"
-#include <iplugingame.h>
-#include <ilockedwaitingforprocess.h>
 #include <errorcodes.h>
 #include <report.h>
 #include <log.h>
@@ -645,6 +643,7 @@ bool startSteam(QWidget* parent)
 
   HANDLE ph = INVALID_HANDLE_VALUE;
   const auto e = spawn(sp, ph);
+  ::CloseHandle(ph);
 
   if (e != ERROR_SUCCESS) {
     // make sure username and passwords are not shown
diff --git a/src/spawn.h b/src/spawn.h
index 0464ffd6..9fb346b0 100644
--- a/src/spawn.h
+++ b/src/spawn.h
@@ -28,8 +28,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 class Settings;
 
-namespace MOBase { class IPluginGame; }
-
 namespace spawn
 {
 
diff --git a/src/waitingonclosedialog.cpp b/src/waitingonclosedialog.cpp
deleted file mode 100644
index 565d0a36..00000000
--- a/src/waitingonclosedialog.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "waitingonclosedialog.h"
-#include "ui_waitingonclosedialog.h"
-
-#include <QPoint>
-#include <QResizeEvent>
-#include <QWidget>
-#include <Qt>                 // for Qt::FramelessWindowHint, etc
-
-WaitingOnCloseDialog::WaitingOnCloseDialog(QWidget *parent)
-  : LockedDialogBase(parent,true)
-  , ui(new Ui::WaitingOnCloseDialog)
-{
-  ui->setupUi(this);
-
-  // Supposedly the Qt::CustomizeWindowHint should use a customized window
-  // allowing us to select if there is a close button. In practice this doesn't
-  // seem to work. We will ignore pressing the close button if unlockByButton == true
-  Qt::WindowFlags flags =
-    this->windowFlags() | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinimizeButtonHint;
-  if (m_allowClose)
-    flags |= Qt::WindowCloseButtonHint;
-  this->setWindowFlags(flags);
-}
-
-WaitingOnCloseDialog::~WaitingOnCloseDialog()
-{
-    delete ui;
-}
-
-
-void WaitingOnCloseDialog::setProcessName(const QString &name)
-{
-  ui->processLabel->setText(name);
-}
-
-void WaitingOnCloseDialog::on_closeButton_clicked()
-{
-  unlock();
-}
-
-void WaitingOnCloseDialog::on_cancelButton_clicked()
-{
-  cancel();
-  unlock();
-}
-
-void WaitingOnCloseDialog::unlock() {
-  LockedDialogBase::unlock();
-  ui->label->setText("unlocking may take a few seconds");
-  ui->closeButton->setEnabled(false);
-  ui->cancelButton->setEnabled(false);
-}
diff --git a/src/waitingonclosedialog.h b/src/waitingonclosedialog.h
deleted file mode 100644
index 6650c390..00000000
--- a/src/waitingonclosedialog.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "lockeddialogbase.h"
-
-namespace Ui {
-    class WaitingOnCloseDialog;
-}
-
-/**
- * Similar to the LockedDialog but used for waiting on running process during
- * a process close request which requries a slightly different dialog.
- **/
-class WaitingOnCloseDialog : public LockedDialogBase
-{
-    Q_OBJECT
-
-public:
-  explicit WaitingOnCloseDialog(QWidget *parent = 0);
-  ~WaitingOnCloseDialog();
-
-  bool canceled() const { return m_Canceled; }
-
-  void setProcessName(const QString &name) override;
-
-protected:
-
-  void unlock() override;
-
-private slots:
-
-  void on_closeButton_clicked();
-  void on_cancelButton_clicked();
-
-private:
-
-  Ui::WaitingOnCloseDialog *ui;
-};
diff --git a/src/waitingonclosedialog.ui b/src/waitingonclosedialog.ui
deleted file mode 100644
index 9c7818e0..00000000
--- a/src/waitingonclosedialog.ui
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>WaitingOnCloseDialog</class>
- <widget class="QDialog" name="WaitingOnCloseDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>317</width>
-    <height>151</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Waiting for virtualized processes</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0,0">
-   <item>
-    <widget class="QLabel" name="label">
-     <property name="toolTip">
-      <string>This dialog should disappear automatically if the application/game is done.</string>
-     </property>
-     <property name="text">
-      <string>Virtualized processes are still running, it is prefered to keep MO running until they are finished.</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-    <item>
-      <spacer name="verticalSpacer1">
-        <property name="orientation">
-          <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-          <size>
-            <height>10</height>
-          </size>
-        </property>
-      </spacer>
-    </item>
-    <item>
-    <widget class="QLabel" name="processLabel">
-     <property name="font">
-      <font>
-       <italic>true</italic>
-      </font>
-     </property>
-     <property name="styleSheet">
-      <string notr="true">color: grey;</string>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-    <item>
-      <spacer name="verticalSpacer2">
-        <property name="orientation">
-          <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-          <size>
-            <height>10</height>
-          </size>
-        </property>
-      </spacer>
-    </item>
-    <item>
-      <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,0">
-        <item>
-          <widget class="QPushButton" name="closeButton">
-            <property name="text">
-              <string>Close Now</string>
-            </property>
-          </widget>
-        </item>
-        <item>
-          <spacer name="horizontalSpacer_6">
-            <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-              <size>
-                <width>40</width>
-                <height>20</height>
-              </size>
-            </property>
-          </spacer>
-        </item>
-        <item>
-          <widget class="QPushButton" name="cancelButton">
-            <property name="text">
-              <string>Cancel</string>
-            </property>
-          </widget>
-        </item>
-      </layout>
-    </item>
-    <item>
-      <spacer name="verticalSpacer3">
-        <property name="orientation">
-          <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-          <size>
-            <height>10</height>
-          </size>
-        </property>
-      </spacer>
-    </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
-- 
cgit v1.3.1


From decd5c1828f495be4e230c9fc6fb79dd9bfdfb81 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 6 Nov 2019 07:28:11 -0500
Subject: renamed lockwidget files to uilocker

---
 src/CMakeLists.txt   |   6 +-
 src/iuserinterface.h |   1 -
 src/lockwidget.cpp   | 548 ---------------------------------------------------
 src/lockwidget.h     |  95 ---------
 src/organizercore.h  |   2 +-
 src/processrunner.h  |   2 +-
 src/uilocker.cpp     | 548 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/uilocker.h       |  95 +++++++++
 8 files changed, 648 insertions(+), 649 deletions(-)
 delete mode 100644 src/lockwidget.cpp
 delete mode 100644 src/lockwidget.h
 create mode 100644 src/uilocker.cpp
 create mode 100644 src/uilocker.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 06f2cd1e..d935981d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -141,7 +141,7 @@ SET(organizer_SRCS
 	colortable.cpp
 	sanitychecks.cpp
 	processrunner.cpp
-	lockwidget.cpp
+	uilocker.cpp
 
     shared/windows_error.cpp
     shared/error_report.cpp
@@ -262,7 +262,7 @@ SET(organizer_HDRS
 	envwindows.h
 	colortable.h
 	processrunner.h
-	lockwidget.h
+	uilocker.h
 
     shared/windows_error.h
     shared/error_report.h
@@ -344,6 +344,7 @@ set(core
 	organizerproxy
 	apiuseraccount
 	processrunner
+	uilocker
 )
 
 set(dialogs
@@ -473,7 +474,6 @@ set(widgets
 	filterwidget
 	icondelegate
 	lcdnumber
-	lockwidget
 	loglist
 	loghighlighter
 	modflagicondelegate
diff --git a/src/iuserinterface.h b/src/iuserinterface.h
index 99caceb1..aa48194f 100644
--- a/src/iuserinterface.h
+++ b/src/iuserinterface.h
@@ -3,7 +3,6 @@
 
 
 #include "modinfodialogfwd.h"
-#include "lockwidget.h"
 #include <iplugintool.h>
 #include <ipluginmodpage.h>
 #include <delayedfilewriter.h>
diff --git a/src/lockwidget.cpp b/src/lockwidget.cpp
deleted file mode 100644
index 150d2847..00000000
--- a/src/lockwidget.cpp
+++ /dev/null
@@ -1,548 +0,0 @@
-#include "lockwidget.h"
-#include "mainwindow.h"
-#include <QGraphicsDropShadowEffect>
-#include <QMenuBar>
-#include <QStatusBar>
-
-class UILockerInterface
-{
-public:
-  UILockerInterface(QWidget* mainUI) :
-    m_mainUI(mainUI), m_target(nullptr), m_message(nullptr), m_info(nullptr),
-    m_buttons(nullptr), m_reason(UILocker::NoReason)
-  {
-    m_timer.reset(new QTimer);
-    QObject::connect(m_timer.get(), &QTimer::timeout, [&]{ checkTarget(); });
-    m_timer->start(200);
-
-    set();
-  }
-
-  ~UILockerInterface()
-  {
-  }
-
-  void checkTarget()
-  {
-    if (set()) {
-      update(m_reason);
-    }
-  }
-
-  bool set()
-  {
-    QWidget* newTarget = nullptr;
-
-    newTarget = m_mainUI;
-    if (auto* w = QApplication::activeModalWidget()) {
-      newTarget = w;
-    }
-
-    if (newTarget == m_target) {
-      return false;
-    }
-
-    m_target = newTarget;
-
-    QFrame* center = nullptr;
-
-    if (m_target) {
-      center = createOverlay(m_target);
-    } else {
-      center = createDialog();
-    }
-
-    createMessageLabel();
-    createInfoLabel();
-    createButtonsPanel();
-
-    center->layout()->addWidget(m_message);
-    center->layout()->addWidget(m_info);
-    center->layout()->addWidget(m_buttons);
-
-    m_topLevel->setFocusPolicy(Qt::TabFocus);
-    m_topLevel->setFocus();
-    m_topLevel->show();
-    m_topLevel->setEnabled(true);
-
-    m_topLevel->raise();
-    m_topLevel->activateWindow();
-
-    return true;
-  }
-
-  void update(UILocker::Reasons reason)
-  {
-    m_reason = reason;
-    updateMessage(reason);
-    updateButtons(reason);
-    setInfo(m_labels);
-  }
-
-  void setInfo(const QStringList& labels)
-  {
-    const int MaxLabels = 2;
-
-    m_labels = labels;
-
-    QString s;
-
-    if (labels.size() > MaxLabels) {
-      s = labels.mid(0, MaxLabels).join(", ") + "...";
-    } else {
-      s = labels.join(", ");
-    }
-
-    m_info->setText(s);
-  }
-
-  QWidget* topLevel()
-  {
-    return m_topLevel.get();
-  }
-
-private:
-  class Filter : public QObject
-  {
-  public:
-    std::function<void ()> resized;
-    std::function<void ()> closed;
-
-  protected:
-    bool eventFilter(QObject* o, QEvent* e) override
-    {
-      if (e->type() == QEvent::Resize) {
-        if (resized) {
-          resized();
-        }
-      } else if (e->type() == QEvent::Close) {
-        if (closed) {
-          closed();
-        }
-      }
-
-      return QObject::eventFilter(o, e);
-    }
-  };
-
-
-  std::unique_ptr<QTimer> m_timer;
-  QWidget* m_mainUI;
-  QWidget* m_target;
-  std::unique_ptr<QWidget> m_topLevel;
-  QLabel* m_message;
-  QLabel* m_info;
-  QStringList m_labels;
-  QWidget* m_buttons;
-  std::unique_ptr<Filter> m_filter;
-  UILocker::Reasons m_reason;
-
-
-  bool hasMainUI() const
-  {
-    return (m_target != nullptr);
-  }
-
-  QWidget* createTransparentWidget(QWidget* parent=nullptr)
-  {
-    auto* w = new QWidget(parent);
-
-    w->setWindowOpacity(0);
-    w->setAttribute(Qt::WA_NoSystemBackground);
-    w->setAttribute(Qt::WA_TranslucentBackground);
-
-    return w;
-  }
-
-  QFrame* createOverlay(QWidget* mainUI)
-  {
-    m_topLevel.reset(createTransparentWidget(mainUI));
-    m_topLevel->setWindowFlags(m_topLevel->windowFlags() & Qt::FramelessWindowHint);
-    m_topLevel->setGeometry(mainUI->rect());
-
-    m_filter.reset(new Filter);
-    m_filter->resized = [=]{ m_topLevel->setGeometry(mainUI->rect()); };
-    m_filter->closed = [=]{ checkTarget(); };
-
-    mainUI->installEventFilter(m_filter.get());
-
-    return createFrame();
-  }
-
-  QFrame* createDialog()
-  {
-    m_topLevel.reset(new QDialog);
-
-    return createFrame();
-  }
-
-  QFrame* createFrame()
-  {
-    auto* frame = new QFrame;
-    auto* ly = new QVBoxLayout(frame);
-
-    if (hasMainUI()) {
-      frame->setFrameStyle(QFrame::StyledPanel);
-      frame->setLineWidth(1);
-      frame->setAutoFillBackground(true);
-
-      auto* shadow = new QGraphicsDropShadowEffect;
-      shadow->setBlurRadius(50);
-      shadow->setOffset(0);
-      shadow->setColor(QColor(0, 0, 0, 100));
-      frame->setGraphicsEffect(shadow);
-    } else {
-      ly->setContentsMargins(0, 0, 0, 0);
-    }
-
-    auto* grid = new QGridLayout(m_topLevel.get());
-    grid->addWidget(createTransparentWidget(), 0, 1);
-    grid->addWidget(createTransparentWidget(), 2, 1);
-    grid->addWidget(createTransparentWidget(), 1, 0);
-    grid->addWidget(createTransparentWidget(), 1, 2);
-    grid->addWidget(frame, 1, 1);
-
-    if (!hasMainUI()) {
-      grid->setContentsMargins(0, 0, 0, 0);
-    }
-
-    grid->setRowStretch(0, 1);
-    grid->setRowStretch(2, 1);
-    grid->setColumnStretch(0, 1);
-    grid->setColumnStretch(2, 1);
-
-    return frame;
-  }
-
-  void createMessageLabel()
-  {
-    m_message = new QLabel;
-    m_message->setAlignment(Qt::AlignCenter | Qt::AlignHCenter);
-  }
-
-  void createInfoLabel()
-  {
-    m_info = new QLabel(" ");
-    m_info->setAlignment(Qt::AlignCenter | Qt::AlignHCenter);
-  }
-
-  void createButtonsPanel()
-  {
-    m_buttons = new QWidget;
-    m_buttons->setLayout(new QHBoxLayout);
-  }
-
-
-  void updateMessage(UILocker::Reasons reason)
-  {
-    switch (reason)
-    {
-      case UILocker::LockUI:
-      {
-        QString s;
-
-        if (hasMainUI()) {
-          s = QObject::tr(
-            "Mod Organizer is locked while the application is running.");
-        } else {
-          s = QObject::tr("Mod Organizer is currently running an application.");
-        }
-
-        m_message->setText(s);
-
-        break;
-      }
-
-      case UILocker::OutputRequired:
-      {
-        m_message->setText(QObject::tr(
-          "The application must run to completion because its output is "
-          "required."));
-
-        break;
-      }
-
-      case UILocker::PreventExit:
-      {
-        m_message->setText(QObject::tr(
-          "Mod Organizer is waiting on application to close before exiting."));
-
-        break;
-      }
-    }
-  }
-
-  void updateButtons(UILocker::Reasons reason)
-  {
-    MOBase::deleteChildWidgets(m_buttons);
-    auto* ly = m_buttons->layout();
-
-    switch (reason)
-    {
-      case UILocker::LockUI: // fall-through
-      case UILocker::OutputRequired:
-      {
-        auto* unlock = new QPushButton(QObject::tr("Unlock"));
-
-        QObject::connect(unlock, &QPushButton::clicked, [&]{
-          UILocker::instance().onForceUnlock();
-        });
-
-        ly->addWidget(unlock);
-
-        break;
-      }
-
-      case UILocker::PreventExit:
-      {
-        auto* exit = new QPushButton(QObject::tr("Exit Now"));
-        QObject::connect(exit, &QPushButton::clicked, [&]{
-          UILocker::instance().onForceUnlock();
-        });
-
-        ly->addWidget(exit);
-
-        auto* cancel = new QPushButton(QObject::tr("Cancel"));
-        QObject::connect(cancel, &QPushButton::clicked, [&]{
-          UILocker::instance().onCancel();
-        });
-
-        ly->addWidget(cancel);
-
-        break;
-      }
-    }
-  }
-};
-
-UILocker::Session::~Session()
-{
-  unlock();
-}
-
-void UILocker::Session::unlock()
-{
-  QMetaObject::invokeMethod(qApp, [this]{
-    UILocker::instance().unlock(this);
-  });
-}
-
-void UILocker::Session::setInfo(DWORD pid, const QString& name)
-{
-  {
-    std::scoped_lock lock(m_mutex);
-    m_pid = pid;
-    m_name = name;
-  }
-
-  QMetaObject::invokeMethod(qApp, [this]{
-    UILocker::instance().updateLabel();
-  });
-}
-
-DWORD UILocker::Session::pid() const
-{
-  std::scoped_lock lock(m_mutex);
-  return m_pid;
-}
-
-const QString& UILocker::Session::name() const
-{
-  std::scoped_lock lock(m_mutex);
-  return m_name;
-}
-
-UILocker::Results UILocker::Session::result() const
-{
-  return UILocker::instance().result();
-}
-
-
-static UILocker* g_instance = nullptr;
-
-
-UILocker::UILocker()
-  : m_parent(nullptr), m_result(NoResult)
-{
-  Q_ASSERT(!g_instance);
-  g_instance = this;
-}
-
-UILocker::~UILocker()
-{
-  const auto v = m_sessions;
-
-  for (auto& wp : v) {
-    if (auto s=wp.lock()) {
-      unlock(s.get());
-    }
-  }
-}
-
-UILocker& UILocker::instance()
-{
-  Q_ASSERT(g_instance);
-  return *g_instance;
-}
-
-void UILocker::setUserInterface(QWidget* parent)
-{
-  m_parent = parent;
-}
-
-std::shared_ptr<UILocker::Session> UILocker::lock(Reasons reason)
-{
-  m_result = StillLocked;
-  createUi(reason);
-
-  auto ls = std::make_shared<Session>();
-  m_sessions.push_back(ls);
-
-  updateLabel();
-
-  return ls;
-}
-
-void UILocker::unlock(Session* s)
-{
-  auto itor = m_sessions.begin();
-  for (;;) {
-    if (itor == m_sessions.end()) {
-      break;
-    }
-
-    if (auto ss=itor->lock()) {
-      if (ss.get() == s) {
-        itor = m_sessions.erase(itor);
-        continue;
-      }
-    } else {
-      itor = m_sessions.erase(itor);
-      continue;
-    }
-
-    ++itor;
-  }
-
-  if (m_sessions.empty()) {
-    m_ui.reset();
-    enableAll();
-  } else {
-    updateLabel();
-  }
-}
-
-void UILocker::unlockCurrent()
-{
-  if (m_sessions.empty()) {
-    return;
-  }
-
-  auto s = m_sessions.back().lock();
-  if (!s) {
-    m_sessions.pop_back();
-    return;
-  }
-
-  unlock(s.get());
-}
-
-void UILocker::updateLabel()
-{
-  QStringList labels;
-
-  for (auto itor=m_sessions.rbegin(); itor!=m_sessions.rend(); ++itor) {
-    if (auto ss=itor->lock()) {
-      labels.push_back(QString("%1 (%2)").arg(ss->name()).arg(ss->pid()));
-    }
-  }
-
-  m_ui->setInfo(labels);
-}
-
-UILocker::Results UILocker::result() const
-{
-  return m_result;
-}
-
-void UILocker::createUi(Reasons reason)
-{
-  if (!m_ui) {
-    m_ui.reset(new UILockerInterface(m_parent));
-  }
-
-  m_ui->update(reason);
-
-  disableAll();
-}
-
-void UILocker::onForceUnlock()
-{
-  m_result = ForceUnlocked;
-  unlockCurrent();
-}
-
-void UILocker::onCancel()
-{
-  m_result = Cancelled;
-  unlockCurrent();
-}
-
-template <class T>
-QList<T> findChildrenImmediate(QWidget* parent)
-{
-  return parent->findChildren<T>(QString(), Qt::FindDirectChildrenOnly);
-}
-
-void UILocker::disableAll()
-{
-  const auto topLevels = QApplication::topLevelWidgets();
-
-  for (auto* w : topLevels) {
-    if (auto* mw=dynamic_cast<QMainWindow*>(w)) {
-      disable(mw->centralWidget());
-      disable(mw->menuBar());
-      disable(mw->statusBar());
-
-      for (auto* tb : findChildrenImmediate<QToolBar*>(w)) {
-        disable(tb);
-      }
-
-      for (auto* d : findChildrenImmediate<QDockWidget*>(w)) {
-        disable(d);
-      }
-    }
-
-    if (auto* d=dynamic_cast<QDialog*>(w)) {
-      // don't disable stuff if this dialog is the overlay, which happens when
-      // there's no ui
-      if (d != m_ui->topLevel()) {
-        // no central widget, just disable the children, except for the overlay
-        for (auto* child : findChildrenImmediate<QWidget*>(d)) {
-          if (child != m_ui->topLevel()) {
-            disable(child);
-          }
-        }
-      }
-    }
-  }
-}
-
-void UILocker::enableAll()
-{
-  for (auto w : m_disabled) {
-    if (w) {
-      w->setEnabled(true);
-    }
-  }
-
-  m_disabled.clear();
-}
-
-void UILocker::disable(QWidget* w)
-{
-  if (w->isEnabled()) {
-    w->setEnabled(false);
-    m_disabled.push_back(w);
-  }
-}
diff --git a/src/lockwidget.h b/src/lockwidget.h
deleted file mode 100644
index d8c22999..00000000
--- a/src/lockwidget.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#pragma once
-
-#include <QMainWindow>
-#include <mutex>
-
-class UILockerInterface;
-
-class UILocker
-{
-  friend class UILockerInterface;
-
-public:
-  // reason to show the widget
-  //
-  enum Reasons
-  {
-    NoReason = 0,
-
-    // lock the ui
-    LockUI,
-
-    // because the output is required
-    OutputRequired,
-
-    // to prevent exiting until all processes are completed
-    PreventExit
-  };
-
-  // returned by result()
-  //
-  enum Results
-  {
-    NoResult = 0,
-
-    // the widget is still up
-    StillLocked,
-
-    // force unlock was clicked
-    ForceUnlocked,
-
-    // cancel was clicked
-    Cancelled
-  };
-
-
-  class Session
-  {
-  public:
-    ~Session();
-
-    void unlock();
-    void setInfo(DWORD pid, const QString& name);
-    Results result() const;
-
-    DWORD pid() const;
-    const QString& name() const;
-
-  private:
-    mutable std::mutex m_mutex;
-    DWORD m_pid;
-    QString m_name;
-  };
-
-
-  UILocker();
-  ~UILocker();
-
-  static UILocker& instance();
-
-  void setUserInterface(QWidget* parent);
-
-  std::shared_ptr<Session> lock(Reasons reason);
-
-  Results result() const;
-
-private:
-  QWidget* m_parent;
-  std::unique_ptr<UILockerInterface> m_ui;
-  std::vector<std::weak_ptr<Session>> m_sessions;
-  std::atomic<Results> m_result;
-  std::vector<QPointer<QWidget>> m_disabled;
-
-  void createUi(Reasons reason);
-
-  void unlockCurrent();
-  void unlock(Session* s);
-  void updateLabel();
-
-  void onForceUnlock();
-  void onCancel();
-
-  void disableAll();
-  void enableAll();
-  void disable(QWidget* w);
-};
diff --git a/src/organizercore.h b/src/organizercore.h
index 47630dc2..6c9edb9f 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -14,7 +14,7 @@
 #include "usvfsconnector.h"
 #include "moshortcut.h"
 #include "processrunner.h"
-#include "lockwidget.h"
+#include "uilocker.h"
 #include <directoryentry.h>
 #include <imoinfo.h>
 #include <iplugindiagnose.h>
diff --git a/src/processrunner.h b/src/processrunner.h
index af5cd416..c61d6b70 100644
--- a/src/processrunner.h
+++ b/src/processrunner.h
@@ -2,7 +2,7 @@
 #define PROCESSRUNNER_H
 
 #include "spawn.h"
-#include "lockwidget.h"
+#include "uilocker.h"
 #include "envmodule.h"
 #include <executableinfo.h>
 
diff --git a/src/uilocker.cpp b/src/uilocker.cpp
new file mode 100644
index 00000000..01794d6b
--- /dev/null
+++ b/src/uilocker.cpp
@@ -0,0 +1,548 @@
+#include "uilocker.h"
+#include "mainwindow.h"
+#include <QGraphicsDropShadowEffect>
+#include <QMenuBar>
+#include <QStatusBar>
+
+class UILockerInterface
+{
+public:
+  UILockerInterface(QWidget* mainUI) :
+    m_mainUI(mainUI), m_target(nullptr), m_message(nullptr), m_info(nullptr),
+    m_buttons(nullptr), m_reason(UILocker::NoReason)
+  {
+    m_timer.reset(new QTimer);
+    QObject::connect(m_timer.get(), &QTimer::timeout, [&]{ checkTarget(); });
+    m_timer->start(200);
+
+    set();
+  }
+
+  ~UILockerInterface()
+  {
+  }
+
+  void checkTarget()
+  {
+    if (set()) {
+      update(m_reason);
+    }
+  }
+
+  bool set()
+  {
+    QWidget* newTarget = nullptr;
+
+    newTarget = m_mainUI;
+    if (auto* w = QApplication::activeModalWidget()) {
+      newTarget = w;
+    }
+
+    if (newTarget == m_target) {
+      return false;
+    }
+
+    m_target = newTarget;
+
+    QFrame* center = nullptr;
+
+    if (m_target) {
+      center = createOverlay(m_target);
+    } else {
+      center = createDialog();
+    }
+
+    createMessageLabel();
+    createInfoLabel();
+    createButtonsPanel();
+
+    center->layout()->addWidget(m_message);
+    center->layout()->addWidget(m_info);
+    center->layout()->addWidget(m_buttons);
+
+    m_topLevel->setFocusPolicy(Qt::TabFocus);
+    m_topLevel->setFocus();
+    m_topLevel->show();
+    m_topLevel->setEnabled(true);
+
+    m_topLevel->raise();
+    m_topLevel->activateWindow();
+
+    return true;
+  }
+
+  void update(UILocker::Reasons reason)
+  {
+    m_reason = reason;
+    updateMessage(reason);
+    updateButtons(reason);
+    setInfo(m_labels);
+  }
+
+  void setInfo(const QStringList& labels)
+  {
+    const int MaxLabels = 2;
+
+    m_labels = labels;
+
+    QString s;
+
+    if (labels.size() > MaxLabels) {
+      s = labels.mid(0, MaxLabels).join(", ") + "...";
+    } else {
+      s = labels.join(", ");
+    }
+
+    m_info->setText(s);
+  }
+
+  QWidget* topLevel()
+  {
+    return m_topLevel.get();
+  }
+
+private:
+  class Filter : public QObject
+  {
+  public:
+    std::function<void ()> resized;
+    std::function<void ()> closed;
+
+  protected:
+    bool eventFilter(QObject* o, QEvent* e) override
+    {
+      if (e->type() == QEvent::Resize) {
+        if (resized) {
+          resized();
+        }
+      } else if (e->type() == QEvent::Close) {
+        if (closed) {
+          closed();
+        }
+      }
+
+      return QObject::eventFilter(o, e);
+    }
+  };
+
+
+  std::unique_ptr<QTimer> m_timer;
+  QWidget* m_mainUI;
+  QWidget* m_target;
+  std::unique_ptr<QWidget> m_topLevel;
+  QLabel* m_message;
+  QLabel* m_info;
+  QStringList m_labels;
+  QWidget* m_buttons;
+  std::unique_ptr<Filter> m_filter;
+  UILocker::Reasons m_reason;
+
+
+  bool hasMainUI() const
+  {
+    return (m_target != nullptr);
+  }
+
+  QWidget* createTransparentWidget(QWidget* parent=nullptr)
+  {
+    auto* w = new QWidget(parent);
+
+    w->setWindowOpacity(0);
+    w->setAttribute(Qt::WA_NoSystemBackground);
+    w->setAttribute(Qt::WA_TranslucentBackground);
+
+    return w;
+  }
+
+  QFrame* createOverlay(QWidget* mainUI)
+  {
+    m_topLevel.reset(createTransparentWidget(mainUI));
+    m_topLevel->setWindowFlags(m_topLevel->windowFlags() & Qt::FramelessWindowHint);
+    m_topLevel->setGeometry(mainUI->rect());
+
+    m_filter.reset(new Filter);
+    m_filter->resized = [=]{ m_topLevel->setGeometry(mainUI->rect()); };
+    m_filter->closed = [=]{ checkTarget(); };
+
+    mainUI->installEventFilter(m_filter.get());
+
+    return createFrame();
+  }
+
+  QFrame* createDialog()
+  {
+    m_topLevel.reset(new QDialog);
+
+    return createFrame();
+  }
+
+  QFrame* createFrame()
+  {
+    auto* frame = new QFrame;
+    auto* ly = new QVBoxLayout(frame);
+
+    if (hasMainUI()) {
+      frame->setFrameStyle(QFrame::StyledPanel);
+      frame->setLineWidth(1);
+      frame->setAutoFillBackground(true);
+
+      auto* shadow = new QGraphicsDropShadowEffect;
+      shadow->setBlurRadius(50);
+      shadow->setOffset(0);
+      shadow->setColor(QColor(0, 0, 0, 100));
+      frame->setGraphicsEffect(shadow);
+    } else {
+      ly->setContentsMargins(0, 0, 0, 0);
+    }
+
+    auto* grid = new QGridLayout(m_topLevel.get());
+    grid->addWidget(createTransparentWidget(), 0, 1);
+    grid->addWidget(createTransparentWidget(), 2, 1);
+    grid->addWidget(createTransparentWidget(), 1, 0);
+    grid->addWidget(createTransparentWidget(), 1, 2);
+    grid->addWidget(frame, 1, 1);
+
+    if (!hasMainUI()) {
+      grid->setContentsMargins(0, 0, 0, 0);
+    }
+
+    grid->setRowStretch(0, 1);
+    grid->setRowStretch(2, 1);
+    grid->setColumnStretch(0, 1);
+    grid->setColumnStretch(2, 1);
+
+    return frame;
+  }
+
+  void createMessageLabel()
+  {
+    m_message = new QLabel;
+    m_message->setAlignment(Qt::AlignCenter | Qt::AlignHCenter);
+  }
+
+  void createInfoLabel()
+  {
+    m_info = new QLabel(" ");
+    m_info->setAlignment(Qt::AlignCenter | Qt::AlignHCenter);
+  }
+
+  void createButtonsPanel()
+  {
+    m_buttons = new QWidget;
+    m_buttons->setLayout(new QHBoxLayout);
+  }
+
+
+  void updateMessage(UILocker::Reasons reason)
+  {
+    switch (reason)
+    {
+      case UILocker::LockUI:
+      {
+        QString s;
+
+        if (hasMainUI()) {
+          s = QObject::tr(
+            "Mod Organizer is locked while the application is running.");
+        } else {
+          s = QObject::tr("Mod Organizer is currently running an application.");
+        }
+
+        m_message->setText(s);
+
+        break;
+      }
+
+      case UILocker::OutputRequired:
+      {
+        m_message->setText(QObject::tr(
+          "The application must run to completion because its output is "
+          "required."));
+
+        break;
+      }
+
+      case UILocker::PreventExit:
+      {
+        m_message->setText(QObject::tr(
+          "Mod Organizer is waiting on application to close before exiting."));
+
+        break;
+      }
+    }
+  }
+
+  void updateButtons(UILocker::Reasons reason)
+  {
+    MOBase::deleteChildWidgets(m_buttons);
+    auto* ly = m_buttons->layout();
+
+    switch (reason)
+    {
+      case UILocker::LockUI: // fall-through
+      case UILocker::OutputRequired:
+      {
+        auto* unlock = new QPushButton(QObject::tr("Unlock"));
+
+        QObject::connect(unlock, &QPushButton::clicked, [&]{
+          UILocker::instance().onForceUnlock();
+        });
+
+        ly->addWidget(unlock);
+
+        break;
+      }
+
+      case UILocker::PreventExit:
+      {
+        auto* exit = new QPushButton(QObject::tr("Exit Now"));
+        QObject::connect(exit, &QPushButton::clicked, [&]{
+          UILocker::instance().onForceUnlock();
+        });
+
+        ly->addWidget(exit);
+
+        auto* cancel = new QPushButton(QObject::tr("Cancel"));
+        QObject::connect(cancel, &QPushButton::clicked, [&]{
+          UILocker::instance().onCancel();
+        });
+
+        ly->addWidget(cancel);
+
+        break;
+      }
+    }
+  }
+};
+
+UILocker::Session::~Session()
+{
+  unlock();
+}
+
+void UILocker::Session::unlock()
+{
+  QMetaObject::invokeMethod(qApp, [this]{
+    UILocker::instance().unlock(this);
+  });
+}
+
+void UILocker::Session::setInfo(DWORD pid, const QString& name)
+{
+  {
+    std::scoped_lock lock(m_mutex);
+    m_pid = pid;
+    m_name = name;
+  }
+
+  QMetaObject::invokeMethod(qApp, [this]{
+    UILocker::instance().updateLabel();
+  });
+}
+
+DWORD UILocker::Session::pid() const
+{
+  std::scoped_lock lock(m_mutex);
+  return m_pid;
+}
+
+const QString& UILocker::Session::name() const
+{
+  std::scoped_lock lock(m_mutex);
+  return m_name;
+}
+
+UILocker::Results UILocker::Session::result() const
+{
+  return UILocker::instance().result();
+}
+
+
+static UILocker* g_instance = nullptr;
+
+
+UILocker::UILocker()
+  : m_parent(nullptr), m_result(NoResult)
+{
+  Q_ASSERT(!g_instance);
+  g_instance = this;
+}
+
+UILocker::~UILocker()
+{
+  const auto v = m_sessions;
+
+  for (auto& wp : v) {
+    if (auto s=wp.lock()) {
+      unlock(s.get());
+    }
+  }
+}
+
+UILocker& UILocker::instance()
+{
+  Q_ASSERT(g_instance);
+  return *g_instance;
+}
+
+void UILocker::setUserInterface(QWidget* parent)
+{
+  m_parent = parent;
+}
+
+std::shared_ptr<UILocker::Session> UILocker::lock(Reasons reason)
+{
+  m_result = StillLocked;
+  createUi(reason);
+
+  auto ls = std::make_shared<Session>();
+  m_sessions.push_back(ls);
+
+  updateLabel();
+
+  return ls;
+}
+
+void UILocker::unlock(Session* s)
+{
+  auto itor = m_sessions.begin();
+  for (;;) {
+    if (itor == m_sessions.end()) {
+      break;
+    }
+
+    if (auto ss=itor->lock()) {
+      if (ss.get() == s) {
+        itor = m_sessions.erase(itor);
+        continue;
+      }
+    } else {
+      itor = m_sessions.erase(itor);
+      continue;
+    }
+
+    ++itor;
+  }
+
+  if (m_sessions.empty()) {
+    m_ui.reset();
+    enableAll();
+  } else {
+    updateLabel();
+  }
+}
+
+void UILocker::unlockCurrent()
+{
+  if (m_sessions.empty()) {
+    return;
+  }
+
+  auto s = m_sessions.back().lock();
+  if (!s) {
+    m_sessions.pop_back();
+    return;
+  }
+
+  unlock(s.get());
+}
+
+void UILocker::updateLabel()
+{
+  QStringList labels;
+
+  for (auto itor=m_sessions.rbegin(); itor!=m_sessions.rend(); ++itor) {
+    if (auto ss=itor->lock()) {
+      labels.push_back(QString("%1 (%2)").arg(ss->name()).arg(ss->pid()));
+    }
+  }
+
+  m_ui->setInfo(labels);
+}
+
+UILocker::Results UILocker::result() const
+{
+  return m_result;
+}
+
+void UILocker::createUi(Reasons reason)
+{
+  if (!m_ui) {
+    m_ui.reset(new UILockerInterface(m_parent));
+  }
+
+  m_ui->update(reason);
+
+  disableAll();
+}
+
+void UILocker::onForceUnlock()
+{
+  m_result = ForceUnlocked;
+  unlockCurrent();
+}
+
+void UILocker::onCancel()
+{
+  m_result = Cancelled;
+  unlockCurrent();
+}
+
+template <class T>
+QList<T> findChildrenImmediate(QWidget* parent)
+{
+  return parent->findChildren<T>(QString(), Qt::FindDirectChildrenOnly);
+}
+
+void UILocker::disableAll()
+{
+  const auto topLevels = QApplication::topLevelWidgets();
+
+  for (auto* w : topLevels) {
+    if (auto* mw=dynamic_cast<QMainWindow*>(w)) {
+      disable(mw->centralWidget());
+      disable(mw->menuBar());
+      disable(mw->statusBar());
+
+      for (auto* tb : findChildrenImmediate<QToolBar*>(w)) {
+        disable(tb);
+      }
+
+      for (auto* d : findChildrenImmediate<QDockWidget*>(w)) {
+        disable(d);
+      }
+    }
+
+    if (auto* d=dynamic_cast<QDialog*>(w)) {
+      // don't disable stuff if this dialog is the overlay, which happens when
+      // there's no ui
+      if (d != m_ui->topLevel()) {
+        // no central widget, just disable the children, except for the overlay
+        for (auto* child : findChildrenImmediate<QWidget*>(d)) {
+          if (child != m_ui->topLevel()) {
+            disable(child);
+          }
+        }
+      }
+    }
+  }
+}
+
+void UILocker::enableAll()
+{
+  for (auto w : m_disabled) {
+    if (w) {
+      w->setEnabled(true);
+    }
+  }
+
+  m_disabled.clear();
+}
+
+void UILocker::disable(QWidget* w)
+{
+  if (w->isEnabled()) {
+    w->setEnabled(false);
+    m_disabled.push_back(w);
+  }
+}
diff --git a/src/uilocker.h b/src/uilocker.h
new file mode 100644
index 00000000..d8c22999
--- /dev/null
+++ b/src/uilocker.h
@@ -0,0 +1,95 @@
+#pragma once
+
+#include <QMainWindow>
+#include <mutex>
+
+class UILockerInterface;
+
+class UILocker
+{
+  friend class UILockerInterface;
+
+public:
+  // reason to show the widget
+  //
+  enum Reasons
+  {
+    NoReason = 0,
+
+    // lock the ui
+    LockUI,
+
+    // because the output is required
+    OutputRequired,
+
+    // to prevent exiting until all processes are completed
+    PreventExit
+  };
+
+  // returned by result()
+  //
+  enum Results
+  {
+    NoResult = 0,
+
+    // the widget is still up
+    StillLocked,
+
+    // force unlock was clicked
+    ForceUnlocked,
+
+    // cancel was clicked
+    Cancelled
+  };
+
+
+  class Session
+  {
+  public:
+    ~Session();
+
+    void unlock();
+    void setInfo(DWORD pid, const QString& name);
+    Results result() const;
+
+    DWORD pid() const;
+    const QString& name() const;
+
+  private:
+    mutable std::mutex m_mutex;
+    DWORD m_pid;
+    QString m_name;
+  };
+
+
+  UILocker();
+  ~UILocker();
+
+  static UILocker& instance();
+
+  void setUserInterface(QWidget* parent);
+
+  std::shared_ptr<Session> lock(Reasons reason);
+
+  Results result() const;
+
+private:
+  QWidget* m_parent;
+  std::unique_ptr<UILockerInterface> m_ui;
+  std::vector<std::weak_ptr<Session>> m_sessions;
+  std::atomic<Results> m_result;
+  std::vector<QPointer<QWidget>> m_disabled;
+
+  void createUi(Reasons reason);
+
+  void unlockCurrent();
+  void unlock(Session* s);
+  void updateLabel();
+
+  void onForceUnlock();
+  void onCancel();
+
+  void disableAll();
+  void enableAll();
+  void disable(QWidget* w);
+};
-- 
cgit v1.3.1


From 838446e262ac628c748b2e2b2f2ec0cfaff01508 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 16 Nov 2019 19:41:17 -0500
Subject: split loot stuff to loot.h/cpp, no changes in functionality

---
 src/CMakeLists.txt |   3 +
 src/loot.cpp       | 244 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/loot.h         |  10 +++
 src/mainwindow.cpp | 227 +------------------------------------------------
 src/mainwindow.h   |   4 -
 5 files changed, 261 insertions(+), 227 deletions(-)
 create mode 100644 src/loot.cpp
 create mode 100644 src/loot.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d935981d..70c501ae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -142,6 +142,7 @@ SET(organizer_SRCS
 	sanitychecks.cpp
 	processrunner.cpp
 	uilocker.cpp
+	loot.cpp
 
     shared/windows_error.cpp
     shared/error_report.cpp
@@ -263,6 +264,7 @@ SET(organizer_HDRS
 	colortable.h
 	processrunner.h
 	uilocker.h
+	loot.h
 
     shared/windows_error.h
     shared/error_report.h
@@ -465,6 +467,7 @@ set(utilities
 	shared/util
 	usvfsconnector
 	shared/windows_error
+	loot
 )
 
 set(widgets
diff --git a/src/loot.cpp b/src/loot.cpp
new file mode 100644
index 00000000..b19c59ed
--- /dev/null
+++ b/src/loot.cpp
@@ -0,0 +1,244 @@
+#include "spawn.h"
+#include "organizercore.h"
+#include <log.h>
+#include <report.h>
+
+using namespace MOBase;
+
+void createStdoutPipe(HANDLE *stdOutRead, HANDLE *stdOutWrite)
+{
+  SECURITY_ATTRIBUTES secAttributes;
+  secAttributes.nLength = sizeof(SECURITY_ATTRIBUTES);
+  secAttributes.bInheritHandle = TRUE;
+  secAttributes.lpSecurityDescriptor = nullptr;
+
+  if (!::CreatePipe(stdOutRead, stdOutWrite, &secAttributes, 0)) {
+    log::error("failed to create stdout reroute");
+  }
+
+  if (!::SetHandleInformation(*stdOutRead, HANDLE_FLAG_INHERIT, 0)) {
+    log::error("failed to correctly set up the stdout reroute");
+    *stdOutWrite = *stdOutRead = INVALID_HANDLE_VALUE;
+  }
+}
+
+std::string readFromPipe(HANDLE stdOutRead)
+{
+  static const int chunkSize = 128;
+  std::string result;
+
+  char buffer[chunkSize + 1];
+  buffer[chunkSize] = '\0';
+
+  DWORD read = 1;
+  while (read > 0) {
+    if (!::ReadFile(stdOutRead, buffer, chunkSize, &read, nullptr)) {
+      break;
+    }
+    if (read > 0) {
+      result.append(buffer, read);
+      if (read < chunkSize) {
+        break;
+      }
+    }
+  }
+  return result;
+}
+
+void processLOOTOut(
+  OrganizerCore& core,
+  const std::string &lootOut, std::string &errorMessages,
+  QProgressDialog &dialog)
+{
+  std::vector<std::string> lines;
+  boost::split(lines, lootOut, boost::is_any_of("\r\n"));
+
+  std::regex exRequires("\"([^\"]*)\" requires \"([^\"]*)\", but it is missing\\.");
+  std::regex exIncompatible("\"([^\"]*)\" is incompatible with \"([^\"]*)\", but both are present\\.");
+
+  for (const std::string &line : lines) {
+    if (line.length() > 0) {
+      size_t progidx    = line.find("[progress]");
+      size_t erroridx   = line.find("[error]");
+      if (progidx != std::string::npos) {
+        dialog.setLabelText(line.substr(progidx + 11).c_str());
+      } else if (erroridx != std::string::npos) {
+        log::warn("{}", line);
+        errorMessages.append(boost::algorithm::trim_copy(line.substr(erroridx + 8)) + "\n");
+      } else {
+        std::smatch match;
+        if (std::regex_match(line, match, exRequires)) {
+          std::string modName(match[1].first, match[1].second);
+          std::string dependency(match[2].first, match[2].second);
+          core.pluginList()->addInformation(modName.c_str(), QObject::tr("depends on missing \"%1\"").arg(dependency.c_str()));
+        } else if (std::regex_match(line, match, exIncompatible)) {
+          std::string modName(match[1].first, match[1].second);
+          std::string dependency(match[2].first, match[2].second);
+          core.pluginList()->addInformation(modName.c_str(), QObject::tr("incompatible with \"%1\"").arg(dependency.c_str()));
+        } else {
+          log::debug("[loot] {}", line);
+        }
+      }
+    }
+  }
+}
+
+bool runLoot(QWidget* parent, OrganizerCore& core, bool didUpdateMasterList)
+{
+  std::string errorMessages;
+
+  //m_OrganizerCore.currentProfile()->writeModlistNow();
+  core.savePluginList();
+
+  //Create a backup of the load orders w/ LOOT in name
+  //to make sure that any sorting is easily undo-able.
+  //Need to figure out how I want to do that.
+
+  bool success = false;
+
+  try {
+    QProgressDialog dialog(parent);
+
+    dialog.setLabelText(QObject::tr("Please wait while LOOT is running"));
+    dialog.setMaximum(0);
+    dialog.show();
+
+    QString outPath = QDir::temp().absoluteFilePath("lootreport.json");
+
+    QStringList parameters;
+    parameters
+      << "--game" << core.managedGame()->gameShortName()
+      << "--gamePath" << QString("\"%1\"").arg(core.managedGame()->gameDirectory().absolutePath())
+      << "--pluginListPath" << QString("\"%1/loadorder.txt\"").arg(core.profilePath())
+      << "--out" << QString("\"%1\"").arg(outPath);
+
+    if (didUpdateMasterList) {
+      parameters << "--skipUpdateMasterlist";
+    }
+
+    HANDLE stdOutWrite = INVALID_HANDLE_VALUE;
+    HANDLE stdOutRead = INVALID_HANDLE_VALUE;
+    createStdoutPipe(&stdOutRead, &stdOutWrite);
+
+    try {
+      core.prepareVFS();
+    } catch (const UsvfsConnectorException &e) {
+      log::debug("{}", e.what());
+      return false;
+    } catch (const std::exception &e) {
+      QMessageBox::warning(parent, QObject::tr("Error"), e.what());
+      return false;
+    }
+
+    spawn::SpawnParameters sp;
+    sp.binary = QFileInfo(qApp->applicationDirPath() + "/loot/lootcli.exe");
+    sp.arguments = parameters.join(" ");
+    sp.currentDirectory.setPath(qApp->applicationDirPath() + "/loot");
+    sp.hooked = true;
+    sp.stdOut = stdOutWrite;
+
+    HANDLE loot = spawn::startBinary(parent, sp);
+
+    // we don't use the write end
+    ::CloseHandle(stdOutWrite);
+
+    core.pluginList()->clearAdditionalInformation();
+
+    DWORD retLen;
+    JOBOBJECT_BASIC_PROCESS_ID_LIST info;
+    HANDLE processHandle = loot;
+
+    if (loot != INVALID_HANDLE_VALUE) {
+      bool isJobHandle = true;
+      ULONG lastProcessID;
+      DWORD res = ::MsgWaitForMultipleObjects(1, &loot, false, 100, QS_KEY | QS_MOUSE);
+      while ((res != WAIT_FAILED) && (res != WAIT_OBJECT_0)) {
+        if (isJobHandle) {
+          if (::QueryInformationJobObject(loot, JobObjectBasicProcessIdList, &info, sizeof(info), &retLen) > 0) {
+            if (info.NumberOfProcessIdsInList == 0) {
+              log::debug("no more processes in job");
+              break;
+            } else {
+              if (lastProcessID != info.ProcessIdList[0]) {
+                lastProcessID = info.ProcessIdList[0];
+                if (processHandle != loot) {
+                  ::CloseHandle(processHandle);
+                }
+                processHandle = ::OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, lastProcessID);
+              }
+            }
+          } else {
+            // the info-object I passed only provides space for 1 process id. but since this code only cares about whether there
+            // is more than one that's good enough. ERROR_MORE_DATA simply signals there are at least two processes running.
+            // any other error probably means the handle is a regular process handle, probably caused by running MO in a job without
+            // the right to break out.
+            if (::GetLastError() != ERROR_MORE_DATA) {
+              isJobHandle = false;
+            }
+          }
+        }
+
+        if (dialog.wasCanceled()) {
+          if (isJobHandle) {
+            ::TerminateJobObject(loot, 1);
+          } else {
+            ::TerminateProcess(loot, 1);
+          }
+        }
+
+        // keep processing events so the app doesn't appear dead
+        QCoreApplication::processEvents();
+        std::string lootOut = readFromPipe(stdOutRead);
+        processLOOTOut(core, lootOut, errorMessages, dialog);
+
+        res = ::MsgWaitForMultipleObjects(1, &loot, false, 100, QS_KEY | QS_MOUSE);
+      }
+
+      std::string remainder = readFromPipe(stdOutRead).c_str();
+      if (remainder.length() > 0) {
+        processLOOTOut(core, remainder, errorMessages, dialog);
+      }
+
+      DWORD exitCode = 0UL;
+      ::GetExitCodeProcess(processHandle, &exitCode);
+      ::CloseHandle(processHandle);
+      if (exitCode != 0UL) {
+        reportError(QObject::tr("loot failed. Exit code was: %1").arg(exitCode));
+        return false;
+      } else {
+        success = true;
+        QFile outFile(outPath);
+        outFile.open(QIODevice::ReadOnly);
+        QJsonDocument doc = QJsonDocument::fromJson(outFile.readAll());
+        QJsonArray array = doc.array();
+        for (auto iter = array.begin();  iter != array.end(); ++iter) {
+          QJsonObject pluginObj = (*iter).toObject();
+          QJsonArray pluginMessages = pluginObj["messages"].toArray();
+          for (auto msgIter = pluginMessages.begin(); msgIter != pluginMessages.end(); ++msgIter) {
+            QJsonObject msg = (*msgIter).toObject();
+            core.pluginList()->addInformation(pluginObj["name"].toString(),
+              QString("%1: %2").arg(msg["type"].toString(), msg["message"].toString()));
+          }
+          if (pluginObj["dirty"].toString() == "yes")
+            core.pluginList()->addInformation(pluginObj["name"].toString(), "dirty");
+        }
+
+      }
+    } else {
+      reportError(QObject::tr("failed to start loot"));
+    }
+  } catch (const std::exception &e) {
+    reportError(QObject::tr("failed to run loot: %1").arg(e.what()));
+  }
+
+  if (errorMessages.length() > 0) {
+    QMessageBox *warn = new QMessageBox(
+      QMessageBox::Warning, QObject::tr("Errors occurred"),
+      errorMessages.c_str(), QMessageBox::Ok, parent);
+
+    warn->setModal(false);
+    warn->show();
+  }
+
+  return success;
+}
diff --git a/src/loot.h b/src/loot.h
new file mode 100644
index 00000000..2314e5b3
--- /dev/null
+++ b/src/loot.h
@@ -0,0 +1,10 @@
+#ifndef MODORGANIZER_LOOT_H
+#define MODORGANIZER_LOOT_H
+
+#include <QWidget>
+
+class OrganizerCore;
+
+bool runLoot(QWidget* parent, OrganizerCore& core, bool didUpdateMasterList);
+
+#endif // MODORGANIZER_LOOT_H
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9453f07c..11edfc81 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -39,7 +39,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "spawn.h"
 #include "versioninfo.h"
 #include "instancemanager.h"
-
+#include "loot.h"
 #include "report.h"
 #include "modlist.h"
 #include "modlistsortproxy.h"
@@ -6369,233 +6369,14 @@ void MainWindow::on_showHiddenBox_toggled(bool checked)
   m_OrganizerCore.downloadManager()->setShowHidden(checked);
 }
 
-
-void MainWindow::createStdoutPipe(HANDLE *stdOutRead, HANDLE *stdOutWrite)
-{
-  SECURITY_ATTRIBUTES secAttributes;
-  secAttributes.nLength = sizeof(SECURITY_ATTRIBUTES);
-  secAttributes.bInheritHandle = TRUE;
-  secAttributes.lpSecurityDescriptor = nullptr;
-
-  if (!::CreatePipe(stdOutRead, stdOutWrite, &secAttributes, 0)) {
-    log::error("failed to create stdout reroute");
-  }
-
-  if (!::SetHandleInformation(*stdOutRead, HANDLE_FLAG_INHERIT, 0)) {
-    log::error("failed to correctly set up the stdout reroute");
-    *stdOutWrite = *stdOutRead = INVALID_HANDLE_VALUE;
-  }
-}
-
-std::string MainWindow::readFromPipe(HANDLE stdOutRead)
-{
-  static const int chunkSize = 128;
-  std::string result;
-
-  char buffer[chunkSize + 1];
-  buffer[chunkSize] = '\0';
-
-  DWORD read = 1;
-  while (read > 0) {
-    if (!::ReadFile(stdOutRead, buffer, chunkSize, &read, nullptr)) {
-      break;
-    }
-    if (read > 0) {
-      result.append(buffer, read);
-      if (read < chunkSize) {
-        break;
-      }
-    }
-  }
-  return result;
-}
-
-void MainWindow::processLOOTOut(const std::string &lootOut, std::string &errorMessages, QProgressDialog &dialog)
-{
-  std::vector<std::string> lines;
-  boost::split(lines, lootOut, boost::is_any_of("\r\n"));
-
-  std::regex exRequires("\"([^\"]*)\" requires \"([^\"]*)\", but it is missing\\.");
-  std::regex exIncompatible("\"([^\"]*)\" is incompatible with \"([^\"]*)\", but both are present\\.");
-
-  for (const std::string &line : lines) {
-    if (line.length() > 0) {
-      size_t progidx    = line.find("[progress]");
-      size_t erroridx   = line.find("[error]");
-      if (progidx != std::string::npos) {
-        dialog.setLabelText(line.substr(progidx + 11).c_str());
-      } else if (erroridx != std::string::npos) {
-        log::warn("{}", line);
-        errorMessages.append(boost::algorithm::trim_copy(line.substr(erroridx + 8)) + "\n");
-      } else {
-        std::smatch match;
-        if (std::regex_match(line, match, exRequires)) {
-          std::string modName(match[1].first, match[1].second);
-          std::string dependency(match[2].first, match[2].second);
-          m_OrganizerCore.pluginList()->addInformation(modName.c_str(), tr("depends on missing \"%1\"").arg(dependency.c_str()));
-        } else if (std::regex_match(line, match, exIncompatible)) {
-          std::string modName(match[1].first, match[1].second);
-          std::string dependency(match[2].first, match[2].second);
-          m_OrganizerCore.pluginList()->addInformation(modName.c_str(), tr("incompatible with \"%1\"").arg(dependency.c_str()));
-        } else {
-          log::debug("[loot] {}", line);
-        }
-      }
-    }
-  }
-}
-
 void MainWindow::on_bossButton_clicked()
 {
-  std::string errorMessages;
-
-  //m_OrganizerCore.currentProfile()->writeModlistNow();
   m_OrganizerCore.savePluginList();
-  //Create a backup of the load orders w/ LOOT in name
-  //to make sure that any sorting is easily undo-able.
-  //Need to figure out how I want to do that.
 
-  bool success = false;
-
-  try {
-    setEnabled(false);
-    ON_BLOCK_EXIT([&] () { setEnabled(true); });
-    QProgressDialog dialog(this);
-    dialog.setLabelText(tr("Please wait while LOOT is running"));
-    dialog.setMaximum(0);
-    dialog.show();
-
-    QString outPath = QDir::temp().absoluteFilePath("lootreport.json");
-
-    QStringList parameters;
-    parameters << "--game" << m_OrganizerCore.managedGame()->gameShortName()
-        << "--gamePath" << QString("\"%1\"").arg(m_OrganizerCore.managedGame()->gameDirectory().absolutePath())
-        << "--pluginListPath" << QString("\"%1/loadorder.txt\"").arg(m_OrganizerCore.profilePath())
-        << "--out" << QString("\"%1\"").arg(outPath);
-
-    if (m_DidUpdateMasterList) {
-      parameters << "--skipUpdateMasterlist";
-    }
-    HANDLE stdOutWrite = INVALID_HANDLE_VALUE;
-    HANDLE stdOutRead = INVALID_HANDLE_VALUE;
-    createStdoutPipe(&stdOutRead, &stdOutWrite);
-    try {
-      m_OrganizerCore.prepareVFS();
-    } catch (const UsvfsConnectorException &e) {
-      log::debug("{}", e.what());
-      return;
-    } catch (const std::exception &e) {
-      QMessageBox::warning(qApp->activeWindow(), tr("Error"), e.what());
-      return;
-    }
-
-    spawn::SpawnParameters sp;
-    sp.binary = QFileInfo(qApp->applicationDirPath() + "/loot/lootcli.exe");
-    sp.arguments = parameters.join(" ");
-    sp.currentDirectory.setPath(qApp->applicationDirPath() + "/loot");
-    sp.hooked = true;
-    sp.stdOut = stdOutWrite;
-
-    HANDLE loot = spawn::startBinary(this, sp);
-
-    // we don't use the write end
-    ::CloseHandle(stdOutWrite);
-
-    m_OrganizerCore.pluginList()->clearAdditionalInformation();
-
-    DWORD retLen;
-    JOBOBJECT_BASIC_PROCESS_ID_LIST info;
-    HANDLE processHandle = loot;
-
-    if (loot != INVALID_HANDLE_VALUE) {
-      bool isJobHandle = true;
-      ULONG lastProcessID;
-      DWORD res = ::MsgWaitForMultipleObjects(1, &loot, false, 100, QS_KEY | QS_MOUSE);
-      while ((res != WAIT_FAILED) && (res != WAIT_OBJECT_0)) {
-        if (isJobHandle) {
-          if (::QueryInformationJobObject(loot, JobObjectBasicProcessIdList, &info, sizeof(info), &retLen) > 0) {
-            if (info.NumberOfProcessIdsInList == 0) {
-              log::debug("no more processes in job");
-              break;
-            } else {
-              if (lastProcessID != info.ProcessIdList[0]) {
-                lastProcessID = info.ProcessIdList[0];
-                if (processHandle != loot) {
-                  ::CloseHandle(processHandle);
-                }
-                processHandle = ::OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, lastProcessID);
-              }
-            }
-          } else {
-            // the info-object I passed only provides space for 1 process id. but since this code only cares about whether there
-            // is more than one that's good enough. ERROR_MORE_DATA simply signals there are at least two processes running.
-            // any other error probably means the handle is a regular process handle, probably caused by running MO in a job without
-            // the right to break out.
-            if (::GetLastError() != ERROR_MORE_DATA) {
-              isJobHandle = false;
-            }
-          }
-        }
-
-        if (dialog.wasCanceled()) {
-          if (isJobHandle) {
-            ::TerminateJobObject(loot, 1);
-          } else {
-            ::TerminateProcess(loot, 1);
-          }
-        }
-
-        // keep processing events so the app doesn't appear dead
-        QCoreApplication::processEvents();
-        std::string lootOut = readFromPipe(stdOutRead);
-        processLOOTOut(lootOut, errorMessages, dialog);
-
-        res = ::MsgWaitForMultipleObjects(1, &loot, false, 100, QS_KEY | QS_MOUSE);
-      }
-
-      std::string remainder = readFromPipe(stdOutRead).c_str();
-      if (remainder.length() > 0) {
-        processLOOTOut(remainder, errorMessages, dialog);
-      }
-      DWORD exitCode = 0UL;
-      ::GetExitCodeProcess(processHandle, &exitCode);
-      ::CloseHandle(processHandle);
-      if (exitCode != 0UL) {
-        reportError(tr("loot failed. Exit code was: %1").arg(exitCode));
-        return;
-      } else {
-        success = true;
-        QFile outFile(outPath);
-        outFile.open(QIODevice::ReadOnly);
-        QJsonDocument doc = QJsonDocument::fromJson(outFile.readAll());
-        QJsonArray array = doc.array();
-        for (auto iter = array.begin();  iter != array.end(); ++iter) {
-          QJsonObject pluginObj = (*iter).toObject();
-          QJsonArray pluginMessages = pluginObj["messages"].toArray();
-          for (auto msgIter = pluginMessages.begin(); msgIter != pluginMessages.end(); ++msgIter) {
-            QJsonObject msg = (*msgIter).toObject();
-            m_OrganizerCore.pluginList()->addInformation(pluginObj["name"].toString(),
-                QString("%1: %2").arg(msg["type"].toString(), msg["message"].toString()));
-          }
-          if (pluginObj["dirty"].toString() == "yes")
-            m_OrganizerCore.pluginList()->addInformation(pluginObj["name"].toString(), "dirty");
-        }
-
-      }
-    } else {
-      reportError(tr("failed to start loot"));
-    }
-  } catch (const std::exception &e) {
-    reportError(tr("failed to run loot: %1").arg(e.what()));
-  }
-
-  if (errorMessages.length() > 0) {
-    QMessageBox *warn = new QMessageBox(QMessageBox::Warning, tr("Errors occurred"), errorMessages.c_str(), QMessageBox::Ok, this);
-    warn->setModal(false);
-    warn->show();
-  }
+  setEnabled(false);
+  ON_BLOCK_EXIT([&] () { setEnabled(true); });
 
-  if (success) {
+  if (runLoot(this, m_OrganizerCore, m_DidUpdateMasterList)) {
     m_DidUpdateMasterList = true;
     m_OrganizerCore.refreshESPList(false);
     m_OrganizerCore.savePluginList();
diff --git a/src/mainwindow.h b/src/mainwindow.h
index c80287b2..7c2ee1eb 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -136,10 +136,6 @@ public:
 
   void addPrimaryCategoryCandidates(QMenu *primaryCategoryMenu, ModInfo::Ptr info);
 
-  void createStdoutPipe(HANDLE *stdOutRead, HANDLE *stdOutWrite);
-  std::string readFromPipe(HANDLE stdOutRead);
-  void processLOOTOut(const std::string &lootOut, std::string &errorMessages, QProgressDialog &dialog);
-
   void updateModInDirectoryStructure(unsigned int index, ModInfo::Ptr modInfo);
 
   QString getOriginDisplayName(int originID);
-- 
cgit v1.3.1


From 2b5747c19d942974295be18042fbdde8ddc4cc78 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 18 Nov 2019 17:04:01 -0500
Subject: handles changes in lootcli for a more formal communication protocol

---
 src/CMakeLists.txt |   2 +
 src/loot.cpp       | 129 +++++++++++++++++++++++++++++++++++++----------------
 src/loot.h         |  12 +++--
 3 files changed, 101 insertions(+), 42 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 70c501ae..824ffa33 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -569,11 +569,13 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src
                     ${project_path}/bsatk/src
                     ${project_path}/esptk/src
                     ${project_path}/archive/src
+					${project_path}/lootcli/include
                     ${dependency_project_path}/usvfs/include
                     ${project_path}/game_gamebryo/src/gamebryo
                     ${project_path}/game_gamebryo/src/creation
                     ${project_path}/game_features/src
                     ${project_path}/githubpp/src
+					${SPDLOG_ROOT}/include
                     ${LZ4_ROOT}/lib)
 
 INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS})
diff --git a/src/loot.cpp b/src/loot.cpp
index 1fc0e438..7184cce8 100644
--- a/src/loot.cpp
+++ b/src/loot.cpp
@@ -22,19 +22,15 @@ public:
 
     QObject::connect(
       &m_loot, &Loot::progress,
-      this, [&](auto&& s){ setText(s); }, Qt::QueuedConnection);
+      this, [&](auto&& p){ setProgress(p); }, Qt::QueuedConnection);
 
     QObject::connect(
-      &m_loot, &Loot::information, this,
-      [&](auto&& mod, auto&& i){ setInfo(mod, i); }, Qt::QueuedConnection);
-
-    QObject::connect(
-      &m_loot, &Loot::errorMessage, this,
-      [&](auto&& s){ onErrorMessage(s); }, Qt::QueuedConnection);
+      &m_loot, &Loot::log, this,
+      [&](auto&& lv, auto&& s){ log(lv, s); }, Qt::QueuedConnection);
 
     QObject::connect(
-      &m_loot, &Loot::error, this,
-      [&](auto&& s){ onError(s); }, Qt::QueuedConnection);
+      &m_loot, &Loot::information, this,
+      [&](auto&& mod, auto&& i){ setInfo(mod, i); }, Qt::QueuedConnection);
 
     QObject::connect(
       &m_loot, &Loot::finished, this,
@@ -46,6 +42,29 @@ public:
     m_label->setText(s);
   }
 
+  void setProgress(lootcli::Progress p)
+  {
+    setText(progressToString(p));
+  }
+
+  QString progressToString(lootcli::Progress p)
+  {
+    using P = lootcli::Progress;
+
+    switch (p)
+    {
+      case P::CheckingMasterlistExistence: return tr("Checking masterlist existence");
+      case P::UpdatingMasterlist: return tr("Updating masterlist");
+      case P::LoadingLists: return tr("Loading lists");
+      case P::ReadingPlugins: return tr("Reading plugins");
+      case P::SortingPlugins: return tr("Sorting plugins");
+      case P::WritingLoadorder: return tr("Writing loadorder.txt");
+      case P::ParsingLootMessages: return tr("Parsing loot messages");
+      case P::Done: return tr("Done");
+      default: return QString("unknown progress %1").arg(static_cast<int>(p));
+    }
+  }
+
   void setIndeterminate()
   {
     m_progress->setMaximum(0);
@@ -153,10 +172,6 @@ private:
 
   void addLineOutput(const QString& line)
   {
-    if (line == m_lastLine) {
-      return;
-    }
-
     m_output->appendPlainText(line);
     m_lastLine = line;
   }
@@ -164,12 +179,19 @@ private:
   void onFinished()
   {
     m_finished = true;
-    close();
   }
 
-  void onErrorMessage(const QString& s)
+  void log(log::Levels lv, const QString& s)
   {
-    m_errorMessages += s;
+    if (lv == log::Levels::Error) {
+      MOBase::log::error("{}", s);
+      
+      if (!m_errorMessages.isEmpty()) {
+        m_errorMessages += "\n";
+      }
+
+      m_errorMessages += s;
+    }
   }
 };
 
@@ -235,7 +257,7 @@ bool Loot::start(QWidget* parent, OrganizerCore& core, bool didUpdateMasterList)
 
   HANDLE lootHandle = spawn::startBinary(parent, sp);
   if (lootHandle == INVALID_HANDLE_VALUE) {
-    emit error(tr("failed to start loot"));
+    emit log(log::Levels::Error, tr("failed to start loot"));
     return false;
   }
 
@@ -275,7 +297,7 @@ void Loot::lootThread()
     m_result = true;
     processOutputFile();
   } catch (const std::exception &e) {
-    emit error(tr("failed to run loot: %1").arg(e.what()));
+    emit log(log::Levels::Error, tr("failed to run loot: %1").arg(e.what()));
   }
 }
 
@@ -316,7 +338,7 @@ bool Loot::waitForCompletion()
   }
 
   if (exitCode != 0UL) {
-    emit error(tr("Loot failed. Exit code was: %1").arg(exitCode));
+    emit log(log::Levels::Error, tr("Loot failed. Exit code was: %1").arg(exitCode));
     return false;
   }
 
@@ -350,40 +372,69 @@ void Loot::processStdout(const std::string &lootOut)
 {
   emit output(QString::fromStdString(lootOut));
 
-  std::vector<std::string> lines;
-  boost::split(lines, lootOut, boost::is_any_of("\r\n"));
-
-  std::regex exRequires("\"([^\"]*)\" requires \"([^\"]*)\", but it is missing\\.");
-  std::regex exIncompatible("\"([^\"]*)\" is incompatible with \"([^\"]*)\", but both are present\\.");
-
-  for (const std::string &line : lines) {
-    if (line.length() > 0) {
-      size_t progidx    = line.find("[progress]");
-      size_t erroridx   = line.find("[error]");
-      if (progidx != std::string::npos) {
-        emit progress(line.substr(progidx + 11).c_str());
-      } else if (erroridx != std::string::npos) {
-        log::warn("{}", line);
-        emit errorMessage(QString::fromStdString(
-          boost::algorithm::trim_copy(line.substr(erroridx + 8)) + "\n"));
-      } else {
+  m_outputBuffer += lootOut;
+  std::size_t start = 0;
+
+  for (;;) {
+    const auto newline = m_outputBuffer.find("\n", start);
+    if (newline == std::string::npos) {
+      break;
+    }
+
+    const std::string_view line(m_outputBuffer.c_str() + start, newline - start);
+    const auto m = lootcli::parseMessage(line);
+
+    if (m.type == lootcli::MessageType::None) {
+      log::error("unrecognised loot output: '{}'", line);
+      continue;
+    }
+
+    processMessage(m);
+
+    start = newline + 1;
+  }
+
+  m_outputBuffer.erase(0, start);
+}
+
+void Loot::processMessage(const lootcli::Message& m)
+{
+  static const std::regex exRequires("\"([^\"]*)\" requires \"([^\"]*)\", but it is missing\\.");
+  static const std::regex exIncompatible("\"([^\"]*)\" is incompatible with \"([^\"]*)\", but both are present\\.");
+
+  switch (m.type)
+  {
+    case lootcli::MessageType::Log:
+    {
+      if (m.logLevel == spdlog::level::err) {
         std::smatch match;
-        if (std::regex_match(line, match, exRequires)) {
+
+        if (std::regex_match(m.log, match, exRequires)) {
           std::string modName(match[1].first, match[1].second);
           std::string dependency(match[2].first, match[2].second);
           emit information(
             QString::fromStdString(modName),
             tr("depends on missing \"%1\"").arg(dependency.c_str()));
-        } else if (std::regex_match(line, match, exIncompatible)) {
+        } else if (std::regex_match(m.log, match, exIncompatible)) {
           std::string modName(match[1].first, match[1].second);
           std::string dependency(match[2].first, match[2].second);
           emit information(
             QString::fromStdString(modName),
             tr("incompatible with \"%1\"").arg(dependency.c_str()));
         } else {
-          log::debug("[loot] {}", line);
+          emit log(log::levelFromSpdlog(m.logLevel), QString::fromStdString(m.log));
         }
+      } else {
+        emit log(log::levelFromSpdlog(m.logLevel), QString::fromStdString(m.log));
       }
+
+      break;
+    }
+
+    case lootcli::MessageType::Progress:
+    {
+      emit progress(m.progress);
+      break;
     }
   }
 }
diff --git a/src/loot.h b/src/loot.h
index 11bb4987..ab959f2e 100644
--- a/src/loot.h
+++ b/src/loot.h
@@ -3,9 +3,13 @@
 
 #include "envmodule.h"
 #include <log.h>
+#include <lootcli/lootcli.h>
 #include <windows.h>
 #include <QWidget>
 
+Q_DECLARE_METATYPE(lootcli::Progress);
+Q_DECLARE_METATYPE(MOBase::log::Levels);
+
 class OrganizerCore;
 
 class Loot : public QObject
@@ -22,10 +26,9 @@ public:
 
 signals:
   void output(const QString& s);
-  void progress(const QString& s);
+  void progress(const lootcli::Progress p);
+  void log(MOBase::log::Levels level, const QString& s);
   void information(const QString& mod, const QString& info);
-  void errorMessage(const QString& s);
-  void error(const QString& s);
   void finished();
 
 private:
@@ -35,12 +38,15 @@ private:
   QString m_outPath;
   env::HandlePtr m_lootProcess;
   env::HandlePtr m_stdout;
+  std::string m_outputBuffer;
 
   std::string readFromPipe();
 
   void lootThread();
   bool waitForCompletion();
+
   void processStdout(const std::string &lootOut);
+  void processMessage(const lootcli::Message& m);
 
   void processOutputFile();
   bool processOutputPlugin(const QJsonValue& pluginValue);
-- 
cgit v1.3.1


From 981c1b773966a30374a90bc21d6ebd9c7bf86040 Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Tue, 19 Nov 2019 14:42:50 -0600
Subject: Move all Qt deployment to main MO project

---
 src/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d935981d..f168ef36 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -653,6 +653,10 @@ INSTALL(
         ${qt5bin}/windeployqt.exe --verbose 0 uibase.dll ${windeploy_parameters}
         WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
     )
+    EXECUTE_PROCESS(COMMAND
+        ${qt5bin}/windeployqt.exe --verbose 0 plugins/bsa_packer.dll ${windeploy_parameters}
+        WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin
+    )
     file(REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/bin/platforms)
     file(REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/bin/styles)
     file(REMOVE_RECURSE ${CMAKE_INSTALL_PREFIX}/bin/dlls/imageformats)
-- 
cgit v1.3.1


From 5c9de17b6376ce94b1cdff4f4edbba798e9bfd08 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 23 Nov 2019 22:08:53 -0500
Subject: rewrite of json report parsing added json.h with some utilities

---
 src/CMakeLists.txt |   2 +
 src/json.h         | 190 ++++++++++++++++++++++++++++++
 src/loot.cpp       | 332 ++++++++++++++++++++++++++++++++---------------------
 src/loot.h         |  32 +++---
 4 files changed, 412 insertions(+), 144 deletions(-)
 create mode 100644 src/json.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 824ffa33..3b74ea37 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -265,6 +265,7 @@ SET(organizer_HDRS
 	processrunner.h
 	uilocker.h
 	loot.h
+	json.h
 
     shared/windows_error.h
     shared/error_report.h
@@ -468,6 +469,7 @@ set(utilities
 	usvfsconnector
 	shared/windows_error
 	loot
+	json
 )
 
 set(widgets
diff --git a/src/json.h b/src/json.h
new file mode 100644
index 00000000..d182f330
--- /dev/null
+++ b/src/json.h
@@ -0,0 +1,190 @@
+#ifndef MODORGANIZER_JSON_INCLUDED
+#define MODORGANIZER_JSON_INCLUDED
+
+#include <log.h>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QJsonValue>
+
+namespace json
+{
+
+class failed {};
+
+
+namespace details
+{
+
+QString typeName(const QJsonValue& v)
+{
+  if (v.isUndefined()) {
+    return "undefined";
+  } else if (v.isNull()) {
+    return "null";
+  } else if (v.isArray()) {
+    return "an array";
+  } else if (v.isBool()) {
+    return "a bool";
+  } else if (v.isDouble()) {
+    return "a double";
+  } else if (v.isObject()) {
+    return "an object";
+  } else if (v.isString()) {
+    return "a string";
+  } else {
+    return "an unknown type";
+  }
+}
+
+QString typeName(const QJsonDocument& doc)
+{
+  if (doc.isEmpty()) {
+    return "empty";
+  } else if (doc.isNull()) {
+    return "null";
+  } else if (doc.isArray()) {
+    return "an array";
+  } else if (doc.isObject()) {
+    return "an object";
+  } else {
+    return "an unknown type";
+  }
+}
+
+
+template <class T>
+T convert(const QJsonValue& v) = delete;
+
+template <>
+bool convert<bool>(const QJsonValue& v)
+{
+  if (!v.isBool()) {
+    throw failed();
+  }
+
+  return v.toBool();
+}
+
+template <>
+QJsonObject convert<QJsonObject>(const QJsonValue& v)
+{
+  if (!v.isObject()) {
+    throw failed();
+  }
+
+  return v.toObject();
+}
+
+template <>
+QString convert<QString>(const QJsonValue& v)
+{
+  if (!v.isString()) {
+    throw failed();
+  }
+
+  return v.toString();
+}
+
+template <>
+QJsonArray convert<QJsonArray>(const QJsonValue& v)
+{
+  if (!v.isArray()) {
+    throw failed();
+  }
+
+  return v.toArray();
+}
+
+template <>
+qint64 convert<qint64>(const QJsonValue& v)
+{
+  if (!v.isDouble()) {
+    throw failed();
+  }
+
+  return static_cast<qint64>(v.toDouble());
+}
+
+} // namespace
+
+
+template <class T>
+T convert(const QJsonValue& value, const char* what)
+{
+  try
+  {
+    return details::convert<T>(value);
+  }
+  catch(failed&)
+  {
+    MOBase::log::error(
+      "'{}' is a {}, not a {}",
+      what, details::typeName(value), typeid(T).name);
+
+    throw;
+  }
+}
+
+template <class T>
+T convertWarn(const QJsonValue& value, const char* what, T def={})
+{
+  try
+  {
+    return details::convert<T>(value);
+  }
+  catch(failed&)
+  {
+    MOBase::log::warn(
+      "'{}' is a {}, not a {}",
+      what, details::typeName(value), typeid(T).name());
+
+    return def;
+  }
+}
+
+template <class T>
+T get(const QJsonObject& o, const char* e)
+{
+  if (!o.contains(e)) {
+    MOBase::log::error("property '{}' is missing", e);
+    throw failed();
+  }
+
+  return convert<T>(o[e], e);
+}
+
+template <class T>
+T getWarn(const QJsonObject& o, const char* e, T def={})
+{
+  if (!o.contains(e)) {
+    MOBase::log::warn("property '{}' is missing", e);
+    return def;
+  }
+
+  return convertWarn<T>(o[e], e);
+}
+
+template <class T>
+T getOpt(const QJsonObject& o, const char* e, T def={})
+{
+  if (!o.contains(e)) {
+    return def;
+  }
+
+  return convertWarn<T>(o[e], e);
+}
+
+
+template <class Value>
+void requireObject(const Value& v, const char* what)
+{
+  if (!v.isObject()) {
+    MOBase::log::error("{} is {}, not an object", what, details::typeName(v));
+    throw failed();
+  }
+}
+
+} // namespace
+
+#endif // MODORGANIZER_JSON_INCLUDED
diff --git a/src/loot.cpp b/src/loot.cpp
index eef16b45..88ea8ce8 100644
--- a/src/loot.cpp
+++ b/src/loot.cpp
@@ -1,10 +1,12 @@
 #include "loot.h"
 #include "spawn.h"
 #include "organizercore.h"
+#include "json.h"
 #include <log.h>
 #include <report.h>
 
 using namespace MOBase;
+using namespace json;
 
 log::Levels levelFromLoot(lootcli::LogLevels level)
 {
@@ -193,7 +195,6 @@ private:
     ly->addLayout(buttons);
 
     m_output = new QPlainTextEdit;
-    m_output->setWordWrapMode(QTextOption::NoWrap);
     ly->addWidget(m_output);
 
     m_buttons = new QDialogButtonBox(QDialogButtonBox::Cancel);
@@ -254,6 +255,81 @@ private:
 };
 
 
+struct Loot::Message
+{
+  QString type;
+  QString text;
+};
+
+struct Loot::File
+{
+  QString name;
+  QString displayName;
+};
+
+struct Loot::Dirty
+{
+  qint64 crc=0;
+  qint64 itm=0;
+  qint64 deletedReferences=0;
+  qint64 deletedNavmesh=0;
+  QString cleaningUtility;
+  QString info;
+
+  QString toString(bool isClean) const
+  {
+    if (isClean) {
+      return QObject::tr("Verified clean by %1")
+        .arg(cleaningUtility.isEmpty() ? "?" : cleaningUtility);
+    }
+
+    QString s = cleaningString();
+
+    if (!info.isEmpty()) {
+      s += " " + info;
+    }
+
+    return s;
+  }
+
+  QString cleaningString() const
+  {
+    return QObject::tr("%1 found %2 ITM record(s), %3 deleted reference(s) and %4 deleted navmesh(es).")
+      .arg(cleaningUtility.isEmpty() ? "?" : cleaningUtility)
+      .arg(itm)
+      .arg(deletedReferences)
+      .arg(deletedNavmesh);
+  }
+};
+
+struct Loot::Plugin
+{
+  QString name;
+  std::vector<File> incompatibilities;
+  std::vector<Message> messages;
+  std::vector<Dirty> dirty, clean;
+  std::vector<QString> missingMasters;
+  bool loadsArchive = false;
+  bool isMaster = false;
+  bool isLightMaster = false;
+};
+
+struct Loot::Stats
+{
+  qint64 time = 0;
+  QString version;
+};
+
+struct Loot::Report
+{
+  std::vector<Message> messages;
+  std::vector<Plugin> plugins;
+  Stats stats;
+};
+
+
+class ReportFailed {};
+
 Loot::Loot()
   : m_thread(nullptr), m_cancel(false), m_result(false)
 {
@@ -522,49 +598,16 @@ void Loot::processMessage(const lootcli::Message& m)
   }
 }
 
-QString jsonType(const QJsonValue& v)
-{
-  if (v.isUndefined()) {
-    return "undefined";
-  } else if (v.isNull()) {
-    return "null";
-  } else if (v.isArray()) {
-    return "an array";
-  } else if (v.isBool()) {
-    return "a bool";
-  } else if (v.isDouble()) {
-    return "a double";
-  } else if (v.isObject()) {
-    return "an object";
-  } else if (v.isString()) {
-    return "a string";
-  } else {
-    return "an unknown type";
-  }
-}
-
-QString jsonType(const QJsonDocument& doc)
-{
-  if (doc.isEmpty()) {
-    return "empty";
-  } else if (doc.isNull()) {
-    return "null";
-  } else if (doc.isArray()) {
-    return "an array";
-  } else if (doc.isObject()) {
-    return "an object";
-  } else {
-    return "an unknown type";
-  }
-}
-
 void Loot::processOutputFile()
 {
+  log::info("parsing json output file at '{}'", m_outPath);
+
   QFile outFile(m_outPath);
   if (!outFile.open(QIODevice::ReadOnly)) {
-    logJsonError(
-      "failed to open file, {} (error {})",
-      outFile.errorString(), outFile.error());
+    emit log(
+      MOBase::log::Error,
+      QString("failed to open file, %1 (error %2)")
+        .arg(outFile.errorString()).arg(outFile.error()));
 
     return;
   }
@@ -572,149 +615,178 @@ void Loot::processOutputFile()
   QJsonParseError e;
   const QJsonDocument doc = QJsonDocument::fromJson(outFile.readAll(), &e);
   if (doc.isNull()) {
-    logJsonError("invalid json, {} (error {})", e.errorString(), e.error);
-    return;
-  }
+    emit log(
+      MOBase::log::Error,
+      QString("invalid json, %1 (error %2)")
+        .arg(e.errorString()).arg(e.error));
 
-  if (!doc.isObject()) {
-    logJsonError("root is {}, not an object", jsonType(doc));
     return;
   }
 
-  const QJsonObject object = doc.object();
+  const auto report = createReport(doc);
 
-  if (object.contains("messages")) {
-    const auto messagesValue = object["messages"];
+  for (auto&& m : report.messages) {
+    emit log(levelFromLoot(
+      lootcli::logLevelFromString(m.type.toStdString())),
+      m.text);
+  }
 
-    if (messagesValue.isArray()) {
-      processMessages(messagesValue.toArray());
-    } else {
-      logJsonError(
-        "'messages' property is {}, not an array", jsonType(messagesValue));
+  for (auto&& p : report.plugins) {
+    for (auto&& d : p.dirty) {
+      emit information(p.name, d.toString(false));
     }
-
   }
+}
 
-  if (object.contains("plugins")) {
-    const auto pluginsValue = object["plugins"];
+Loot::Report Loot::createReport(const QJsonDocument& doc) const
+{
+  requireObject(doc, "root");
 
-    if (pluginsValue.isArray()) {
-      processPlugins(pluginsValue.toArray());
-    } else {
-      logJsonError(
-        "'plugins' property is {}, not an array", jsonType(pluginsValue));
-    }
-  }
+  Report r;
+  const QJsonObject object = doc.object();
+
+  r.messages = reportMessages(getOpt<QJsonArray>(object, "messages"));
+  r.plugins = reportPlugins(getOpt<QJsonArray>(object, "plugins"));
+
+  return r;
 }
 
-bool Loot::processMessages(const QJsonArray& messages)
+std::vector<Loot::Plugin> Loot::reportPlugins(const QJsonArray& plugins) const
 {
-  for (auto messageValue : messages) {
-    if (messageValue.isObject()) {
-      processMessage(messageValue.toObject());
-    } else {
-      logJsonError("a message is {}, not an object", jsonType(messageValue));
+  std::vector<Loot::Plugin> v;
+
+  for (auto pluginValue : plugins) {
+    const auto o = convertWarn<QJsonObject>(pluginValue, "plugin");
+    if (o.isEmpty()) {
+      continue;
+    }
+
+    auto p = reportPlugin(o);
+    if (!p.name.isEmpty()) {
+      v.emplace_back(std::move(p));
     }
   }
 
-  return true;
+  return v;
 }
 
-bool Loot::processMessage(const QJsonObject& message)
+Loot::Plugin Loot::reportPlugin(const QJsonObject& plugin) const
 {
-  const auto messageType = message["type"].toString();
-  const auto messageString = message["message"].toString();
+  Plugin p;
 
-  if (messageType.isEmpty()) {
-    logJsonError("there's a message with no 'type' property");
-    return false;
+  p.name = getWarn<QString>(plugin, "name");
+  if (p.name.isEmpty()) {
+    return {};
   }
 
-  if (messageString.isEmpty()) {
-    logJsonError("there's a message with no 'message' property");
-    return false;
+  if (plugin.contains("incompatibilities")) {
+    p.incompatibilities = reportFiles(getOpt<QJsonArray>(plugin, "incompatibilities"));
   }
 
-  emit log(levelFromLoot(
-    lootcli::logLevelFromString(messageType.toStdString())),
-    messageString);
+  if (plugin.contains("messages")) {
+    p.messages = reportMessages(getOpt<QJsonArray>(plugin, "messages"));
+  }
 
-  return true;
-}
+  if (plugin.contains("dirty")) {
+    p.dirty = reportDirty(getOpt<QJsonArray>(plugin, "dirty"));
+  }
 
-bool Loot::processPlugins(const QJsonArray& plugins)
-{
-  for (auto pluginValue : plugins) {
-    if (pluginValue.isObject()) {
-      processPlugin(pluginValue.toObject());
-    } else {
-      logJsonError("a plugin is {}, not an object", jsonType(pluginValue));
-    }
+  if (plugin.contains("clean")) {
+    p.clean = reportDirty(getOpt<QJsonArray>(plugin, "clean"));
   }
 
-  return true;
+  if (plugin.contains("missingMasters")) {
+    p.missingMasters = reportStringArray(getOpt<QJsonArray>(plugin, "missingMasters"));
+  }
+
+  p.loadsArchive = getOpt(plugin, "loadsArchive", false);
+  p.isMaster = getOpt(plugin, "isMaster", false);
+  p.isLightMaster = getOpt(plugin, "isLightMaster", false);
+
+  return p;
 }
 
-bool Loot::processPlugin(const QJsonObject& plugin)
+std::vector<Loot::Message> Loot::reportMessages(const QJsonArray& array) const
 {
-  if (!plugin.contains("name")) {
-    logJsonError("plugin missing 'name' property");
-    return false;
-  }
+  std::vector<Loot::Message> v;
 
-  const auto nameValue = plugin["name"];
-  if (!nameValue.isString()) {
-    logJsonError("plugin property 'name' is {}, not a string", jsonType(nameValue));
-    return false;
-  }
+  for (auto messageValue : array) {
+    const auto o = convertWarn<QJsonObject>(messageValue, "message");
+    if (o.isEmpty()) {
+      continue;
+    }
 
-  const auto name = nameValue.toString();
+    Message m;
+    m.type = getWarn<QString>(o, "type");
+    m.text = getWarn<QString>(o, "text");
 
-  processPluginDirty(name, plugin);
+    if (!m.text.isEmpty()) {
+      v.emplace_back(std::move(m));
+    }
+  }
 
-  return true;
+  return v;
 }
 
-
-bool Loot::processPluginDirty(const QString& name, const QJsonObject& plugin)
+std::vector<Loot::File> Loot::reportFiles(const QJsonArray& array) const
 {
-  if (!plugin.contains("dirty")) {
-    return true;
-  }
+  std::vector<Loot::File> v;
+
+  for (auto&& fileValue : array) {
+    const auto o = convertWarn<QJsonObject>(fileValue, "file");
+    if (o.isEmpty()) {
+      continue;
+    }
 
-  const auto dirtyValue = plugin["dirty"];
+    File f;
 
-  if (!dirtyValue.isArray()) {
-    logJsonError(
-      "'dirty' value for plugin '{}' is {}, not an array",
-      name, jsonType(dirtyValue));
+    f.name = getWarn<QString>(o, "name");
+    f.displayName = getOpt<QString>(o, "displayName");
 
-    return false;
+    if (!f.name.isEmpty()) {
+      v.emplace_back(std::move(f));
+    }
   }
 
-  const auto dirty = dirtyValue.toArray();
+  return v;
+}
+
+std::vector<Loot::Dirty> Loot::reportDirty(const QJsonArray& array) const
+{
+  std::vector<Loot::Dirty> v;
 
+  for (auto&& dirtyValue : array) {
+    const auto o = convertWarn<QJsonObject>(dirtyValue, "dirty");
 
-  for (auto stringValue : dirty) {
-    if (!stringValue.isString()) {
-      logJsonError(
-        "'dirty' value for plugin '{}' is {}, not a string",
-        name, jsonType(stringValue));
+    Dirty d;
 
-      continue;
-    }
+    d.crc = getWarn<qint64>(o, "crc");
+    d.itm = getOpt<qint64>(o, "itm");
+    d.deletedReferences = getOpt<qint64>(o, "deletedReferences");
+    d.deletedNavmesh = getOpt<qint64>(o, "deletedNavmesh");
+    d.cleaningUtility = getOpt<QString>(o, "cleaningUtility");
+    d.info = getOpt<QString>(o, "info");
 
-    const auto string = stringValue.toString();
+    v.emplace_back(std::move(d));
+  }
+
+  return v;
+}
 
-    if (string.isEmpty()) {
-      logJsonError("'dirty' string for plugin '{}' is empty", name);
+std::vector<QString> Loot::reportStringArray(const QJsonArray& array) const
+{
+  std::vector<QString> v;
+
+  for (auto&& sv : array) {
+    auto s = convertWarn<QString>(sv, "string");
+    if (s.isEmpty()) {
       continue;
     }
 
-    emit information(name, string);
+    v.emplace_back(std::move(s));
   }
 
-  return true;
+  return v;
 }
 
 
diff --git a/src/loot.h b/src/loot.h
index 54fc6fd1..95dbbe50 100644
--- a/src/loot.h
+++ b/src/loot.h
@@ -33,6 +33,14 @@ signals:
   void finished();
 
 private:
+  struct Report;
+  struct Stats;
+  struct Message;
+  struct Plugin;
+  struct Dirty;
+  struct File;
+  class BadReport {};
+
   std::unique_ptr<QThread> m_thread;
   std::atomic<bool> m_cancel;
   std::atomic<bool> m_result;
@@ -50,20 +58,16 @@ private:
   void processMessage(const lootcli::Message& m);
 
   void processOutputFile();
-  bool processMessages(const QJsonArray& messages);
-  bool processMessage(const QJsonObject& message);
-  bool processPlugins(const QJsonArray& plugins);
-  bool processPlugin(const QJsonObject& plugin);
-
-  bool processPluginDirty(const QString& name, const QJsonObject& plugin);
-
-  template <class Format, class... Args>
-  void logJsonError(Format&& f, Args&&... args)
-  {
-    MOBase::log::error(
-      std::string("loot output file '{}': ") + f,
-      m_outPath, std::forward<Args>(args)...);
-  };
+
+  Report createReport(const QJsonDocument& doc) const;
+  Message reportMessage(const QJsonObject& message) const;
+  std::vector<Plugin> reportPlugins(const QJsonArray& plugins) const;
+  Loot::Plugin reportPlugin(const QJsonObject& plugin) const;
+
+  std::vector<Message> reportMessages(const QJsonArray& array) const;
+  std::vector<Loot::File> reportFiles(const QJsonArray& array) const;
+  std::vector<Loot::Dirty> reportDirty(const QJsonArray& array) const;
+  std::vector<QString> reportStringArray(const QJsonArray& array) const;
 };
 
 
-- 
cgit v1.3.1


From cd876a0f9ffd03c711812c2ade92836e5d6c0203 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sun, 24 Nov 2019 20:11:50 -0500
Subject: split loot dialog, added ui file

---
 src/CMakeLists.txt |  10 +-
 src/loot.cpp       | 271 +----------------------------------------------------
 src/lootdialog.cpp | 222 +++++++++++++++++++++++++++++++++++++++++++
 src/lootdialog.h   |  47 ++++++++++
 src/lootdialog.ui  | 214 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 492 insertions(+), 272 deletions(-)
 create mode 100644 src/lootdialog.cpp
 create mode 100644 src/lootdialog.h
 create mode 100644 src/lootdialog.ui

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b74ea37..db3bda73 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -143,6 +143,7 @@ SET(organizer_SRCS
 	processrunner.cpp
 	uilocker.cpp
 	loot.cpp
+	lootdialog.cpp
 
     shared/windows_error.cpp
     shared/error_report.cpp
@@ -265,6 +266,7 @@ SET(organizer_HDRS
 	processrunner.h
 	uilocker.h
 	loot.h
+	lootdialog.h
 	json.h
 
     shared/windows_error.h
@@ -392,6 +394,11 @@ set(executables
 	editexecutablesdialog
 )
 
+set(loot
+	loot
+	lootdialog
+)
+
 set(modinfo
 	modinfo
 	modinfobackup
@@ -468,7 +475,6 @@ set(utilities
 	shared/util
 	usvfsconnector
 	shared/windows_error
-	loot
 	json
 )
 
@@ -490,7 +496,7 @@ set(widgets
 )
 
 set(src_filters
-	application core browser dialogs downloads env executables modinfo
+	application core browser dialogs downloads env executables loot modinfo
 	modinfo\\dialog modlist plugins previews profiles settings settingsdialog
 	utilities widgets
 )
diff --git a/src/loot.cpp b/src/loot.cpp
index c73dcaa7..f0618b0b 100644
--- a/src/loot.cpp
+++ b/src/loot.cpp
@@ -1,4 +1,5 @@
 #include "loot.h"
+#include "lootdialog.h"
 #include "spawn.h"
 #include "organizercore.h"
 #include "json.h"
@@ -32,276 +33,6 @@ log::Levels levelFromLoot(lootcli::LogLevels level)
   }
 }
 
-class LootDialog : public QDialog
-{
-public:
-  LootDialog(QWidget* parent, OrganizerCore& core, Loot& loot) :
-    QDialog(parent), m_core(core), m_loot(loot),
-    m_label(nullptr), m_progress(nullptr),
-    m_report(nullptr), m_output(nullptr), m_buttons(nullptr),
-    m_finished(false), m_cancelling(false)
-  {
-    createUI();
-    m_progress->setMaximum(0);
-
-    QObject::connect(
-      &m_loot, &Loot::output, this,
-      [&](auto&& s){ addOutput(s); }, Qt::QueuedConnection);
-
-    QObject::connect(
-      &m_loot, &Loot::progress,
-      this, [&](auto&& p){ setProgress(p); }, Qt::QueuedConnection);
-
-    QObject::connect(
-      &m_loot, &Loot::log, this,
-      [&](auto&& lv, auto&& s){ log(lv, s); }, Qt::QueuedConnection);
-
-    QObject::connect(
-      &m_loot, &Loot::finished, this,
-      [&]{ onFinished(); }, Qt::QueuedConnection);
-  }
-
-  void setText(const QString& s)
-  {
-    m_label->setText(s);
-  }
-
-  void setProgress(lootcli::Progress p)
-  {
-    setText(progressToString(p));
-
-    if (p == lootcli::Progress::Done) {
-      m_progress->setRange(0, 1);
-      m_progress->setValue(1);
-    }
-  }
-
-  QString progressToString(lootcli::Progress p)
-  {
-    using P = lootcli::Progress;
-
-    switch (p)
-    {
-      case P::CheckingMasterlistExistence: return tr("Checking masterlist existence");
-      case P::UpdatingMasterlist: return tr("Updating masterlist");
-      case P::LoadingLists: return tr("Loading lists");
-      case P::ReadingPlugins: return tr("Reading plugins");
-      case P::SortingPlugins: return tr("Sorting plugins");
-      case P::WritingLoadorder: return tr("Writing loadorder.txt");
-      case P::ParsingLootMessages: return tr("Parsing loot messages");
-      case P::Done: return tr("Done");
-      default: return QString("unknown progress %1").arg(static_cast<int>(p));
-    }
-  }
-
-  void addOutput(const QString& s)
-  {
-    if (m_core.settings().diagnostics().lootLogLevel() > lootcli::LogLevels::Debug) {
-      return;
-    }
-
-    const auto lines = s.split(QRegExp("[\\r\\n]"), QString::SkipEmptyParts);
-
-    for (auto&& line : lines) {
-      if (line.isEmpty()) {
-        continue;
-      }
-
-      addLineOutput(line);
-    }
-  }
-
-  bool result() const
-  {
-    return m_loot.result();
-  }
-
-  void cancel()
-  {
-    if (!m_finished && !m_cancelling) {
-      addLineOutput(tr("Stopping LOOT..."));
-      m_loot.cancel();
-      m_buttons->setEnabled(false);
-      m_cancelling = true;
-    }
-  }
-
-  int exec() override
-  {
-    return QDialog::exec();
-  }
-
-  void openReport()
-  {
-    const auto path = m_loot.outPath();
-    shell::Open(path);
-  }
-
-private:
-  OrganizerCore& m_core;
-  Loot& m_loot;
-  QLabel* m_label;
-  QProgressBar* m_progress;
-  QTextEdit* m_messages;
-  QPushButton* m_report;
-  QPlainTextEdit* m_output;
-  QDialogButtonBox* m_buttons;
-  bool m_finished;
-  bool m_cancelling;
-
-  void createUI()
-  {
-    auto* root = new QWidget(this);
-    auto* ly = new QVBoxLayout(root);
-
-    setLayout(new QVBoxLayout);
-    layout()->setContentsMargins(0, 0, 0, 0);
-    layout()->addWidget(root);
-
-    m_label = new QLabel;
-    ly->addWidget(m_label);
-
-    m_progress = new QProgressBar;
-    ly->addWidget(m_progress);
-
-    m_messages = new QTextEdit;
-    ly->addWidget(m_messages);
-
-    auto* more = createMoreUI();
-    ly->addWidget(more);
-
-    resize(700, 400);
-  }
-
-  QWidget* createMoreUI()
-  {
-    auto* more = new QWidget;
-    auto* ly = new QVBoxLayout(more);
-    ly->setContentsMargins(0, 0, 0, 0);
-
-    auto* buttons = new QHBoxLayout;
-    buttons->setContentsMargins(0, 0, 0, 0);
-    m_report = new QPushButton(tr("Open JSON report"));
-    m_report->setEnabled(false);
-    connect(m_report, &QPushButton::clicked, [&]{ openReport(); });
-    buttons->addWidget(m_report);
-    buttons->addStretch(1);
-    ly->addLayout(buttons);
-
-    m_output = new QPlainTextEdit;
-    ly->addWidget(m_output);
-
-    m_buttons = new QDialogButtonBox(QDialogButtonBox::Cancel);
-    connect(m_buttons, &QDialogButtonBox::clicked, [&](auto* b){ onButton(b); });
-    ly->addWidget(m_buttons);
-
-    return more;
-  }
-
-  void closeEvent(QCloseEvent* e) override
-  {
-    if (m_finished) {
-      QDialog::closeEvent(e);
-    } else {
-      cancel();
-      e->ignore();
-    }
-  }
-
-  void onButton(QAbstractButton* b)
-  {
-    if (m_buttons->buttonRole(b) == QDialogButtonBox::RejectRole) {
-      if (m_finished) {
-        close();
-      } else {
-        cancel();
-      }
-    }
-  }
-
-  void addLineOutput(const QString& line)
-  {
-    m_output->appendPlainText(line);
-  }
-
-  void onFinished()
-  {
-    m_finished = true;
-
-    if (m_cancelling) {
-      close();
-    } else {
-      handleReport();
-      m_report->setEnabled(true);
-      m_buttons->setStandardButtons(QDialogButtonBox::Close);
-    }
-  }
-
-  void log(log::Levels lv, const QString& s)
-  {
-    if (lv >= log::Levels::Warning) {
-      log::log(lv, "{}", s);
-    }
-
-    if (m_core.settings().diagnostics().lootLogLevel() > lootcli::LogLevels::Debug) {
-      addLineOutput(QString("[%1] %2").arg(log::levelToString(lv)).arg(s));
-    }
-  }
-
-  void handleReport()
-  {
-    const auto& report = m_loot.report();
-
-    if (!report.messages.empty()) {
-      addLineOutput("");
-    }
-
-    QString html;
-
-    if (!report.messages.empty()) {
-      html += "<ul>";
-
-      for (auto&& m : report.messages) {
-        log(m.type, m.text);
-
-        html += "<li>";
-
-        switch (m.type)
-        {
-          case log::Error:
-          {
-            html += "<b>" + QObject::tr("Error") + "</b>: ";
-            break;
-          }
-
-          case log::Warning:
-          {
-            html += "<b>" + QObject::tr("Warning") + "</b>: ";
-            break;
-          }
-
-          default:
-          {
-            break;
-          }
-        }
-
-        html += m.text + "</li>";
-      }
-
-      html + "</ul>";
-    } else {
-      html += QObject::tr("No messages.");
-    }
-
-    m_messages->setHtml(html);
-
-    for (auto&& p : report.plugins) {
-      m_core.pluginList()->addLootReport(p.name, p);
-    }
-  }
-};
-
 
 QString Loot::Dirty::toString(bool isClean) const
 {
diff --git a/src/lootdialog.cpp b/src/lootdialog.cpp
new file mode 100644
index 00000000..db41959d
--- /dev/null
+++ b/src/lootdialog.cpp
@@ -0,0 +1,222 @@
+#include "lootdialog.h"
+#include "ui_lootdialog.h"
+#include "loot.h"
+#include "organizercore.h"
+#include <utility.h>
+#include <expanderwidget.h>
+
+using namespace MOBase;
+
+LootDialog::LootDialog(QWidget* parent, OrganizerCore& core, Loot& loot) :
+  QDialog(parent), ui(new Ui::LootDialog), m_core(core), m_loot(loot),
+  m_finished(false), m_cancelling(false)
+{
+  createUI();
+
+  QObject::connect(
+    &m_loot, &Loot::output, this,
+    [&](auto&& s){ addOutput(s); }, Qt::QueuedConnection);
+
+  QObject::connect(
+    &m_loot, &Loot::progress,
+    this, [&](auto&& p){ setProgress(p); }, Qt::QueuedConnection);
+
+  QObject::connect(
+    &m_loot, &Loot::log, this,
+    [&](auto&& lv, auto&& s){ log(lv, s); }, Qt::QueuedConnection);
+
+  QObject::connect(
+    &m_loot, &Loot::finished, this,
+    [&]{ onFinished(); }, Qt::QueuedConnection);
+}
+
+LootDialog::~LootDialog() = default;
+
+void LootDialog::setText(const QString& s)
+{
+  ui->progressText->setText(s);
+}
+
+void LootDialog::setProgress(lootcli::Progress p)
+{
+  setText(progressToString(p));
+
+  if (p == lootcli::Progress::Done) {
+    ui->progressBar->setRange(0, 1);
+    ui->progressBar->setValue(1);
+  }
+}
+
+QString LootDialog::progressToString(lootcli::Progress p)
+{
+  using P = lootcli::Progress;
+
+  switch (p)
+  {
+    case P::CheckingMasterlistExistence: return tr("Checking masterlist existence");
+    case P::UpdatingMasterlist: return tr("Updating masterlist");
+    case P::LoadingLists: return tr("Loading lists");
+    case P::ReadingPlugins: return tr("Reading plugins");
+    case P::SortingPlugins: return tr("Sorting plugins");
+    case P::WritingLoadorder: return tr("Writing loadorder.txt");
+    case P::ParsingLootMessages: return tr("Parsing loot messages");
+    case P::Done: return tr("Done");
+    default: return QString("unknown progress %1").arg(static_cast<int>(p));
+  }
+}
+
+void LootDialog::addOutput(const QString& s)
+{
+  if (m_core.settings().diagnostics().lootLogLevel() > lootcli::LogLevels::Debug) {
+    return;
+  }
+
+  const auto lines = s.split(QRegExp("[\\r\\n]"), QString::SkipEmptyParts);
+
+  for (auto&& line : lines) {
+    if (line.isEmpty()) {
+      continue;
+    }
+
+    addLineOutput(line);
+  }
+}
+
+bool LootDialog::result() const
+{
+  return m_loot.result();
+}
+
+void LootDialog::cancel()
+{
+  if (!m_finished && !m_cancelling) {
+    addLineOutput(tr("Stopping LOOT..."));
+    m_loot.cancel();
+    ui->buttons->setEnabled(false);
+    m_cancelling = true;
+  }
+}
+
+void LootDialog::openReport()
+{
+  const auto path = m_loot.outPath();
+  shell::Open(path);
+}
+
+void LootDialog::createUI()
+{
+  ui->setupUi(this);
+  ui->progressBar->setMaximum(0);
+
+  ui->openJsonReport->setEnabled(false);
+  connect(ui->openJsonReport, &QPushButton::clicked, [&]{ openReport(); });
+
+  new ExpanderWidget(ui->details, ui->detailsPanel);
+
+  connect(ui->buttons, &QDialogButtonBox::clicked, [&](auto* b){ onButton(b); });
+
+  resize(480, 275);
+}
+
+void LootDialog::closeEvent(QCloseEvent* e)
+{
+  if (m_finished) {
+    QDialog::closeEvent(e);
+  } else {
+    cancel();
+    e->ignore();
+  }
+}
+
+void LootDialog::onButton(QAbstractButton* b)
+{
+  if (ui->buttons->buttonRole(b) == QDialogButtonBox::RejectRole) {
+    if (m_finished) {
+      close();
+    } else {
+      cancel();
+    }
+  }
+}
+
+void LootDialog::addLineOutput(const QString& line)
+{
+  ui->output->appendPlainText(line);
+}
+
+void LootDialog::onFinished()
+{
+  m_finished = true;
+
+  if (m_cancelling) {
+    close();
+  } else {
+    handleReport();
+    ui->openJsonReport->setEnabled(true);
+    ui->buttons->setStandardButtons(QDialogButtonBox::Close);
+  }
+}
+
+void LootDialog::log(log::Levels lv, const QString& s)
+{
+  if (lv >= log::Levels::Warning) {
+    log::log(lv, "{}", s);
+  }
+
+  if (m_core.settings().diagnostics().lootLogLevel() > lootcli::LogLevels::Debug) {
+    addLineOutput(QString("[%1] %2").arg(log::levelToString(lv)).arg(s));
+  }
+}
+
+void LootDialog::handleReport()
+{
+  const auto& report = m_loot.report();
+
+  if (!report.messages.empty()) {
+    addLineOutput("");
+  }
+
+  QString html;
+
+  if (!report.messages.empty()) {
+    html += "<ul>";
+
+    for (auto&& m : report.messages) {
+      log(m.type, m.text);
+
+      html += "<li>";
+
+      switch (m.type)
+      {
+        case log::Error:
+        {
+          html += "<b>" + QObject::tr("Error") + "</b>: ";
+          break;
+        }
+
+        case log::Warning:
+        {
+          html += "<b>" + QObject::tr("Warning") + "</b>: ";
+          break;
+        }
+
+        default:
+        {
+          break;
+        }
+      }
+
+      html += m.text + "</li>";
+    }
+
+    html + "</ul>";
+  } else {
+    html += QObject::tr("No messages.");
+  }
+
+  ui->report->setHtml(html);
+
+  for (auto&& p : report.plugins) {
+    m_core.pluginList()->addLootReport(p.name, p);
+  }
+}
diff --git a/src/lootdialog.h b/src/lootdialog.h
new file mode 100644
index 00000000..e4647b5c
--- /dev/null
+++ b/src/lootdialog.h
@@ -0,0 +1,47 @@
+#ifndef MODORGANIZER_LOOTDIALOG_H
+#define MODORGANIZER_LOOTDIALOG_H
+
+#include <lootcli/lootcli.h>
+#include <log.h>
+
+namespace Ui { class LootDialog; }
+
+class OrganizerCore;
+class Loot;
+
+class LootDialog : public QDialog
+{
+public:
+  LootDialog(QWidget* parent, OrganizerCore& core, Loot& loot);
+  ~LootDialog();
+
+  void setText(const QString& s);
+  void setProgress(lootcli::Progress p);
+
+  QString progressToString(lootcli::Progress p);
+
+  void addOutput(const QString& s);
+
+  bool result() const;
+
+  void cancel();
+
+  void openReport();
+
+private:
+  std::unique_ptr<Ui::LootDialog> ui;
+  OrganizerCore& m_core;
+  Loot& m_loot;
+  bool m_finished;
+  bool m_cancelling;
+
+  void createUI();
+  void closeEvent(QCloseEvent* e) override;
+  void onButton(QAbstractButton* b);
+  void addLineOutput(const QString& line);
+  void onFinished();
+  void log(MOBase::log::Levels lv, const QString& s);
+  void handleReport();
+};
+
+#endif // MODORGANIZER_LOOTDIALOG_H
diff --git a/src/lootdialog.ui b/src/lootdialog.ui
new file mode 100644
index 00000000..7e10b1db
--- /dev/null
+++ b/src/lootdialog.ui
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LootDialog</class>
+ <widget class="QDialog" name="LootDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>457</width>
+    <height>343</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>LOOT</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout_5">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QWidget" name="widget_2" native="true">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="progressText">
+           <property name="text">
+            <string>Progress</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QProgressBar" name="progressBar">
+           <property name="value">
+            <number>24</number>
+           </property>
+           <property name="textVisible">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QTextEdit" name="report">
+           <property name="readOnly">
+            <bool>true</bool>
+           </property>
+           <property name="textInteractionFlags">
+            <set>Qt::TextBrowserInteraction</set>
+           </property>
+           <property name="placeholderText">
+            <string>LOOT Report</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QWidget" name="widget_3" native="true">
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QToolButton" name="details">
+           <property name="text">
+            <string>Details</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QWidget" name="detailsPanel" native="true">
+           <layout class="QVBoxLayout" name="verticalLayout_3">
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QWidget" name="widget_5" native="true">
+              <layout class="QHBoxLayout" name="horizontalLayout">
+               <property name="leftMargin">
+                <number>0</number>
+               </property>
+               <property name="topMargin">
+                <number>0</number>
+               </property>
+               <property name="rightMargin">
+                <number>0</number>
+               </property>
+               <property name="bottomMargin">
+                <number>0</number>
+               </property>
+               <item>
+                <widget class="QPushButton" name="openJsonReport">
+                 <property name="text">
+                  <string>Open JSON report</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPlainTextEdit" name="output"/>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttons">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttons</sender>
+   <signal>accepted()</signal>
+   <receiver>LootDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttons</sender>
+   <signal>rejected()</signal>
+   <receiver>LootDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
-- 
cgit v1.3.1


From 64304a6368cf8357bb04d1c0057aec637ebb479a Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sun, 24 Nov 2019 23:23:15 -0500
Subject: tweaked css, finished markdown report copy markdown.html to
 resources/

---
 src/CMakeLists.txt          |   4 +-
 src/loot.cpp                | 139 ++++++++++++
 src/loot.h                  |  13 +-
 src/lootdialog.cpp          |  44 +---
 src/resources/markdown.html | 528 ++++++++++++++++++++++----------------------
 5 files changed, 424 insertions(+), 304 deletions(-)

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db3bda73..5a510806 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -676,4 +676,6 @@ INSTALL(
 )
 
 # qdds.dll needs installing manually as Qt no longer ships with it by default.
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qdds.dll DESTINATION bin/dlls/imageformats)
\ No newline at end of file
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qdds.dll DESTINATION bin/dlls/imageformats)
+
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/markdown.html DESTINATION bin/resources)
diff --git a/src/loot.cpp b/src/loot.cpp
index 5d75eeaa..2faf9c2e 100644
--- a/src/loot.cpp
+++ b/src/loot.cpp
@@ -34,6 +34,99 @@ log::Levels levelFromLoot(lootcli::LogLevels level)
 }
 
 
+QString Loot::Report::toMarkdown() const
+{
+  QString s;
+
+  if (!messages.empty()) {
+    s += "### " + QObject::tr("General messages") + "\n";
+
+    for (auto&& m : messages) {
+      s += " - " + m.toMarkdown() + "\n";
+    }
+  }
+
+  if (!plugins.empty()) {
+    if (!s.isEmpty()) {
+      s += "\n";
+    }
+
+    s += "### " + QObject::tr("Plugins") + "\n";
+
+    for (auto&& p : plugins) {
+      const auto ps = p.toMarkdown();
+      if (!ps.isEmpty()) {
+        s += ps + "\n";
+      }
+    }
+  }
+
+  if (s.isEmpty()) {
+    s += "**" + QObject::tr("No messages.") + "**";
+  }
+
+  s += stats.toMarkdown();
+
+  return s;
+}
+
+QString Loot::Stats::toMarkdown() const
+{
+  return QString("`stats: %1s, lootcli %2, loot %3`")
+    .arg(QString::number(time / 1000.0, 'f', 2))
+    .arg(lootcliVersion)
+    .arg(lootVersion);
+}
+
+QString Loot::Plugin::toMarkdown() const
+{
+  QString s;
+
+  if (!incompatibilities.empty()) {
+    s += " - **" + QObject::tr("Incompatibilities") + ": ";
+
+    QString fs;
+    for (auto&& f : incompatibilities) {
+      if (!fs.isEmpty()) {
+        fs += ", ";
+      }
+
+      fs += f.displayName.isEmpty() ? f.name : f.displayName;
+    }
+
+    s += fs + "**\n";
+  }
+
+  if (!missingMasters.empty()) {
+    s += " - **" + QObject::tr("Missing masters") + ": ";
+
+    QString ms;
+    for (auto&& m : missingMasters) {
+      if (!ms.isEmpty()) {
+        ms += ", ";
+      }
+
+      ms += m;
+    }
+
+    s += ms + "**\n";
+  }
+
+  for (auto&& m : messages) {
+    s += " - " + m.toMarkdown() + "\n";
+  }
+
+  for (auto&& d : dirty) {
+    s += " - " + d.toMarkdown(false) + "\n";
+  }
+
+  if (!s.isEmpty()) {
+    s = "#### " + name + "\n" + s;
+  }
+
+  return s;
+}
+
 QString Loot::Dirty::toString(bool isClean) const
 {
   if (isClean) {
@@ -50,6 +143,11 @@ QString Loot::Dirty::toString(bool isClean) const
   return s;
 }
 
+QString Loot::Dirty::toMarkdown(bool isClean) const
+{
+  return toString(isClean);
+}
+
 QString Loot::Dirty::cleaningString() const
 {
   return QObject::tr("%1 found %2 ITM record(s), %3 deleted reference(s) and %4 deleted navmesh(es).")
@@ -59,6 +157,35 @@ QString Loot::Dirty::cleaningString() const
     .arg(deletedNavmesh);
 }
 
+QString Loot::Message::toMarkdown() const
+{
+  QString s;
+
+  switch (type)
+  {
+    case log::Error:
+    {
+      s += "**" + QObject::tr("Error") + "**: ";
+      break;
+    }
+
+    case log::Warning:
+    {
+      s += "**" + QObject::tr("Warning") + "**: ";
+      break;
+    }
+
+    default:
+    {
+      break;
+    }
+  }
+
+  s += text;
+
+  return s;
+}
+
 
 Loot::Loot()
   : m_thread(nullptr), m_cancel(false), m_result(false)
@@ -348,6 +475,7 @@ Loot::Report Loot::createReport(const QJsonDocument& doc) const
 
   r.messages = reportMessages(getOpt<QJsonArray>(object, "messages"));
   r.plugins = reportPlugins(getOpt<QJsonArray>(object, "plugins"));
+  r.stats = reportStats(getWarn<QJsonObject>(object, "stats"));
 
   return r;
 }
@@ -407,6 +535,17 @@ Loot::Plugin Loot::reportPlugin(const QJsonObject& plugin) const
   return p;
 }
 
+Loot::Stats Loot::reportStats(const QJsonObject& stats) const
+{
+  Stats s;
+
+  s.time = getWarn<qint64>(stats, "time");
+  s.lootcliVersion = getWarn<QString>(stats, "lootcliVersion");
+  s.lootVersion = getWarn<QString>(stats, "lootVersion");
+
+  return s;
+}
+
 std::vector<Loot::Message> Loot::reportMessages(const QJsonArray& array) const
 {
   std::vector<Loot::Message> v;
diff --git a/src/loot.h b/src/loot.h
index 3a7c6aa9..30ef4b60 100644
--- a/src/loot.h
+++ b/src/loot.h
@@ -21,6 +21,8 @@ public:
   {
     MOBase::log::Levels type;
     QString text;
+
+    QString toMarkdown() const;
   };
 
   struct File
@@ -39,6 +41,7 @@ public:
     QString info;
 
     QString toString(bool isClean) const;
+    QString toMarkdown(bool isClean) const;
     QString cleaningString() const;
   };
 
@@ -52,12 +55,17 @@ public:
     bool loadsArchive = false;
     bool isMaster = false;
     bool isLightMaster = false;
+
+    QString toMarkdown() const;
   };
 
   struct Stats
   {
     qint64 time = 0;
-    QString version;
+    QString lootcliVersion;
+    QString lootVersion;
+
+    QString toMarkdown() const;
   };
 
   struct Report
@@ -65,6 +73,8 @@ public:
     std::vector<Message> messages;
     std::vector<Plugin> plugins;
     Stats stats;
+
+    QString toMarkdown() const;
   };
 
 
@@ -107,6 +117,7 @@ private:
   Message reportMessage(const QJsonObject& message) const;
   std::vector<Plugin> reportPlugins(const QJsonArray& plugins) const;
   Loot::Plugin reportPlugin(const QJsonObject& plugin) const;
+  Loot::Stats reportStats(const QJsonObject& stats) const;
 
   std::vector<Message> reportMessages(const QJsonArray& array) const;
   std::vector<Loot::File> reportFiles(const QJsonArray& array) const;
diff --git a/src/lootdialog.cpp b/src/lootdialog.cpp
index 9c7b482e..c7cdfecd 100644
--- a/src/lootdialog.cpp
+++ b/src/lootdialog.cpp
@@ -226,49 +226,19 @@ void LootDialog::log(log::Levels lv, const QString& s)
 
 void LootDialog::handleReport()
 {
-  const auto& report = m_loot.report();
+  const auto& lootReport = m_loot.report();
 
-  if (!report.messages.empty()) {
+  if (!lootReport.messages.empty()) {
     addLineOutput("");
   }
 
-  QString md;
-
-  if (!report.messages.empty()) {
-    for (auto&& m : report.messages) {
-      log(m.type, m.text);
-
-      md += " - ";
-
-      switch (m.type)
-      {
-        case log::Error:
-        {
-          md += "**" + QObject::tr("Error") + "**: ";
-          break;
-        }
-
-        case log::Warning:
-        {
-          md += "**" + QObject::tr("Warning") + "**: ";
-          break;
-        }
-
-        default:
-        {
-          break;
-        }
-      }
-
-      md += m.text + "\n";
-    }
-  } else {
-    md += QObject::tr("**No messages.**");
+  for (auto&& m : lootReport.messages) {
+    log(m.type, m.text);
   }
 
-  m_report.setText(md);
-
-  for (auto&& p : report.plugins) {
+  for (auto&& p : lootReport.plugins) {
     m_core.pluginList()->addLootReport(p.name, p);
   }
+
+  m_report.setText(lootReport.toMarkdown());
 }
diff --git a/src/resources/markdown.html b/src/resources/markdown.html
index a09b2209..1ecaf1b9 100644
--- a/src/resources/markdown.html
+++ b/src/resources/markdown.html
@@ -2,278 +2,276 @@
 <html lang="en">
 <meta charset="utf-8">
 <head>
-  <script>
-/**
- * marked - a markdown parser
- * Copyright (c) 2011-2018, Christopher Jeffrey. (MIT Licensed)
- * https://github.com/markedjs/marked
- */
-!function(e){"use strict";var x={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:/^ {0,3}(`{3,}|~{3,})([^`~\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/,hr:/^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,heading:/^ {0,3}(#{1,6}) +([^\n]*?)(?: +#+)? *(?:\n+|$)/,blockquote:/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,list:/^( {0,3})(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:"^ {0,3}(?:<(script|pre|style)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?\\?>\\n*|<![A-Z][\\s\\S]*?>\\n*|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>\\n*|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:\\n{2,}|$)|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$)|</(?!script|pre|style)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$))",def:/^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,nptable:g,table:g,lheading:/^([^\n]+)\n {0,3}(=+|-+) *(?:\n+|$)/,_paragraph:/^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html)[^\n]+)*)/,text:/^[^\n]+/};function a(e){this.tokens=[],this.tokens.links=Object.create(null),this.options=e||k.defaults,this.rules=x.normal,this.options.pedantic?this.rules=x.pedantic:this.options.gfm&&(this.rules=x.gfm)}x._label=/(?!\s*\])(?:\\[\[\]]|[^\[\]])+/,x._title=/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/,x.def=i(x.def).replace("label",x._label).replace("title",x._title).getRegex(),x.bullet=/(?:[*+-]|\d{1,9}\.)/,x.item=/^( *)(bull) ?[^\n]*(?:\n(?!\1bull ?)[^\n]*)*/,x.item=i(x.item,"gm").replace(/bull/g,x.bullet).getRegex(),x.list=i(x.list).replace(/bull/g,x.bullet).replace("hr","\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def","\\n+(?="+x.def.source+")").getRegex(),x._tag="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",x._comment=/<!--(?!-?>)[\s\S]*?-->/,x.html=i(x.html,"i").replace("comment",x._comment).replace("tag",x._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),x.paragraph=i(x._paragraph).replace("hr",x.hr).replace("heading"," {0,3}#{1,6} +").replace("|lheading","").replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}|~{3,})[^`\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|!--)").replace("tag",x._tag).getRegex(),x.blockquote=i(x.blockquote).replace("paragraph",x.paragraph).getRegex(),x.normal=f({},x),x.gfm=f({},x.normal,{nptable:/^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,table:/^ *\|(.+)\n *\|?( *[-:]+[-| :]*)(?:\n((?: *[^>\n ].*(?:\n|$))*)\n*|$)/}),x.pedantic=f({},x.normal,{html:i("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)|<tag(?:\"[^\"]*\"|'[^']*'|\\s[^'\"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment",x._comment).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *(?:#+ *)?(?:\n+|$)/,fences:g,paragraph:i(x.normal._paragraph).replace("hr",x.hr).replace("heading"," *#{1,6} *[^\n]").replace("lheading",x.lheading).replace("blockquote"," {0,3}>").replace("|fences","").replace("|list","").replace("|html","").getRegex()}),a.rules=x,a.lex=function(e,t){return new a(t).lex(e)},a.prototype.lex=function(e){return e=e.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n"),this.token(e,!0)},a.prototype.token=function(e,t){var n,r,s,i,l,o,a,h,p,u,c,g,f,d,m,k;for(e=e.replace(/^ +$/gm,"");e;)if((s=this.rules.newline.exec(e))&&(e=e.substring(s[0].length),1<s[0].length&&this.tokens.push({type:"space"})),s=this.rules.code.exec(e)){var b=this.tokens[this.tokens.length-1];e=e.substring(s[0].length),b&&"paragraph"===b.type?b.text+="\n"+s[0].trimRight():(s=s[0].replace(/^ {4}/gm,""),this.tokens.push({type:"code",codeBlockStyle:"indented",text:this.options.pedantic?s:w(s,"\n")}))}else if(s=this.rules.fences.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"code",lang:s[2]?s[2].trim():s[2],text:s[3]||""});else if(s=this.rules.heading.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"heading",depth:s[1].length,text:s[2]});else if((s=this.rules.nptable.exec(e))&&(o={type:"table",header:y(s[1].replace(/^ *| *\| *$/g,"")),align:s[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:s[3]?s[3].replace(/\n$/,"").split("\n"):[]}).header.length===o.align.length){for(e=e.substring(s[0].length),c=0;c<o.align.length;c++)/^ *-+: *$/.test(o.align[c])?o.align[c]="right":/^ *:-+: *$/.test(o.align[c])?o.align[c]="center":/^ *:-+ *$/.test(o.align[c])?o.align[c]="left":o.align[c]=null;for(c=0;c<o.cells.length;c++)o.cells[c]=y(o.cells[c],o.header.length);this.tokens.push(o)}else if(s=this.rules.hr.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"hr"});else if(s=this.rules.blockquote.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"blockquote_start"}),s=s[0].replace(/^ *> ?/gm,""),this.token(s,t),this.tokens.push({type:"blockquote_end"});else if(s=this.rules.list.exec(e)){for(e=e.substring(s[0].length),a={type:"list_start",ordered:d=1<(i=s[2]).length,start:d?+i:"",loose:!1},this.tokens.push(a),n=!(h=[]),f=(s=s[0].match(this.rules.item)).length,c=0;c<f;c++)u=(o=s[c]).length,~(o=o.replace(/^ *([*+-]|\d+\.) */,"")).indexOf("\n ")&&(u-=o.length,o=this.options.pedantic?o.replace(/^ {1,4}/gm,""):o.replace(new RegExp("^ {1,"+u+"}","gm"),"")),c!==f-1&&(l=x.bullet.exec(s[c+1])[0],(1<i.length?1===l.length:1<l.length||this.options.smartLists&&l!==i)&&(e=s.slice(c+1).join("\n")+e,c=f-1)),r=n||/\n\n(?!\s*$)/.test(o),c!==f-1&&(n="\n"===o.charAt(o.length-1),r||(r=n)),r&&(a.loose=!0),k=void 0,(m=/^\[[ xX]\] /.test(o))&&(k=" "!==o[1],o=o.replace(/^\[[ xX]\] +/,"")),p={type:"list_item_start",task:m,checked:k,loose:r},h.push(p),this.tokens.push(p),this.token(o,!1),this.tokens.push({type:"list_item_end"});if(a.loose)for(f=h.length,c=0;c<f;c++)h[c].loose=!0;this.tokens.push({type:"list_end"})}else if(s=this.rules.html.exec(e))e=e.substring(s[0].length),this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:!this.options.sanitizer&&("pre"===s[1]||"script"===s[1]||"style"===s[1]),text:this.options.sanitize?this.options.sanitizer?this.options.sanitizer(s[0]):_(s[0]):s[0]});else if(t&&(s=this.rules.def.exec(e)))e=e.substring(s[0].length),s[3]&&(s[3]=s[3].substring(1,s[3].length-1)),g=s[1].toLowerCase().replace(/\s+/g," "),this.tokens.links[g]||(this.tokens.links[g]={href:s[2],title:s[3]});else if((s=this.rules.table.exec(e))&&(o={type:"table",header:y(s[1].replace(/^ *| *\| *$/g,"")),align:s[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:s[3]?s[3].replace(/\n$/,"").split("\n"):[]}).header.length===o.align.length){for(e=e.substring(s[0].length),c=0;c<o.align.length;c++)/^ *-+: *$/.test(o.align[c])?o.align[c]="right":/^ *:-+: *$/.test(o.align[c])?o.align[c]="center":/^ *:-+ *$/.test(o.align[c])?o.align[c]="left":o.align[c]=null;for(c=0;c<o.cells.length;c++)o.cells[c]=y(o.cells[c].replace(/^ *\| *| *\| *$/g,""),o.header.length);this.tokens.push(o)}else if(s=this.rules.lheading.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"heading",depth:"="===s[2].charAt(0)?1:2,text:s[1]});else if(t&&(s=this.rules.paragraph.exec(e)))e=e.substring(s[0].length),this.tokens.push({type:"paragraph",text:"\n"===s[1].charAt(s[1].length-1)?s[1].slice(0,-1):s[1]});else if(s=this.rules.text.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"text",text:s[0]});else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0));return this.tokens};var n={escape:/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,autolink:/^<(scheme:[^\s\x00-\x1f<>]*|email)>/,url:g,tag:"^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>",link:/^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/,reflink:/^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,nolink:/^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,strong:/^__([^\s_])__(?!_)|^\*\*([^\s*])\*\*(?!\*)|^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)/,em:/^_([^\s_])_(?!_)|^\*([^\s*<\[])\*(?!\*)|^_([^\s<][\s\S]*?[^\s_])_(?!_|[^\spunctuation])|^_([^\s_<][\s\S]*?[^\s])_(?!_|[^\spunctuation])|^\*([^\s<"][\s\S]*?[^\s\*])\*(?!\*|[^\spunctuation])|^\*([^\s*"<\[][\s\S]*?[^\s])\*(?!\*)/,code:/^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,br:/^( {2,}|\\)\n(?!\s*$)/,del:g,text:/^(`+|[^`])(?:[\s\S]*?(?:(?=[\\<!\[`*]|\b_|$)|[^ ](?= {2,}\n))|(?= {2,}\n))/};function p(e,t){if(this.options=t||k.defaults,this.links=e,this.rules=n.normal,this.renderer=this.options.renderer||new r,this.renderer.options=this.options,!this.links)throw new Error("Tokens array requires a `links` property.");this.options.pedantic?this.rules=n.pedantic:this.options.gfm&&(this.options.breaks?this.rules=n.breaks:this.rules=n.gfm)}function r(e){this.options=e||k.defaults}function s(){}function h(e){this.tokens=[],this.token=null,this.options=e||k.defaults,this.options.renderer=this.options.renderer||new r,this.renderer=this.options.renderer,this.renderer.options=this.options,this.slugger=new t}function t(){this.seen={}}function _(e,t){if(t){if(_.escapeTest.test(e))return e.replace(_.escapeReplace,function(e){return _.replacements[e]})}else if(_.escapeTestNoEncode.test(e))return e.replace(_.escapeReplaceNoEncode,function(e){return _.replacements[e]});return e}function c(e){return e.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi,function(e,t){return"colon"===(t=t.toLowerCase())?":":"#"===t.charAt(0)?"x"===t.charAt(1)?String.fromCharCode(parseInt(t.substring(2),16)):String.fromCharCode(+t.substring(1)):""})}function i(n,e){return n=n.source||n,e=e||"",{replace:function(e,t){return t=(t=t.source||t).replace(/(^|[^\[])\^/g,"$1"),n=n.replace(e,t),this},getRegex:function(){return new RegExp(n,e)}}}function l(e,t,n){if(e){try{var r=decodeURIComponent(c(n)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return null}if(0===r.indexOf("javascript:")||0===r.indexOf("vbscript:")||0===r.indexOf("data:"))return null}t&&!u.test(n)&&(n=function(e,t){o[" "+e]||(/^[^:]+:\/*[^/]*$/.test(e)?o[" "+e]=e+"/":o[" "+e]=w(e,"/",!0));return e=o[" "+e],"//"===t.slice(0,2)?e.replace(/:[\s\S]*/,":")+t:"/"===t.charAt(0)?e.replace(/(:\/*[^/]*)[\s\S]*/,"$1")+t:e+t}(t,n));try{n=encodeURI(n).replace(/%25/g,"%")}catch(e){return null}return n}n._punctuation="!\"#$%&'()*+,\\-./:;<=>?@\\[^_{|}~",n.em=i(n.em).replace(/punctuation/g,n._punctuation).getRegex(),n._escapes=/\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g,n._scheme=/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/,n._email=/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/,n.autolink=i(n.autolink).replace("scheme",n._scheme).replace("email",n._email).getRegex(),n._attribute=/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/,n.tag=i(n.tag).replace("comment",x._comment).replace("attribute",n._attribute).getRegex(),n._label=/(?:\[[^\[\]]*\]|\\.|`[^`]*`|[^\[\]\\`])*?/,n._href=/<(?:\\[<>]?|[^\s<>\\])*>|[^\s\x00-\x1f]*/,n._title=/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/,n.link=i(n.link).replace("label",n._label).replace("href",n._href).replace("title",n._title).getRegex(),n.reflink=i(n.reflink).replace("label",n._label).getRegex(),n.normal=f({},n),n.pedantic=f({},n.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,link:i(/^!?\[(label)\]\((.*?)\)/).replace("label",n._label).getRegex(),reflink:i(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label",n._label).getRegex()}),n.gfm=f({},n.normal,{escape:i(n.escape).replace("])","~|])").getRegex(),_extended_email:/[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,url:/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,_backpedal:/(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,del:/^~+(?=\S)([\s\S]*?\S)~+/,text:/^(`+|[^`])(?:[\s\S]*?(?:(?=[\\<!\[`*~]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@))|(?= {2,}\n|[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@))/}),n.gfm.url=i(n.gfm.url,"i").replace("email",n.gfm._extended_email).getRegex(),n.breaks=f({},n.gfm,{br:i(n.br).replace("{2,}","*").getRegex(),text:i(n.gfm.text).replace("\\b_","\\b_| {2,}\\n").replace(/\{2,\}/g,"*").getRegex()}),p.rules=n,p.output=function(e,t,n){return new p(t,n).output(e)},p.prototype.output=function(e){for(var t,n,r,s,i,l,o="";e;)if(i=this.rules.escape.exec(e))e=e.substring(i[0].length),o+=_(i[1]);else if(i=this.rules.tag.exec(e))!this.inLink&&/^<a /i.test(i[0])?this.inLink=!0:this.inLink&&/^<\/a>/i.test(i[0])&&(this.inLink=!1),!this.inRawBlock&&/^<(pre|code|kbd|script)(\s|>)/i.test(i[0])?this.inRawBlock=!0:this.inRawBlock&&/^<\/(pre|code|kbd|script)(\s|>)/i.test(i[0])&&(this.inRawBlock=!1),e=e.substring(i[0].length),o+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(i[0]):_(i[0]):i[0];else if(i=this.rules.link.exec(e)){var a=d(i[2],"()");if(-1<a){var h=4+i[1].length+a;i[2]=i[2].substring(0,a),i[0]=i[0].substring(0,h).trim(),i[3]=""}e=e.substring(i[0].length),this.inLink=!0,r=i[2],s=this.options.pedantic?(t=/^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(r))?(r=t[1],t[3]):"":i[3]?i[3].slice(1,-1):"",r=r.trim().replace(/^<([\s\S]*)>$/,"$1"),o+=this.outputLink(i,{href:p.escapes(r),title:p.escapes(s)}),this.inLink=!1}else if((i=this.rules.reflink.exec(e))||(i=this.rules.nolink.exec(e))){if(e=e.substring(i[0].length),t=(i[2]||i[1]).replace(/\s+/g," "),!(t=this.links[t.toLowerCase()])||!t.href){o+=i[0].charAt(0),e=i[0].substring(1)+e;continue}this.inLink=!0,o+=this.outputLink(i,t),this.inLink=!1}else if(i=this.rules.strong.exec(e))e=e.substring(i[0].length),o+=this.renderer.strong(this.output(i[4]||i[3]||i[2]||i[1]));else if(i=this.rules.em.exec(e))e=e.substring(i[0].length),o+=this.renderer.em(this.output(i[6]||i[5]||i[4]||i[3]||i[2]||i[1]));else if(i=this.rules.code.exec(e))e=e.substring(i[0].length),o+=this.renderer.codespan(_(i[2].trim(),!0));else if(i=this.rules.br.exec(e))e=e.substring(i[0].length),o+=this.renderer.br();else if(i=this.rules.del.exec(e))e=e.substring(i[0].length),o+=this.renderer.del(this.output(i[1]));else if(i=this.rules.autolink.exec(e))e=e.substring(i[0].length),r="@"===i[2]?"mailto:"+(n=_(this.mangle(i[1]))):n=_(i[1]),o+=this.renderer.link(r,null,n);else if(this.inLink||!(i=this.rules.url.exec(e))){if(i=this.rules.text.exec(e))e=e.substring(i[0].length),this.inRawBlock?o+=this.renderer.text(this.options.sanitize?this.options.sanitizer?this.options.sanitizer(i[0]):_(i[0]):i[0]):o+=this.renderer.text(_(this.smartypants(i[0])));else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0))}else{if("@"===i[2])r="mailto:"+(n=_(i[0]));else{for(;l=i[0],i[0]=this.rules._backpedal.exec(i[0])[0],l!==i[0];);n=_(i[0]),r="www."===i[1]?"http://"+n:n}e=e.substring(i[0].length),o+=this.renderer.link(r,null,n)}return o},p.escapes=function(e){return e?e.replace(p.rules._escapes,"$1"):e},p.prototype.outputLink=function(e,t){var n=t.href,r=t.title?_(t.title):null;return"!"!==e[0].charAt(0)?this.renderer.link(n,r,this.output(e[1])):this.renderer.image(n,r,_(e[1]))},p.prototype.smartypants=function(e){return this.options.smartypants?e.replace(/---/g,"—").replace(/--/g,"–").replace(/(^|[-\u2014/(\[{"\s])'/g,"$1‘").replace(/'/g,"’").replace(/(^|[-\u2014/(\[{\u2018\s])"/g,"$1“").replace(/"/g,"”").replace(/\.{3}/g,"…"):e},p.prototype.mangle=function(e){if(!this.options.mangle)return e;for(var t,n="",r=e.length,s=0;s<r;s++)t=e.charCodeAt(s),.5<Math.random()&&(t="x"+t.toString(16)),n+="&#"+t+";";return n},r.prototype.code=function(e,t,n){var r=(t||"").match(/\S*/)[0];if(this.options.highlight){var s=this.options.highlight(e,r);null!=s&&s!==e&&(n=!0,e=s)}return r?'<pre><code class="'+this.options.langPrefix+_(r,!0)+'">'+(n?e:_(e,!0))+"</code></pre>\n":"<pre><code>"+(n?e:_(e,!0))+"</code></pre>"},r.prototype.blockquote=function(e){return"<blockquote>\n"+e+"</blockquote>\n"},r.prototype.html=function(e){return e},r.prototype.heading=function(e,t,n,r){return this.options.headerIds?"<h"+t+' id="'+this.options.headerPrefix+r.slug(n)+'">'+e+"</h"+t+">\n":"<h"+t+">"+e+"</h"+t+">\n"},r.prototype.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"},r.prototype.list=function(e,t,n){var r=t?"ol":"ul";return"<"+r+(t&&1!==n?' start="'+n+'"':"")+">\n"+e+"</"+r+">\n"},r.prototype.listitem=function(e){return"<li>"+e+"</li>\n"},r.prototype.checkbox=function(e){return"<input "+(e?'checked="" ':"")+'disabled="" type="checkbox"'+(this.options.xhtml?" /":"")+"> "},r.prototype.paragraph=function(e){return"<p>"+e+"</p>\n"},r.prototype.table=function(e,t){return t&&(t="<tbody>"+t+"</tbody>"),"<table>\n<thead>\n"+e+"</thead>\n"+t+"</table>\n"},r.prototype.tablerow=function(e){return"<tr>\n"+e+"</tr>\n"},r.prototype.tablecell=function(e,t){var n=t.header?"th":"td";return(t.align?"<"+n+' align="'+t.align+'">':"<"+n+">")+e+"</"+n+">\n"},r.prototype.strong=function(e){return"<strong>"+e+"</strong>"},r.prototype.em=function(e){return"<em>"+e+"</em>"},r.prototype.codespan=function(e){return"<code>"+e+"</code>"},r.prototype.br=function(){return this.options.xhtml?"<br/>":"<br>"},r.prototype.del=function(e){return"<del>"+e+"</del>"},r.prototype.link=function(e,t,n){if(null===(e=l(this.options.sanitize,this.options.baseUrl,e)))return n;var r='<a href="'+_(e)+'"';return t&&(r+=' title="'+t+'"'),r+=">"+n+"</a>"},r.prototype.image=function(e,t,n){if(null===(e=l(this.options.sanitize,this.options.baseUrl,e)))return n;var r='<img src="'+e+'" alt="'+n+'"';return t&&(r+=' title="'+t+'"'),r+=this.options.xhtml?"/>":">"},r.prototype.text=function(e){return e},s.prototype.strong=s.prototype.em=s.prototype.codespan=s.prototype.del=s.prototype.text=function(e){return e},s.prototype.link=s.prototype.image=function(e,t,n){return""+n},s.prototype.br=function(){return""},h.parse=function(e,t){return new h(t).parse(e)},h.prototype.parse=function(e){this.inline=new p(e.links,this.options),this.inlineText=new p(e.links,f({},this.options,{renderer:new s})),this.tokens=e.reverse();for(var t="";this.next();)t+=this.tok();return t},h.prototype.next=function(){return this.token=this.tokens.pop(),this.token},h.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0},h.prototype.parseText=function(){for(var e=this.token.text;"text"===this.peek().type;)e+="\n"+this.next().text;return this.inline.output(e)},h.prototype.tok=function(){switch(this.token.type){case"space":return"";case"hr":return this.renderer.hr();case"heading":return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,c(this.inlineText.output(this.token.text)),this.slugger);case"code":return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);case"table":var e,t,n,r,s="",i="";for(n="",e=0;e<this.token.header.length;e++)n+=this.renderer.tablecell(this.inline.output(this.token.header[e]),{header:!0,align:this.token.align[e]});for(s+=this.renderer.tablerow(n),e=0;e<this.token.cells.length;e++){for(t=this.token.cells[e],n="",r=0;r<t.length;r++)n+=this.renderer.tablecell(this.inline.output(t[r]),{header:!1,align:this.token.align[r]});i+=this.renderer.tablerow(n)}return this.renderer.table(s,i);case"blockquote_start":for(i="";"blockquote_end"!==this.next().type;)i+=this.tok();return this.renderer.blockquote(i);case"list_start":i="";for(var l=this.token.ordered,o=this.token.start;"list_end"!==this.next().type;)i+=this.tok();return this.renderer.list(i,l,o);case"list_item_start":i="";var a=this.token.loose,h=this.token.checked,p=this.token.task;for(this.token.task&&(i+=this.renderer.checkbox(h));"list_item_end"!==this.next().type;)i+=a||"text"!==this.token.type?this.tok():this.parseText();return this.renderer.listitem(i,p,h);case"html":return this.renderer.html(this.token.text);case"paragraph":return this.renderer.paragraph(this.inline.output(this.token.text));case"text":return this.renderer.paragraph(this.parseText());default:var u='Token with "'+this.token.type+'" type was not found.';if(!this.options.silent)throw new Error(u);console.log(u)}},t.prototype.slug=function(e){var t=e.toLowerCase().trim().replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g,"").replace(/\s/g,"-");if(this.seen.hasOwnProperty(t))for(var n=t;this.seen[n]++,t=n+"-"+this.seen[n],this.seen.hasOwnProperty(t););return this.seen[t]=0,t},_.escapeTest=/[&<>"']/,_.escapeReplace=/[&<>"']/g,_.replacements={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},_.escapeTestNoEncode=/[<>"']|&(?!#?\w+;)/,_.escapeReplaceNoEncode=/[<>"']|&(?!#?\w+;)/g;var o={},u=/^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;function g(){}function f(e){for(var t,n,r=1;r<arguments.length;r++)for(n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}function y(e,t){var n=e.replace(/\|/g,function(e,t,n){for(var r=!1,s=t;0<=--s&&"\\"===n[s];)r=!r;return r?"|":" |"}).split(/ \|/),r=0;if(n.length>t)n.splice(t);else for(;n.length<t;)n.push("");for(;r<n.length;r++)n[r]=n[r].trim().replace(/\\\|/g,"|");return n}function w(e,t,n){if(0===e.length)return"";for(var r=0;r<e.length;){var s=e.charAt(e.length-r-1);if(s!==t||n){if(s===t||!n)break;r++}else r++}return e.substr(0,e.length-r)}function d(e,t){if(-1===e.indexOf(t[1]))return-1;for(var n=0,r=0;r<e.length;r++)if("\\"===e[r])r++;else if(e[r]===t[0])n++;else if(e[r]===t[1]&&--n<0)return r;return-1}function m(e){e&&e.sanitize&&!e.silent&&console.warn("marked(): sanitize and sanitizer parameters are deprecated since version 0.7.0, should not be used and will be removed in the future. Read more here: https://marked.js.org/#/USING_ADVANCED.md#options")}function k(e,n,r){if(null==e)throw new Error("marked(): input parameter is undefined or null");if("string"!=typeof e)throw new Error("marked(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");if(r||"function"==typeof n){r||(r=n,n=null),m(n=f({},k.defaults,n||{}));var s,i,l=n.highlight,t=0;try{s=a.lex(e,n)}catch(e){return r(e)}i=s.length;var o=function(t){if(t)return n.highlight=l,r(t);var e;try{e=h.parse(s,n)}catch(e){t=e}return n.highlight=l,t?r(t):r(null,e)};if(!l||l.length<3)return o();if(delete n.highlight,!i)return o();for(;t<s.length;t++)!function(n){"code"!==n.type?--i||o():l(n.text,n.lang,function(e,t){return e?o(e):null==t||t===n.text?--i||o():(n.text=t,n.escaped=!0,void(--i||o()))})}(s[t])}else try{return n&&(n=f({},k.defaults,n)),m(n),h.parse(a.lex(e,n),n)}catch(e){if(e.message+="\nPlease report this to https://github.com/markedjs/marked.",(n||k.defaults).silent)return"<p>An error occurred:</p><pre>"+_(e.message+"",!0)+"</pre>";throw e}}g.exec=g,k.options=k.setOptions=function(e){return f(k.defaults,e),k},k.getDefaults=function(){return{baseUrl:null,breaks:!1,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:new r,sanitize:!1,sanitizer:null,silent:!1,smartLists:!1,smartypants:!1,xhtml:!1}},k.defaults=k.getDefaults(),k.Parser=h,k.parser=h.parse,k.Renderer=r,k.TextRenderer=s,k.Lexer=a,k.lexer=a.lex,k.InlineLexer=p,k.inlineLexer=p.output,k.Slugger=t,k.parse=k,"undefined"!=typeof module&&"object"==typeof exports?module.exports=k:"function"==typeof define&&define.amd?define(function(){return k}):e.marked=k}(this||("undefined"!=typeof window?window:global));
-  </script>
-  <script src="qrc:/qtwebchannel/qwebchannel.js"></script>
-  <style>
-	  body{
-		margin: 0 auto;
-		font-family: sans-serif;
-		color: #F1F1F1;
-		line-height: 1;
-		max-width: 960px;
-		padding-left: 25px;
-		padding-top: 10px;
-		background-color: #2D2D30;
-	}
-	h1, h2, h3, h4 {
-		color: #111111;
-		font-weight: 400;
-	}
-	h1, h2, h3, h4, h5, p {
-		margin-bottom: 24px;
-		padding: 0;
-	}
-	h1 {
-		font-size: 48px;
-	}
-	h2 {
-		font-size: 36px;
-		/* The bottom margin is small. It's designed to be used with gray meta text
-		 * below a post title. */
-		margin: 24px 0 6px;
-	}
-	h3 {
-		font-size: 24px;
-	}
-	h4 {
-		font-size: 21px;
-	}
-	h5 {
-		font-size: 18px;
-	}
-	a {
-		color: #0099ff;
-		margin: 0;
-		padding: 0;
-		vertical-align: baseline;
-	}
-	a:hover {
-		text-decoration: none;
-		color: #ff6600;
-	}
-	a:visited {
-		color: purple;
-	}
-	ul, ol {
-		padding: 0;
-		margin: 0;
-	}
-	li {
-		line-height: 24px;
-	}
-	li ul, li ul {
-		margin-left: 24px;
-	}
-	p, ul, ol {
-		font-size: 14px;
-		line-height: 24px;
-		max-width: 540px;
-	}
-	pre {
-		padding: 0px 24px;
-		max-width: 800px;
-		white-space: pre-wrap;
-	}
-	code {
-		font-family: Consolas, Monaco, Andale Mono, monospace;
-		line-height: 1.5;
-		font-size: 13px;
-	}
-	aside {
-		display: block;
-		float: right;
-		width: 390px;
-	}
-	blockquote {
-		border-left:.5em solid #eee;
-		padding: 0 2em;
-		margin-left:0;
-		max-width: 476px;
-	}
-	blockquote  cite {
-		font-size:14px;
-		line-height:20px;
-		color:#bfbfbf;
-	}
-	blockquote cite:before {
-		content: '\2014 \00A0';
-	}
+	<script>
+		/**
+		 * marked - a markdown parser
+		 * Copyright (c) 2011-2018, Christopher Jeffrey. (MIT Licensed)
+		 * https://github.com/markedjs/marked
+		 */
+		!function(e){"use strict";var x={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:/^ {0,3}(`{3,}|~{3,})([^`~\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/,hr:/^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,heading:/^ {0,3}(#{1,6}) +([^\n]*?)(?: +#+)? *(?:\n+|$)/,blockquote:/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,list:/^( {0,3})(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:"^ {0,3}(?:<(script|pre|style)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?\\?>\\n*|<![A-Z][\\s\\S]*?>\\n*|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>\\n*|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:\\n{2,}|$)|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$)|</(?!script|pre|style)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$))",def:/^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,nptable:g,table:g,lheading:/^([^\n]+)\n {0,3}(=+|-+) *(?:\n+|$)/,_paragraph:/^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html)[^\n]+)*)/,text:/^[^\n]+/};function a(e){this.tokens=[],this.tokens.links=Object.create(null),this.options=e||k.defaults,this.rules=x.normal,this.options.pedantic?this.rules=x.pedantic:this.options.gfm&&(this.rules=x.gfm)}x._label=/(?!\s*\])(?:\\[\[\]]|[^\[\]])+/,x._title=/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/,x.def=i(x.def).replace("label",x._label).replace("title",x._title).getRegex(),x.bullet=/(?:[*+-]|\d{1,9}\.)/,x.item=/^( *)(bull) ?[^\n]*(?:\n(?!\1bull ?)[^\n]*)*/,x.item=i(x.item,"gm").replace(/bull/g,x.bullet).getRegex(),x.list=i(x.list).replace(/bull/g,x.bullet).replace("hr","\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def","\\n+(?="+x.def.source+")").getRegex(),x._tag="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",x._comment=/<!--(?!-?>)[\s\S]*?-->/,x.html=i(x.html,"i").replace("comment",x._comment).replace("tag",x._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),x.paragraph=i(x._paragraph).replace("hr",x.hr).replace("heading"," {0,3}#{1,6} +").replace("|lheading","").replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}|~{3,})[^`\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html","</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|!--)").replace("tag",x._tag).getRegex(),x.blockquote=i(x.blockquote).replace("paragraph",x.paragraph).getRegex(),x.normal=f({},x),x.gfm=f({},x.normal,{nptable:/^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/,table:/^ *\|(.+)\n *\|?( *[-:]+[-| :]*)(?:\n((?: *[^>\n ].*(?:\n|$))*)\n*|$)/}),x.pedantic=f({},x.normal,{html:i("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)|<tag(?:\"[^\"]*\"|'[^']*'|\\s[^'\"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment",x._comment).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *(?:#+ *)?(?:\n+|$)/,fences:g,paragraph:i(x.normal._paragraph).replace("hr",x.hr).replace("heading"," *#{1,6} *[^\n]").replace("lheading",x.lheading).replace("blockquote"," {0,3}>").replace("|fences","").replace("|list","").replace("|html","").getRegex()}),a.rules=x,a.lex=function(e,t){return new a(t).lex(e)},a.prototype.lex=function(e){return e=e.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n"),this.token(e,!0)},a.prototype.token=function(e,t){var n,r,s,i,l,o,a,h,p,u,c,g,f,d,m,k;for(e=e.replace(/^ +$/gm,"");e;)if((s=this.rules.newline.exec(e))&&(e=e.substring(s[0].length),1<s[0].length&&this.tokens.push({type:"space"})),s=this.rules.code.exec(e)){var b=this.tokens[this.tokens.length-1];e=e.substring(s[0].length),b&&"paragraph"===b.type?b.text+="\n"+s[0].trimRight():(s=s[0].replace(/^ {4}/gm,""),this.tokens.push({type:"code",codeBlockStyle:"indented",text:this.options.pedantic?s:w(s,"\n")}))}else if(s=this.rules.fences.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"code",lang:s[2]?s[2].trim():s[2],text:s[3]||""});else if(s=this.rules.heading.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"heading",depth:s[1].length,text:s[2]});else if((s=this.rules.nptable.exec(e))&&(o={type:"table",header:y(s[1].replace(/^ *| *\| *$/g,"")),align:s[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:s[3]?s[3].replace(/\n$/,"").split("\n"):[]}).header.length===o.align.length){for(e=e.substring(s[0].length),c=0;c<o.align.length;c++)/^ *-+: *$/.test(o.align[c])?o.align[c]="right":/^ *:-+: *$/.test(o.align[c])?o.align[c]="center":/^ *:-+ *$/.test(o.align[c])?o.align[c]="left":o.align[c]=null;for(c=0;c<o.cells.length;c++)o.cells[c]=y(o.cells[c],o.header.length);this.tokens.push(o)}else if(s=this.rules.hr.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"hr"});else if(s=this.rules.blockquote.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"blockquote_start"}),s=s[0].replace(/^ *> ?/gm,""),this.token(s,t),this.tokens.push({type:"blockquote_end"});else if(s=this.rules.list.exec(e)){for(e=e.substring(s[0].length),a={type:"list_start",ordered:d=1<(i=s[2]).length,start:d?+i:"",loose:!1},this.tokens.push(a),n=!(h=[]),f=(s=s[0].match(this.rules.item)).length,c=0;c<f;c++)u=(o=s[c]).length,~(o=o.replace(/^ *([*+-]|\d+\.) */,"")).indexOf("\n ")&&(u-=o.length,o=this.options.pedantic?o.replace(/^ {1,4}/gm,""):o.replace(new RegExp("^ {1,"+u+"}","gm"),"")),c!==f-1&&(l=x.bullet.exec(s[c+1])[0],(1<i.length?1===l.length:1<l.length||this.options.smartLists&&l!==i)&&(e=s.slice(c+1).join("\n")+e,c=f-1)),r=n||/\n\n(?!\s*$)/.test(o),c!==f-1&&(n="\n"===o.charAt(o.length-1),r||(r=n)),r&&(a.loose=!0),k=void 0,(m=/^\[[ xX]\] /.test(o))&&(k=" "!==o[1],o=o.replace(/^\[[ xX]\] +/,"")),p={type:"list_item_start",task:m,checked:k,loose:r},h.push(p),this.tokens.push(p),this.token(o,!1),this.tokens.push({type:"list_item_end"});if(a.loose)for(f=h.length,c=0;c<f;c++)h[c].loose=!0;this.tokens.push({type:"list_end"})}else if(s=this.rules.html.exec(e))e=e.substring(s[0].length),this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:!this.options.sanitizer&&("pre"===s[1]||"script"===s[1]||"style"===s[1]),text:this.options.sanitize?this.options.sanitizer?this.options.sanitizer(s[0]):_(s[0]):s[0]});else if(t&&(s=this.rules.def.exec(e)))e=e.substring(s[0].length),s[3]&&(s[3]=s[3].substring(1,s[3].length-1)),g=s[1].toLowerCase().replace(/\s+/g," "),this.tokens.links[g]||(this.tokens.links[g]={href:s[2],title:s[3]});else if((s=this.rules.table.exec(e))&&(o={type:"table",header:y(s[1].replace(/^ *| *\| *$/g,"")),align:s[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:s[3]?s[3].replace(/\n$/,"").split("\n"):[]}).header.length===o.align.length){for(e=e.substring(s[0].length),c=0;c<o.align.length;c++)/^ *-+: *$/.test(o.align[c])?o.align[c]="right":/^ *:-+: *$/.test(o.align[c])?o.align[c]="center":/^ *:-+ *$/.test(o.align[c])?o.align[c]="left":o.align[c]=null;for(c=0;c<o.cells.length;c++)o.cells[c]=y(o.cells[c].replace(/^ *\| *| *\| *$/g,""),o.header.length);this.tokens.push(o)}else if(s=this.rules.lheading.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"heading",depth:"="===s[2].charAt(0)?1:2,text:s[1]});else if(t&&(s=this.rules.paragraph.exec(e)))e=e.substring(s[0].length),this.tokens.push({type:"paragraph",text:"\n"===s[1].charAt(s[1].length-1)?s[1].slice(0,-1):s[1]});else if(s=this.rules.text.exec(e))e=e.substring(s[0].length),this.tokens.push({type:"text",text:s[0]});else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0));return this.tokens};var n={escape:/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,autolink:/^<(scheme:[^\s\x00-\x1f<>]*|email)>/,url:g,tag:"^comment|^</[a-zA-Z][\\w:-]*\\s*>|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^<![a-zA-Z]+\\s[\\s\\S]*?>|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>",link:/^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/,reflink:/^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,nolink:/^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,strong:/^__([^\s_])__(?!_)|^\*\*([^\s*])\*\*(?!\*)|^__([^\s][\s\S]*?[^\s])__(?!_)|^\*\*([^\s][\s\S]*?[^\s])\*\*(?!\*)/,em:/^_([^\s_])_(?!_)|^\*([^\s*<\[])\*(?!\*)|^_([^\s<][\s\S]*?[^\s_])_(?!_|[^\spunctuation])|^_([^\s_<][\s\S]*?[^\s])_(?!_|[^\spunctuation])|^\*([^\s<"][\s\S]*?[^\s\*])\*(?!\*|[^\spunctuation])|^\*([^\s*"<\[][\s\S]*?[^\s])\*(?!\*)/,code:/^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,br:/^( {2,}|\\)\n(?!\s*$)/,del:g,text:/^(`+|[^`])(?:[\s\S]*?(?:(?=[\\<!\[`*]|\b_|$)|[^ ](?= {2,}\n))|(?= {2,}\n))/};function p(e,t){if(this.options=t||k.defaults,this.links=e,this.rules=n.normal,this.renderer=this.options.renderer||new r,this.renderer.options=this.options,!this.links)throw new Error("Tokens array requires a `links` property.");this.options.pedantic?this.rules=n.pedantic:this.options.gfm&&(this.options.breaks?this.rules=n.breaks:this.rules=n.gfm)}function r(e){this.options=e||k.defaults}function s(){}function h(e){this.tokens=[],this.token=null,this.options=e||k.defaults,this.options.renderer=this.options.renderer||new r,this.renderer=this.options.renderer,this.renderer.options=this.options,this.slugger=new t}function t(){this.seen={}}function _(e,t){if(t){if(_.escapeTest.test(e))return e.replace(_.escapeReplace,function(e){return _.replacements[e]})}else if(_.escapeTestNoEncode.test(e))return e.replace(_.escapeReplaceNoEncode,function(e){return _.replacements[e]});return e}function c(e){return e.replace(/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi,function(e,t){return"colon"===(t=t.toLowerCase())?":":"#"===t.charAt(0)?"x"===t.charAt(1)?String.fromCharCode(parseInt(t.substring(2),16)):String.fromCharCode(+t.substring(1)):""})}function i(n,e){return n=n.source||n,e=e||"",{replace:function(e,t){return t=(t=t.source||t).replace(/(^|[^\[])\^/g,"$1"),n=n.replace(e,t),this},getRegex:function(){return new RegExp(n,e)}}}function l(e,t,n){if(e){try{var r=decodeURIComponent(c(n)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return null}if(0===r.indexOf("javascript:")||0===r.indexOf("vbscript:")||0===r.indexOf("data:"))return null}t&&!u.test(n)&&(n=function(e,t){o[" "+e]||(/^[^:]+:\/*[^/]*$/.test(e)?o[" "+e]=e+"/":o[" "+e]=w(e,"/",!0));return e=o[" "+e],"//"===t.slice(0,2)?e.replace(/:[\s\S]*/,":")+t:"/"===t.charAt(0)?e.replace(/(:\/*[^/]*)[\s\S]*/,"$1")+t:e+t}(t,n));try{n=encodeURI(n).replace(/%25/g,"%")}catch(e){return null}return n}n._punctuation="!\"#$%&'()*+,\\-./:;<=>?@\\[^_{|}~",n.em=i(n.em).replace(/punctuation/g,n._punctuation).getRegex(),n._escapes=/\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g,n._scheme=/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/,n._email=/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/,n.autolink=i(n.autolink).replace("scheme",n._scheme).replace("email",n._email).getRegex(),n._attribute=/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/,n.tag=i(n.tag).replace("comment",x._comment).replace("attribute",n._attribute).getRegex(),n._label=/(?:\[[^\[\]]*\]|\\.|`[^`]*`|[^\[\]\\`])*?/,n._href=/<(?:\\[<>]?|[^\s<>\\])*>|[^\s\x00-\x1f]*/,n._title=/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/,n.link=i(n.link).replace("label",n._label).replace("href",n._href).replace("title",n._title).getRegex(),n.reflink=i(n.reflink).replace("label",n._label).getRegex(),n.normal=f({},n),n.pedantic=f({},n.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/,link:i(/^!?\[(label)\]\((.*?)\)/).replace("label",n._label).getRegex(),reflink:i(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label",n._label).getRegex()}),n.gfm=f({},n.normal,{escape:i(n.escape).replace("])","~|])").getRegex(),_extended_email:/[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,url:/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,_backpedal:/(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,del:/^~+(?=\S)([\s\S]*?\S)~+/,text:/^(`+|[^`])(?:[\s\S]*?(?:(?=[\\<!\[`*~]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@))|(?= {2,}\n|[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@))/}),n.gfm.url=i(n.gfm.url,"i").replace("email",n.gfm._extended_email).getRegex(),n.breaks=f({},n.gfm,{br:i(n.br).replace("{2,}","*").getRegex(),text:i(n.gfm.text).replace("\\b_","\\b_| {2,}\\n").replace(/\{2,\}/g,"*").getRegex()}),p.rules=n,p.output=function(e,t,n){return new p(t,n).output(e)},p.prototype.output=function(e){for(var t,n,r,s,i,l,o="";e;)if(i=this.rules.escape.exec(e))e=e.substring(i[0].length),o+=_(i[1]);else if(i=this.rules.tag.exec(e))!this.inLink&&/^<a /i.test(i[0])?this.inLink=!0:this.inLink&&/^<\/a>/i.test(i[0])&&(this.inLink=!1),!this.inRawBlock&&/^<(pre|code|kbd|script)(\s|>)/i.test(i[0])?this.inRawBlock=!0:this.inRawBlock&&/^<\/(pre|code|kbd|script)(\s|>)/i.test(i[0])&&(this.inRawBlock=!1),e=e.substring(i[0].length),o+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(i[0]):_(i[0]):i[0];else if(i=this.rules.link.exec(e)){var a=d(i[2],"()");if(-1<a){var h=4+i[1].length+a;i[2]=i[2].substring(0,a),i[0]=i[0].substring(0,h).trim(),i[3]=""}e=e.substring(i[0].length),this.inLink=!0,r=i[2],s=this.options.pedantic?(t=/^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(r))?(r=t[1],t[3]):"":i[3]?i[3].slice(1,-1):"",r=r.trim().replace(/^<([\s\S]*)>$/,"$1"),o+=this.outputLink(i,{href:p.escapes(r),title:p.escapes(s)}),this.inLink=!1}else if((i=this.rules.reflink.exec(e))||(i=this.rules.nolink.exec(e))){if(e=e.substring(i[0].length),t=(i[2]||i[1]).replace(/\s+/g," "),!(t=this.links[t.toLowerCase()])||!t.href){o+=i[0].charAt(0),e=i[0].substring(1)+e;continue}this.inLink=!0,o+=this.outputLink(i,t),this.inLink=!1}else if(i=this.rules.strong.exec(e))e=e.substring(i[0].length),o+=this.renderer.strong(this.output(i[4]||i[3]||i[2]||i[1]));else if(i=this.rules.em.exec(e))e=e.substring(i[0].length),o+=this.renderer.em(this.output(i[6]||i[5]||i[4]||i[3]||i[2]||i[1]));else if(i=this.rules.code.exec(e))e=e.substring(i[0].length),o+=this.renderer.codespan(_(i[2].trim(),!0));else if(i=this.rules.br.exec(e))e=e.substring(i[0].length),o+=this.renderer.br();else if(i=this.rules.del.exec(e))e=e.substring(i[0].length),o+=this.renderer.del(this.output(i[1]));else if(i=this.rules.autolink.exec(e))e=e.substring(i[0].length),r="@"===i[2]?"mailto:"+(n=_(this.mangle(i[1]))):n=_(i[1]),o+=this.renderer.link(r,null,n);else if(this.inLink||!(i=this.rules.url.exec(e))){if(i=this.rules.text.exec(e))e=e.substring(i[0].length),this.inRawBlock?o+=this.renderer.text(this.options.sanitize?this.options.sanitizer?this.options.sanitizer(i[0]):_(i[0]):i[0]):o+=this.renderer.text(_(this.smartypants(i[0])));else if(e)throw new Error("Infinite loop on byte: "+e.charCodeAt(0))}else{if("@"===i[2])r="mailto:"+(n=_(i[0]));else{for(;l=i[0],i[0]=this.rules._backpedal.exec(i[0])[0],l!==i[0];);n=_(i[0]),r="www."===i[1]?"http://"+n:n}e=e.substring(i[0].length),o+=this.renderer.link(r,null,n)}return o},p.escapes=function(e){return e?e.replace(p.rules._escapes,"$1"):e},p.prototype.outputLink=function(e,t){var n=t.href,r=t.title?_(t.title):null;return"!"!==e[0].charAt(0)?this.renderer.link(n,r,this.output(e[1])):this.renderer.image(n,r,_(e[1]))},p.prototype.smartypants=function(e){return this.options.smartypants?e.replace(/---/g,"—").replace(/--/g,"–").replace(/(^|[-\u2014/(\[{"\s])'/g,"$1‘").replace(/'/g,"’").replace(/(^|[-\u2014/(\[{\u2018\s])"/g,"$1“").replace(/"/g,"”").replace(/\.{3}/g,"…"):e},p.prototype.mangle=function(e){if(!this.options.mangle)return e;for(var t,n="",r=e.length,s=0;s<r;s++)t=e.charCodeAt(s),.5<Math.random()&&(t="x"+t.toString(16)),n+="&#"+t+";";return n},r.prototype.code=function(e,t,n){var r=(t||"").match(/\S*/)[0];if(this.options.highlight){var s=this.options.highlight(e,r);null!=s&&s!==e&&(n=!0,e=s)}return r?'<pre><code class="'+this.options.langPrefix+_(r,!0)+'">'+(n?e:_(e,!0))+"</code></pre>\n":"<pre><code>"+(n?e:_(e,!0))+"</code></pre>"},r.prototype.blockquote=function(e){return"<blockquote>\n"+e+"</blockquote>\n"},r.prototype.html=function(e){return e},r.prototype.heading=function(e,t,n,r){return this.options.headerIds?"<h"+t+' id="'+this.options.headerPrefix+r.slug(n)+'">'+e+"</h"+t+">\n":"<h"+t+">"+e+"</h"+t+">\n"},r.prototype.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"},r.prototype.list=function(e,t,n){var r=t?"ol":"ul";return"<"+r+(t&&1!==n?' start="'+n+'"':"")+">\n"+e+"</"+r+">\n"},r.prototype.listitem=function(e){return"<li>"+e+"</li>\n"},r.prototype.checkbox=function(e){return"<input "+(e?'checked="" ':"")+'disabled="" type="checkbox"'+(this.options.xhtml?" /":"")+"> "},r.prototype.paragraph=function(e){return"<p>"+e+"</p>\n"},r.prototype.table=function(e,t){return t&&(t="<tbody>"+t+"</tbody>"),"<table>\n<thead>\n"+e+"</thead>\n"+t+"</table>\n"},r.prototype.tablerow=function(e){return"<tr>\n"+e+"</tr>\n"},r.prototype.tablecell=function(e,t){var n=t.header?"th":"td";return(t.align?"<"+n+' align="'+t.align+'">':"<"+n+">")+e+"</"+n+">\n"},r.prototype.strong=function(e){return"<strong>"+e+"</strong>"},r.prototype.em=function(e){return"<em>"+e+"</em>"},r.prototype.codespan=function(e){return"<code>"+e+"</code>"},r.prototype.br=function(){return this.options.xhtml?"<br/>":"<br>"},r.prototype.del=function(e){return"<del>"+e+"</del>"},r.prototype.link=function(e,t,n){if(null===(e=l(this.options.sanitize,this.options.baseUrl,e)))return n;var r='<a href="'+_(e)+'"';return t&&(r+=' title="'+t+'"'),r+=">"+n+"</a>"},r.prototype.image=function(e,t,n){if(null===(e=l(this.options.sanitize,this.options.baseUrl,e)))return n;var r='<img src="'+e+'" alt="'+n+'"';return t&&(r+=' title="'+t+'"'),r+=this.options.xhtml?"/>":">"},r.prototype.text=function(e){return e},s.prototype.strong=s.prototype.em=s.prototype.codespan=s.prototype.del=s.prototype.text=function(e){return e},s.prototype.link=s.prototype.image=function(e,t,n){return""+n},s.prototype.br=function(){return""},h.parse=function(e,t){return new h(t).parse(e)},h.prototype.parse=function(e){this.inline=new p(e.links,this.options),this.inlineText=new p(e.links,f({},this.options,{renderer:new s})),this.tokens=e.reverse();for(var t="";this.next();)t+=this.tok();return t},h.prototype.next=function(){return this.token=this.tokens.pop(),this.token},h.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0},h.prototype.parseText=function(){for(var e=this.token.text;"text"===this.peek().type;)e+="\n"+this.next().text;return this.inline.output(e)},h.prototype.tok=function(){switch(this.token.type){case"space":return"";case"hr":return this.renderer.hr();case"heading":return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,c(this.inlineText.output(this.token.text)),this.slugger);case"code":return this.renderer.code(this.token.text,this.token.lang,this.token.escaped);case"table":var e,t,n,r,s="",i="";for(n="",e=0;e<this.token.header.length;e++)n+=this.renderer.tablecell(this.inline.output(this.token.header[e]),{header:!0,align:this.token.align[e]});for(s+=this.renderer.tablerow(n),e=0;e<this.token.cells.length;e++){for(t=this.token.cells[e],n="",r=0;r<t.length;r++)n+=this.renderer.tablecell(this.inline.output(t[r]),{header:!1,align:this.token.align[r]});i+=this.renderer.tablerow(n)}return this.renderer.table(s,i);case"blockquote_start":for(i="";"blockquote_end"!==this.next().type;)i+=this.tok();return this.renderer.blockquote(i);case"list_start":i="";for(var l=this.token.ordered,o=this.token.start;"list_end"!==this.next().type;)i+=this.tok();return this.renderer.list(i,l,o);case"list_item_start":i="";var a=this.token.loose,h=this.token.checked,p=this.token.task;for(this.token.task&&(i+=this.renderer.checkbox(h));"list_item_end"!==this.next().type;)i+=a||"text"!==this.token.type?this.tok():this.parseText();return this.renderer.listitem(i,p,h);case"html":return this.renderer.html(this.token.text);case"paragraph":return this.renderer.paragraph(this.inline.output(this.token.text));case"text":return this.renderer.paragraph(this.parseText());default:var u='Token with "'+this.token.type+'" type was not found.';if(!this.options.silent)throw new Error(u);console.log(u)}},t.prototype.slug=function(e){var t=e.toLowerCase().trim().replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g,"").replace(/\s/g,"-");if(this.seen.hasOwnProperty(t))for(var n=t;this.seen[n]++,t=n+"-"+this.seen[n],this.seen.hasOwnProperty(t););return this.seen[t]=0,t},_.escapeTest=/[&<>"']/,_.escapeReplace=/[&<>"']/g,_.replacements={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},_.escapeTestNoEncode=/[<>"']|&(?!#?\w+;)/,_.escapeReplaceNoEncode=/[<>"']|&(?!#?\w+;)/g;var o={},u=/^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;function g(){}function f(e){for(var t,n,r=1;r<arguments.length;r++)for(n in t=arguments[r])Object.prototype.hasOwnProperty.call(t,n)&&(e[n]=t[n]);return e}function y(e,t){var n=e.replace(/\|/g,function(e,t,n){for(var r=!1,s=t;0<=--s&&"\\"===n[s];)r=!r;return r?"|":" |"}).split(/ \|/),r=0;if(n.length>t)n.splice(t);else for(;n.length<t;)n.push("");for(;r<n.length;r++)n[r]=n[r].trim().replace(/\\\|/g,"|");return n}function w(e,t,n){if(0===e.length)return"";for(var r=0;r<e.length;){var s=e.charAt(e.length-r-1);if(s!==t||n){if(s===t||!n)break;r++}else r++}return e.substr(0,e.length-r)}function d(e,t){if(-1===e.indexOf(t[1]))return-1;for(var n=0,r=0;r<e.length;r++)if("\\"===e[r])r++;else if(e[r]===t[0])n++;else if(e[r]===t[1]&&--n<0)return r;return-1}function m(e){e&&e.sanitize&&!e.silent&&console.warn("marked(): sanitize and sanitizer parameters are deprecated since version 0.7.0, should not be used and will be removed in the future. Read more here: https://marked.js.org/#/USING_ADVANCED.md#options")}function k(e,n,r){if(null==e)throw new Error("marked(): input parameter is undefined or null");if("string"!=typeof e)throw new Error("marked(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");if(r||"function"==typeof n){r||(r=n,n=null),m(n=f({},k.defaults,n||{}));var s,i,l=n.highlight,t=0;try{s=a.lex(e,n)}catch(e){return r(e)}i=s.length;var o=function(t){if(t)return n.highlight=l,r(t);var e;try{e=h.parse(s,n)}catch(e){t=e}return n.highlight=l,t?r(t):r(null,e)};if(!l||l.length<3)return o();if(delete n.highlight,!i)return o();for(;t<s.length;t++)!function(n){"code"!==n.type?--i||o():l(n.text,n.lang,function(e,t){return e?o(e):null==t||t===n.text?--i||o():(n.text=t,n.escaped=!0,void(--i||o()))})}(s[t])}else try{return n&&(n=f({},k.defaults,n)),m(n),h.parse(a.lex(e,n),n)}catch(e){if(e.message+="\nPlease report this to https://github.com/markedjs/marked.",(n||k.defaults).silent)return"<p>An error occurred:</p><pre>"+_(e.message+"",!0)+"</pre>";throw e}}g.exec=g,k.options=k.setOptions=function(e){return f(k.defaults,e),k},k.getDefaults=function(){return{baseUrl:null,breaks:!1,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:new r,sanitize:!1,sanitizer:null,silent:!1,smartLists:!1,smartypants:!1,xhtml:!1}},k.defaults=k.getDefaults(),k.Parser=h,k.parser=h.parse,k.Renderer=r,k.TextRenderer=s,k.Lexer=a,k.lexer=a.lex,k.InlineLexer=p,k.inlineLexer=p.output,k.Slugger=t,k.parse=k,"undefined"!=typeof module&&"object"==typeof exports?module.exports=k:"function"==typeof define&&define.amd?define(function(){return k}):e.marked=k}(this||("undefined"!=typeof window?window:global));
+	</script>
+	<script src="qrc:/qtwebchannel/qwebchannel.js"></script>
+	<style>
+		body{
+			margin: 0 auto;
+			background: #2D2D30;
+			font-family: Sans-serif;
+			color: #F1F1F1;
+			line-height: 1;
+			max-width: 960px;
+			padding-left: 10px;
+			padding-top: 0px;
+		}
+		h1, h2, h3, h4 {
+			font-weight: 400;
+		}
+		h1, h2, h3, h4, h5, p {
+			margin-bottom: 24px;
+			padding: 0;
+		}
+		h1 {
+			font-size: 48px;
+		}
+		h2 {
+			font-size: 36px;
+			margin: 24px 0 6px;
+		}
+		h3 {
+			font-size: 24px;
+		}
+		h4 {
+			font-size: 21px;
+		}
+		h5 {
+			font-size: 18px;
+		}
+		a {
+			color: #61BFC1;
+			margin: 0;
+			padding: 0;
+			text-decoration: none;
+			vertical-align: baseline;
+		}
+		a:hover {
+			text-decoration: underline;
+		}
+		a:visited {
+			color: #466B6C;
+		}
+		ul, ol {
+			padding: 0;
+			padding-left: 20px;
+			margin: 0;
+		}
+		li {
+			line-height: 24px;
+		}
+		li ul, li ul {
+			margin-left: 24px;
+		}
+		p, ul, ol {
+			font-size: 14px;
+			line-height: 24px;
+			max-width: 540px;
+		}
+		pre {
+			padding: 0px 24px;
+			max-width: 800px;
+			white-space: pre-wrap;
+		}
+		code {
+			font-family: Consolas, Monaco, Andale Mono, monospace;
+			line-height: 1.5;
+			font-size: 13px;
+		}
+		aside {
+			display: block;
+			float: right;
+			width: 390px;
+		}
+		blockquote {
+			border-left:.5em solid #eee;
+			padding: 0 2em;
+			margin-left:0;
+			max-width: 476px;
+		}
+		blockquote  cite {
+			font-size:14px;
+			line-height:20px;
+			color:#bfbfbf;
+		}
+		blockquote cite:before {
+			content: '\2014 \00A0';
+		}
 
-	blockquote p {
-		color: #666;
-		max-width: 460px;
-	}
-	hr {
-		width: 540px;
-		text-align: left;
-		margin: 0 auto 0 0;
-		color: #999;
-	}
+		blockquote p {
+			color: #666;
+			max-width: 460px;
+		}
+		hr {
+			width: 540px;
+			text-align: left;
+			margin: 0 auto 0 0;
+			color: #999;
+		}
 
-	/* Code below this line is copyright Twitter Inc. */
+		/* Code below this line is copyright Twitter Inc. */
 
-	button,
-	input,
-	select,
-	textarea {
-	  font-size: 100%;
-	  margin: 0;
-	  vertical-align: baseline;
-	  *vertical-align: middle;
-	}
-	button, input {
-	  line-height: normal;
-	  *overflow: visible;
-	}
-	button::-moz-focus-inner, input::-moz-focus-inner {
-	  border: 0;
-	  padding: 0;
-	}
-	button,
-	input[type="button"],
-	input[type="reset"],
-	input[type="submit"] {
-	  cursor: pointer;
-	  -webkit-appearance: button;
-	}
-	input[type=checkbox], input[type=radio] {
-	  cursor: pointer;
-	}
-	/* override default chrome & firefox settings */
-	input:not([type="image"]), textarea {
-	  -webkit-box-sizing: content-box;
-	  -moz-box-sizing: content-box;
-	  box-sizing: content-box;
-	}
+		button,
+		input,
+		select,
+		textarea {
+		  font-size: 100%;
+		  margin: 0;
+		  vertical-align: baseline;
+		  *vertical-align: middle;
+		}
+		button, input {
+		  line-height: normal;
+		  *overflow: visible;
+		}
+		button::-moz-focus-inner, input::-moz-focus-inner {
+		  border: 0;
+		  padding: 0;
+		}
+		button,
+		input[type="button"],
+		input[type="reset"],
+		input[type="submit"] {
+		  cursor: pointer;
+		  -webkit-appearance: button;
+		}
+		input[type=checkbox], input[type=radio] {
+		  cursor: pointer;
+		}
+		/* override default chrome & firefox settings */
+		input:not([type="image"]), textarea {
+		  -webkit-box-sizing: content-box;
+		  -moz-box-sizing: content-box;
+		  box-sizing: content-box;
+		}
 
-	input[type="search"] {
-	  -webkit-appearance: textfield;
-	  -webkit-box-sizing: content-box;
-	  -moz-box-sizing: content-box;
-	  box-sizing: content-box;
-	}
-	input[type="search"]::-webkit-search-decoration {
-	  -webkit-appearance: none;
-	}
-	label,
-	input,
-	select,
-	textarea {
-	  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-	  font-size: 13px;
-	  font-weight: normal;
-	  line-height: normal;
-	  margin-bottom: 18px;
-	}
-	input[type=checkbox], input[type=radio] {
-	  cursor: pointer;
-	  margin-bottom: 0;
-	}
-	input[type=text],
-	input[type=password],
-	textarea,
-	select {
-	  display: inline-block;
-	  width: 210px;
-	  padding: 4px;
-	  font-size: 13px;
-	  font-weight: normal;
-	  line-height: 18px;
-	  height: 18px;
-	  color: #808080;
-	  border: 1px solid #ccc;
-	  -webkit-border-radius: 3px;
-	  -moz-border-radius: 3px;
-	  border-radius: 3px;
-	}
-	select, input[type=file] {
-	  height: 27px;
-	  line-height: 27px;
-	}
-	textarea {
-	  height: auto;
-	}
+		input[type="search"] {
+		  -webkit-appearance: textfield;
+		  -webkit-box-sizing: content-box;
+		  -moz-box-sizing: content-box;
+		  box-sizing: content-box;
+		}
+		input[type="search"]::-webkit-search-decoration {
+		  -webkit-appearance: none;
+		}
+		label,
+		input,
+		select,
+		textarea {
+		  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+		  font-size: 13px;
+		  font-weight: normal;
+		  line-height: normal;
+		  margin-bottom: 18px;
+		}
+		input[type=checkbox], input[type=radio] {
+		  cursor: pointer;
+		  margin-bottom: 0;
+		}
+		input[type=text],
+		input[type=password],
+		textarea,
+		select {
+		  display: inline-block;
+		  width: 210px;
+		  padding: 4px;
+		  font-size: 13px;
+		  font-weight: normal;
+		  line-height: 18px;
+		  height: 18px;
+		  color: #808080;
+		  border: 1px solid #ccc;
+		  -webkit-border-radius: 3px;
+		  -moz-border-radius: 3px;
+		  border-radius: 3px;
+		}
+		select, input[type=file] {
+		  height: 27px;
+		  line-height: 27px;
+		}
+		textarea {
+		  height: auto;
+		}
 
-	/* grey out placeholders */
-	:-moz-placeholder {
-	  color: #bfbfbf;
-	}
-	::-webkit-input-placeholder {
-	  color: #bfbfbf;
-	}
+		/* grey out placeholders */
+		:-moz-placeholder {
+		  color: #bfbfbf;
+		}
+		::-webkit-input-placeholder {
+		  color: #bfbfbf;
+		}
 
-	input[type=text],
-	input[type=password],
-	select,
-	textarea {
-	  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-	  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-	  transition: border linear 0.2s, box-shadow linear 0.2s;
-	  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
-	  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
-	  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
-	}
-	input[type=text]:focus, input[type=password]:focus, textarea:focus {
-	  outline: none;
-	  border-color: rgba(82, 168, 236, 0.8);
-	  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-	  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-	  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-	}
+		input[type=text],
+		input[type=password],
+		select,
+		textarea {
+		  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+		  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+		  transition: border linear 0.2s, box-shadow linear 0.2s;
+		  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+		  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+		  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+		}
+		input[type=text]:focus, input[type=password]:focus, textarea:focus {
+		  outline: none;
+		  border-color: rgba(82, 168, 236, 0.8);
+		  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+		  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+		  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+		}
 
-	/* buttons */
-	button {
-	  display: inline-block;
-	  padding: 4px 14px;
-	  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-	  font-size: 13px;
-	  line-height: 18px;
-	  -webkit-border-radius: 4px;
-	  -moz-border-radius: 4px;
-	  border-radius: 4px;
-	  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-	  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-	  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-	  background-color: #0064cd;
-	  background-repeat: repeat-x;
-	  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
-	  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
-	  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
-	  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
-	  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
-	  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
-	  background-image: linear-gradient(top, #049cdb, #0064cd);
-	  color: #fff;
-	  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-	  border: 1px solid #004b9a;
-	  border-bottom-color: #003f81;
-	  -webkit-transition: 0.1s linear all;
-	  -moz-transition: 0.1s linear all;
-	  transition: 0.1s linear all;
-	  border-color: #0064cd #0064cd #003f81;
-	  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-	}
-	button:hover {
-	  color: #fff;
-	  background-position: 0 -15px;
-	  text-decoration: none;
-	}
-	button:active {
-	  -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-	  -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-	  box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-	}
-	button::-moz-focus-inner {
-	  padding: 0;
-	  border: 0;
-	}
+		/* buttons */
+		button {
+		  display: inline-block;
+		  padding: 4px 14px;
+		  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+		  font-size: 13px;
+		  line-height: 18px;
+		  -webkit-border-radius: 4px;
+		  -moz-border-radius: 4px;
+		  border-radius: 4px;
+		  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+		  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+		  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+		  background-color: #0064cd;
+		  background-repeat: repeat-x;
+		  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+		  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+		  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+		  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+		  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+		  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+		  background-image: linear-gradient(top, #049cdb, #0064cd);
+		  color: #fff;
+		  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+		  border: 1px solid #004b9a;
+		  border-bottom-color: #003f81;
+		  -webkit-transition: 0.1s linear all;
+		  -moz-transition: 0.1s linear all;
+		  transition: 0.1s linear all;
+		  border-color: #0064cd #0064cd #003f81;
+		  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+		}
+		button:hover {
+		  color: #fff;
+		  background-position: 0 -15px;
+		  text-decoration: none;
+		}
+		button:active {
+		  -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+		  -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+		  box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+		}
+		button::-moz-focus-inner {
+		  padding: 0;
+		  border: 0;
+		}
 	</style>
 </head>
 <body>
-- 
cgit v1.3.1


From 4bbdbb000fd5051fe80b5dca21dda60910284333 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Wed, 27 Nov 2019 19:14:37 -0500
Subject: split filter list

---
 src/CMakeLists.txt |   3 +
 src/filterlist.cpp | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/filterlist.h   |  42 ++++++++++++
 src/mainwindow.cpp | 177 ++++---------------------------------------------
 src/mainwindow.h   |  12 +---
 5 files changed, 249 insertions(+), 174 deletions(-)
 create mode 100644 src/filterlist.cpp
 create mode 100644 src/filterlist.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e3a42409..a46908ef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -144,6 +144,7 @@ SET(organizer_SRCS
 	uilocker.cpp
 	loot.cpp
 	lootdialog.cpp
+	filterlist.cpp
 
     shared/windows_error.cpp
     shared/error_report.cpp
@@ -268,6 +269,7 @@ SET(organizer_HDRS
 	loot.h
 	lootdialog.h
 	json.h
+	filterlist.h
 
     shared/windows_error.h
     shared/error_report.h
@@ -320,6 +322,7 @@ SET(organizer_RCS
 source_group(src REGULAR_EXPRESSION ".*\\.(h|cpp|ui)")
 
 set(application
+	filterlist
 	iuserinterface
 	main
 	mainwindow
diff --git a/src/filterlist.cpp b/src/filterlist.cpp
new file mode 100644
index 00000000..8ef4b62d
--- /dev/null
+++ b/src/filterlist.cpp
@@ -0,0 +1,189 @@
+#include "filterlist.h"
+#include "ui_mainwindow.h"
+#include "categories.h"
+#include "categoriesdialog.h"
+#include <utility.h>
+
+using namespace MOBase;
+
+FilterList::FilterList(Ui::MainWindow* ui, CategoryFactory& factory)
+  : ui(ui), m_factory(factory)
+{
+  QObject::connect(
+    ui->categoriesList, &QTreeWidget::customContextMenuRequested,
+    [&](auto&& pos){ onContextMenu(pos); });
+
+  QObject::connect(
+    ui->categoriesList, &QTreeWidget::itemSelectionChanged,
+    [&]{ onSelection(); });
+}
+
+QTreeWidgetItem* FilterList::addFilterItem(
+  QTreeWidgetItem *root, const QString &name, int categoryID,
+  ModListSortProxy::FilterType type)
+{
+  QTreeWidgetItem *item = new QTreeWidgetItem(QStringList(name));
+  item->setData(0, Qt::ToolTipRole, name);
+  item->setData(0, Qt::UserRole, categoryID);
+  item->setData(0, Qt::UserRole + 1, type);
+  if (root != nullptr) {
+    root->addChild(item);
+  } else {
+    ui->categoriesList->addTopLevelItem(item);
+  }
+  return item;
+}
+
+void FilterList::addContentFilters()
+{
+  for (unsigned i = 0; i < ModInfo::NUM_CONTENT_TYPES; ++i) {
+    addFilterItem(nullptr, tr("<Contains %1>").arg(ModInfo::getContentTypeName(i)), i, ModListSortProxy::TYPE_CONTENT);
+  }
+}
+
+void FilterList::addCategoryFilters(QTreeWidgetItem *root, const std::set<int> &categoriesUsed, int targetID)
+{
+  for (unsigned int i = 1;
+    i < static_cast<unsigned int>(m_factory.numCategories()); ++i) {
+    if ((m_factory.getParentID(i) == targetID)) {
+      int categoryID = m_factory.getCategoryID(i);
+      if (categoriesUsed.find(categoryID) != categoriesUsed.end()) {
+        QTreeWidgetItem *item =
+          addFilterItem(root, m_factory.getCategoryName(i),
+            categoryID, ModListSortProxy::TYPE_CATEGORY);
+        if (m_factory.hasChildren(i)) {
+          addCategoryFilters(item, categoriesUsed, categoryID);
+        }
+      }
+    }
+  }
+}
+
+void FilterList::refresh()
+{
+  QItemSelection currentSelection = ui->modList->selectionModel()->selection();
+
+  QVariant currentIndexName = ui->modList->currentIndex().data();
+  ui->modList->setCurrentIndex(QModelIndex());
+
+  QStringList selectedItems;
+  for (QTreeWidgetItem *item : ui->categoriesList->selectedItems()) {
+    selectedItems.append(item->text(0));
+  }
+
+  ui->categoriesList->clear();
+  addFilterItem(nullptr, tr("<Checked>"), CategoryFactory::CATEGORY_SPECIAL_CHECKED, ModListSortProxy::TYPE_SPECIAL);
+  addFilterItem(nullptr, tr("<Unchecked>"), CategoryFactory::CATEGORY_SPECIAL_UNCHECKED, ModListSortProxy::TYPE_SPECIAL);
+  addFilterItem(nullptr, tr("<Update>"), CategoryFactory::CATEGORY_SPECIAL_UPDATEAVAILABLE, ModListSortProxy::TYPE_SPECIAL);
+  addFilterItem(nullptr, tr("<Mod Backup>"), CategoryFactory::CATEGORY_SPECIAL_BACKUP, ModListSortProxy::TYPE_SPECIAL);
+  addFilterItem(nullptr, tr("<Managed by MO>"), CategoryFactory::CATEGORY_SPECIAL_MANAGED, ModListSortProxy::TYPE_SPECIAL);
+  addFilterItem(nullptr, tr("<Managed outside MO>"), CategoryFactory::CATEGORY_SPECIAL_UNMANAGED, ModListSortProxy::TYPE_SPECIAL);
+  addFilterItem(nullptr, tr("<No category>"), CategoryFactory::CATEGORY_SPECIAL_NOCATEGORY, ModListSortProxy::TYPE_SPECIAL);
+  addFilterItem(nullptr, tr("<Conflicted>"), CategoryFactory::CATEGORY_SPECIAL_CONFLICT, ModListSortProxy::TYPE_SPECIAL);
+  addFilterItem(nullptr, tr("<Not Endorsed>"), CategoryFactory::CATEGORY_SPECIAL_NOTENDORSED, ModListSortProxy::TYPE_SPECIAL);
+  addFilterItem(nullptr, tr("<No Nexus ID>"), CategoryFactory::CATEGORY_SPECIAL_NONEXUSID, ModListSortProxy::TYPE_SPECIAL);
+  addFilterItem(nullptr, tr("<No valid game data>"), CategoryFactory::CATEGORY_SPECIAL_NOGAMEDATA, ModListSortProxy::TYPE_SPECIAL);
+
+  addContentFilters();
+  std::set<int> categoriesUsed;
+  for (unsigned int modIdx = 0; modIdx < ModInfo::getNumMods(); ++modIdx) {
+    ModInfo::Ptr modInfo = ModInfo::getByIndex(modIdx);
+    for (int categoryID : modInfo->getCategories()) {
+      int currentID = categoryID;
+      std::set<int> cycleTest;
+      // also add parents so they show up in the tree
+      while (currentID != 0) {
+        categoriesUsed.insert(currentID);
+        if (!cycleTest.insert(currentID).second) {
+          log::warn("cycle in categories: {}", SetJoin(cycleTest, ", "));
+          break;
+        }
+        currentID = m_factory.getParentID(m_factory.getCategoryIndex(currentID));
+      }
+    }
+  }
+
+  addCategoryFilters(nullptr, categoriesUsed, 0);
+
+  for (const QString &item : selectedItems) {
+    QList<QTreeWidgetItem*> matches = ui->categoriesList->findItems(item, Qt::MatchFixedString | Qt::MatchRecursive);
+    if (matches.size() > 0) {
+      matches.at(0)->setSelected(true);
+    }
+  }
+  ui->modList->selectionModel()->select(currentSelection, QItemSelectionModel::Select);
+  QModelIndexList matchList;
+  if (currentIndexName.isValid()) {
+    matchList = ui->modList->model()->match(ui->modList->model()->index(0, 0), Qt::DisplayRole, currentIndexName);
+  }
+
+  if (matchList.size() > 0) {
+    ui->modList->setCurrentIndex(matchList.at(0));
+  }
+}
+
+void FilterList::setSelection(std::vector<int> categories)
+{
+  for (int i = 0; i < ui->categoriesList->topLevelItemCount(); ++i) {
+    if (ui->categoriesList->topLevelItem(i)->data(0, Qt::UserRole) == CategoryFactory::CATEGORY_SPECIAL_UPDATEAVAILABLE) {
+      ui->categoriesList->setCurrentItem(ui->categoriesList->topLevelItem(i));
+      break;
+    }
+  }
+}
+
+void FilterList::clearSelection()
+{
+  ui->categoriesList->clearSelection();
+}
+
+void FilterList::onSelection()
+{
+  QModelIndexList indices = ui->categoriesList->selectionModel()->selectedRows();
+  std::vector<int> categories;
+  std::vector<int> content;
+  for (const QModelIndex &index : indices) {
+    int filterType = index.data(Qt::UserRole + 1).toInt();
+    if ((filterType == ModListSortProxy::TYPE_CATEGORY)
+      || (filterType == ModListSortProxy::TYPE_SPECIAL)) {
+      int categoryId = index.data(Qt::UserRole).toInt();
+      if (categoryId != CategoryFactory::CATEGORY_NONE) {
+        categories.push_back(categoryId);
+      }
+    } else if (filterType == ModListSortProxy::TYPE_CONTENT) {
+      int contentId = index.data(Qt::UserRole).toInt();
+      content.push_back(contentId);
+    }
+  }
+
+  emit changed(categories, content);
+
+  ui->clickBlankButton->setEnabled(categories.size() > 0 || content.size() >0);
+
+  if (indices.count() == 0) {
+    ui->currentCategoryLabel->setText(QString("(%1)").arg(tr("<All>")));
+  } else if (indices.count() > 1) {
+    ui->currentCategoryLabel->setText(QString("(%1)").arg(tr("<Multiple>")));
+  } else {
+    ui->currentCategoryLabel->setText(QString("(%1)").arg(indices.first().data().toString()));
+  }
+  ui->modList->reset();
+}
+
+void FilterList::onContextMenu(const QPoint &pos)
+{
+  QMenu menu;
+  menu.addAction(tr("Edit Categories..."), [&]{ editCategories(); });
+  menu.addAction(tr("Deselect filter"), [&]{ clearSelection(); });
+
+  menu.exec(ui->categoriesList->viewport()->mapToGlobal(pos));
+}
+
+void FilterList::editCategories()
+{
+  CategoriesDialog dialog(qApp->activeWindow());
+
+  if (dialog.exec() == QDialog::Accepted) {
+    dialog.commitChanges();
+  }
+}
diff --git a/src/filterlist.h b/src/filterlist.h
new file mode 100644
index 00000000..ca74021a
--- /dev/null
+++ b/src/filterlist.h
@@ -0,0 +1,42 @@
+#ifndef MODORGANIZER_CATEGORIESLIST_INCLUDED
+#define MODORGANIZER_CATEGORIESLIST_INCLUDED
+
+#include "modlistsortproxy.h"
+#include <QTreeWidgetItem>
+
+namespace Ui { class MainWindow; };
+class CategoryFactory;
+
+class FilterList : public QObject
+{
+  Q_OBJECT;
+
+public:
+  FilterList(Ui::MainWindow* ui, CategoryFactory& factory);
+
+  void setSelection(std::vector<int> categories);
+  void clearSelection();
+  void refresh();
+
+signals:
+  void changed(std::vector<int> categories, std::vector<int> content);
+
+private:
+  Ui::MainWindow* ui;
+  CategoryFactory& m_factory;
+
+  void onContextMenu(const QPoint &pos);
+  void onSelection();
+
+  void editCategories();
+
+  QTreeWidgetItem* addFilterItem(
+    QTreeWidgetItem *root, const QString &name, int categoryID,
+    ModListSortProxy::FilterType type);
+
+  void addContentFilters();
+  void addCategoryFilters(
+    QTreeWidgetItem *root, const std::set<int> &categoriesUsed, int targetID);
+};
+
+#endif // MODORGANIZER_CATEGORIESLIST_INCLUDED
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index d5636ab9..b63f9211 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -75,6 +75,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "appconfig.h"
 #include "eventfilter.h"
 #include "statusbar.h"
+#include "filterlist.h"
 #include <utility.h>
 #include <dataarchives.h>
 #include <bsainvalidation.h>
@@ -260,6 +261,11 @@ MainWindow::MainWindow(Settings &settings
   languageChange(settings.interface().language());
 
   m_CategoryFactory.loadCategories();
+  m_Filters.reset(new FilterList(ui, m_CategoryFactory));
+  connect(m_Filters.get(), &FilterList::changed, [&](auto&& cats, auto&& content) {
+    m_ModListSortProxy->setCategoryFilter(cats);
+    m_ModListSortProxy->setContentFilter(content);
+  });
 
   ui->logList->setCore(m_OrganizerCore);
 
@@ -1223,7 +1229,7 @@ void MainWindow::showEvent(QShowEvent *event)
 
   if (!m_WasVisible) {
     readSettings();
-    refreshFilters();
+    m_Filters->refresh();
 
     // this needs to be connected here instead of in the constructor because the
     // actual changing of the stylesheet is done by MOApplication, which
@@ -2646,108 +2652,6 @@ void MainWindow::fileMoved(const QString &filePath, const QString &oldOriginName
   }
 }
 
-QTreeWidgetItem *MainWindow::addFilterItem(QTreeWidgetItem *root, const QString &name, int categoryID, ModListSortProxy::FilterType type)
-{
-  QTreeWidgetItem *item = new QTreeWidgetItem(QStringList(name));
-  item->setData(0, Qt::ToolTipRole, name);
-  item->setData(0, Qt::UserRole, categoryID);
-  item->setData(0, Qt::UserRole + 1, type);
-  if (root != nullptr) {
-    root->addChild(item);
-  } else {
-    ui->categoriesList->addTopLevelItem(item);
-  }
-  return item;
-}
-
-void MainWindow::addContentFilters()
-{
-  for (unsigned i = 0; i < ModInfo::NUM_CONTENT_TYPES; ++i) {
-    addFilterItem(nullptr, tr("<Contains %1>").arg(ModInfo::getContentTypeName(i)), i, ModListSortProxy::TYPE_CONTENT);
-  }
-}
-
-void MainWindow::addCategoryFilters(QTreeWidgetItem *root, const std::set<int> &categoriesUsed, int targetID)
-{
-  for (unsigned int i = 1;
-       i < static_cast<unsigned int>(m_CategoryFactory.numCategories()); ++i) {
-    if ((m_CategoryFactory.getParentID(i) == targetID)) {
-      int categoryID = m_CategoryFactory.getCategoryID(i);
-      if (categoriesUsed.find(categoryID) != categoriesUsed.end()) {
-        QTreeWidgetItem *item =
-            addFilterItem(root, m_CategoryFactory.getCategoryName(i),
-                          categoryID, ModListSortProxy::TYPE_CATEGORY);
-        if (m_CategoryFactory.hasChildren(i)) {
-          addCategoryFilters(item, categoriesUsed, categoryID);
-        }
-      }
-    }
-  }
-}
-
-void MainWindow::refreshFilters()
-{
-  QItemSelection currentSelection = ui->modList->selectionModel()->selection();
-
-  QVariant currentIndexName = ui->modList->currentIndex().data();
-  ui->modList->setCurrentIndex(QModelIndex());
-
-  QStringList selectedItems;
-  for (QTreeWidgetItem *item : ui->categoriesList->selectedItems()) {
-    selectedItems.append(item->text(0));
-  }
-
-  ui->categoriesList->clear();
-  addFilterItem(nullptr, tr("<Checked>"), CategoryFactory::CATEGORY_SPECIAL_CHECKED, ModListSortProxy::TYPE_SPECIAL);
-  addFilterItem(nullptr, tr("<Unchecked>"), CategoryFactory::CATEGORY_SPECIAL_UNCHECKED, ModListSortProxy::TYPE_SPECIAL);
-  addFilterItem(nullptr, tr("<Update>"), CategoryFactory::CATEGORY_SPECIAL_UPDATEAVAILABLE, ModListSortProxy::TYPE_SPECIAL);
-  addFilterItem(nullptr, tr("<Mod Backup>"), CategoryFactory::CATEGORY_SPECIAL_BACKUP, ModListSortProxy::TYPE_SPECIAL);
-  addFilterItem(nullptr, tr("<Managed by MO>"), CategoryFactory::CATEGORY_SPECIAL_MANAGED, ModListSortProxy::TYPE_SPECIAL);
-  addFilterItem(nullptr, tr("<Managed outside MO>"), CategoryFactory::CATEGORY_SPECIAL_UNMANAGED, ModListSortProxy::TYPE_SPECIAL);
-  addFilterItem(nullptr, tr("<No category>"), CategoryFactory::CATEGORY_SPECIAL_NOCATEGORY, ModListSortProxy::TYPE_SPECIAL);
-  addFilterItem(nullptr, tr("<Conflicted>"), CategoryFactory::CATEGORY_SPECIAL_CONFLICT, ModListSortProxy::TYPE_SPECIAL);
-  addFilterItem(nullptr, tr("<Not Endorsed>"), CategoryFactory::CATEGORY_SPECIAL_NOTENDORSED, ModListSortProxy::TYPE_SPECIAL);
-  addFilterItem(nullptr, tr("<No Nexus ID>"), CategoryFactory::CATEGORY_SPECIAL_NONEXUSID, ModListSortProxy::TYPE_SPECIAL);
-  addFilterItem(nullptr, tr("<No valid game data>"), CategoryFactory::CATEGORY_SPECIAL_NOGAMEDATA, ModListSortProxy::TYPE_SPECIAL);
-
-  addContentFilters();
-  std::set<int> categoriesUsed;
-  for (unsigned int modIdx = 0; modIdx < ModInfo::getNumMods(); ++modIdx) {
-    ModInfo::Ptr modInfo = ModInfo::getByIndex(modIdx);
-    for (int categoryID : modInfo->getCategories()) {
-      int currentID = categoryID;
-      std::set<int> cycleTest;
-      // also add parents so they show up in the tree
-      while (currentID != 0) {
-        categoriesUsed.insert(currentID);
-        if (!cycleTest.insert(currentID).second) {
-          log::warn("cycle in categories: {}", SetJoin(cycleTest, ", "));
-          break;
-        }
-        currentID = m_CategoryFactory.getParentID(m_CategoryFactory.getCategoryIndex(currentID));
-      }
-    }
-  }
-
-  addCategoryFilters(nullptr, categoriesUsed, 0);
-
-  for (const QString &item : selectedItems) {
-    QList<QTreeWidgetItem*> matches = ui->categoriesList->findItems(item, Qt::MatchFixedString | Qt::MatchRecursive);
-    if (matches.size() > 0) {
-      matches.at(0)->setSelected(true);
-    }
-  }
-  ui->modList->selectionModel()->select(currentSelection, QItemSelectionModel::Select);
-  QModelIndexList matchList;
-  if (currentIndexName.isValid()) {
-    matchList = ui->modList->model()->match(ui->modList->model()->index(0, 0), Qt::DisplayRole, currentIndexName);
-  }
-
-  if (matchList.size() > 0) {
-    ui->modList->setCurrentIndex(matchList.at(0));
-  }
-}
-
 
 void MainWindow::renameMod_clicked()
 {
@@ -4121,7 +4025,7 @@ void MainWindow::addRemoveCategories_MenuHandler() {
     m_OrganizerCore.modList()->notifyChange(m_ContextRow);
   }
 
-  refreshFilters();
+  m_Filters->refresh();
 }
 
 void MainWindow::replaceCategories_MenuHandler() {
@@ -4165,7 +4069,7 @@ void MainWindow::replaceCategories_MenuHandler() {
     m_OrganizerCore.modList()->notifyChange(m_ContextRow);
   }
 
-  refreshFilters();
+  m_Filters->refresh();
 }
 
 void MainWindow::saveArchiveList()
@@ -4217,12 +4121,7 @@ void MainWindow::checkModsForUpdates()
 
   if (updatesAvailable || checkingModsForUpdate) {
     m_ModListSortProxy->setCategoryFilter(boost::assign::list_of(CategoryFactory::CATEGORY_SPECIAL_UPDATEAVAILABLE));
-    for (int i = 0; i < ui->categoriesList->topLevelItemCount(); ++i) {
-      if (ui->categoriesList->topLevelItem(i)->data(0, Qt::UserRole) == CategoryFactory::CATEGORY_SPECIAL_UPDATEAVAILABLE) {
-        ui->categoriesList->setCurrentItem(ui->categoriesList->topLevelItem(i));
-        break;
-      }
-    }
+    m_Filters->setSelection({CategoryFactory::CATEGORY_SPECIAL_UPDATEAVAILABLE});
   }
 }
 
@@ -4848,40 +4747,6 @@ void MainWindow::on_modList_customContextMenuRequested(const QPoint &pos)
 }
 
 
-void MainWindow::on_categoriesList_itemSelectionChanged()
-{
-  QModelIndexList indices = ui->categoriesList->selectionModel()->selectedRows();
-  std::vector<int> categories;
-  std::vector<int> content;
-  for (const QModelIndex &index : indices) {
-    int filterType = index.data(Qt::UserRole + 1).toInt();
-    if ((filterType == ModListSortProxy::TYPE_CATEGORY)
-        || (filterType == ModListSortProxy::TYPE_SPECIAL)) {
-      int categoryId = index.data(Qt::UserRole).toInt();
-      if (categoryId != CategoryFactory::CATEGORY_NONE) {
-        categories.push_back(categoryId);
-      }
-    } else if (filterType == ModListSortProxy::TYPE_CONTENT) {
-      int contentId = index.data(Qt::UserRole).toInt();
-      content.push_back(contentId);
-    }
-  }
-
-  m_ModListSortProxy->setCategoryFilter(categories);
-  m_ModListSortProxy->setContentFilter(content);
-  ui->clickBlankButton->setEnabled(categories.size() > 0 || content.size() >0);
-
-  if (indices.count() == 0) {
-    ui->currentCategoryLabel->setText(QString("(%1)").arg(tr("<All>")));
-  } else if (indices.count() > 1) {
-    ui->currentCategoryLabel->setText(QString("(%1)").arg(tr("<Multiple>")));
-  } else {
-    ui->currentCategoryLabel->setText(QString("(%1)").arg(indices.first().data().toString()));
-  }
-  ui->modList->reset();
-}
-
-
 void MainWindow::deleteSavegame_clicked()
 {
   SaveGameInfo const *info = m_OrganizerCore.managedGame()->feature<SaveGameInfo>();
@@ -5071,7 +4936,7 @@ void MainWindow::on_actionSettings_triggered()
   instManager->setDownloadDirectory(settings.paths().downloads());
 
   fixCategories();
-  refreshFilters();
+  m_Filters->refresh();
 
   if (settings.paths().profiles() != oldProfilesDirectory) {
     refreshProfiles();
@@ -6213,27 +6078,9 @@ void MainWindow::on_displayCategoriesBtn_toggled(bool checked)
   setCategoryListVisible(checked);
 }
 
-void MainWindow::editCategories()
-{
-  CategoriesDialog dialog(this);
-
-  if (dialog.exec() == QDialog::Accepted) {
-    dialog.commitChanges();
-  }
-}
-
 void MainWindow::deselectFilters()
 {
-  ui->categoriesList->clearSelection();
-}
-
-void MainWindow::on_categoriesList_customContextMenuRequested(const QPoint &pos)
-{
-  QMenu menu;
-  menu.addAction(tr("Edit Categories..."), this, SLOT(editCategories()));
-  menu.addAction(tr("Deselect filter"), this, SLOT(deselectFilters()));
-
-  menu.exec(ui->categoriesList->viewport()->mapToGlobal(pos));
+  m_Filters->clearSelection();
 }
 
 
diff --git a/src/mainwindow.h b/src/mainwindow.h
index c99c724b..04ba7a35 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -39,6 +39,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 class Executable;
 class CategoryFactory;
 class OrganizerCore;
+class FilterList;
 
 class PluginListSortProxy;
 namespace BSA { class Archive; }
@@ -235,8 +236,6 @@ private:
 
   void writeDataToFile(QFile &file, const QString &directory, const MOShared::DirectoryEntry &directoryEntry);
 
-  void refreshFilters();
-
   /**
    * Sets category selections from menu; for multiple mods, this will only apply
    * the changes made in the menu (which is the delta between the current menu selection and the reference mod)
@@ -266,10 +265,6 @@ private:
 
   size_t checkForProblems();
 
-  QTreeWidgetItem *addFilterItem(QTreeWidgetItem *root, const QString &name, int categoryID, ModListSortProxy::FilterType type);
-  void addContentFilters();
-  void addCategoryFilters(QTreeWidgetItem *root, const std::set<int> &categoriesUsed, int targetID);
-
   void setCategoryListVisible(bool visible);
 
   void displaySaveGameInfo(QListWidgetItem *newItem);
@@ -327,6 +322,8 @@ private:
 
   MOBase::TutorialControl m_Tutorial;
 
+  std::unique_ptr<FilterList> m_Filters;
+
   int m_OldProfileIndex;
 
   std::vector<QString> m_ModNameList; // the mod-list to go with the directory structure
@@ -515,7 +512,6 @@ private slots:
 
   void onRequestsChanged(const APIStats& stats, const APIUserAccount& user);
 
-  void editCategories();
   void deselectFilters();
 
   void displayModInformation(const QString &modName, ModInfoTabIDs tabID);
@@ -630,7 +626,6 @@ private slots: // ui slots
   void on_clearFiltersButton_clicked();
   void on_btnRefreshData_clicked();
   void on_btnRefreshDownloads_clicked();
-  void on_categoriesList_customContextMenuRequested(const QPoint &pos);
   void on_conflictsCheckBox_toggled(bool checked);
   void on_showArchiveDataCheckBox_toggled(bool checked);
   void on_dataTree_customContextMenuRequested(const QPoint &pos);
@@ -647,7 +642,6 @@ private slots: // ui slots
   void on_espList_customContextMenuRequested(const QPoint &pos);
   void on_displayCategoriesBtn_toggled(bool checked);
   void on_groupCombo_currentIndexChanged(int index);
-  void on_categoriesList_itemSelectionChanged();
   void on_linkButton_pressed();
   void on_showHiddenBox_toggled(bool checked);
   void on_bsaList_itemChanged(QTreeWidgetItem *item, int column);
-- 
cgit v1.3.1


From b3331ef2c0b50ab2cea4c328e78f6ab58bca099d Mon Sep 17 00:00:00 2001
From: Silarn <jrim@rimpo.org>
Date: Fri, 6 Dec 2019 23:12:18 -0600
Subject: Separate conflict flags and render them in separate columns

---
 src/CMakeLists.txt              |    3 +
 src/colortable.cpp              |   61 +-
 src/mainwindow.cpp              |   22 +-
 src/modconflicticondelegate.cpp |  160 ++
 src/modconflicticondelegate.h   |   36 +
 src/modflagicondelegate.cpp     |   74 +-
 src/modflagicondelegate.h       |    4 -
 src/modinfo.h                   |   25 +-
 src/modinfobackup.cpp           |    1 +
 src/modinfodialogfwd.h          |    1 +
 src/modinfooverwrite.cpp        |    9 +
 src/modinfooverwrite.h          |    1 +
 src/modinfowithconflictinfo.cpp |    4 +-
 src/modinfowithconflictinfo.h   |    3 +-
 src/modlist.cpp                 |   40 +-
 src/modlist.h                   |    3 +
 src/modlistsortproxy.cpp        |   21 +
 src/modlistsortproxy.h          |    1 +
 src/organizer_en.ts             | 3671 ++++++++++++++++++++++-----------------
 19 files changed, 2390 insertions(+), 1750 deletions(-)
 create mode 100644 src/modconflicticondelegate.cpp
 create mode 100644 src/modconflicticondelegate.h

(limited to 'src/CMakeLists.txt')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a46908ef..d0215930 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -114,6 +114,7 @@ SET(organizer_SRCS
     previewdialog.cpp
     aboutdialog.cpp
     modflagicondelegate.cpp
+    modconflicticondelegate.cpp
     genericicondelegate.cpp
     organizerproxy.cpp
     viewmarkingscrollbar.cpp
@@ -238,6 +239,7 @@ SET(organizer_HDRS
     previewdialog.h
     aboutdialog.h
     modflagicondelegate.h
+    modconflicticondelegate.h
     genericicondelegate.h
     organizerproxy.h
     viewmarkingscrollbar.h
@@ -491,6 +493,7 @@ set(widgets
 	loglist
 	loghighlighter
 	modflagicondelegate
+	modconflicticondelegate
 	modidlineedit
 	noeditdelegate
 	qtgroupingproxy
diff --git a/src/colortable.cpp b/src/colortable.cpp
index 61c5ee5f..b1e4ef6c 100644
--- a/src/colortable.cpp
+++ b/src/colortable.cpp
@@ -1,5 +1,6 @@
 #include "colortable.h"
 #include "modflagicondelegate.h"
+#include "modconflicticondelegate.h"
 #include "settings.h"
 
 class ColorItem;
@@ -52,21 +53,17 @@ public:
   }
 
   void paint(
-    QPainter *painter, const QStyleOptionViewItem &option,
-    const QModelIndex &index) const override
+    QPainter* painter, const QStyleOptionViewItem& option,
+    const QModelIndex& index) const override
   {
     paintBackground(m_table, painter, option, index);
     ModFlagIconDelegate::paintIcons(painter, option, index, getIcons(index));
   }
 
 protected:
-  QList<QString> getIcons(const QModelIndex &index) const override
+  QList<QString> getIcons(const QModelIndex& index) const override
   {
     const auto flags = {
-      ModInfo::FLAG_CONFLICT_MIXED,
-      ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE,
-      ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN,
-      ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED,
       ModInfo::FLAG_BACKUP,
       ModInfo::FLAG_NOTENDORSED,
       ModInfo::FLAG_NOTES,
@@ -76,7 +73,48 @@ protected:
     return getIconsForFlags(flags, false);
   }
 
-  size_t getNumIcons(const QModelIndex &index) const override
+  size_t getNumIcons(const QModelIndex& index) const override
+  {
+    return getIcons(index).size();
+  }
+
+private:
+  QTableWidget* m_table;
+};
+
+
+// delegate for the icons column; paints the background and icons
+//
+class FakeModConflictIconDelegate : public ModConflictIconDelegate
+{
+public:
+  explicit FakeModConflictIconDelegate(QTableWidget* table)
+    : m_table(table)
+  {
+  }
+
+  void paint(
+    QPainter* painter, const QStyleOptionViewItem& option,
+    const QModelIndex& index) const override
+  {
+    paintBackground(m_table, painter, option, index);
+    ModFlagIconDelegate::paintIcons(painter, option, index, getIcons(index));
+  }
+
+protected:
+  QList<QString> getIcons(const QModelIndex& index) const override
+  {
+    const auto flags = {
+      ModInfo::FLAG_CONFLICT_MIXED,
+      ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE,
+      ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN,
+      ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED
+    };
+
+    return getIconsForFlags(flags, false);
+  }
+
+  size_t getNumIcons(const QModelIndex& index) const override
   {
     return getIcons(index).size();
   }
@@ -183,11 +221,12 @@ void paintBackground(
 ColorTable::ColorTable(QWidget* parent)
   : QTableWidget(parent), m_settings(nullptr)
 {
-  setColumnCount(3);
-  setHorizontalHeaderLabels({"", "", ""});
+  setColumnCount(4);
+  setHorizontalHeaderLabels({"", "", "", ""});
 
   setItemDelegateForColumn(1, new ColoredBackgroundDelegate(this));
-  setItemDelegateForColumn(2, new FakeModFlagIconDelegate(this));
+  setItemDelegateForColumn(2, new FakeModConflictIconDelegate(this));
+  setItemDelegateForColumn(3, new FakeModFlagIconDelegate(this));
 
   connect(
     this, &QTableWidget::cellActivated,
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index cb242b88..68627c90 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -61,6 +61,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "filedialogmemory.h"
 #include "tutorialmanager.h"
 #include "modflagicondelegate.h"
+#include "modconflicticondelegate.h"
 #include "genericicondelegate.h"
 #include "selectiondialog.h"
 #include "csvbuilder.h"
@@ -552,7 +553,16 @@ void MainWindow::setupModList()
     flagDelegate, SLOT(columnResized(int,int,int)));
 
 
+  ModConflictIconDelegate* conflictFlagDelegate = new ModConflictIconDelegate(
+    ui->modList, ModList::COL_CONFLICTFLAGS, 120);
+
+  connect(
+    ui->modList->header(), SIGNAL(sectionResized(int, int, int)),
+    conflictFlagDelegate, SLOT(columnResized(int, int, int)));
+
+
   ui->modList->setItemDelegateForColumn(ModList::COL_FLAGS, flagDelegate);
+  ui->modList->setItemDelegateForColumn(ModList::COL_CONFLICTFLAGS, conflictFlagDelegate);
   ui->modList->setItemDelegateForColumn(ModList::COL_CONTENT, contentDelegate);
   ui->modList->header()->installEventFilter(m_OrganizerCore.modList());
 
@@ -2317,6 +2327,15 @@ void MainWindow::processUpdates(Settings& settings) {
         ui->downloadView->header()->hideSection(i);
       }
     }
+
+    if (lastVersion < QVersionNumber(2, 2, 2)) {
+      bool lastHidden = true;
+      for (int i = ModList::COL_CONFLICTFLAGS; i < ui->modList->model()->columnCount(); ++i) {
+        bool hidden = ui->modList->header()->isSectionHidden(i);
+        ui->modList->header()->setSectionHidden(i, lastHidden);
+        lastHidden = hidden;
+      }
+    }
   }
 
   if (currentVersion < lastVersion) {
@@ -3877,7 +3896,8 @@ void MainWindow::on_modList_doubleClicked(const QModelIndex &index)
         case ModList::COL_MODID: tab = ModInfoTabIDs::Nexus; break;
         case ModList::COL_GAME: tab = ModInfoTabIDs::Nexus; break;
         case ModList::COL_CATEGORY: tab = ModInfoTabIDs::Categories; break;
-        case ModList::COL_FLAGS: tab = ModInfoTabIDs::Conflicts; break;
+        case ModList::COL_CONFLICTFLAGS: tab = ModInfoTabIDs::Conflicts; break;
+        case ModList::COL_FLAGS: tab = ModInfoTabIDs::Flags; break;
       }
 
       displayModInformation(sourceIdx.row(), tab);
diff --git a/src/modconflicticondelegate.cpp b/src/modconflicticondelegate.cpp
new file mode 100644
index 00000000..2ccf3363
--- /dev/null
+++ b/src/modconflicticondelegate.cpp
@@ -0,0 +1,160 @@
+#include "modconflicticondelegate.h"
+#include <log.h>
+#include <QList>
+
+using namespace MOBase;
+
+ModInfo::EConflictFlag ModConflictIconDelegate::m_ConflictFlags[4] = { ModInfo::FLAG_CONFLICT_MIXED
+                                                         , ModInfo::FLAG_CONFLICT_OVERWRITE
+                                                         , ModInfo::FLAG_CONFLICT_OVERWRITTEN
+                                                         , ModInfo::FLAG_CONFLICT_REDUNDANT };
+
+ModInfo::EConflictFlag ModConflictIconDelegate::m_ArchiveLooseConflictFlags[2] = { ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE
+                                                                     , ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN };
+
+ModInfo::EConflictFlag ModConflictIconDelegate::m_ArchiveConflictFlags[3] = { ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED
+                                                                , ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE
+                                                                , ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN };
+
+ModConflictIconDelegate::ModConflictIconDelegate(QObject *parent, int logicalIndex, int compactSize)
+  : IconDelegate(parent)
+  , m_LogicalIndex(logicalIndex)
+  , m_CompactSize(compactSize)
+  , m_Compact(false)
+{
+}
+
+void ModConflictIconDelegate::columnResized(int logicalIndex, int, int newSize)
+{
+  if (logicalIndex == m_LogicalIndex) {
+    m_Compact = newSize < m_CompactSize;
+  }
+}
+
+QList<QString> ModConflictIconDelegate::getIconsForFlags(
+  std::vector<ModInfo::EConflictFlag> flags, bool compact)
+{
+  QList<QString> result;
+
+  // Don't do flags for overwrite
+  if (std::find(flags.begin(), flags.end(),ModInfo::FLAG_OVERWRITE_CONFLICT) != flags.end())
+    return result;
+
+  // insert conflict icons to provide nicer alignment
+  { // insert loose file conflicts first
+    auto iter = std::find_first_of(flags.begin(), flags.end(),
+                                    m_ConflictFlags, m_ConflictFlags + 4);
+    if (iter != flags.end()) {
+      result.append(getFlagIcon(*iter));
+      flags.erase(iter);
+    } else if (!compact) {
+      result.append(QString());
+    }
+  }
+
+  { // insert loose vs archive overwrite second
+    auto iter = std::find(flags.begin(), flags.end(),
+      ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE);
+    if (iter != flags.end()) {
+      result.append(getFlagIcon(*iter));
+      flags.erase(iter);
+    } else if (!compact) {
+      result.append(QString());
+    }
+  }
+
+  { // insert loose vs archive overwritten third
+    auto iter = std::find_first_of(flags.begin(), flags.end(),
+      m_ArchiveLooseConflictFlags + 1, m_ArchiveLooseConflictFlags + 2);
+    if (iter != flags.end()) {
+      result.append(getFlagIcon(*iter));
+      flags.erase(iter);
+    } else if (!compact) {
+      result.append(QString());
+    }
+  }
+
+  { // insert archive conflicts last
+    auto iter = std::find_first_of(flags.begin(), flags.end(),
+      m_ArchiveConflictFlags, m_ArchiveConflictFlags + 3);
+    if (iter != flags.end()) {
+      result.append(getFlagIcon(*iter));
+      flags.erase(iter);
+    } else if (!compact) {
+      result.append(QString());
+    }
+  }
+
+  for (auto iter = flags.begin(); iter != flags.end(); ++iter) {
+    auto iconPath = getFlagIcon(*iter);
+    if (!iconPath.isEmpty())
+      result.append(iconPath);
+  }
+
+  return result;
+}
+
+QList<QString> ModConflictIconDelegate::getIcons(const QModelIndex &index) const
+{
+  QVariant modid = index.data(Qt::UserRole + 1);
+
+  if (modid.isValid()) {
+    ModInfo::Ptr info = ModInfo::getByIndex(modid.toInt());
+    return getIconsForFlags(info->getConflictFlags(), m_Compact);
+  }
+
+  return {};
+}
+
+QString ModConflictIconDelegate::getFlagIcon(ModInfo::EConflictFlag flag)
+{
+  switch (flag) {
+    case ModInfo::FLAG_CONFLICT_MIXED: return QStringLiteral(":/MO/gui/emblem_conflict_mixed");
+    case ModInfo::FLAG_CONFLICT_OVERWRITE: return QStringLiteral(":/MO/gui/emblem_conflict_overwrite");
+    case ModInfo::FLAG_CONFLICT_OVERWRITTEN: return QStringLiteral(":/MO/gui/emblem_conflict_overwritten");
+    case ModInfo::FLAG_CONFLICT_REDUNDANT: return QStringLiteral(":/MO/gui/emblem_conflict_redundant");
+    case ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE: return QStringLiteral(":/MO/gui/archive_loose_conflict_overwrite");
+    case ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN: return QStringLiteral(":/MO/gui/archive_loose_conflict_overwritten");
+    case ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED: return QStringLiteral(":/MO/gui/archive_conflict_mixed");
+    case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE: return QStringLiteral(":/MO/gui/archive_conflict_winner");
+    case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN: return QStringLiteral(":/MO/gui/archive_conflict_loser");
+    case ModInfo::FLAG_OVERWRITE_CONFLICT: return QString();
+    default:
+      log::warn("ModInfo flag {} has no defined icon", flag);
+      return QString();
+  }
+}
+
+size_t ModConflictIconDelegate::getNumIcons(const QModelIndex &index) const
+{
+  unsigned int modIdx = index.data(Qt::UserRole + 1).toInt();
+  if (modIdx < ModInfo::getNumMods()) {
+    ModInfo::Ptr info = ModInfo::getByIndex(modIdx);
+    std::vector<ModInfo::EConflictFlag> flags = info->getConflictFlags();
+    size_t count = flags.size();
+    if (std::find_first_of(flags.begin(), flags.end(), m_ConflictFlags, m_ConflictFlags + 4) == flags.end()) {
+      ++count;
+    }
+    return count;
+  } else {
+    return 0;
+  }
+}
+
+
+QSize ModConflictIconDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &modelIndex) const
+{
+  size_t count = getNumIcons(modelIndex);
+  unsigned int index = modelIndex.data(Qt::UserRole + 1).toInt();
+  QSize result;
+  if (index < ModInfo::getNumMods()) {
+    result = QSize(static_cast<int>(count) * 40, 20);
+  } else {
+    result = QSize(1, 20);
+  }
+  if (option.rect.width() > 0) {
+    result.setWidth(std::min(option.rect.width(), result.width()));
+  }
+  return result;
+}
+
diff --git a/src/modconflicticondelegate.h b/src/modconflicticondelegate.h
new file mode 100644
index 00000000..d36477c6
--- /dev/null
+++ b/src/modconflicticondelegate.h
@@ -0,0 +1,36 @@
+#ifndef MODCONFLICTICONDELEGATE_H
+#define MODCONFLICTICONDELEGATE_H
+
+#include "icondelegate.h"
+
+class ModConflictIconDelegate : public IconDelegate
+{
+  Q_OBJECT;
+
+public:
+  explicit ModConflictIconDelegate(QObject *parent = 0, int logicalIndex = -1, int compactSize = 120);
+  virtual QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+
+  static QList<QString> getIconsForFlags(
+    std::vector<ModInfo::EConflictFlag> flags, bool compact);
+
+  static QString getFlagIcon(ModInfo::EConflictFlag flag);
+
+public slots:
+  void columnResized(int logicalIndex, int oldSize, int newSize);
+
+protected:
+  virtual QList<QString> getIcons(const QModelIndex &index) const;
+  virtual size_t getNumIcons(const QModelIndex &index) const;
+
+private:
+  static ModInfo::EConflictFlag m_ConflictFlags[4];
+  static ModInfo::EConflictFlag m_ArchiveLooseConflictFlags[2];
+  static ModInfo::EConflictFlag m_ArchiveConflictFlags[3];
+
+  int m_LogicalIndex;
+  int m_CompactSize;
+  bool m_Compact;
+};
+
+#endif // MODCONFLICTICONDELEGATE_H
diff --git a/src/modflagicondelegate.cpp b/src/modflagicondelegate.cpp
index a5e9aa22..6e1df147 100644
--- a/src/modflagicondelegate.cpp
+++ b/src/modflagicondelegate.cpp
@@ -4,18 +4,6 @@
 
 using namespace MOBase;
 
-ModInfo::EFlag ModFlagIconDelegate::m_ConflictFlags[4] = { ModInfo::FLAG_CONFLICT_MIXED
-                                                         , ModInfo::FLAG_CONFLICT_OVERWRITE
-                                                         , ModInfo::FLAG_CONFLICT_OVERWRITTEN
-                                                         , ModInfo::FLAG_CONFLICT_REDUNDANT };
-
-ModInfo::EFlag ModFlagIconDelegate::m_ArchiveLooseConflictFlags[2] = { ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE
-                                                                     , ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN };
-
-ModInfo::EFlag ModFlagIconDelegate::m_ArchiveConflictFlags[3] = { ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED
-                                                                , ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE
-                                                                , ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN };
-
 ModFlagIconDelegate::ModFlagIconDelegate(QObject *parent, int logicalIndex, int compactSize)
   : IconDelegate(parent)
   , m_LogicalIndex(logicalIndex)
@@ -37,54 +25,9 @@ QList<QString> ModFlagIconDelegate::getIconsForFlags(
   QList<QString> result;
 
   // Don't do flags for overwrite
-  if (std::find(flags.begin(), flags.end(),ModInfo::FLAG_OVERWRITE) != flags.end())
+  if (std::find(flags.begin(), flags.end(), ModInfo::FLAG_OVERWRITE) != flags.end())
     return result;
 
-  // insert conflict icons to provide nicer alignment
-  { // insert loose file conflicts first
-    auto iter = std::find_first_of(flags.begin(), flags.end(),
-                                    m_ConflictFlags, m_ConflictFlags + 4);
-    if (iter != flags.end()) {
-      result.append(getFlagIcon(*iter));
-      flags.erase(iter);
-    } else if (!compact) {
-      result.append(QString());
-    }
-  }
-
-  { // insert loose vs archive overwrite second
-    auto iter = std::find(flags.begin(), flags.end(),
-      ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE);
-    if (iter != flags.end()) {
-      result.append(getFlagIcon(*iter));
-      flags.erase(iter);
-    } else if (!compact) {
-      result.append(QString());
-    }
-  }
-
-  { // insert loose vs archive overwritten third
-    auto iter = std::find_first_of(flags.begin(), flags.end(),
-      m_ArchiveLooseConflictFlags + 1, m_ArchiveLooseConflictFlags + 2);
-    if (iter != flags.end()) {
-      result.append(getFlagIcon(*iter));
-      flags.erase(iter);
-    } else if (!compact) {
-      result.append(QString());
-    }
-  }
-
-  { // insert archive conflicts last
-    auto iter = std::find_first_of(flags.begin(), flags.end(),
-      m_ArchiveConflictFlags, m_ArchiveConflictFlags + 3);
-    if (iter != flags.end()) {
-      result.append(getFlagIcon(*iter));
-      flags.erase(iter);
-    } else if (!compact) {
-      result.append(QString());
-    }
-  }
-
   for (auto iter = flags.begin(); iter != flags.end(); ++iter) {
     auto iconPath = getFlagIcon(*iter);
     if (!iconPath.isEmpty())
@@ -113,15 +56,6 @@ QString ModFlagIconDelegate::getFlagIcon(ModInfo::EFlag flag)
     case ModInfo::FLAG_INVALID: return QStringLiteral(":/MO/gui/problem");
     case ModInfo::FLAG_NOTENDORSED: return QStringLiteral(":/MO/gui/emblem_notendorsed");
     case ModInfo::FLAG_NOTES: return QStringLiteral(":/MO/gui/emblem_notes");
-    case ModInfo::FLAG_CONFLICT_MIXED: return QStringLiteral(":/MO/gui/emblem_conflict_mixed");
-    case ModInfo::FLAG_CONFLICT_OVERWRITE: return QStringLiteral(":/MO/gui/emblem_conflict_overwrite");
-    case ModInfo::FLAG_CONFLICT_OVERWRITTEN: return QStringLiteral(":/MO/gui/emblem_conflict_overwritten");
-    case ModInfo::FLAG_CONFLICT_REDUNDANT: return QStringLiteral(":/MO/gui/emblem_conflict_redundant");
-    case ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE: return QStringLiteral(":/MO/gui/archive_loose_conflict_overwrite");
-    case ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN: return QStringLiteral(":/MO/gui/archive_loose_conflict_overwritten");
-    case ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED: return QStringLiteral(":/MO/gui/archive_conflict_mixed");
-    case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE: return QStringLiteral(":/MO/gui/archive_conflict_winner");
-    case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN: return QStringLiteral(":/MO/gui/archive_conflict_loser");
     case ModInfo::FLAG_ALTERNATE_GAME: return QStringLiteral(":/MO/gui/alternate_game");
     case ModInfo::FLAG_FOREIGN: return QString();
     case ModInfo::FLAG_SEPARATOR: return QString();
@@ -140,11 +74,7 @@ size_t ModFlagIconDelegate::getNumIcons(const QModelIndex &index) const
   if (modIdx < ModInfo::getNumMods()) {
     ModInfo::Ptr info = ModInfo::getByIndex(modIdx);
     std::vector<ModInfo::EFlag> flags = info->getFlags();
-    size_t count = flags.size();
-    if (std::find_first_of(flags.begin(), flags.end(), m_ConflictFlags, m_ConflictFlags + 4) == flags.end()) {
-      ++count;
-    }
-    return count;
+    return flags.size();
   } else {
     return 0;
   }
diff --git a/src/modflagicondelegate.h b/src/modflagicondelegate.h
index 4f22dd90..ecab7e95 100644
--- a/src/modflagicondelegate.h
+++ b/src/modflagicondelegate.h
@@ -24,10 +24,6 @@ protected:
   virtual size_t getNumIcons(const QModelIndex &index) const;
 
 private:
-  static ModInfo::EFlag m_ConflictFlags[4];
-  static ModInfo::EFlag m_ArchiveLooseConflictFlags[2];
-  static ModInfo::EFlag m_ArchiveConflictFlags[3];
-
   int m_LogicalIndex;
   int m_CompactSize;
   bool m_Compact;
diff --git a/src/modinfo.h b/src/modinfo.h
index 30a115c7..7c41e0a1 100644
--- a/src/modinfo.h
+++ b/src/modinfo.h
@@ -60,14 +60,7 @@ public:
 
   static QString s_HiddenExt;
 
-  enum EFlag {
-    FLAG_INVALID,
-    FLAG_BACKUP,
-    FLAG_SEPARATOR,
-    FLAG_OVERWRITE,
-    FLAG_FOREIGN,
-    FLAG_NOTENDORSED,
-    FLAG_NOTES,
+  enum EConflictFlag {
     FLAG_CONFLICT_OVERWRITE,
     FLAG_CONFLICT_OVERWRITTEN,
     FLAG_CONFLICT_MIXED,
@@ -77,6 +70,17 @@ public:
     FLAG_ARCHIVE_CONFLICT_OVERWRITE,
     FLAG_ARCHIVE_CONFLICT_OVERWRITTEN,
     FLAG_ARCHIVE_CONFLICT_MIXED,
+    FLAG_OVERWRITE_CONFLICT,
+  };
+
+  enum EFlag {
+    FLAG_INVALID,
+    FLAG_BACKUP,
+    FLAG_SEPARATOR,
+    FLAG_OVERWRITE,
+    FLAG_FOREIGN,
+    FLAG_NOTENDORSED,
+    FLAG_NOTES,
     FLAG_PLUGIN_SELECTED,
     FLAG_ALTERNATE_GAME,
     FLAG_TRACKED,
@@ -519,6 +523,11 @@ public:
    */
   virtual std::vector<EFlag> getFlags() const = 0;
 
+  /**
+   * @return a list of conflict flags for this mod
+   */
+  virtual std::vector<EConflictFlag> getConflictFlags() const = 0;
+
   /**
    * @return a list of content types contained in a mod
    */
diff --git a/src/modinfobackup.cpp b/src/modinfobackup.cpp
index 6e307103..6a34b86a 100644
--- a/src/modinfobackup.cpp
+++ b/src/modinfobackup.cpp
@@ -1,5 +1,6 @@
 #include "modinfobackup.h"
 
+
 std::vector<ModInfo::EFlag> ModInfoBackup::getFlags() const
 {
   std::vector<ModInfo::EFlag> result = ModInfoRegular::getFlags();
diff --git a/src/modinfodialogfwd.h b/src/modinfodialogfwd.h
index 2147fc04..e4a61208 100644
--- a/src/modinfodialogfwd.h
+++ b/src/modinfodialogfwd.h
@@ -14,6 +14,7 @@ enum class ModInfoTabIDs
   Images,
   Esps,
   Conflicts,
+  Flags,
   Categories,
   Nexus,
   Notes,
diff --git a/src/modinfooverwrite.cpp b/src/modinfooverwrite.cpp
index fb110abb..9a6a22c1 100644
--- a/src/modinfooverwrite.cpp
+++ b/src/modinfooverwrite.cpp
@@ -37,6 +37,15 @@ std::vector<ModInfo::EFlag> ModInfoOverwrite::getFlags() const
   return result;
 }
 
+std::vector<ModInfo::EConflictFlag> ModInfoOverwrite::getConflictFlags() const
+{
+  std::vector<ModInfo::EConflictFlag> result;
+  result.push_back(FLAG_OVERWRITE_CONFLICT);
+  for (auto flag : ModInfoWithConflictInfo::getConflictFlags())
+    result.push_back(flag);
+  return result;
+}
+
 int ModInfoOverwrite::getHighlight() const
 {
   int highlight = (isValid() ? HIGHLIGHT_IMPORTANT : HIGHLIGHT_INVALID) | HIGHLIGHT_CENTER;
diff --git a/src/modinfooverwrite.h b/src/modinfooverwrite.h
index c5f58c2e..ecbdbe3d 100644
--- a/src/modinfooverwrite.h
+++ b/src/modinfooverwrite.h
@@ -51,6 +51,7 @@ public:
   virtual QDateTime getExpires() const { return QDateTime(); }
   virtual std::vector<QString> getIniTweaks() const { return std::vector<QString>(); }
   virtual std::vector<ModInfo::EFlag> getFlags() const;
+  virtual std::vector<ModInfo::EConflictFlag> getConflictFlags() const;
   virtual int getHighlight() const;
   virtual QString getDescription() const;
   virtual int getNexusFileStatus() const { return 0; }
diff --git a/src/modinfowithconflictinfo.cpp b/src/modinfowithconflictinfo.cpp
index 7a2b0071..f5a243ae 100644
--- a/src/modinfowithconflictinfo.cpp
+++ b/src/modinfowithconflictinfo.cpp
@@ -14,9 +14,9 @@ void ModInfoWithConflictInfo::clearCaches()
   m_LastConflictCheck = QTime();
 }
 
-std::vector<ModInfo::EFlag> ModInfoWithConflictInfo::getFlags() const
+std::vector<ModInfo::EConflictFlag> ModInfoWithConflictInfo::getConflictFlags() const
 {
-  std::vector<ModInfo::EFlag> result;
+  std::vector<ModInfo::EConflictFlag> result;
   switch (isConflicted()) {
     case CONFLICT_MIXED: {
       result.push_back(ModInfo::FLAG_CONFLICT_MIXED);
diff --git a/src/modinfowithconflictinfo.h b/src/modinfowithconflictinfo.h
index 13d87d25..9869bc5a 100644
--- a/src/modinfowithconflictinfo.h
+++ b/src/modinfowithconflictinfo.h
@@ -12,7 +12,8 @@ public:
 
   ModInfoWithConflictInfo(PluginContainer *pluginContainer, MOShared::DirectoryEntry **directoryStructure);
 
-  std::vector<ModInfo::EFlag> getFlags() const;
+  std::vector<ModInfo::EConflictFlag> getConflictFlags() const;
+  virtual std::vector<ModInfo::EFlag> getFlags() const { return std::vector<ModInfo::EFlag>(); };
 
   /**
    * @brief clear all caches held for this mod
diff --git a/src/modlist.cpp b/src/modlist.cpp
index b7a9b0a1..c5b8c856 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -159,15 +159,6 @@ QString ModList::getFlagText(ModInfo::EFlag flag, ModInfo::Ptr modInfo) const
         output << QString("<i>%1</i>").arg(modInfo->notes());
       return output.join("");
     }
-    case ModInfo::FLAG_CONFLICT_OVERWRITE: return tr("Overwrites loose files");
-    case ModInfo::FLAG_CONFLICT_OVERWRITTEN: return tr("Overwritten loose files");
-    case ModInfo::FLAG_CONFLICT_MIXED: return tr("Loose files Overwrites & Overwritten");
-    case ModInfo::FLAG_CONFLICT_REDUNDANT: return tr("Redundant");
-    case ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE: return tr("Overwrites an archive with loose files");
-    case ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN: return tr("Archive is overwritten by loose files");
-    case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE: return tr("Overwrites another archive file");
-    case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN: return tr("Overwritten by another archive file");
-    case ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED: return tr("Archive files overwrites & overwritten");
     case ModInfo::FLAG_ALTERNATE_GAME: return tr("<br>This mod is for a different game, "
       "make sure it's compatible or it could cause crashes.");
     case ModInfo::FLAG_TRACKED: return tr("Mod is being tracked on the website");
@@ -176,6 +167,23 @@ QString ModList::getFlagText(ModInfo::EFlag flag, ModInfo::Ptr modInfo) const
 }
 
 
+QString ModList::getConflictFlagText(ModInfo::EConflictFlag flag, ModInfo::Ptr modInfo) const
+{
+  switch (flag) {
+  case ModInfo::FLAG_CONFLICT_OVERWRITE: return tr("Overwrites loose files");
+  case ModInfo::FLAG_CONFLICT_OVERWRITTEN: return tr("Overwritten loose files");
+  case ModInfo::FLAG_CONFLICT_MIXED: return tr("Loose files Overwrites & Overwritten");
+  case ModInfo::FLAG_CONFLICT_REDUNDANT: return tr("Redundant");
+  case ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITE: return tr("Overwrites an archive with loose files");
+  case ModInfo::FLAG_ARCHIVE_LOOSE_CONFLICT_OVERWRITTEN: return tr("Archive is overwritten by loose files");
+  case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE: return tr("Overwrites another archive file");
+  case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN: return tr("Overwritten by another archive file");
+  case ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED: return tr("Archive files overwrites & overwritten");
+  default: return "";
+  }
+}
+
+
 QVariantList ModList::contentsToIcons(const std::vector<ModInfo::EContent> &contents) const
 {
   QVariantList result;
@@ -218,7 +226,8 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
   if ((role == Qt::DisplayRole) ||
       (role == Qt::EditRole)) {
     if ((column == COL_FLAGS)
-        || (column == COL_CONTENT)) {
+        || (column == COL_CONTENT)
+        || (column == COL_CONFLICTFLAGS)) {
       return QVariant();
     } else if (column == COL_NAME) {
       auto flags = modInfo->getFlags();
@@ -443,6 +452,15 @@ QVariant ModList::data(const QModelIndex &modelIndex, int role) const
         result += getFlagText(flag, modInfo);
       }
 
+      return result;
+    } else if (column == COL_CONFLICTFLAGS) {
+      QString result;
+
+      for (ModInfo::EConflictFlag flag : modInfo->getConflictFlags()) {
+        if (result.length() != 0) result += "<br>";
+        result += getConflictFlagText(flag, modInfo);
+      }
+
       return result;
     } else if (column == COL_CONTENT) {
       return contentsToToolTip(modInfo->getContents());
@@ -1274,6 +1292,7 @@ void ModList::dropModeUpdate(bool dropOnItems)
 QString ModList::getColumnName(int column)
 {
   switch (column) {
+    case COL_CONFLICTFLAGS: return tr("Conflicts");
     case COL_FLAGS:    return tr("Flags");
     case COL_CONTENT:  return tr("Content");
     case COL_NAME:     return tr("Mod Name");
@@ -1299,6 +1318,7 @@ QString ModList::getColumnToolTip(int column)
     case COL_CATEGORY: return tr("Category of the mod.");
     case COL_GAME:     return tr("The source game which was the origin of this mod.");
     case COL_MODID:    return tr("Id of the mod as used on Nexus.");
+    case COL_CONFLICTFLAGS: return tr("Indicators of file conflicts between mods.");
     case COL_FLAGS:    return tr("Emblems to highlight things that might require attention.");
     case COL_CONTENT:  return tr("Depicts the content of the mod:<br>"
                                  "<table cellspacing=7>"
diff --git a/src/modlist.h b/src/modlist.h
index 631401c0..8841ec29 100644
--- a/src/modlist.h
+++ b/src/modlist.h
@@ -57,6 +57,7 @@ public:
 
   enum EColumn {
     COL_NAME,
+    COL_CONFLICTFLAGS,
     COL_FLAGS,
     COL_CONTENT,
     COL_CATEGORY,
@@ -289,6 +290,8 @@ private:
 
   QString getFlagText(ModInfo::EFlag flag, ModInfo::Ptr modInfo) const;
 
+  QString getConflictFlagText(ModInfo::EConflictFlag flag, ModInfo::Ptr modInfo) const;
+
   static QString getColumnToolTip(int column);
 
   QVariantList contentsToIcons(const std::vector<ModInfo::EContent> &content) const;
diff --git a/src/modlistsortproxy.cpp b/src/modlistsortproxy.cpp
index 64d5de42..440786c5 100644
--- a/src/modlistsortproxy.cpp
+++ b/src/modlistsortproxy.cpp
@@ -115,6 +115,17 @@ unsigned long ModListSortProxy::flagsId(const std::vector<ModInfo::EFlag> &flags
   return result;
 }
 
+unsigned long ModListSortProxy::conflictFlagsId(const std::vector<ModInfo::EConflictFlag>& flags) const
+{
+  unsigned long result = 0;
+  for (ModInfo::EConflictFlag flag : flags) {
+    if ((flag != ModInfo::FLAG_OVERWRITE_CONFLICT)) {
+      result += 1 << (int)flag;
+    }
+  }
+  return result;
+}
+
 bool ModListSortProxy::lessThan(const QModelIndex &left,
                                 const QModelIndex &right) const
 {
@@ -155,6 +166,16 @@ bool ModListSortProxy::lessThan(const QModelIndex &left,
         lt = flagsId(leftFlags) < flagsId(rightFlags);
       }
     } break;
+    case ModList::COL_CONFLICTFLAGS: {
+      std::vector<ModInfo::EConflictFlag> leftFlags = leftMod->getConflictFlags();
+      std::vector<ModInfo::EConflictFlag> rightFlags = rightMod->getConflictFlags();
+      if (leftFlags.size() != rightFlags.size()) {
+        lt = leftFlags.size() < rightFlags.size();
+      }
+      else {
+        lt = conflictFlagsId(leftFlags) < conflictFlagsId(rightFlags);
+      }
+    } break;
     case ModList::COL_CONTENT: {
       std::vector<ModInfo::EContent> lContent = leftMod->getContents();
       std::vector<ModInfo::EContent> rContent = rightMod->getContents();
diff --git a/src/modlistsortproxy.h b/src/modlistsortproxy.h
index 46356fe9..d733b783 100644
--- a/src/modlistsortproxy.h
+++ b/src/modlistsortproxy.h
@@ -142,6 +142,7 @@ protected:
 private:
 
   unsigned long flagsId(const std::vector<ModInfo::EFlag> &flags) const;
+  unsigned long conflictFlagsId(const std::vector<ModInfo::EConflictFlag>& flags) const;
   bool hasConflictFlag(const std::vector<ModInfo::EFlag> &flags) const;
   void updateFilterActive();
   bool filterMatchesModAnd(ModInfo::Ptr info, bool enabled) const;
diff --git a/src/organizer_en.ts b/src/organizer_en.ts
index e3531cb2..72972e4f 100644
--- a/src/organizer_en.ts
+++ b/src/organizer_en.ts
@@ -15,117 +15,122 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="156"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Source code can be found at &lt;a href=&quot;https://github.com/ModOrganizer2/modorganizer&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#007af4;&quot;&gt;GitHub&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location filename="aboutdialog.ui" line="110"/>
+        <source>usvfs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="164"/>
+        <location filename="aboutdialog.ui" line="163"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Source code can be found at &lt;a href=&quot;https://github.com/ModOrganizer2/modorganizer&quot;&gt;GitHub&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="aboutdialog.ui" line="171"/>
         <source>Used Software</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="177"/>
+        <location filename="aboutdialog.ui" line="184"/>
         <source>Thanks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="183"/>
+        <location filename="aboutdialog.ui" line="190"/>
         <source>Lead Developers &amp;&amp; Maintainers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="193"/>
+        <location filename="aboutdialog.ui" line="200"/>
         <source>LePresidente (Project Lead)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="219"/>
+        <location filename="aboutdialog.ui" line="226"/>
         <source>MO2 Developers &amp;&amp; Contributors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="260"/>
+        <location filename="aboutdialog.ui" line="267"/>
         <source>Translators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="285"/>
+        <location filename="aboutdialog.ui" line="292"/>
         <source>Cyb3r (Dutch)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="295"/>
+        <location filename="aboutdialog.ui" line="302"/>
         <source>fruttyx (French)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="310"/>
+        <location filename="aboutdialog.ui" line="317"/>
         <source>Yoplala (French)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="315"/>
+        <location filename="aboutdialog.ui" line="322"/>
         <source>Faron (German)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="325"/>
+        <location filename="aboutdialog.ui" line="332"/>
         <source>yohru (Japanese)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="330"/>
+        <location filename="aboutdialog.ui" line="337"/>
         <source>Mordan (Greek)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="343"/>
+        <location filename="aboutdialog.ui" line="350"/>
         <source>Yoosk (Polish)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="348"/>
+        <location filename="aboutdialog.ui" line="355"/>
         <source>Brgodfx (Portuguese)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="353"/>
+        <location filename="aboutdialog.ui" line="360"/>
         <source>zDas (Portuguese)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="373"/>
+        <location filename="aboutdialog.ui" line="380"/>
         <source>Jax (Swedish)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="378"/>
+        <location filename="aboutdialog.ui" line="385"/>
         <source>Nubbie (Swedish)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="383"/>
+        <location filename="aboutdialog.ui" line="390"/>
         <source>...and all other contributors!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="397"/>
+        <location filename="aboutdialog.ui" line="404"/>
         <source>Other Supporters &amp;&amp; Contributors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="407"/>
+        <location filename="aboutdialog.ui" line="414"/>
         <source>Tannin (Original Creator)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="524"/>
+        <location filename="aboutdialog.ui" line="531"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="aboutdialog.cpp" line="114"/>
+        <location filename="aboutdialog.cpp" line="117"/>
         <source>No license</source>
         <translation type="unfinished"></translation>
     </message>
@@ -173,17 +178,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>AdvancedConflictListModel</name>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="333"/>
+        <location filename="modinfodialogconflicts.cpp" line="341"/>
         <source>Overwrites</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="334"/>
+        <location filename="modinfodialogconflicts.cpp" line="342"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="335"/>
+        <location filename="modinfodialogconflicts.cpp" line="343"/>
         <source>Overwritten By</source>
         <translation type="unfinished"></translation>
     </message>
@@ -289,33 +294,43 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ConflictsTab</name>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="700"/>
-        <source>&amp;Hide</source>
+        <location filename="modinfodialogconflicts.cpp" line="771"/>
+        <source>&amp;Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="705"/>
-        <source>&amp;Unhide</source>
+        <location filename="modinfodialogconflicts.cpp" line="773"/>
+        <source>&amp;Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="708"/>
-        <source>&amp;Open/Execute</source>
+        <location filename="modinfodialogconflicts.cpp" line="774"/>
+        <source>Open with &amp;VFS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="711"/>
+        <location filename="modinfodialogconflicts.cpp" line="777"/>
         <source>&amp;Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="714"/>
+        <location filename="modinfodialogconflicts.cpp" line="780"/>
+        <source>&amp;Go to...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modinfodialogconflicts.cpp" line="783"/>
         <source>Open in &amp;Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="717"/>
-        <source>&amp;Go to...</source>
+        <location filename="modinfodialogconflicts.cpp" line="786"/>
+        <source>&amp;Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modinfodialogconflicts.cpp" line="791"/>
+        <source>&amp;Unhide</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -403,79 +418,84 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="94"/>
-        <source>&lt; game %1 mod %2 file %3 &gt;</source>
+        <location filename="downloadlist.cpp" line="80"/>
+        <source>Source Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="downloadlist.cpp" line="95"/>
-        <source>Unknown</source>
+        <source>&lt; game %1 mod %2 file %3 &gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="downloadlist.cpp" line="96"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="downloadlist.cpp" line="97"/>
         <source>Pending</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="130"/>
+        <location filename="downloadlist.cpp" line="137"/>
         <source>Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="131"/>
+        <location filename="downloadlist.cpp" line="138"/>
         <source>Canceling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="132"/>
+        <location filename="downloadlist.cpp" line="139"/>
         <source>Pausing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="133"/>
+        <location filename="downloadlist.cpp" line="140"/>
         <source>Canceled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="134"/>
+        <location filename="downloadlist.cpp" line="141"/>
         <source>Paused</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="135"/>
+        <location filename="downloadlist.cpp" line="142"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="136"/>
-        <location filename="downloadlist.cpp" line="137"/>
-        <location filename="downloadlist.cpp" line="138"/>
+        <location filename="downloadlist.cpp" line="143"/>
+        <location filename="downloadlist.cpp" line="144"/>
+        <location filename="downloadlist.cpp" line="145"/>
         <source>Fetching Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="139"/>
+        <location filename="downloadlist.cpp" line="146"/>
         <source>Downloaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="140"/>
+        <location filename="downloadlist.cpp" line="147"/>
         <source>Installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="141"/>
+        <location filename="downloadlist.cpp" line="148"/>
         <source>Uninstalled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="159"/>
+        <location filename="downloadlist.cpp" line="166"/>
         <source>Pending download</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlist.cpp" line="163"/>
+        <location filename="downloadlist.cpp" line="170"/>
         <source>Information missing, please select &quot;Query Info&quot; from the context menu to re-retrieve.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -483,156 +503,153 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DownloadListWidget</name>
     <message>
-        <location filename="downloadlistwidget.cpp" line="216"/>
+        <location filename="downloadlistwidget.cpp" line="217"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="218"/>
+        <location filename="downloadlistwidget.cpp" line="219"/>
         <source>Query Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="220"/>
+        <location filename="downloadlistwidget.cpp" line="221"/>
         <source>Visit on Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="221"/>
+        <location filename="downloadlistwidget.cpp" line="222"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="222"/>
-        <location filename="downloadlistwidget.cpp" line="234"/>
-        <location filename="downloadlistwidget.cpp" line="239"/>
+        <location filename="downloadlistwidget.cpp" line="223"/>
+        <location filename="downloadlistwidget.cpp" line="235"/>
+        <location filename="downloadlistwidget.cpp" line="240"/>
         <source>Show in Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="226"/>
-        <location filename="downloadlistwidget.cpp" line="237"/>
+        <location filename="downloadlistwidget.cpp" line="227"/>
+        <location filename="downloadlistwidget.cpp" line="238"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="228"/>
+        <location filename="downloadlistwidget.cpp" line="229"/>
         <source>Un-Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="230"/>
+        <location filename="downloadlistwidget.cpp" line="231"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="232"/>
+        <location filename="downloadlistwidget.cpp" line="233"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="233"/>
+        <location filename="downloadlistwidget.cpp" line="234"/>
         <source>Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="238"/>
+        <location filename="downloadlistwidget.cpp" line="239"/>
         <source>Resume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="250"/>
+        <location filename="downloadlistwidget.cpp" line="251"/>
         <source>Delete Installed Downloads...</source>
-        <oldsource>Delete Installed...</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="251"/>
+        <location filename="downloadlistwidget.cpp" line="252"/>
         <source>Delete Uninstalled Downloads...</source>
-        <oldsource>Delete Uninstalled...</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="252"/>
+        <location filename="downloadlistwidget.cpp" line="253"/>
         <source>Delete All Downloads...</source>
-        <oldsource>Delete All...</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="256"/>
+        <location filename="downloadlistwidget.cpp" line="257"/>
         <source>Hide Installed...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="257"/>
+        <location filename="downloadlistwidget.cpp" line="258"/>
         <source>Hide Uninstalled...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="258"/>
+        <location filename="downloadlistwidget.cpp" line="259"/>
         <source>Hide All...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="260"/>
+        <location filename="downloadlistwidget.cpp" line="261"/>
         <source>Un-Hide All...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="283"/>
-        <location filename="downloadlistwidget.cpp" line="338"/>
-        <location filename="downloadlistwidget.cpp" line="347"/>
-        <location filename="downloadlistwidget.cpp" line="356"/>
+        <location filename="downloadlistwidget.cpp" line="284"/>
+        <location filename="downloadlistwidget.cpp" line="339"/>
+        <location filename="downloadlistwidget.cpp" line="348"/>
+        <location filename="downloadlistwidget.cpp" line="357"/>
         <source>Delete Files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="284"/>
+        <location filename="downloadlistwidget.cpp" line="285"/>
         <source>This will permanently delete the selected download.
 
 Are you absolutely sure you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="339"/>
+        <location filename="downloadlistwidget.cpp" line="340"/>
         <source>This will remove all finished downloads from this list and from disk.
 
 Are you absolutely sure you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="348"/>
+        <location filename="downloadlistwidget.cpp" line="349"/>
         <source>This will remove all installed downloads from this list and from disk.
 
 Are you absolutely sure you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="357"/>
+        <location filename="downloadlistwidget.cpp" line="358"/>
         <source>This will remove all uninstalled downloads from this list and from disk.
 
 Are you absolutely sure you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="365"/>
-        <location filename="downloadlistwidget.cpp" line="374"/>
-        <location filename="downloadlistwidget.cpp" line="383"/>
+        <location filename="downloadlistwidget.cpp" line="366"/>
+        <location filename="downloadlistwidget.cpp" line="375"/>
+        <location filename="downloadlistwidget.cpp" line="384"/>
         <source>Hide Files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="366"/>
+        <location filename="downloadlistwidget.cpp" line="367"/>
         <source>This will remove all finished downloads from this list (but NOT from disk).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="375"/>
+        <location filename="downloadlistwidget.cpp" line="376"/>
         <source>This will remove all installed downloads from this list (but NOT from disk).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadlistwidget.cpp" line="384"/>
+        <location filename="downloadlistwidget.cpp" line="385"/>
         <source>This will remove all uninstalled downloads from this list (but NOT from disk).</source>
         <translation type="unfinished"></translation>
     </message>
@@ -645,37 +662,37 @@ Are you absolutely sure you want to proceed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="381"/>
+        <location filename="downloadmanager.cpp" line="386"/>
         <source>Memory allocation error (in refreshing directory).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="481"/>
+        <location filename="downloadmanager.cpp" line="486"/>
         <source>failed to download %1: could not open output file: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="504"/>
+        <location filename="downloadmanager.cpp" line="509"/>
         <source>Download again?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="504"/>
+        <location filename="downloadmanager.cpp" line="509"/>
         <source>A file with the same name &quot;%1&quot; has already been downloaded. Do you want to download it again? The new file will receive a different name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="559"/>
+        <location filename="downloadmanager.cpp" line="564"/>
         <source>Wrong Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="559"/>
+        <location filename="downloadmanager.cpp" line="564"/>
         <source>The download link is for a mod for &quot;%1&quot; but this instance of MO has been set up for &quot;%2&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="567"/>
+        <location filename="downloadmanager.cpp" line="572"/>
         <source>There is already a download queued for this file.
 
 Mod %1
@@ -683,12 +700,12 @@ File %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="574"/>
+        <location filename="downloadmanager.cpp" line="579"/>
         <source>Already Queued</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="583"/>
+        <location filename="downloadmanager.cpp" line="588"/>
         <source>There is already a download started for this file.
 
 Mod %1:	%2
@@ -696,276 +713,277 @@ File %3:	%4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="618"/>
+        <location filename="downloadmanager.cpp" line="623"/>
         <source>Already Started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="647"/>
-        <location filename="downloadmanager.cpp" line="780"/>
+        <location filename="downloadmanager.cpp" line="652"/>
+        <location filename="downloadmanager.cpp" line="785"/>
         <source>remove: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="666"/>
+        <location filename="downloadmanager.cpp" line="671"/>
         <source>failed to delete %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="673"/>
+        <location filename="downloadmanager.cpp" line="678"/>
         <source>failed to delete meta file for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="733"/>
+        <location filename="downloadmanager.cpp" line="738"/>
         <source>restore: invalid download index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="802"/>
+        <location filename="downloadmanager.cpp" line="807"/>
         <source>cancel: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="815"/>
+        <location filename="downloadmanager.cpp" line="820"/>
         <source>pause: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="837"/>
+        <location filename="downloadmanager.cpp" line="842"/>
         <source>resume: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="848"/>
+        <location filename="downloadmanager.cpp" line="853"/>
         <source>resume (int): invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="872"/>
+        <location filename="downloadmanager.cpp" line="877"/>
         <source>No known download urls. Sorry, this download can&apos;t be resumed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="913"/>
-        <location filename="downloadmanager.cpp" line="965"/>
+        <location filename="downloadmanager.cpp" line="918"/>
+        <location filename="downloadmanager.cpp" line="970"/>
         <source>query: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="935"/>
+        <location filename="downloadmanager.cpp" line="940"/>
         <source>Please enter the nexus mod id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="935"/>
+        <location filename="downloadmanager.cpp" line="940"/>
         <source>Mod ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="946"/>
+        <location filename="downloadmanager.cpp" line="951"/>
         <source>Please select the source game code for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="998"/>
+        <location filename="downloadmanager.cpp" line="1003"/>
         <source>Hashing download file &apos;%1&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="999"/>
+        <location filename="downloadmanager.cpp" line="1004"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1028"/>
+        <location filename="downloadmanager.cpp" line="1033"/>
         <source>VisitNexus: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1049"/>
+        <location filename="downloadmanager.cpp" line="1054"/>
         <source>Nexus ID for this Mod is unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1056"/>
+        <location filename="downloadmanager.cpp" line="1061"/>
         <source>OpenFile: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1073"/>
+        <location filename="downloadmanager.cpp" line="1078"/>
         <source>OpenFileInDownloadsFolder: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1108"/>
+        <location filename="downloadmanager.cpp" line="1113"/>
         <source>get pending: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1117"/>
+        <location filename="downloadmanager.cpp" line="1122"/>
         <source>get path: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1126"/>
+        <location filename="downloadmanager.cpp" line="1131"/>
         <source>Main</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1127"/>
+        <location filename="downloadmanager.cpp" line="1132"/>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1128"/>
+        <location filename="downloadmanager.cpp" line="1133"/>
         <source>Optional</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1129"/>
+        <location filename="downloadmanager.cpp" line="1134"/>
         <source>Old</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1130"/>
+        <location filename="downloadmanager.cpp" line="1135"/>
         <source>Miscellaneous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1131"/>
+        <location filename="downloadmanager.cpp" line="1136"/>
         <source>Deleted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1132"/>
+        <location filename="downloadmanager.cpp" line="1137"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1139"/>
+        <location filename="downloadmanager.cpp" line="1144"/>
         <source>display name: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1159"/>
+        <location filename="downloadmanager.cpp" line="1164"/>
         <source>file name: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1168"/>
+        <location filename="downloadmanager.cpp" line="1173"/>
         <source>file time: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1187"/>
+        <location filename="downloadmanager.cpp" line="1192"/>
         <source>file size: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1197"/>
+        <location filename="downloadmanager.cpp" line="1202"/>
         <source>progress: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1207"/>
+        <location filename="downloadmanager.cpp" line="1212"/>
         <source>state: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1217"/>
+        <location filename="downloadmanager.cpp" line="1222"/>
         <source>infocomplete: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1232"/>
-        <location filename="downloadmanager.cpp" line="1240"/>
+        <location filename="downloadmanager.cpp" line="1237"/>
+        <location filename="downloadmanager.cpp" line="1245"/>
+        <location filename="downloadmanager.cpp" line="1258"/>
         <source>mod id: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1248"/>
+        <location filename="downloadmanager.cpp" line="1266"/>
         <source>ishidden: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1257"/>
+        <location filename="downloadmanager.cpp" line="1275"/>
         <source>file info: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1267"/>
+        <location filename="downloadmanager.cpp" line="1285"/>
         <source>mark installed: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1312"/>
+        <location filename="downloadmanager.cpp" line="1330"/>
         <source>mark uninstalled: invalid download index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1478"/>
+        <location filename="downloadmanager.cpp" line="1496"/>
         <source>Memory allocation error (in processing progress event).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1488"/>
+        <location filename="downloadmanager.cpp" line="1506"/>
         <source>Memory allocation error (in processing downloaded data).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1604"/>
+        <location filename="downloadmanager.cpp" line="1622"/>
         <source>Information updated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1606"/>
-        <location filename="downloadmanager.cpp" line="1621"/>
+        <location filename="downloadmanager.cpp" line="1624"/>
+        <location filename="downloadmanager.cpp" line="1641"/>
         <source>No matching file found on Nexus! Maybe this file is no longer available or it was renamed?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1608"/>
+        <location filename="downloadmanager.cpp" line="1626"/>
         <source>No file on Nexus matches the selected file by name. Please manually choose the correct one.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1753"/>
+        <location filename="downloadmanager.cpp" line="1782"/>
         <source>No download server available. Please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1923"/>
+        <location filename="downloadmanager.cpp" line="1952"/>
         <source>Failed to request file info from nexus: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1950"/>
+        <location filename="downloadmanager.cpp" line="1979"/>
         <source>Warning: Content type is: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1955"/>
+        <location filename="downloadmanager.cpp" line="1984"/>
         <source>Download header content length: %1 downloaded file size: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1957"/>
+        <location filename="downloadmanager.cpp" line="1986"/>
         <source>Download failed: %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="1979"/>
+        <location filename="downloadmanager.cpp" line="2008"/>
         <source>We were unable to download the file due to errors after four retries. There may be an issue with the Nexus servers.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2062"/>
+        <location filename="downloadmanager.cpp" line="2091"/>
         <source>failed to re-open %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="2107"/>
+        <location filename="downloadmanager.cpp" line="2136"/>
         <source>Unable to write download to drive (return %1).
 Check the drive&apos;s available storage.
 
@@ -998,19 +1016,18 @@ Canceling download &quot;%2&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="114"/>
         <location filename="editexecutablesdialog.ui" line="117"/>
         <location filename="editexecutablesdialog.ui" line="120"/>
+        <location filename="editexecutablesdialog.ui" line="123"/>
         <source>Remove the selected executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="123"/>
+        <location filename="editexecutablesdialog.ui" line="126"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="134"/>
         <location filename="editexecutablesdialog.ui" line="137"/>
         <location filename="editexecutablesdialog.ui" line="140"/>
         <location filename="editexecutablesdialog.ui" line="143"/>
@@ -1018,7 +1035,11 @@ Canceling download &quot;%2&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="154"/>
+        <location filename="editexecutablesdialog.ui" line="146"/>
+        <source>Up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="editexecutablesdialog.ui" line="157"/>
         <location filename="editexecutablesdialog.ui" line="160"/>
         <location filename="editexecutablesdialog.ui" line="163"/>
@@ -1026,261 +1047,339 @@ Canceling download &quot;%2&quot;...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="174"/>
+        <location filename="editexecutablesdialog.ui" line="166"/>
+        <source>Down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="editexecutablesdialog.ui" line="177"/>
         <location filename="editexecutablesdialog.ui" line="180"/>
+        <location filename="editexecutablesdialog.ui" line="183"/>
         <source>Adds the executables provided by the game plugin and moves any existing executables out of the way</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="183"/>
+        <location filename="editexecutablesdialog.ui" line="186"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="196"/>
+        <location filename="editexecutablesdialog.ui" line="199"/>
         <source>List of configured executables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="199"/>
+        <location filename="editexecutablesdialog.ui" line="202"/>
         <source>This is a list of your configured executables. Executables in grey are automatically recognised and can not be modified.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="248"/>
+        <location filename="editexecutablesdialog.ui" line="251"/>
         <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="255"/>
         <location filename="editexecutablesdialog.ui" line="258"/>
+        <location filename="editexecutablesdialog.ui" line="261"/>
         <source>Name of the executable. This is only for display purposes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="265"/>
+        <location filename="editexecutablesdialog.ui" line="268"/>
         <source>Binary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="274"/>
         <location filename="editexecutablesdialog.ui" line="277"/>
+        <location filename="editexecutablesdialog.ui" line="280"/>
         <source>Binary to run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="284"/>
+        <location filename="editexecutablesdialog.ui" line="287"/>
         <source>Browse filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="287"/>
+        <location filename="editexecutablesdialog.ui" line="290"/>
         <source>Browse filesystem for the executable to run.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="290"/>
-        <location filename="editexecutablesdialog.ui" line="311"/>
+        <location filename="editexecutablesdialog.ui" line="293"/>
+        <location filename="editexecutablesdialog.ui" line="314"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="299"/>
+        <location filename="editexecutablesdialog.ui" line="302"/>
         <source>Start in</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="320"/>
+        <location filename="editexecutablesdialog.ui" line="323"/>
         <source>Arguments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="327"/>
         <location filename="editexecutablesdialog.ui" line="330"/>
+        <location filename="editexecutablesdialog.ui" line="333"/>
         <source>Arguments to pass to the application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="341"/>
+        <location filename="editexecutablesdialog.ui" line="344"/>
         <source>Allow the Steam AppID to be used for this executable to be changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="344"/>
+        <location filename="editexecutablesdialog.ui" line="347"/>
         <source>Allow the Steam AppID to be used for this executable to be changed.
 Every game/tool distributed through Steam has a unique ID. MO needs to know this ID to start those programs directly, otherwise the program is started by steam and then MO will not work. By default, MO will use the AppID for the game.
 Right now the only case I know of where this needs to be overwritten is for the Skyrim Creation Kit which has its own AppID. This overwrite is already preconfigured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="349"/>
+        <location filename="editexecutablesdialog.ui" line="352"/>
         <source>Overwrite Steam AppID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="359"/>
+        <location filename="editexecutablesdialog.ui" line="362"/>
         <source>Steam AppID to use for this executable that differs from the games AppID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="362"/>
+        <location filename="editexecutablesdialog.ui" line="365"/>
         <source>Steam AppID to use for this executable that differs from the games AppID.
 Every game/tool distributed through Steam has a unique ID. MO needs to know this ID to start those programs directly, otherwise the program is started by steam and then MO will not work. By default, MO will use the AppID for the game (usually 72850).
 Right now the only case I know of where this needs to be overwritten is for the Skyrim Creation Kit which has its own AppID (usually 202480). This overwrite is already preconfigured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="375"/>
+        <location filename="editexecutablesdialog.ui" line="378"/>
         <source>If this is enabled, new files are created in the specified mod instead of the &quot;Overwrite&quot; mod.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="378"/>
-        <source>Create Files in Mod instead of Overwrite (*)</source>
+        <location filename="editexecutablesdialog.ui" line="381"/>
+        <source>Create files in mod instead of overwrite (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="396"/>
+        <location filename="editexecutablesdialog.ui" line="399"/>
         <source>If this is enabled, the configured libraries will be automatically loaded when this executable is launched.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="399"/>
-        <source>Force Load Libraries (*)</source>
+        <location filename="editexecutablesdialog.ui" line="402"/>
+        <source>Force load libraries (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="422"/>
+        <location filename="editexecutablesdialog.ui" line="425"/>
         <source>Configure Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="431"/>
-        <source>Use Application&apos;s Icon for desktop shortcuts</source>
-        <oldsource>Use Application&apos;s Icon for shortcuts</oldsource>
+        <location filename="editexecutablesdialog.ui" line="434"/>
+        <source>Use application&apos;s icon for desktop shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="editexecutablesdialog.ui" line="441"/>
+        <location filename="editexecutablesdialog.ui" line="444"/>
+        <source>This executable will not appear in the list, on the toolbar or in the menu. It will still be visible in this dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="editexecutablesdialog.ui" line="447"/>
+        <source>Hide in user interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="editexecutablesdialog.ui" line="454"/>
+        <source>(*) Profile specific</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="editexecutablesdialog.cpp" line="89"/>
+        <source>Add from file...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="editexecutablesdialog.cpp" line="90"/>
+        <source>Add empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.ui" line="438"/>
-        <source>(*) Profile Specific</source>
+        <location filename="editexecutablesdialog.cpp" line="91"/>
+        <source>Clone selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.cpp" line="441"/>
+        <location filename="editexecutablesdialog.cpp" line="500"/>
         <source>Reset plugin executables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.cpp" line="443"/>
+        <location filename="editexecutablesdialog.cpp" line="502"/>
         <source>This will restore all the executables provided by the game plugin. If there are existing executables with the same names, they will be automatically renamed and left unchanged.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.cpp" line="462"/>
-        <location filename="editexecutablesdialog.cpp" line="624"/>
+        <location filename="editexecutablesdialog.cpp" line="687"/>
+        <location filename="editexecutablesdialog.cpp" line="729"/>
         <source>New Executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.cpp" line="606"/>
-        <source>Select a binary</source>
+        <location filename="editexecutablesdialog.cpp" line="742"/>
+        <source>Select a directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.cpp" line="607"/>
-        <source>Executable (%1)</source>
+        <location filename="editexecutablesdialog.cpp" line="788"/>
+        <source>Executables (*.exe *.bat *.jar)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.cpp" line="639"/>
-        <source>Select a directory</source>
+        <location filename="editexecutablesdialog.cpp" line="789"/>
+        <source>All Files (*.*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.cpp" line="688"/>
-        <source>Java (32-bit) required</source>
+        <location filename="editexecutablesdialog.cpp" line="792"/>
+        <source>Select an executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="editexecutablesdialog.cpp" line="689"/>
-        <source>MO requires 32-bit java to run this application. If you already have it installed, select javaw.exe from that installation as the binary.</source>
+        <location filename="editexecutablesdialog.cpp" line="808"/>
+        <source>Java required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="editexecutablesdialog.cpp" line="809"/>
+        <source>MO requires Java to run this application. If you already have it installed, select javaw.exe from that installation as the binary.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FileTreeTab</name>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="25"/>
+        <location filename="modinfodialogfiletree.cpp" line="28"/>
         <source>&amp;New Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="26"/>
+        <location filename="modinfodialogfiletree.cpp" line="29"/>
         <source>&amp;Open/Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="27"/>
+        <location filename="modinfodialogfiletree.cpp" line="30"/>
+        <source>Open with &amp;VFS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modinfodialogfiletree.cpp" line="31"/>
         <source>&amp;Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="28"/>
+        <location filename="modinfodialogfiletree.cpp" line="32"/>
         <source>Open in &amp;Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="29"/>
+        <location filename="modinfodialogfiletree.cpp" line="33"/>
         <source>&amp;Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="30"/>
+        <location filename="modinfodialogfiletree.cpp" line="34"/>
         <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="31"/>
+        <location filename="modinfodialogfiletree.cpp" line="35"/>
         <source>&amp;Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="32"/>
+        <location filename="modinfodialogfiletree.cpp" line="36"/>
         <source>&amp;Unhide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="104"/>
-        <location filename="modinfodialogfiletree.cpp" line="110"/>
+        <location filename="modinfodialogfiletree.cpp" line="127"/>
+        <location filename="modinfodialogfiletree.cpp" line="133"/>
         <source>New Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="116"/>
+        <location filename="modinfodialogfiletree.cpp" line="139"/>
         <source>Failed to create &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="181"/>
+        <location filename="modinfodialogfiletree.cpp" line="238"/>
         <source>Are you sure you want to delete &quot;%1&quot;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="183"/>
+        <location filename="modinfodialogfiletree.cpp" line="240"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="186"/>
+        <location filename="modinfodialogfiletree.cpp" line="243"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogfiletree.cpp" line="221"/>
+        <location filename="modinfodialogfiletree.cpp" line="278"/>
         <source>Failed to delete %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="modinfodialogfiletree.cpp" line="454"/>
+        <source>&amp;Execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modinfodialogfiletree.cpp" line="457"/>
+        <source>&amp;Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FilterList</name>
+    <message>
+        <location filename="filterlist.cpp" line="104"/>
+        <source>Not</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="filterlist.cpp" line="207"/>
+        <source>Filter separators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="filterlist.cpp" line="208"/>
+        <source>Show separators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="filterlist.cpp" line="209"/>
+        <source>Hide separators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="filterlist.cpp" line="243"/>
+        <source>&lt;Contains %1&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FindDialog</name>
@@ -1416,9 +1515,16 @@ Right now the only case I know of where this needs to be overwritten is for the
         <source>Extracting files</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="installationmanager.cpp" line="310"/>
+        <location filename="installationmanager.cpp" line="619"/>
+        <location filename="installationmanager.cpp" line="624"/>
+        <source>Extraction failed: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="installationmanager.cpp" line="494"/>
-        <source>failed to create backup</source>
+        <source>Failed to create backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1511,29 +1617,6 @@ This is likely due to a corrupted or incompatible download or unrecognized archi
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>LockedDialog</name>
-    <message>
-        <location filename="lockeddialog.ui" line="14"/>
-        <source>Running virtualized processes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="lockeddialog.ui" line="20"/>
-        <source>This dialog should disappear automatically if the application/game is done. Click unlock if it didn&apos;t.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="lockeddialog.ui" line="23"/>
-        <source>MO is locked while the executable is running.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="lockeddialog.ui" line="78"/>
-        <source>Unlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>LogList</name>
     <message>
@@ -1572,6 +1655,57 @@ This is likely due to a corrupted or incompatible download or unrecognized archi
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Loot</name>
+    <message>
+        <location filename="loot.cpp" line="477"/>
+        <source>failed to start loot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="loot.cpp" line="581"/>
+        <source>Loot failed. Exit code was: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>LootDialog</name>
+    <message>
+        <location filename="lootdialog.ui" line="14"/>
+        <source>LOOT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.ui" line="50"/>
+        <source>Progress</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.ui" line="89"/>
+        <source>about:blank</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.ui" line="118"/>
+        <source>Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.ui" line="155"/>
+        <source>Open JSON report</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.cpp" line="139"/>
+        <source>Stopping LOOT...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.cpp" line="275"/>
+        <source>Loot failed to run</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MOApplication</name>
     <message>
@@ -1598,17 +1732,17 @@ This is likely due to a corrupted or incompatible download or unrecognized archi
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/textviewer.cpp" line="143"/>
+        <location filename="../../uibase/src/textviewer.cpp" line="159"/>
         <source>failed to write to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/textviewer.cpp" line="179"/>
+        <location filename="../../uibase/src/textviewer.cpp" line="199"/>
         <source>file not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/textviewer.cpp" line="204"/>
+        <location filename="../../uibase/src/textviewer.cpp" line="224"/>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1632,48 +1766,59 @@ This is likely due to a corrupted or incompatible download or unrecognized archi
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="mainwindow.ui" line="50"/>
-        <location filename="mainwindow.ui" line="515"/>
-        <source>Categories</source>
+        <location filename="mainwindow.ui" line="53"/>
+        <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="116"/>
+        <location filename="mainwindow.ui" line="139"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="135"/>
-        <source>If checked, only mods that match all selected categories are displayed.</source>
+        <location filename="mainwindow.ui" line="146"/>
+        <source>Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="177"/>
+        <source>Display mods that match all selected categories.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="138"/>
+        <location filename="mainwindow.ui" line="180"/>
         <source>And</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="148"/>
-        <source>If checked, all mods that match at least one of the selected categories are displayed.</source>
+        <location filename="mainwindow.ui" line="190"/>
+        <source>Display mods that match at least one of the selected categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="151"/>
+        <location filename="mainwindow.ui" line="193"/>
         <source>Or</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="186"/>
+        <location filename="mainwindow.ui" line="200"/>
+        <source>Filter: only show the separators that match the current filters
+Show: always show separators
+Hide: never show separators</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="237"/>
         <source>Profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="196"/>
+        <location filename="mainwindow.ui" line="247"/>
         <source>Pick a module collection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="199"/>
+        <location filename="mainwindow.ui" line="250"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1683,84 +1828,84 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="230"/>
+        <location filename="mainwindow.ui" line="281"/>
         <source>Open list options...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="233"/>
+        <location filename="mainwindow.ui" line="284"/>
         <source>Refresh list. This is usually not necessary unless you modified data outside the program.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="253"/>
+        <location filename="mainwindow.ui" line="304"/>
         <source>Show Open Folders menu...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="267"/>
-        <location filename="mainwindow.ui" line="781"/>
+        <location filename="mainwindow.ui" line="318"/>
+        <location filename="mainwindow.ui" line="819"/>
         <source>Restore Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="281"/>
-        <location filename="mainwindow.ui" line="801"/>
-        <location filename="mainwindow.cpp" line="4752"/>
+        <location filename="mainwindow.ui" line="332"/>
+        <location filename="mainwindow.ui" line="839"/>
+        <location filename="mainwindow.cpp" line="4777"/>
         <source>Create Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="295"/>
-        <location filename="mainwindow.ui" line="815"/>
+        <location filename="mainwindow.ui" line="346"/>
+        <location filename="mainwindow.ui" line="853"/>
         <source>Active:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="308"/>
+        <location filename="mainwindow.ui" line="359"/>
         <source>This provides statistics about the mod list.  The total number of active mod is normally displayed.  Other statistics may be accessed with the tooltip of this counter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="335"/>
-        <source>List of available mods.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.ui" line="338"/>
+        <location filename="mainwindow.ui" line="386"/>
         <source>This is a list of installed mods. Use the checkboxes to activate/deactivate mods and drag &amp; drop mods to change their &quot;installation&quot; orders.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="426"/>
-        <location filename="mainwindow.ui" line="534"/>
-        <location filename="mainwindow.ui" line="916"/>
-        <location filename="mainwindow.ui" line="1252"/>
+        <location filename="mainwindow.ui" line="474"/>
+        <location filename="mainwindow.ui" line="575"/>
+        <location filename="mainwindow.ui" line="954"/>
+        <location filename="mainwindow.ui" line="1287"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="483"/>
+        <location filename="mainwindow.ui" line="524"/>
         <source>Clear all Filters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="510"/>
+        <location filename="mainwindow.ui" line="551"/>
         <source>No groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="520"/>
+        <location filename="mainwindow.ui" line="556"/>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="561"/>
         <source>Nexus IDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="569"/>
+        <location filename="mainwindow.ui" line="610"/>
         <source>Pick a program to run.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="572"/>
+        <location filename="mainwindow.ui" line="613"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1770,12 +1915,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="620"/>
+        <location filename="mainwindow.ui" line="661"/>
         <source>Run program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="623"/>
+        <location filename="mainwindow.ui" line="664"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1784,17 +1929,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="633"/>
+        <location filename="mainwindow.ui" line="674"/>
         <source>Run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="674"/>
+        <location filename="mainwindow.ui" line="715"/>
         <source>Create a shortcut in your start menu or on the desktop to the specified program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="677"/>
+        <location filename="mainwindow.ui" line="718"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1803,32 +1948,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="684"/>
+        <location filename="mainwindow.ui" line="725"/>
         <source>Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="734"/>
+        <location filename="mainwindow.ui" line="775"/>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="757"/>
+        <location filename="mainwindow.ui" line="795"/>
         <source>Sort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="828"/>
+        <location filename="mainwindow.ui" line="866"/>
         <source>This provides statistics about the plugin list.  The total number of active plugins is normally displayed.  Other statistics may be accessed with the tooltip of this counter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="855"/>
+        <location filename="mainwindow.ui" line="893"/>
         <source>List of available esp/esm files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="858"/>
+        <location filename="mainwindow.ui" line="896"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1837,27 +1982,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="929"/>
+        <location filename="mainwindow.ui" line="967"/>
         <source>Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="949"/>
+        <location filename="mainwindow.ui" line="987"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;BSAs / BA2s are bundles of game assets (textures, scripts, etc.). By default, the engine loads these bundles in a separate step from loose files. &lt;p&gt;Their load order is specified by the priority of the corresponding plugin (right pane, plugins tab).&lt;/p&gt;&lt;p&gt;If there is a matching plugin, the game will load them no matter what.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="952"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Currently detected archives. (&lt;a href=&quot;#&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;What is an archive?&lt;/span&gt;&lt;/a&gt;)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location filename="mainwindow.ui" line="990"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Currently detected archives. (&lt;a href=&quot;#&quot;&gt;What is an archive?&lt;/a&gt;)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="967"/>
+        <location filename="mainwindow.ui" line="1005"/>
         <source>List of available BS Archives. Archives not checked here are not managed by MO and ignore installation order.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="970"/>
+        <location filename="mainwindow.ui" line="1008"/>
         <source>BSA files are archives (comparable to .zip files) that contain data assets (meshes, textures, ...) to be used by the game. As such they &quot;compete&quot; with loose files in your data directory over which is loaded.
                     By default, BSAs that share their base name with an enabled ESP (i.e. plugin.esp and plugin.bsa) are automatically loaded and will have precedence over all loose files, the installation order you set up to the left is then ignored!
 
@@ -1865,72 +2010,72 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="999"/>
+        <location filename="mainwindow.ui" line="1037"/>
         <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1017"/>
+        <location filename="mainwindow.ui" line="1055"/>
         <source>refresh data-directory overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1020"/>
+        <location filename="mainwindow.ui" line="1058"/>
         <source>Refresh the overview. This may take a moment.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1023"/>
-        <location filename="mainwindow.ui" line="1166"/>
-        <location filename="mainwindow.cpp" line="4625"/>
-        <location filename="mainwindow.cpp" line="5444"/>
+        <location filename="mainwindow.ui" line="1061"/>
+        <location filename="mainwindow.ui" line="1201"/>
+        <location filename="mainwindow.cpp" line="4650"/>
+        <location filename="mainwindow.cpp" line="5550"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1039"/>
+        <location filename="mainwindow.ui" line="1077"/>
         <source>This is an overview of your data directory as visible to the game (and tools). </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1052"/>
+        <location filename="mainwindow.ui" line="1087"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1057"/>
+        <location filename="mainwindow.ui" line="1092"/>
         <source>Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1069"/>
-        <location filename="mainwindow.ui" line="1072"/>
+        <location filename="mainwindow.ui" line="1104"/>
+        <location filename="mainwindow.ui" line="1107"/>
         <source>Filters the above list so that only conflicts are displayed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1075"/>
+        <location filename="mainwindow.ui" line="1110"/>
         <source>Show only conflicts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1082"/>
-        <location filename="mainwindow.ui" line="1088"/>
+        <location filename="mainwindow.ui" line="1117"/>
+        <location filename="mainwindow.ui" line="1123"/>
         <source>Filters the above list so that files from archives are not shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1091"/>
+        <location filename="mainwindow.ui" line="1126"/>
         <source>Show files from Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1101"/>
+        <location filename="mainwindow.ui" line="1136"/>
         <source>Saves</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1125"/>
+        <location filename="mainwindow.ui" line="1160"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -1941,1170 +2086,1119 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1145"/>
+        <location filename="mainwindow.ui" line="1180"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1163"/>
+        <location filename="mainwindow.ui" line="1198"/>
         <source>Refresh downloads view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1194"/>
+        <location filename="mainwindow.ui" line="1229"/>
         <source>This is a list of mods you downloaded from Nexus. Double click one to install it. You can also drag an archive into here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1232"/>
+        <location filename="mainwindow.ui" line="1267"/>
         <source>Show Hidden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1274"/>
+        <location filename="mainwindow.ui" line="1309"/>
         <source>Main ToolBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1316"/>
+        <location filename="mainwindow.ui" line="1351"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1326"/>
-        <location filename="mainwindow.ui" line="1495"/>
+        <location filename="mainwindow.ui" line="1361"/>
+        <location filename="mainwindow.ui" line="1530"/>
         <source>&amp;Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1337"/>
-        <location filename="mainwindow.ui" line="1591"/>
-        <location filename="mainwindow.ui" line="1594"/>
+        <location filename="mainwindow.ui" line="1372"/>
+        <location filename="mainwindow.ui" line="1626"/>
+        <location filename="mainwindow.ui" line="1629"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1346"/>
+        <location filename="mainwindow.ui" line="1381"/>
         <source>&amp;View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1350"/>
+        <location filename="mainwindow.ui" line="1385"/>
         <source>&amp;Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1371"/>
+        <location filename="mainwindow.ui" line="1406"/>
         <source>&amp;Run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1385"/>
-        <location filename="mainwindow.ui" line="1733"/>
+        <location filename="mainwindow.ui" line="1420"/>
+        <location filename="mainwindow.ui" line="1768"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1429"/>
+        <location filename="mainwindow.ui" line="1464"/>
         <source>Install &amp;Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1432"/>
+        <location filename="mainwindow.ui" line="1467"/>
         <source>Install &amp;Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1435"/>
-        <location filename="mainwindow.ui" line="1438"/>
+        <location filename="mainwindow.ui" line="1470"/>
+        <location filename="mainwindow.ui" line="1473"/>
         <source>Install a new mod from an archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1441"/>
+        <location filename="mainwindow.ui" line="1476"/>
         <source>Ctrl+M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1450"/>
+        <location filename="mainwindow.ui" line="1485"/>
         <source>&amp;Profiles...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1453"/>
+        <location filename="mainwindow.ui" line="1488"/>
         <source>&amp;Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1456"/>
-        <location filename="mainwindow.ui" line="1459"/>
+        <location filename="mainwindow.ui" line="1491"/>
+        <location filename="mainwindow.ui" line="1494"/>
         <source>Configure profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1462"/>
+        <location filename="mainwindow.ui" line="1497"/>
         <source>Ctrl+P</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1471"/>
+        <location filename="mainwindow.ui" line="1506"/>
         <source>&amp;Executables...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1474"/>
+        <location filename="mainwindow.ui" line="1509"/>
         <source>&amp;Executables</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1477"/>
-        <location filename="mainwindow.ui" line="1480"/>
+        <location filename="mainwindow.ui" line="1512"/>
+        <location filename="mainwindow.ui" line="1515"/>
         <source>Configure the executables that can be started through Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1483"/>
+        <location filename="mainwindow.ui" line="1518"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1492"/>
+        <location filename="mainwindow.ui" line="1527"/>
         <source>&amp;Tool Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1498"/>
+        <location filename="mainwindow.ui" line="1533"/>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1501"/>
+        <location filename="mainwindow.ui" line="1536"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1510"/>
+        <location filename="mainwindow.ui" line="1545"/>
         <source>&amp;Settings...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1513"/>
+        <location filename="mainwindow.ui" line="1548"/>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1516"/>
-        <location filename="mainwindow.ui" line="1519"/>
+        <location filename="mainwindow.ui" line="1551"/>
+        <location filename="mainwindow.ui" line="1554"/>
         <source>Configure settings and workarounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1522"/>
+        <location filename="mainwindow.ui" line="1557"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1531"/>
-        <location filename="mainwindow.ui" line="1534"/>
+        <location filename="mainwindow.ui" line="1566"/>
+        <location filename="mainwindow.ui" line="1569"/>
         <source>Visit &amp;Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1537"/>
-        <location filename="mainwindow.ui" line="1540"/>
+        <location filename="mainwindow.ui" line="1572"/>
+        <location filename="mainwindow.ui" line="1575"/>
         <source>Visit the Nexus website in your browser for more mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1543"/>
+        <location filename="mainwindow.ui" line="1578"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1555"/>
-        <location filename="mainwindow.ui" line="1558"/>
+        <location filename="mainwindow.ui" line="1590"/>
+        <location filename="mainwindow.ui" line="1593"/>
         <source>&amp;Update Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1561"/>
-        <location filename="mainwindow.ui" line="1564"/>
+        <location filename="mainwindow.ui" line="1596"/>
+        <location filename="mainwindow.ui" line="1599"/>
         <source>Mod Organizer is up-to-date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1573"/>
+        <location filename="mainwindow.ui" line="1608"/>
         <source>&amp;Notifications...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1576"/>
-        <location filename="mainwindow.ui" line="1579"/>
+        <location filename="mainwindow.ui" line="1611"/>
+        <location filename="mainwindow.ui" line="1614"/>
         <source>Open the notifications dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1582"/>
+        <location filename="mainwindow.ui" line="1617"/>
         <source>This button will be highlighted on the toolbar if MO discovered potential problems in your setup and provide tips on how to fix them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1597"/>
-        <location filename="mainwindow.ui" line="1600"/>
+        <location filename="mainwindow.ui" line="1632"/>
+        <location filename="mainwindow.ui" line="1635"/>
         <source>Show help options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1603"/>
+        <location filename="mainwindow.ui" line="1638"/>
         <source>Ctrl+H</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1612"/>
-        <location filename="mainwindow.ui" line="1615"/>
+        <location filename="mainwindow.ui" line="1647"/>
+        <location filename="mainwindow.ui" line="1650"/>
         <source>&amp;Endorse ModOrganizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1618"/>
-        <location filename="mainwindow.ui" line="1621"/>
-        <location filename="mainwindow.cpp" line="5472"/>
+        <location filename="mainwindow.ui" line="1653"/>
+        <location filename="mainwindow.ui" line="1656"/>
+        <location filename="mainwindow.cpp" line="5576"/>
         <source>Endorse Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1630"/>
+        <location filename="mainwindow.ui" line="1665"/>
         <source>&amp;Change Game...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1633"/>
+        <location filename="mainwindow.ui" line="1668"/>
         <source>&amp;Change Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1636"/>
-        <location filename="mainwindow.ui" line="1639"/>
+        <location filename="mainwindow.ui" line="1671"/>
+        <location filename="mainwindow.ui" line="1674"/>
         <source>Open the Instance selection dialog to manage a different Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1644"/>
-        <location filename="mainwindow.ui" line="1647"/>
+        <location filename="mainwindow.ui" line="1679"/>
+        <location filename="mainwindow.ui" line="1682"/>
         <source>E&amp;xit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1650"/>
-        <location filename="mainwindow.ui" line="1653"/>
+        <location filename="mainwindow.ui" line="1685"/>
+        <location filename="mainwindow.ui" line="1688"/>
         <source>Exits Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1661"/>
+        <location filename="mainwindow.ui" line="1696"/>
         <source>M&amp;ain Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1669"/>
+        <location filename="mainwindow.ui" line="1704"/>
         <source>&amp;Small Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1677"/>
+        <location filename="mainwindow.ui" line="1712"/>
         <source>Lar&amp;ge Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1685"/>
+        <location filename="mainwindow.ui" line="1720"/>
         <source>&amp;Icons Only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1693"/>
+        <location filename="mainwindow.ui" line="1728"/>
         <source>&amp;Text Only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1701"/>
+        <location filename="mainwindow.ui" line="1736"/>
         <source>I&amp;cons and Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1709"/>
+        <location filename="mainwindow.ui" line="1744"/>
         <source>M&amp;edium Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1717"/>
+        <location filename="mainwindow.ui" line="1752"/>
         <source>&amp;Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.ui" line="1725"/>
+        <location filename="mainwindow.ui" line="1760"/>
         <source>Status &amp;bar</source>
-        <oldsource>St&amp;atus bar</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="295"/>
+        <location filename="mainwindow.cpp" line="361"/>
         <source>Toolbar and Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="296"/>
+        <location filename="mainwindow.cpp" line="362"/>
         <source>Desktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="297"/>
+        <location filename="mainwindow.cpp" line="363"/>
         <source>Start Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="322"/>
+        <location filename="mainwindow.cpp" line="388"/>
         <source>There is no supported sort mechanism for this game. You will probably have to use a third-party tool.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="601"/>
+        <location filename="mainwindow.cpp" line="677"/>
         <source>Crash on exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="602"/>
+        <location filename="mainwindow.cpp" line="678"/>
         <source>MO crashed while exiting.  Some settings may not be saved.
 
 Error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="928"/>
+        <location filename="mainwindow.cpp" line="1010"/>
         <source>There are notifications to read</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="947"/>
+        <location filename="mainwindow.cpp" line="1029"/>
         <source>There are no notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1034"/>
-        <location filename="mainwindow.cpp" line="4762"/>
-        <location filename="mainwindow.cpp" line="4766"/>
+        <location filename="mainwindow.cpp" line="1116"/>
+        <location filename="mainwindow.cpp" line="4787"/>
+        <location filename="mainwindow.cpp" line="4791"/>
         <source>Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1038"/>
+        <location filename="mainwindow.cpp" line="1120"/>
         <source>Won&apos;t Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1055"/>
+        <location filename="mainwindow.cpp" line="1137"/>
         <source>Help on UI</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1059"/>
+        <location filename="mainwindow.cpp" line="1141"/>
         <source>Documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1063"/>
+        <location filename="mainwindow.cpp" line="1145"/>
         <source>Chat on Discord</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1067"/>
+        <location filename="mainwindow.cpp" line="1149"/>
         <source>Report Issue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1071"/>
+        <location filename="mainwindow.cpp" line="1153"/>
         <source>Tutorials</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1110"/>
+        <location filename="mainwindow.cpp" line="1192"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1111"/>
+        <location filename="mainwindow.cpp" line="1193"/>
         <source>About Qt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1170"/>
+        <location filename="mainwindow.cpp" line="1252"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1171"/>
+        <location filename="mainwindow.cpp" line="1253"/>
         <source>Please enter a name for the new profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1179"/>
+        <location filename="mainwindow.cpp" line="1261"/>
         <source>failed to create profile: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1235"/>
+        <location filename="mainwindow.cpp" line="1316"/>
         <source>Show tutorial?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1236"/>
+        <location filename="mainwindow.cpp" line="1317"/>
         <source>You are starting Mod Organizer for the first time. Do you want to show a tutorial of its basic features? If you choose no you can always start the tutorial from the &quot;Help&quot;-menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1280"/>
+        <location filename="mainwindow.cpp" line="1380"/>
         <source>Downloads in progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1281"/>
+        <location filename="mainwindow.cpp" line="1381"/>
         <source>There are still downloads in progress, do you really want to quit?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1399"/>
+        <location filename="mainwindow.cpp" line="1492"/>
         <source>Plugin &quot;%1&quot; failed: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1401"/>
+        <location filename="mainwindow.cpp" line="1494"/>
         <source>Plugin &quot;%1&quot; failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1481"/>
+        <location filename="mainwindow.cpp" line="1574"/>
         <source>Browse Mod Page</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1695"/>
+        <location filename="mainwindow.cpp" line="1778"/>
         <source>Also in: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1706"/>
+        <location filename="mainwindow.cpp" line="1789"/>
         <source>No conflict</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1792"/>
+        <location filename="mainwindow.cpp" line="1914"/>
         <source>&lt;Edit...&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2070"/>
+        <location filename="mainwindow.cpp" line="1925"/>
+        <source>(no executables)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="2199"/>
         <source>This bsa is enabled in the ini file so it may be required!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2123"/>
+        <location filename="mainwindow.cpp" line="2252"/>
         <source>Activating Network Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2201"/>
+        <location filename="mainwindow.cpp" line="2342"/>
         <source>Notice: Your current MO version (%1) is lower than the previously used one (%2). The GUI may not downgrade gracefully, so you may experience oddities. However, there should be no serious issues.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2304"/>
+        <location filename="mainwindow.cpp" line="2418"/>
         <source>Choose Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2305"/>
+        <location filename="mainwindow.cpp" line="2419"/>
         <source>Mod Archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2401"/>
+        <location filename="mainwindow.cpp" line="2513"/>
         <source>Start Tutorial?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2402"/>
+        <location filename="mainwindow.cpp" line="2514"/>
         <source>You&apos;re about to start a tutorial. For technical reasons it&apos;s not possible to end the tutorial early. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2601"/>
+        <location filename="mainwindow.cpp" line="2720"/>
         <source>failed to change origin name: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2625"/>
+        <location filename="mainwindow.cpp" line="2744"/>
         <source>failed to move &quot;%1&quot; from mod &quot;%2&quot; to &quot;%3&quot;: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2649"/>
-        <source>&lt;Contains %1&gt;</source>
+        <location filename="mainwindow.cpp" line="2757"/>
+        <source>failed to rename mod: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2684"/>
-        <source>&lt;Checked&gt;</source>
+        <location filename="mainwindow.cpp" line="2770"/>
+        <source>Overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2685"/>
-        <source>&lt;Unchecked&gt;</source>
+        <location filename="mainwindow.cpp" line="2771"/>
+        <source>This will replace the existing mod &quot;%1&quot;. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2686"/>
-        <source>&lt;Update&gt;</source>
+        <location filename="mainwindow.cpp" line="2774"/>
+        <source>failed to remove mod &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2687"/>
-        <source>&lt;Mod Backup&gt;</source>
+        <location filename="mainwindow.cpp" line="2778"/>
+        <location filename="mainwindow.cpp" line="5297"/>
+        <location filename="mainwindow.cpp" line="5321"/>
+        <source>failed to rename &quot;%1&quot; to &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2688"/>
-        <source>&lt;Managed by MO&gt;</source>
+        <location filename="mainwindow.cpp" line="2866"/>
+        <location filename="mainwindow.cpp" line="4353"/>
+        <location filename="mainwindow.cpp" line="4361"/>
+        <location filename="mainwindow.cpp" line="4887"/>
+        <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2689"/>
-        <source>&lt;Managed outside MO&gt;</source>
+        <location filename="mainwindow.cpp" line="2867"/>
+        <source>Remove the following mods?&lt;br&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2690"/>
-        <source>&lt;No category&gt;</source>
+        <location filename="mainwindow.cpp" line="2882"/>
+        <source>failed to remove mod: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2691"/>
-        <source>&lt;Conflicted&gt;</source>
+        <location filename="mainwindow.cpp" line="2914"/>
+        <location filename="mainwindow.cpp" line="2917"/>
+        <location filename="mainwindow.cpp" line="2927"/>
+        <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2692"/>
-        <source>&lt;Not Endorsed&gt;</source>
+        <location filename="mainwindow.cpp" line="2914"/>
+        <source>Installation file no longer exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2738"/>
-        <source>failed to rename mod: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="2751"/>
-        <source>Overwrite?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="2752"/>
-        <source>This will replace the existing mod &quot;%1&quot;. Continue?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="2755"/>
-        <source>failed to remove mod &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="2759"/>
-        <location filename="mainwindow.cpp" line="5272"/>
-        <location filename="mainwindow.cpp" line="5296"/>
-        <source>failed to rename &quot;%1&quot; to &quot;%2&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="2847"/>
-        <location filename="mainwindow.cpp" line="4329"/>
-        <location filename="mainwindow.cpp" line="4337"/>
-        <location filename="mainwindow.cpp" line="4896"/>
-        <source>Confirm</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="2848"/>
-        <source>Remove the following mods?&lt;br&gt;&lt;ul&gt;%1&lt;/ul&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="2863"/>
-        <source>failed to remove mod: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="2895"/>
-        <location filename="mainwindow.cpp" line="2898"/>
-        <location filename="mainwindow.cpp" line="2908"/>
-        <source>Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="2895"/>
-        <source>Installation file no longer exists</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="2899"/>
+        <location filename="mainwindow.cpp" line="2918"/>
         <source>Mods installed with old versions of MO can&apos;t be reinstalled in this way.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2909"/>
+        <location filename="mainwindow.cpp" line="2928"/>
         <source>Failed to create backup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2937"/>
+        <location filename="mainwindow.cpp" line="2956"/>
         <source>Endorsing multiple mods will take a while. Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2973"/>
+        <location filename="mainwindow.cpp" line="2992"/>
         <source>Unendorsing multiple mods will take a while. Please wait...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3050"/>
+        <location filename="mainwindow.cpp" line="3069"/>
         <source>Failed to display overwrite dialog: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3241"/>
+        <location filename="mainwindow.cpp" line="3260"/>
         <source>Opening Nexus Links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3242"/>
+        <location filename="mainwindow.cpp" line="3261"/>
         <source>You are trying to open %1 links to Nexus Mods.  Are you sure you want to do this?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3269"/>
+        <location filename="mainwindow.cpp" line="3288"/>
         <source>Nexus ID for this mod is unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3280"/>
+        <location filename="mainwindow.cpp" line="3299"/>
         <source>Opening Web Pages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3281"/>
+        <location filename="mainwindow.cpp" line="3300"/>
         <source>You are trying to open %1 Web Pages.  Are you sure you want to do this?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3487"/>
+        <location filename="mainwindow.cpp" line="3506"/>
         <source>&lt;table cellspacing=&quot;5&quot;&gt;&lt;tr&gt;&lt;th&gt;Type&lt;/th&gt;&lt;th&gt;All&lt;/th&gt;&lt;th&gt;Visible&lt;/th&gt;&lt;tr&gt;&lt;td&gt;Enabled mods:&amp;emsp;&lt;/td&gt;&lt;td align=right&gt;%1 / %2&lt;/td&gt;&lt;td align=right&gt;%3 / %4&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Unmanaged/DLCs:&amp;emsp;&lt;/td&gt;&lt;td align=right&gt;%5&lt;/td&gt;&lt;td align=right&gt;%6&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Mod backups:&amp;emsp;&lt;/td&gt;&lt;td align=right&gt;%7&lt;/td&gt;&lt;td align=right&gt;%8&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;Separators:&amp;emsp;&lt;/td&gt;&lt;td align=right&gt;%9&lt;/td&gt;&lt;td align=right&gt;%10&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3542"/>
+        <location filename="mainwindow.cpp" line="3561"/>
         <source>&lt;table cellspacing=&quot;6&quot;&gt;&lt;tr&gt;&lt;th&gt;Type&lt;/th&gt;&lt;th&gt;Active      &lt;/th&gt;&lt;th&gt;Total&lt;/th&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;All plugins:&lt;/td&gt;&lt;td align=right&gt;%1    &lt;/td&gt;&lt;td align=right&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ESMs:&lt;/td&gt;&lt;td align=right&gt;%3    &lt;/td&gt;&lt;td align=right&gt;%4&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ESPs:&lt;/td&gt;&lt;td align=right&gt;%7    &lt;/td&gt;&lt;td align=right&gt;%8&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ESMs+ESPs:&lt;/td&gt;&lt;td align=right&gt;%9    &lt;/td&gt;&lt;td align=right&gt;%10&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;ESLs:&lt;/td&gt;&lt;td align=right&gt;%5    &lt;/td&gt;&lt;td align=right&gt;%6&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3574"/>
-        <location filename="mainwindow.cpp" line="3718"/>
-        <location filename="mainwindow.cpp" line="4687"/>
+        <location filename="mainwindow.cpp" line="3593"/>
+        <location filename="mainwindow.cpp" line="3737"/>
+        <location filename="mainwindow.cpp" line="4712"/>
         <source>Create Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3575"/>
+        <location filename="mainwindow.cpp" line="3594"/>
         <source>This will create an empty mod.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3584"/>
-        <location filename="mainwindow.cpp" line="3728"/>
+        <location filename="mainwindow.cpp" line="3603"/>
+        <location filename="mainwindow.cpp" line="3747"/>
         <source>A mod with this name already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3612"/>
+        <location filename="mainwindow.cpp" line="3631"/>
         <source>Create Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3613"/>
+        <location filename="mainwindow.cpp" line="3632"/>
         <source>This will create a new separator.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3620"/>
+        <location filename="mainwindow.cpp" line="3639"/>
         <source>A separator with this name already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3719"/>
+        <location filename="mainwindow.cpp" line="3738"/>
         <source>This will move all files from overwrite into a new, regular mod.
 Please enter a name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3792"/>
+        <location filename="mainwindow.cpp" line="3811"/>
         <source>Move successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3814"/>
-        <location filename="mainwindow.cpp" line="6096"/>
+        <location filename="mainwindow.cpp" line="3833"/>
+        <location filename="mainwindow.cpp" line="6207"/>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3815"/>
+        <location filename="mainwindow.cpp" line="3834"/>
         <source>About to recursively delete:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4211"/>
+        <location filename="mainwindow.cpp" line="4235"/>
         <source>Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4212"/>
+        <location filename="mainwindow.cpp" line="4236"/>
         <source>The versioning scheme decides which version is considered newer than another.
 This function will guess the versioning scheme under the assumption that the installed version is outdated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4232"/>
+        <location filename="mainwindow.cpp" line="4256"/>
         <source>Sorry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4233"/>
+        <location filename="mainwindow.cpp" line="4257"/>
         <source>I don&apos;t know a versioning scheme where %1 is newer than %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4329"/>
+        <location filename="mainwindow.cpp" line="4353"/>
         <source>Really enable all visible mods?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4337"/>
+        <location filename="mainwindow.cpp" line="4361"/>
         <source>Really disable all visible mods?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4414"/>
+        <location filename="mainwindow.cpp" line="4443"/>
         <source>Export to csv</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4417"/>
+        <location filename="mainwindow.cpp" line="4446"/>
         <source>CSV (Comma Separated Values) is a format that can be imported in programs like Excel to create a spreadsheet.
 You can also use online editors and converters instead.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4420"/>
+        <location filename="mainwindow.cpp" line="4449"/>
         <source>Select what mods you want export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4421"/>
+        <location filename="mainwindow.cpp" line="4450"/>
         <source>All installed mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4422"/>
+        <location filename="mainwindow.cpp" line="4451"/>
         <source>Only active (checked) mods from your current profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4423"/>
+        <location filename="mainwindow.cpp" line="4452"/>
         <source>All currently visible mods in the mod list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4444"/>
+        <location filename="mainwindow.cpp" line="4473"/>
         <source>Choose what Columns to export:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4447"/>
+        <location filename="mainwindow.cpp" line="4476"/>
         <source>Mod_Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4449"/>
+        <location filename="mainwindow.cpp" line="4478"/>
         <source>Mod_Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4451"/>
+        <location filename="mainwindow.cpp" line="4480"/>
         <source>Notes_column</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4452"/>
+        <location filename="mainwindow.cpp" line="4481"/>
         <source>Mod_Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4454"/>
+        <location filename="mainwindow.cpp" line="4483"/>
         <source>Primary_Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4455"/>
+        <location filename="mainwindow.cpp" line="4484"/>
         <source>Nexus_ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4456"/>
+        <location filename="mainwindow.cpp" line="4485"/>
         <source>Mod_Nexus_URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4457"/>
+        <location filename="mainwindow.cpp" line="4486"/>
         <source>Mod_Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4458"/>
+        <location filename="mainwindow.cpp" line="4487"/>
         <source>Install_Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4459"/>
+        <location filename="mainwindow.cpp" line="4488"/>
         <source>Download_File_Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4567"/>
+        <location filename="mainwindow.cpp" line="4596"/>
         <source>export failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4586"/>
+        <location filename="mainwindow.cpp" line="4615"/>
         <source>Open Game folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4588"/>
+        <location filename="mainwindow.cpp" line="4616"/>
         <source>Open MyGames folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4590"/>
+        <location filename="mainwindow.cpp" line="4617"/>
         <source>Open INIs folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4594"/>
+        <location filename="mainwindow.cpp" line="4622"/>
         <source>Open Instance folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4596"/>
+        <location filename="mainwindow.cpp" line="4623"/>
         <source>Open Mods folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4598"/>
+        <location filename="mainwindow.cpp" line="4624"/>
         <source>Open Profile folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4600"/>
+        <location filename="mainwindow.cpp" line="4625"/>
         <source>Open Downloads folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4604"/>
+        <location filename="mainwindow.cpp" line="4631"/>
         <source>Open MO2 Install folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4606"/>
+        <location filename="mainwindow.cpp" line="4632"/>
         <source>Open MO2 Plugins folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4608"/>
+        <location filename="mainwindow.cpp" line="4633"/>
+        <source>Open MO2 Stylesheets folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="4634"/>
         <source>Open MO2 Logs folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4616"/>
+        <location filename="mainwindow.cpp" line="4641"/>
         <source>Install Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4617"/>
+        <location filename="mainwindow.cpp" line="4642"/>
         <source>Create empty mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4618"/>
+        <location filename="mainwindow.cpp" line="4643"/>
         <source>Create Separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4622"/>
+        <location filename="mainwindow.cpp" line="4647"/>
         <source>Enable all visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4623"/>
+        <location filename="mainwindow.cpp" line="4648"/>
         <source>Disable all visible</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4624"/>
+        <location filename="mainwindow.cpp" line="4649"/>
         <source>Check for updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4626"/>
+        <location filename="mainwindow.cpp" line="4651"/>
         <source>Export to csv...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4635"/>
-        <location filename="mainwindow.cpp" line="4651"/>
+        <location filename="mainwindow.cpp" line="4660"/>
+        <location filename="mainwindow.cpp" line="4676"/>
         <source>Send to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4636"/>
-        <location filename="mainwindow.cpp" line="4652"/>
+        <location filename="mainwindow.cpp" line="4661"/>
+        <location filename="mainwindow.cpp" line="4677"/>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4637"/>
-        <location filename="mainwindow.cpp" line="4653"/>
+        <location filename="mainwindow.cpp" line="4662"/>
+        <location filename="mainwindow.cpp" line="4678"/>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4638"/>
-        <location filename="mainwindow.cpp" line="4654"/>
+        <location filename="mainwindow.cpp" line="4663"/>
+        <location filename="mainwindow.cpp" line="4679"/>
         <source>Priority...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4639"/>
+        <location filename="mainwindow.cpp" line="4664"/>
         <source>Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4678"/>
+        <location filename="mainwindow.cpp" line="4703"/>
         <source>All Mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4686"/>
+        <location filename="mainwindow.cpp" line="4711"/>
         <source>Sync to Mods...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4688"/>
+        <location filename="mainwindow.cpp" line="4713"/>
         <source>Move content to Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4689"/>
+        <location filename="mainwindow.cpp" line="4714"/>
         <source>Clear Overwrite...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4691"/>
-        <location filename="mainwindow.cpp" line="4814"/>
+        <location filename="mainwindow.cpp" line="4716"/>
+        <location filename="mainwindow.cpp" line="4839"/>
         <source>Open in Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4693"/>
+        <location filename="mainwindow.cpp" line="4718"/>
         <source>Restore Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4694"/>
+        <location filename="mainwindow.cpp" line="4719"/>
         <source>Remove Backup...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4697"/>
-        <location filename="mainwindow.cpp" line="4716"/>
+        <location filename="mainwindow.cpp" line="4722"/>
+        <location filename="mainwindow.cpp" line="4741"/>
         <source>Change Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4701"/>
-        <location filename="mainwindow.cpp" line="4721"/>
+        <location filename="mainwindow.cpp" line="4726"/>
+        <location filename="mainwindow.cpp" line="4746"/>
         <source>Primary Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4705"/>
+        <location filename="mainwindow.cpp" line="4730"/>
         <source>Rename Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4706"/>
+        <location filename="mainwindow.cpp" line="4731"/>
         <source>Remove Separator...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4709"/>
+        <location filename="mainwindow.cpp" line="4734"/>
         <source>Select Color...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4711"/>
+        <location filename="mainwindow.cpp" line="4736"/>
         <source>Reset Color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4728"/>
+        <location filename="mainwindow.cpp" line="4753"/>
         <source>Change versioning scheme</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4732"/>
+        <location filename="mainwindow.cpp" line="4757"/>
         <source>Force-check updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4734"/>
+        <location filename="mainwindow.cpp" line="4759"/>
         <source>Un-ignore update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4737"/>
+        <location filename="mainwindow.cpp" line="4762"/>
         <source>Ignore update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4742"/>
-        <location filename="mainwindow.cpp" line="6212"/>
+        <location filename="mainwindow.cpp" line="4767"/>
+        <location filename="mainwindow.cpp" line="6365"/>
         <source>Enable selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4743"/>
-        <location filename="mainwindow.cpp" line="6213"/>
+        <location filename="mainwindow.cpp" line="4768"/>
+        <location filename="mainwindow.cpp" line="6366"/>
         <source>Disable selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4749"/>
+        <location filename="mainwindow.cpp" line="4774"/>
         <source>Rename Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4750"/>
+        <location filename="mainwindow.cpp" line="4775"/>
         <source>Reinstall Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4751"/>
+        <location filename="mainwindow.cpp" line="4776"/>
         <source>Remove Mod...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4759"/>
+        <location filename="mainwindow.cpp" line="4784"/>
         <source>Un-Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4763"/>
+        <location filename="mainwindow.cpp" line="4788"/>
         <source>Won&apos;t endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4769"/>
+        <location filename="mainwindow.cpp" line="4794"/>
         <source>Endorsement state unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4779"/>
+        <location filename="mainwindow.cpp" line="4804"/>
         <source>Start tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4782"/>
+        <location filename="mainwindow.cpp" line="4807"/>
         <source>Stop tracking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4785"/>
+        <location filename="mainwindow.cpp" line="4810"/>
         <source>Tracked state unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4796"/>
+        <location filename="mainwindow.cpp" line="4821"/>
         <source>Ignore missing data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4800"/>
+        <location filename="mainwindow.cpp" line="4825"/>
         <source>Mark as converted/working</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4804"/>
+        <location filename="mainwindow.cpp" line="4829"/>
         <source>Visit on Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4810"/>
+        <location filename="mainwindow.cpp" line="4835"/>
         <source>Visit on %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4818"/>
+        <location filename="mainwindow.cpp" line="4843"/>
         <source>Information...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4825"/>
-        <location filename="mainwindow.cpp" line="6265"/>
+        <location filename="mainwindow.cpp" line="4850"/>
+        <location filename="mainwindow.cpp" line="6418"/>
         <source>Exception: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4827"/>
-        <location filename="mainwindow.cpp" line="6267"/>
+        <location filename="mainwindow.cpp" line="4852"/>
+        <location filename="mainwindow.cpp" line="6420"/>
         <source>Unknown exception</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4856"/>
-        <source>&lt;All&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="4858"/>
-        <source>&lt;Multiple&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="4893"/>
+        <location filename="mainwindow.cpp" line="4884"/>
         <source>%1 more</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="mainwindow.cpp" line="4897"/>
+        <location filename="mainwindow.cpp" line="4888"/>
         <source>Are you sure you want to remove the following %n save(s)?&lt;br&gt;&lt;ul&gt;%1&lt;/ul&gt;&lt;br&gt;Removed saves will be sent to the Recycle Bin.</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -3112,12 +3206,12 @@ You can also use online editors and converters instead.</source>
         </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4942"/>
+        <location filename="mainwindow.cpp" line="4933"/>
         <source>Enable Mods...</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="mainwindow.cpp" line="4957"/>
+        <location filename="mainwindow.cpp" line="4948"/>
         <source>Delete %n save(s)</source>
         <translation type="unfinished">
             <numerusform></numerusform>
@@ -3125,349 +3219,330 @@ You can also use online editors and converters instead.</source>
         </translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5018"/>
-        <source>Restarting MO</source>
+        <location filename="mainwindow.cpp" line="5028"/>
+        <source>Restart Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5019"/>
-        <source>Changing the managed game directory requires restarting MO.
-Any pending downloads will be paused.
-
-Click OK to restart MO now.</source>
+        <location filename="mainwindow.cpp" line="5030"/>
+        <source>Mod Organizer must restart to finish configuration changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="5032"/>
+        <source>Restart</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="5033"/>
+        <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5039"/>
+        <location filename="mainwindow.cpp" line="5033"/>
+        <source>Some things might be weird.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="5054"/>
         <source>Can&apos;t change download directory while downloads are in progress!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5185"/>
+        <location filename="mainwindow.cpp" line="5211"/>
         <source>failed to write to file %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5191"/>
+        <location filename="mainwindow.cpp" line="5217"/>
         <source>%1 written</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5215"/>
+        <location filename="mainwindow.cpp" line="5235"/>
         <source>Enter Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5216"/>
-        <source>Please enter a name for the executable</source>
+        <location filename="mainwindow.cpp" line="5236"/>
+        <source>Enter a name for the executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5235"/>
+        <location filename="mainwindow.cpp" line="5258"/>
         <source>Not an executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5235"/>
+        <location filename="mainwindow.cpp" line="5259"/>
         <source>This is not a recognized executable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5257"/>
         <location filename="mainwindow.cpp" line="5282"/>
+        <location filename="mainwindow.cpp" line="5307"/>
         <source>Replace file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5257"/>
+        <location filename="mainwindow.cpp" line="5282"/>
         <source>There already is a hidden version of this file. Replace it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5260"/>
         <location filename="mainwindow.cpp" line="5285"/>
+        <location filename="mainwindow.cpp" line="5310"/>
         <source>File operation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5260"/>
         <location filename="mainwindow.cpp" line="5285"/>
+        <location filename="mainwindow.cpp" line="5310"/>
         <source>Failed to remove &quot;%1&quot;. Maybe you lack the required file permissions?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5282"/>
+        <location filename="mainwindow.cpp" line="5307"/>
         <source>There already is a visible version of this file. Replace it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5326"/>
-        <location filename="mainwindow.cpp" line="6838"/>
+        <location filename="mainwindow.cpp" line="5351"/>
+        <location filename="mainwindow.cpp" line="6762"/>
         <source>Set Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5326"/>
+        <location filename="mainwindow.cpp" line="5351"/>
         <source>Set the priority of the selected plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5390"/>
+        <location filename="mainwindow.cpp" line="5483"/>
         <source>Update available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5417"/>
-        <source>Open/Execute</source>
+        <location filename="mainwindow.cpp" line="5517"/>
+        <source>&amp;Execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5418"/>
-        <source>Add as Executable</source>
+        <location filename="mainwindow.cpp" line="5519"/>
+        <source>&amp;Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="5520"/>
+        <source>Open with &amp;VFS</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5422"/>
+        <location filename="mainwindow.cpp" line="5523"/>
+        <source>&amp;Add as Executable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="5526"/>
         <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5435"/>
+        <location filename="mainwindow.cpp" line="5540"/>
         <source>Un-Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5437"/>
+        <location filename="mainwindow.cpp" line="5542"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5443"/>
+        <location filename="mainwindow.cpp" line="5549"/>
         <source>Write To File...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5473"/>
+        <location filename="mainwindow.cpp" line="5577"/>
         <source>Do you want to endorse Mod Organizer on %1 now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5487"/>
+        <location filename="mainwindow.cpp" line="5591"/>
         <source>Abstain from Endorsing Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5488"/>
+        <location filename="mainwindow.cpp" line="5592"/>
         <source>Are you sure you want to abstain from endorsing Mod Organizer 2?
 You will have to visit the mod page on the %1 Nexus site to change your mind.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5579"/>
+        <location filename="mainwindow.cpp" line="5683"/>
         <source>Thank you for endorsing MO2! :)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5585"/>
+        <location filename="mainwindow.cpp" line="5689"/>
         <source>Please reconsider endorsing MO2 on Nexus!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5843"/>
+        <location filename="mainwindow.cpp" line="5953"/>
         <source>Thank you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5843"/>
+        <location filename="mainwindow.cpp" line="5953"/>
         <source>Thank you for your endorsement!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5935"/>
+        <location filename="mainwindow.cpp" line="6045"/>
         <source>Mod ID %1 no longer seems to be available on Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5937"/>
+        <location filename="mainwindow.cpp" line="6047"/>
         <source>Request to Nexus failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5953"/>
-        <location filename="mainwindow.cpp" line="6015"/>
+        <location filename="mainwindow.cpp" line="6063"/>
+        <location filename="mainwindow.cpp" line="6125"/>
         <source>failed to read %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5965"/>
-        <location filename="mainwindow.cpp" line="6439"/>
+        <location filename="mainwindow.cpp" line="6075"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5965"/>
+        <location filename="mainwindow.cpp" line="6075"/>
         <source>failed to extract %1 (errorcode %2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5997"/>
+        <location filename="mainwindow.cpp" line="6107"/>
         <source>Extract BSA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6026"/>
+        <location filename="mainwindow.cpp" line="6136"/>
         <source>This archive contains invalid hashes. Some files may be broken.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6072"/>
+        <location filename="mainwindow.cpp" line="6182"/>
         <source>Extract...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6096"/>
+        <location filename="mainwindow.cpp" line="6207"/>
         <source>This will restart MO, continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6138"/>
-        <source>Edit Categories...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="6139"/>
-        <source>Deselect filter</source>
+        <location filename="mainwindow.cpp" line="6285"/>
+        <source>&lt;Multiple&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6196"/>
+        <location filename="mainwindow.cpp" line="6349"/>
         <source>Remove &apos;%1&apos; from the toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6217"/>
+        <location filename="mainwindow.cpp" line="6370"/>
         <source>Enable all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6218"/>
+        <location filename="mainwindow.cpp" line="6371"/>
         <source>Disable all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6239"/>
+        <location filename="mainwindow.cpp" line="6392"/>
         <source>Unlock load order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6242"/>
+        <location filename="mainwindow.cpp" line="6395"/>
         <source>Lock load order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6252"/>
+        <location filename="mainwindow.cpp" line="6405"/>
         <source>Open Origin in Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6257"/>
+        <location filename="mainwindow.cpp" line="6410"/>
         <source>Open Origin Info...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6386"/>
-        <source>depends on missing &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="6390"/>
-        <source>incompatible with &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="6415"/>
-        <source>Please wait while LOOT is running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="6514"/>
-        <source>loot failed. Exit code was: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="6536"/>
-        <source>failed to start loot</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="6539"/>
-        <source>failed to run loot: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="6543"/>
-        <source>Errors occurred</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="mainwindow.cpp" line="6580"/>
+        <location filename="mainwindow.cpp" line="6518"/>
         <source>Backup of load order created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6590"/>
+        <location filename="mainwindow.cpp" line="6528"/>
         <source>Choose backup to restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6603"/>
+        <location filename="mainwindow.cpp" line="6541"/>
         <source>No Backups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6603"/>
+        <location filename="mainwindow.cpp" line="6541"/>
         <source>There are no backups to restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6628"/>
-        <location filename="mainwindow.cpp" line="6653"/>
+        <location filename="mainwindow.cpp" line="6566"/>
+        <location filename="mainwindow.cpp" line="6591"/>
         <source>Restore failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6629"/>
-        <location filename="mainwindow.cpp" line="6654"/>
+        <location filename="mainwindow.cpp" line="6567"/>
+        <location filename="mainwindow.cpp" line="6592"/>
         <source>Failed to restore the backup. Errorcode: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6641"/>
+        <location filename="mainwindow.cpp" line="6579"/>
         <source>Backup of mod list created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6738"/>
+        <location filename="mainwindow.cpp" line="6662"/>
         <source>A file with the same name has already been downloaded. What would you like to do?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6740"/>
+        <location filename="mainwindow.cpp" line="6664"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6741"/>
+        <location filename="mainwindow.cpp" line="6665"/>
         <source>Rename new file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6742"/>
+        <location filename="mainwindow.cpp" line="6666"/>
         <source>Ignore file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6838"/>
+        <location filename="mainwindow.cpp" line="6762"/>
         <source>Set the priority of the selected mods</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3484,101 +3559,100 @@ You will have to visit the mod page on the %1 Nexus site to change your mind.</s
 <context>
     <name>ModInfo</name>
     <message>
-        <location filename="modinfo.cpp" line="99"/>
+        <location filename="modinfo.cpp" line="114"/>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="100"/>
+        <location filename="modinfo.cpp" line="115"/>
         <source>Textures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="101"/>
+        <location filename="modinfo.cpp" line="116"/>
         <source>Meshes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="102"/>
+        <location filename="modinfo.cpp" line="117"/>
         <source>Bethesda Archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="103"/>
+        <location filename="modinfo.cpp" line="118"/>
         <source>UI Changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="104"/>
+        <location filename="modinfo.cpp" line="119"/>
         <source>Sound Effects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="105"/>
+        <location filename="modinfo.cpp" line="120"/>
         <source>Scripts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="106"/>
+        <location filename="modinfo.cpp" line="121"/>
         <source>Script Extender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="107"/>
+        <location filename="modinfo.cpp" line="122"/>
         <source>Script Extender Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="108"/>
+        <location filename="modinfo.cpp" line="123"/>
         <source>SkyProc Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="109"/>
+        <location filename="modinfo.cpp" line="124"/>
         <source>MCM Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="110"/>
+        <location filename="modinfo.cpp" line="125"/>
         <source>INI files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="111"/>
+        <location filename="modinfo.cpp" line="126"/>
         <source>ModGroup files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="113"/>
+        <location filename="modinfo.cpp" line="128"/>
         <source>invalid content type: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="137"/>
+        <location filename="modinfo.cpp" line="152"/>
         <source>invalid mod index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="182"/>
+        <location filename="modinfo.cpp" line="197"/>
         <source>remove: invalid mod index %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="322"/>
+        <location filename="modinfo.cpp" line="337"/>
         <source>All of your mods have been checked recently. We restrict update checks to help preserve your available API requests.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfo.cpp" line="325"/>
+        <location filename="modinfo.cpp" line="340"/>
         <source>You have mods that haven&apos;t been checked within the last month using the new API. These mods must be checked before we can use the bulk update API. This will consume significantly more API requests than usual. You will need to rerun the update check once complete in order to parse the remaining mods.</source>
-        <oldsource>You have mods that haven&apos;t been checked within 30 days using the new API. These mods must be checked before we can use the bulk update API. This will consume significantly more API requests than usual. You will need to rerun the update check once complete in order to parse the remaining mods.</oldsource>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ModInfoBackup</name>
     <message>
-        <location filename="modinfobackup.cpp" line="13"/>
+        <location filename="modinfobackup.cpp" line="14"/>
         <source>This is the backup of a mod</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3638,27 +3712,32 @@ You will have to visit the mod page on the %1 Nexus site to change your mind.</s
     </message>
     <message>
         <location filename="modinfodialog.ui" line="273"/>
+        <source>Open with Preview Plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modinfodialog.ui" line="280"/>
         <source>Open in Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="287"/>
+        <location filename="modinfodialog.ui" line="294"/>
         <source>0x0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="305"/>
-        <location filename="modinfodialog.ui" line="330"/>
+        <location filename="modinfodialog.ui" line="312"/>
+        <location filename="modinfodialog.ui" line="337"/>
         <source>Optional ESPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="337"/>
+        <location filename="modinfodialog.ui" line="344"/>
         <source>List of esps, esms, and esls that can not be loaded by the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="340"/>
+        <location filename="modinfodialog.ui" line="347"/>
         <source>List of esps, esms, and esls contained in this plugin that currently can not be loaded by the game. They will not even appear in the esp-list in the main MO-window.
 They usually contain optional functionality, see the readme.
 
@@ -3666,135 +3745,132 @@ Most mods do not have optional esps, so chances are good you are looking at an e
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="384"/>
+        <location filename="modinfodialog.ui" line="391"/>
         <source>Move a file to the data directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="387"/>
+        <location filename="modinfodialog.ui" line="394"/>
         <source>This moves a esp to the esp directory so it can be enabled in the main window. Please note that the ESP merely becomes &quot;available&quot;, it will not necessarily be loaded! That is configured in the main window of MO.</source>
-        <oldsource>This moves a esp to the esp directory so it can be enabled in the main window. Please note that the ESP merely becomes &quot;available&quot;, it will not necessarily be loaded! That is configured in the main window of omo.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="407"/>
+        <location filename="modinfodialog.ui" line="414"/>
         <source>Make the selected mod in the right list unavailable.</source>
-        <oldsource>Make the selected mod in the lower list unavailable.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="410"/>
+        <location filename="modinfodialog.ui" line="417"/>
         <source>The selected esp (in the right list) will be pushed into a subdirectory of the mod and will thus become &quot;invisible&quot; to the game. It can then no longer be activated.</source>
-        <oldsource>The selected esp (in the lower list) will be pushed into a subdirectory of the mod and will thus become &quot;invisible&quot; to the game. It can then no longer be activated.</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="460"/>
+        <location filename="modinfodialog.ui" line="467"/>
         <source>Available ESPs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="467"/>
+        <location filename="modinfodialog.ui" line="474"/>
         <source>ESPs in the data directory and thus visible to the game.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="470"/>
+        <location filename="modinfodialog.ui" line="477"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;These are the mod files that are in the (virtual) data directory of your game and will thus be selectable in the esp list in the main window.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="488"/>
+        <location filename="modinfodialog.ui" line="495"/>
         <source>Conflicts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="498"/>
+        <location filename="modinfodialog.ui" line="505"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="539"/>
+        <location filename="modinfodialog.ui" line="546"/>
         <source>The following conflicted files are provided by this mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="596"/>
+        <location filename="modinfodialog.ui" line="603"/>
         <source>The following conflicted files are provided by other mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="650"/>
+        <location filename="modinfodialog.ui" line="657"/>
         <source>The following files have no conflicts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="707"/>
+        <location filename="modinfodialog.ui" line="714"/>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="777"/>
+        <location filename="modinfodialog.ui" line="784"/>
         <source>Whether files that have no conflicts should be visible in the list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="780"/>
+        <location filename="modinfodialog.ui" line="787"/>
         <source>Show files that have no conflicts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="790"/>
+        <location filename="modinfodialog.ui" line="797"/>
         <source>Shows all mods overwriting or being overwritten by this mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="793"/>
+        <location filename="modinfodialog.ui" line="800"/>
         <source>Show all conflicting mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="803"/>
+        <location filename="modinfodialog.ui" line="810"/>
         <source>Shows only the nearest conflicting mods, in order of priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="806"/>
+        <location filename="modinfodialog.ui" line="813"/>
         <source>Show nearest conflicting mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="828"/>
+        <location filename="modinfodialog.ui" line="835"/>
         <source>Filter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="849"/>
+        <location filename="modinfodialog.ui" line="856"/>
         <source>Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="869"/>
+        <location filename="modinfodialog.ui" line="876"/>
         <source>Primary Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="886"/>
+        <location filename="modinfodialog.ui" line="893"/>
         <source>Nexus Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="909"/>
+        <location filename="modinfodialog.ui" line="916"/>
         <source>Mod ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="916"/>
+        <location filename="modinfodialog.ui" line="923"/>
         <source>Mod ID for this mod on Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="919"/>
+        <location filename="modinfodialog.ui" line="926"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3803,22 +3879,22 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="930"/>
+        <location filename="modinfodialog.ui" line="937"/>
         <source>Source Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="937"/>
+        <location filename="modinfodialog.ui" line="944"/>
         <source>Source game for this mod.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="940"/>
+        <location filename="modinfodialog.ui" line="947"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Source game for this mod. This determines where the mod was downloaded from and decides where to fetch info, version updates, and send endorsements. Changing this will likely require you to enter a new Mod ID.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="947"/>
+        <location filename="modinfodialog.ui" line="954"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3827,83 +3903,83 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="954"/>
+        <location filename="modinfodialog.ui" line="961"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1004"/>
-        <location filename="modinfodialog.ui" line="1010"/>
+        <location filename="modinfodialog.ui" line="1011"/>
+        <location filename="modinfodialog.ui" line="1017"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1007"/>
+        <location filename="modinfodialog.ui" line="1014"/>
         <source>Refresh all information from Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1021"/>
-        <location filename="modinfodialog.ui" line="1146"/>
+        <location filename="modinfodialog.ui" line="1028"/>
+        <location filename="modinfodialog.ui" line="1153"/>
         <source>Open in Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1032"/>
+        <location filename="modinfodialog.ui" line="1039"/>
         <source>Endorse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1043"/>
+        <location filename="modinfodialog.ui" line="1050"/>
         <source>Track</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1110"/>
+        <location filename="modinfodialog.ui" line="1117"/>
         <source>about:blank</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1136"/>
+        <location filename="modinfodialog.ui" line="1143"/>
         <source>Use Custom URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1157"/>
+        <location filename="modinfodialog.ui" line="1164"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1163"/>
-        <location filename="modinfodialog.ui" line="1166"/>
-        <location filename="modinfodialog.ui" line="1169"/>
+        <location filename="modinfodialog.ui" line="1170"/>
+        <location filename="modinfodialog.ui" line="1173"/>
+        <location filename="modinfodialog.ui" line="1176"/>
         <source>Enter comments about the mod here.  These are displayed in the notes column of the mod list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1176"/>
-        <location filename="modinfodialog.ui" line="1179"/>
-        <location filename="modinfodialog.ui" line="1185"/>
+        <location filename="modinfodialog.ui" line="1183"/>
+        <location filename="modinfodialog.ui" line="1186"/>
+        <location filename="modinfodialog.ui" line="1192"/>
         <source>Enter notes about the mod here.  These can be viewed in the mod list by hovering over the notes column or the flags column.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1193"/>
+        <location filename="modinfodialog.ui" line="1200"/>
         <source>Filetree</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1207"/>
+        <location filename="modinfodialog.ui" line="1214"/>
         <source>Open Mod in Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1232"/>
+        <location filename="modinfodialog.ui" line="1239"/>
         <source>A directory view of this mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1235"/>
+        <location filename="modinfodialog.ui" line="1242"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -3913,17 +3989,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1265"/>
+        <location filename="modinfodialog.ui" line="1275"/>
         <source>Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1275"/>
+        <location filename="modinfodialog.ui" line="1285"/>
         <source>Next</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialog.ui" line="1298"/>
+        <location filename="modinfodialog.ui" line="1308"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3954,7 +4030,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ModInfoOverwrite</name>
     <message>
-        <location filename="modinfooverwrite.cpp" line="51"/>
+        <location filename="modinfooverwrite.cpp" line="60"/>
         <source>This pseudo mod contains files from the virtual data tree that got modified (i.e. by the construction kit)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3983,318 +4059,328 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ModList</name>
     <message>
-        <location filename="modlist.cpp" line="68"/>
+        <location filename="modlist.cpp" line="69"/>
         <source>Game Plugins (ESP/ESM/ESL)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="69"/>
+        <location filename="modlist.cpp" line="70"/>
         <source>Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="70"/>
+        <location filename="modlist.cpp" line="71"/>
         <source>Meshes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="71"/>
+        <location filename="modlist.cpp" line="72"/>
         <source>Bethesda Archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="72"/>
+        <location filename="modlist.cpp" line="73"/>
         <source>Scripts (Papyrus)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="73"/>
+        <location filename="modlist.cpp" line="74"/>
         <source>Script Extender Plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="74"/>
+        <location filename="modlist.cpp" line="75"/>
         <source>SkyProc Patcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="75"/>
+        <location filename="modlist.cpp" line="76"/>
         <source>Sound or Music</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="76"/>
+        <location filename="modlist.cpp" line="77"/>
         <source>Textures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="77"/>
+        <location filename="modlist.cpp" line="78"/>
         <source>MCM Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="78"/>
+        <location filename="modlist.cpp" line="79"/>
         <source>INI files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="79"/>
+        <location filename="modlist.cpp" line="80"/>
         <source>ModGroup files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="140"/>
+        <location filename="modlist.cpp" line="141"/>
         <source>This entry contains files that have been created inside the virtual data tree (i.e. by the construction kit)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="149"/>
+        <location filename="modlist.cpp" line="150"/>
         <source>Backup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="150"/>
+        <location filename="modlist.cpp" line="151"/>
         <source>Separator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="151"/>
+        <location filename="modlist.cpp" line="152"/>
         <source>No valid game data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="152"/>
+        <location filename="modlist.cpp" line="153"/>
         <source>Not endorsed yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="161"/>
+        <location filename="modlist.cpp" line="162"/>
+        <source>&lt;br&gt;This mod is for a different game, make sure it&apos;s compatible or it could cause crashes.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modlist.cpp" line="164"/>
+        <source>Mod is being tracked on the website</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modlist.cpp" line="173"/>
         <source>Overwrites loose files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="162"/>
+        <location filename="modlist.cpp" line="174"/>
         <source>Overwritten loose files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="163"/>
+        <location filename="modlist.cpp" line="175"/>
         <source>Loose files Overwrites &amp; Overwritten</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="164"/>
+        <location filename="modlist.cpp" line="176"/>
         <source>Redundant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="165"/>
+        <location filename="modlist.cpp" line="177"/>
         <source>Overwrites an archive with loose files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="166"/>
+        <location filename="modlist.cpp" line="178"/>
         <source>Archive is overwritten by loose files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="167"/>
+        <location filename="modlist.cpp" line="179"/>
         <source>Overwrites another archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="168"/>
+        <location filename="modlist.cpp" line="180"/>
         <source>Overwritten by another archive file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="169"/>
+        <location filename="modlist.cpp" line="181"/>
         <source>Archive files overwrites &amp; overwritten</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="170"/>
-        <source>&lt;br&gt;This mod is for a different game, make sure it&apos;s compatible or it could cause crashes.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="modlist.cpp" line="172"/>
-        <source>Mod is being tracked on the website</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="modlist.cpp" line="264"/>
+        <location filename="modlist.cpp" line="274"/>
         <source>Non-MO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="296"/>
+        <location filename="modlist.cpp" line="306"/>
         <source>invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="456"/>
+        <location filename="modlist.cpp" line="475"/>
         <source>installed version: &quot;%1&quot;, newest version: &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="458"/>
+        <location filename="modlist.cpp" line="477"/>
         <source>The newest version on Nexus seems to be older than the one you have installed. This could either mean the version you have has been withdrawn (i.e. due to a bug) or the author uses a non-standard versioning scheme and that newest version is actually newer. Either way you may want to &quot;upgrade&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="463"/>
+        <location filename="modlist.cpp" line="482"/>
         <source>This file has been marked as &quot;Old&quot;. There is most likely an updated version of this file available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="465"/>
+        <location filename="modlist.cpp" line="484"/>
         <source>This file has been marked as &quot;Deleted&quot;! You may want to check for an update or remove the nexus ID from this mod!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="472"/>
+        <location filename="modlist.cpp" line="491"/>
         <source>%1 minute(s) and %2 second(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="473"/>
+        <location filename="modlist.cpp" line="492"/>
         <source>This mod will be available to check in %2.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="481"/>
+        <location filename="modlist.cpp" line="500"/>
         <source>Categories: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="512"/>
+        <location filename="modlist.cpp" line="531"/>
         <source>Invalid name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="517"/>
+        <location filename="modlist.cpp" line="536"/>
         <source>Name is already in use by another mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1103"/>
+        <location filename="modlist.cpp" line="1122"/>
         <source>drag&amp;drop failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1182"/>
+        <location filename="modlist.cpp" line="1201"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1183"/>
+        <location filename="modlist.cpp" line="1202"/>
         <source>Are you sure you want to remove &quot;%1&quot;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1250"/>
+        <location filename="modlist.cpp" line="1295"/>
+        <source>Conflicts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modlist.cpp" line="1296"/>
         <source>Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1251"/>
+        <location filename="modlist.cpp" line="1297"/>
         <source>Content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1252"/>
+        <location filename="modlist.cpp" line="1298"/>
         <source>Mod Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1253"/>
+        <location filename="modlist.cpp" line="1299"/>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1254"/>
+        <location filename="modlist.cpp" line="1300"/>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1255"/>
+        <location filename="modlist.cpp" line="1301"/>
         <source>Category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1256"/>
+        <location filename="modlist.cpp" line="1302"/>
         <source>Source Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1257"/>
+        <location filename="modlist.cpp" line="1303"/>
         <source>Nexus ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1258"/>
+        <location filename="modlist.cpp" line="1304"/>
         <source>Installation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1259"/>
+        <location filename="modlist.cpp" line="1305"/>
         <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1260"/>
-        <location filename="modlist.cpp" line="1296"/>
+        <location filename="modlist.cpp" line="1306"/>
+        <location filename="modlist.cpp" line="1343"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1268"/>
+        <location filename="modlist.cpp" line="1314"/>
         <source>Name of your mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1269"/>
+        <location filename="modlist.cpp" line="1315"/>
         <source>Version of the mod (if available)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1270"/>
+        <location filename="modlist.cpp" line="1316"/>
         <source>Installation priority of your mod. The higher, the more &quot;important&quot; it is and thus overwrites files from mods with lower priority.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1272"/>
+        <location filename="modlist.cpp" line="1318"/>
         <source>Category of the mod.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1273"/>
+        <location filename="modlist.cpp" line="1319"/>
         <source>The source game which was the origin of this mod.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1274"/>
+        <location filename="modlist.cpp" line="1320"/>
         <source>Id of the mod as used on Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1275"/>
-        <source>Emblemes to highlight things that might require attention.</source>
+        <location filename="modlist.cpp" line="1321"/>
+        <source>Indicators of file conflicts between mods.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="modlist.cpp" line="1322"/>
+        <source>Emblems to highlight things that might require attention.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1276"/>
+        <location filename="modlist.cpp" line="1323"/>
         <source>Depicts the content of the mod:&lt;br&gt;&lt;table cellspacing=7&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/plugin&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;Game plugins (esp/esm/esl)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/interface&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;Interface&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/mesh&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;Meshes&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/bsa&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;BSA&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/texture&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;Textures&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/sound&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;Sounds&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/music&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;Music&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/string&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;Strings&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/script&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;Scripts (Papyrus)&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/skse&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;Script Extender plugins&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/skyproc&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;SkyProc Patcher&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/menu&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;Mod Configuration Menu&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/inifile&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;INI files&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td&gt;&lt;img src=&quot;:/MO/gui/content/modgroup&quot; width=32/&gt;&lt;/td&gt;&lt;td&gt;ModGroup files&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1294"/>
+        <location filename="modlist.cpp" line="1341"/>
         <source>Time this mod was installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modlist.cpp" line="1295"/>
+        <location filename="modlist.cpp" line="1342"/>
         <source>User notes about the mod</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4302,7 +4388,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ModListSortProxy</name>
     <message>
-        <location filename="modlistsortproxy.cpp" line="508"/>
+        <location filename="modlistsortproxy.cpp" line="622"/>
         <source>Drag&amp;Drop is only supported when sorting by priority</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4345,31 +4431,31 @@ p, li { white-space: pre-wrap; }
     <name>NexusInterface</name>
     <message>
         <location filename="nexusinterface.cpp" line="299"/>
-        <source>Failed to guess mod id for &quot;%1&quot;, please pick the correct one</source>
+        <source>Please pick the mod ID for &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="689"/>
+        <location filename="nexusinterface.cpp" line="697"/>
         <source>You must authorize MO2 in Settings -&gt; Nexus to use the Nexus API.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="698"/>
+        <location filename="nexusinterface.cpp" line="706"/>
         <source>You&apos;ve exceeded the Nexus API rate limit and requests are now being throttled. Your next batch of requests will be available in approximately %1 minutes and %2 seconds.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="754"/>
+        <location filename="nexusinterface.cpp" line="762"/>
         <source>Aborting download: Either you clicked on a premium-only link and your account is not premium, or the download link was generated by a different account than the one stored in Mod Organizer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="861"/>
+        <location filename="nexusinterface.cpp" line="869"/>
         <source>empty response</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nexusinterface.cpp" line="919"/>
+        <location filename="nexusinterface.cpp" line="927"/>
         <source>invalid response</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4452,7 +4538,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NoConflictListModel</name>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="321"/>
+        <location filename="modinfodialogconflicts.cpp" line="329"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4460,212 +4546,207 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OrganizerCore</name>
     <message>
-        <location filename="organizercore.cpp" line="249"/>
-        <source>Failed to write settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="organizercore.cpp" line="241"/>
+        <location filename="organizercore.cpp" line="181"/>
         <source>File is write protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="243"/>
+        <location filename="organizercore.cpp" line="183"/>
         <source>Invalid file format (probably a bug)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="245"/>
+        <location filename="organizercore.cpp" line="185"/>
         <source>Unknown error %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="250"/>
+        <location filename="organizercore.cpp" line="189"/>
+        <source>Failed to write settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="organizercore.cpp" line="190"/>
         <source>An error occurred trying to write back MO settings to %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="415"/>
-        <location filename="organizercore.cpp" line="426"/>
+        <location filename="organizercore.cpp" line="366"/>
+        <location filename="organizercore.cpp" line="377"/>
         <source>Download started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="429"/>
+        <location filename="organizercore.cpp" line="380"/>
         <source>Download failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="736"/>
-        <location filename="organizercore.cpp" line="773"/>
-        <location filename="organizercore.cpp" line="784"/>
-        <location filename="organizercore.cpp" line="842"/>
+        <location filename="organizercore.cpp" line="701"/>
+        <location filename="organizercore.cpp" line="738"/>
+        <location filename="organizercore.cpp" line="749"/>
+        <location filename="organizercore.cpp" line="807"/>
         <source>Installation cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="737"/>
-        <location filename="organizercore.cpp" line="785"/>
+        <location filename="organizercore.cpp" line="702"/>
+        <location filename="organizercore.cpp" line="750"/>
         <source>Another installation is currently in progress.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="749"/>
-        <location filename="organizercore.cpp" line="814"/>
+        <location filename="organizercore.cpp" line="714"/>
+        <location filename="organizercore.cpp" line="779"/>
         <source>Installation successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="757"/>
-        <location filename="organizercore.cpp" line="824"/>
+        <location filename="organizercore.cpp" line="722"/>
+        <location filename="organizercore.cpp" line="789"/>
         <source>Configure Mod</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="758"/>
-        <location filename="organizercore.cpp" line="825"/>
+        <location filename="organizercore.cpp" line="723"/>
+        <location filename="organizercore.cpp" line="790"/>
         <source>This mod contains ini tweaks. Do you want to configure them now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="770"/>
-        <location filename="organizercore.cpp" line="835"/>
+        <location filename="organizercore.cpp" line="735"/>
+        <location filename="organizercore.cpp" line="800"/>
         <source>mod not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="774"/>
-        <location filename="organizercore.cpp" line="843"/>
+        <location filename="organizercore.cpp" line="739"/>
+        <location filename="organizercore.cpp" line="808"/>
         <source>The mod was not installed completely.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1115"/>
+        <location filename="organizercore.cpp" line="976"/>
         <source>file not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1129"/>
+        <location filename="organizercore.cpp" line="990"/>
         <source>failed to generate preview for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1181"/>
+        <location filename="organizercore.cpp" line="1042"/>
         <source>Sorry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1182"/>
+        <location filename="organizercore.cpp" line="1043"/>
         <source>Sorry, can&apos;t preview anything. This function currently does not support extracting from bsas.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1192"/>
+        <location filename="organizercore.cpp" line="1053"/>
         <source>File &apos;%1&apos; not found.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1200"/>
+        <location filename="organizercore.cpp" line="1061"/>
         <source>Failed to generate preview for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1325"/>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="organizercore.cpp" line="1425"/>
-        <source>No profile set</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="organizercore.cpp" line="1735"/>
+        <location filename="organizercore.cpp" line="1127"/>
         <source>Failed to refresh list of esps: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1844"/>
+        <location filename="organizercore.cpp" line="1236"/>
         <source>Multiple esps/esls activated, please check that they don&apos;t conflict.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1908"/>
+        <location filename="organizercore.cpp" line="1300"/>
         <source>You need to be logged in with Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1947"/>
+        <location filename="organizercore.cpp" line="1339"/>
         <source>Download?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1948"/>
+        <location filename="organizercore.cpp" line="1340"/>
         <source>A download has been started but no installed page plugin recognizes it.
 If you download anyway no information (i.e. version) will be associated with the download.
 Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2085"/>
-        <location filename="organizercore.cpp" line="2134"/>
+        <location filename="organizercore.cpp" line="1477"/>
+        <location filename="organizercore.cpp" line="1526"/>
         <source>failed to update mod list: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2141"/>
-        <location filename="organizercore.cpp" line="2158"/>
+        <location filename="organizercore.cpp" line="1533"/>
+        <location filename="organizercore.cpp" line="1550"/>
         <source>login successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2168"/>
+        <location filename="organizercore.cpp" line="1560"/>
         <source>Login failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2169"/>
+        <location filename="organizercore.cpp" line="1561"/>
         <source>Login failed, try again?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2178"/>
+        <location filename="organizercore.cpp" line="1570"/>
         <source>login failed: %1. Download will not be associated with an account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2186"/>
+        <location filename="organizercore.cpp" line="1578"/>
         <source>login failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2196"/>
+        <location filename="organizercore.cpp" line="1588"/>
         <source>login failed: %1. You need to log-in with Nexus to update MO.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2249"/>
+        <location filename="organizercore.cpp" line="1641"/>
         <source>MO1 &quot;Script Extender&quot; load mechanism has left hook.dll in your game folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2252"/>
-        <location filename="organizercore.cpp" line="2268"/>
+        <location filename="organizercore.cpp" line="1644"/>
+        <location filename="organizercore.cpp" line="1660"/>
         <source>Description missing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2261"/>
+        <location filename="organizercore.cpp" line="1653"/>
         <source>&lt;a href=&quot;%1&quot;&gt;hook.dll&lt;/a&gt; has been found in your game folder (right click to copy the full path). This is most likely a leftover of setting the ModOrganizer 1 load mechanism to &quot;Script Extender&quot;, in which case you must remove this file either by changing the load mechanism in ModOrganizer 1 or manually removing the file, otherwise the game is likely to crash and burn.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2295"/>
+        <location filename="organizercore.cpp" line="1687"/>
         <source>failed to save load order: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="2367"/>
+        <location filename="organizercore.cpp" line="1765"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="organizercore.cpp" line="1839"/>
         <source>The designated write target &quot;%1&quot; is not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4673,12 +4754,12 @@ Continue?</source>
 <context>
     <name>OverwriteConflictListModel</name>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="295"/>
+        <location filename="modinfodialogconflicts.cpp" line="303"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="296"/>
+        <location filename="modinfodialogconflicts.cpp" line="304"/>
         <source>Overwritten Mods</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4721,43 +4802,43 @@ Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overwriteinfodialog.cpp" line="125"/>
+        <location filename="overwriteinfodialog.cpp" line="136"/>
         <source>mod not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overwriteinfodialog.cpp" line="160"/>
+        <location filename="overwriteinfodialog.cpp" line="171"/>
         <source>Failed to delete &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overwriteinfodialog.cpp" line="176"/>
-        <location filename="overwriteinfodialog.cpp" line="182"/>
-        <location filename="overwriteinfodialog.cpp" line="201"/>
-        <location filename="overwriteinfodialog.cpp" line="206"/>
+        <location filename="overwriteinfodialog.cpp" line="187"/>
+        <location filename="overwriteinfodialog.cpp" line="193"/>
+        <location filename="overwriteinfodialog.cpp" line="212"/>
+        <location filename="overwriteinfodialog.cpp" line="217"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overwriteinfodialog.cpp" line="176"/>
-        <location filename="overwriteinfodialog.cpp" line="201"/>
+        <location filename="overwriteinfodialog.cpp" line="187"/>
+        <location filename="overwriteinfodialog.cpp" line="212"/>
         <source>Are you sure you want to delete &quot;%1&quot;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overwriteinfodialog.cpp" line="182"/>
-        <location filename="overwriteinfodialog.cpp" line="206"/>
+        <location filename="overwriteinfodialog.cpp" line="193"/>
+        <location filename="overwriteinfodialog.cpp" line="217"/>
         <source>Are you sure you want to delete the selected files?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overwriteinfodialog.cpp" line="251"/>
-        <location filename="overwriteinfodialog.cpp" line="257"/>
+        <location filename="overwriteinfodialog.cpp" line="262"/>
+        <location filename="overwriteinfodialog.cpp" line="268"/>
         <source>New Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="overwriteinfodialog.cpp" line="263"/>
+        <location filename="overwriteinfodialog.cpp" line="274"/>
         <source>Failed to create &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4765,12 +4846,12 @@ Continue?</source>
 <context>
     <name>OverwrittenConflictListModel</name>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="308"/>
+        <location filename="modinfodialogconflicts.cpp" line="316"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="modinfodialogconflicts.cpp" line="309"/>
+        <location filename="modinfodialogconflicts.cpp" line="317"/>
         <source>Providing Mod</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4778,18 +4859,18 @@ Continue?</source>
 <context>
     <name>PluginContainer</name>
     <message>
-        <location filename="plugincontainer.cpp" line="332"/>
+        <location filename="plugincontainer.cpp" line="333"/>
         <source>Some plugins could not be loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="335"/>
-        <location filename="plugincontainer.cpp" line="353"/>
+        <location filename="plugincontainer.cpp" line="336"/>
+        <location filename="plugincontainer.cpp" line="354"/>
         <source>Description missing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="344"/>
+        <location filename="plugincontainer.cpp" line="345"/>
         <source>The following plugins could not be loaded. The reason may be missing dependencies (i.e. python) or an outdated version:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4797,152 +4878,176 @@ Continue?</source>
 <context>
     <name>PluginList</name>
     <message>
-        <location filename="pluginlist.cpp" line="104"/>
+        <location filename="pluginlist.cpp" line="111"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="105"/>
+        <location filename="pluginlist.cpp" line="112"/>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="106"/>
+        <location filename="pluginlist.cpp" line="113"/>
         <source>Mod Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="107"/>
+        <location filename="pluginlist.cpp" line="114"/>
         <source>Flags</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="108"/>
-        <location filename="pluginlist.cpp" line="120"/>
+        <location filename="pluginlist.cpp" line="115"/>
+        <location filename="pluginlist.cpp" line="128"/>
         <source>unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="116"/>
-        <source>Name of your mods</source>
+        <location filename="pluginlist.cpp" line="123"/>
+        <source>Name of the plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pluginlist.cpp" line="124"/>
+        <source>Emblems to highlight things that might require attention.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="117"/>
-        <source>Load priority of your mod. The higher, the more &quot;important&quot; it is and thus overwrites data from plugins with lower priority.</source>
+        <location filename="pluginlist.cpp" line="125"/>
+        <source>Load priority of plugins. The higher, the more &quot;important&quot; it is and thus overwrites data from plugins with lower priority.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="119"/>
-        <source>The modindex determines the formids of objects originating from this mods.</source>
+        <location filename="pluginlist.cpp" line="127"/>
+        <source>Determines the formids of objects originating from this mods.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="228"/>
+        <location filename="pluginlist.cpp" line="239"/>
         <source>failed to update esp info for file %1 (source id: %2), error: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="301"/>
+        <location filename="pluginlist.cpp" line="312"/>
         <source>Plugin not found: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="349"/>
-        <location filename="pluginlist.cpp" line="361"/>
+        <location filename="pluginlist.cpp" line="360"/>
+        <location filename="pluginlist.cpp" line="372"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="349"/>
+        <location filename="pluginlist.cpp" line="360"/>
         <source>Really enable all plugins?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="361"/>
+        <location filename="pluginlist.cpp" line="372"/>
         <source>Really disable all plugins?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="470"/>
+        <location filename="pluginlist.cpp" line="492"/>
         <source>The file containing locked plugin indices is broken</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="967"/>
-        <location filename="pluginlist.cpp" line="971"/>
-        <source>&lt;b&gt;Origin&lt;/b&gt;: %1</source>
+        <location filename="pluginlist.cpp" line="1037"/>
+        <source>Origin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="968"/>
-        <source>&lt;br&gt;&lt;b&gt;&lt;i&gt;This plugin can&apos;t be disabled (enforced by the game).&lt;/i&gt;&lt;/b&gt;</source>
+        <location filename="pluginlist.cpp" line="1042"/>
+        <source>This plugin can&apos;t be disabled (enforced by the game).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="973"/>
+        <location filename="pluginlist.cpp" line="1047"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="976"/>
+        <location filename="pluginlist.cpp" line="1053"/>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="979"/>
+        <location filename="pluginlist.cpp" line="1059"/>
         <source>Missing Masters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="986"/>
+        <location filename="pluginlist.cpp" line="1070"/>
         <source>Enabled Masters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="989"/>
+        <location filename="pluginlist.cpp" line="1076"/>
         <source>Loads Archives</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="990"/>
+        <location filename="pluginlist.cpp" line="1078"/>
         <source>There are Archives connected to this plugin. Their assets will be added to your game, overwriting in case of conflicts following the plugin order. Loose files will always overwrite assets from Archives. (This flag only checks for Archives from the same mod as the plugin)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="995"/>
+        <location filename="pluginlist.cpp" line="1088"/>
         <source>Loads INI settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="996"/>
+        <location filename="pluginlist.cpp" line="1089"/>
         <source>There is an ini file connected to this plugin. Its settings will be added to your game settings, overwriting in case of conflicts.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1000"/>
+        <location filename="pluginlist.cpp" line="1096"/>
         <source>This ESP is flagged as an ESL. It will adhere to the ESP load order but the records will be loaded in ESL space.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="1175"/>
-        <source>failed to restore load order for %1</source>
+        <location filename="pluginlist.cpp" line="1130"/>
+        <source>Incompatible with %1</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PluginListSortProxy</name>
     <message>
-        <location filename="pluginlistsortproxy.cpp" line="119"/>
-        <source>Drag&amp;Drop is only supported when sorting by priority or mod index</source>
+        <location filename="pluginlist.cpp" line="1136"/>
+        <source>Depends on missing %1</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>PreviewDialog</name>
     <message>
-        <location filename="previewdialog.ui" line="14"/>
-        <source>Preview</source>
+        <location filename="pluginlist.cpp" line="1145"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pluginlist.cpp" line="1149"/>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="pluginlist.cpp" line="1401"/>
+        <source>failed to restore load order for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PluginListSortProxy</name>
+    <message>
+        <location filename="pluginlistsortproxy.cpp" line="119"/>
+        <source>Drag&amp;Drop is only supported when sorting by priority or mod index</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PreviewDialog</name>
+    <message>
+        <location filename="previewdialog.ui" line="14"/>
+        <source>Preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4965,11 +5070,6 @@ Continue?</source>
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Click a notification above to get more details...&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <oldsource>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:7.8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5326,33 +5426,53 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QApplication</name>
+    <name>QObject</name>
     <message>
-        <location filename="../../uibase/src/registry.cpp" line="36"/>
+        <location filename="../../uibase/src/registry.cpp" line="42"/>
+        <location filename="../../uibase/src/registry.cpp" line="43"/>
+        <location filename="../../uibase/src/textviewer.cpp" line="137"/>
+        <location filename="../../uibase/src/textviewer.cpp" line="138"/>
         <source>INI file is read-only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/registry.cpp" line="37"/>
-        <location filename="../../uibase/src/textviewer.cpp" line="134"/>
-        <source>Mod Organizer is attempting to write to &quot;%1&quot; which is currently set to read-only. Clear the read-only flag to allow the write?</source>
+        <location filename="../../uibase/src/registry.cpp" line="44"/>
+        <location filename="../../uibase/src/textviewer.cpp" line="139"/>
+        <source>Mod Organizer is attempting to write to &quot;%1&quot; which is currently set to read-only.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/textviewer.cpp" line="133"/>
-        <source>File is read-only</source>
+        <location filename="../../uibase/src/registry.cpp" line="47"/>
+        <location filename="../../uibase/src/textviewer.cpp" line="142"/>
+        <source>Clear the read-only flag</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../uibase/src/registry.cpp" line="50"/>
+        <location filename="../../uibase/src/textviewer.cpp" line="145"/>
+        <source>Allow the write once</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../uibase/src/registry.cpp" line="51"/>
+        <location filename="../../uibase/src/textviewer.cpp" line="146"/>
+        <source>The file will be set to read-only again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../uibase/src/registry.cpp" line="54"/>
+        <location filename="../../uibase/src/textviewer.cpp" line="149"/>
+        <source>Skip this file</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <location filename="../../uibase/src/report.cpp" line="38"/>
         <location filename="../../uibase/src/report.cpp" line="41"/>
-        <location filename="main.cpp" line="99"/>
-        <location filename="organizercore.cpp" line="453"/>
-        <location filename="organizercore.cpp" line="468"/>
-        <location filename="settingsdialogdiagnostics.cpp" line="36"/>
+        <location filename="loot.cpp" line="366"/>
+        <location filename="main.cpp" line="104"/>
+        <location filename="organizercore.cpp" line="404"/>
+        <location filename="settingsdialogdiagnostics.cpp" line="37"/>
+        <location filename="settingsdialogdiagnostics.cpp" line="61"/>
         <location filename="settingsdialogpaths.cpp" line="71"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
@@ -5379,8 +5499,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/safewritefile.cpp" line="33"/>
-        <source>failed to open temporary file</source>
+        <location filename="../../uibase/src/safewritefile.cpp" line="43"/>
+        <source>Failed to save &apos;{}&apos;, could not create a temporary file: {} (error {})</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5399,52 +5519,73 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/utility.cpp" line="424"/>
-        <location filename="../../uibase/src/utility.cpp" line="449"/>
+        <location filename="../../uibase/src/utility.cpp" line="311"/>
+        <source>Error %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../uibase/src/utility.cpp" line="527"/>
+        <location filename="../../uibase/src/utility.cpp" line="552"/>
         <source>failed to create directory &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/utility.cpp" line="433"/>
-        <location filename="../../uibase/src/utility.cpp" line="456"/>
+        <location filename="../../uibase/src/utility.cpp" line="536"/>
+        <location filename="../../uibase/src/utility.cpp" line="559"/>
         <source>failed to copy &quot;%1&quot; to &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/utility.cpp" line="703"/>
+        <location filename="../../uibase/src/utility.cpp" line="807"/>
         <source>%1 MB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/utility.cpp" line="703"/>
+        <location filename="../../uibase/src/utility.cpp" line="807"/>
         <source>%1 GB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/utility.cpp" line="703"/>
+        <location filename="../../uibase/src/utility.cpp" line="807"/>
         <source>%1 TB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/utility.cpp" line="706"/>
+        <location filename="../../uibase/src/utility.cpp" line="810"/>
         <source>%1 KB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/utility.cpp" line="724"/>
+        <location filename="../../uibase/src/utility.cpp" line="828"/>
         <source>%1 B/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/utility.cpp" line="728"/>
+        <location filename="../../uibase/src/utility.cpp" line="832"/>
         <source>%1 KB/s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../uibase/src/utility.cpp" line="732"/>
+        <location filename="../../uibase/src/utility.cpp" line="836"/>
         <source>%1 MB/s</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="apiuseraccount.cpp" line="8"/>
+        <source>Regular</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="apiuseraccount.cpp" line="11"/>
+        <source>Premium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="apiuseraccount.cpp" line="15"/>
+        <location filename="settingsdialogdiagnostics.cpp" line="81"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="categories.cpp" line="150"/>
         <source>Failed to save custom categories</source>
@@ -5454,15 +5595,95 @@ p, li { white-space: pre-wrap; }
         <location filename="categories.cpp" line="272"/>
         <location filename="categories.cpp" line="307"/>
         <location filename="categories.cpp" line="317"/>
-        <location filename="categories.cpp" line="327"/>
+        <location filename="categories.cpp" line="360"/>
         <source>invalid category index: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="categories.cpp" line="338"/>
+        <location filename="categories.cpp" line="327"/>
+        <source>&lt;Active&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="328"/>
+        <source>&lt;Update available&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="329"/>
+        <source>&lt;Has category&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="330"/>
+        <source>&lt;Conflicted&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="331"/>
+        <source>&lt;Endorsed&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="332"/>
+        <source>&lt;Has backup&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="333"/>
+        <source>&lt;Managed&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="334"/>
+        <source>&lt;Has valid game data&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="335"/>
+        <source>&lt;Has Nexus ID&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="336"/>
+        <source>&lt;Tracked on Nexus&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="categories.cpp" line="371"/>
         <source>invalid category id: %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="colortable.cpp" line="241"/>
+        <source>Is overwritten (loose files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="colortable.cpp" line="247"/>
+        <source>Is overwriting (loose files)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="colortable.cpp" line="253"/>
+        <source>Is overwritten (archives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="colortable.cpp" line="259"/>
+        <source>Is overwriting (archives)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="colortable.cpp" line="265"/>
+        <source>Mod contains selected plugin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="colortable.cpp" line="271"/>
+        <source>Plugin is contained in selected mod</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="csvbuilder.cpp" line="70"/>
         <source>invalid field name &quot;%1&quot;</source>
@@ -5504,34 +5725,40 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filerenamer.cpp" line="104"/>
+        <location filename="filerenamer.cpp" line="111"/>
         <source>The hidden file &quot;%1&quot; already exists. Replace it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filerenamer.cpp" line="107"/>
+        <location filename="filerenamer.cpp" line="114"/>
         <source>The visible file &quot;%1&quot; already exists. Replace it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filerenamer.cpp" line="117"/>
+        <location filename="filerenamer.cpp" line="124"/>
         <source>Replace file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filerenamer.cpp" line="156"/>
-        <location filename="filerenamer.cpp" line="180"/>
+        <location filename="filerenamer.cpp" line="164"/>
+        <location filename="filerenamer.cpp" line="190"/>
         <source>File operation failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filerenamer.cpp" line="157"/>
-        <source>Failed to remove &quot;%1&quot;. Maybe you lack the required file permissions?</source>
+        <location filename="filerenamer.cpp" line="165"/>
+        <source>Failed to remove &quot;%1&quot;: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="filerenamer.cpp" line="181"/>
-        <source>failed to rename %1 to %2</source>
+        <location filename="filerenamer.cpp" line="191"/>
+        <source>Failed to rename file: %1.<byte value="xd"/>
+<byte value="xd"/>
+Source:<byte value="xd"/>
+&quot;%2&quot;<byte value="xd"/>
+<byte value="xd"/>
+Destination:<byte value="xd"/>
+&quot;%3&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -5670,122 +5897,214 @@ If the folder was still in use, restart MO and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="instancemanager.cpp" line="291"/>
+        <location filename="instancemanager.cpp" line="311"/>
         <location filename="profile.cpp" line="68"/>
         <source>failed to create %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="instancemanager.cpp" line="294"/>
+        <location filename="instancemanager.cpp" line="314"/>
         <source>Data directory created</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="instancemanager.cpp" line="295"/>
+        <location filename="instancemanager.cpp" line="315"/>
         <source>New data directory created at %1. If you don&apos;t want to store a lot of data there, reconfigure the storage directories via settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="100"/>
-        <location filename="organizercore.cpp" line="454"/>
+        <location filename="loot.cpp" line="240"/>
+        <source>General messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="loot.cpp" line="252"/>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="loot.cpp" line="263"/>
+        <source>No messages.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="loot.cpp" line="284"/>
+        <source>Incompatibilities</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="loot.cpp" line="299"/>
+        <source>Missing masters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="loot.cpp" line="331"/>
+        <source>Verified clean by %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="loot.cpp" line="351"/>
+        <source>%1 found %2 ITM record(s), %3 deleted reference(s) and %4 deleted navmesh(es).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="loot.cpp" line="372"/>
+        <location filename="settingsdialogdiagnostics.cpp" line="36"/>
+        <location filename="settingsdialogdiagnostics.cpp" line="60"/>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="loot.cpp" line="869"/>
+        <source>failed to run loot: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.cpp" line="15"/>
+        <source>Checking masterlist existence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.cpp" line="16"/>
+        <source>Updating masterlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.cpp" line="17"/>
+        <source>Loading lists</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.cpp" line="18"/>
+        <source>Reading plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.cpp" line="19"/>
+        <source>Sorting plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.cpp" line="20"/>
+        <source>Writing loadorder.txt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.cpp" line="21"/>
+        <source>Parsing loot messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="lootdialog.cpp" line="22"/>
+        <source>Done</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="main.cpp" line="105"/>
+        <location filename="organizercore.cpp" line="405"/>
         <source>Failed to create &quot;%1&quot;. Your user account probably lacks permission.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="297"/>
+        <location filename="main.cpp" line="302"/>
         <source>Plugin to handle %1 no longer installed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="310"/>
-        <location filename="main.cpp" line="352"/>
-        <location filename="main.cpp" line="368"/>
+        <location filename="main.cpp" line="315"/>
+        <location filename="main.cpp" line="357"/>
+        <location filename="main.cpp" line="373"/>
         <source>The configured path to the game directory (%1) appears to be a symbolic (or other) link. This setup is incompatible with MO2&apos;s VFS and will not run correctly.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="325"/>
+        <location filename="main.cpp" line="330"/>
         <source>Could not use configuration settings for game &quot;%1&quot;, path &quot;%2&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="330"/>
-        <location filename="main.cpp" line="360"/>
-        <location filename="main.cpp" line="385"/>
+        <location filename="main.cpp" line="335"/>
+        <location filename="main.cpp" line="365"/>
+        <location filename="main.cpp" line="390"/>
         <source>Please select the installation of %1 to manage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="331"/>
-        <location filename="main.cpp" line="361"/>
-        <location filename="main.cpp" line="386"/>
+        <location filename="main.cpp" line="336"/>
+        <location filename="main.cpp" line="366"/>
+        <location filename="main.cpp" line="391"/>
         <source>Please select the game to manage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="397"/>
+        <location filename="main.cpp" line="402"/>
         <source>Canceled finding %1 in &quot;%2&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="398"/>
+        <location filename="main.cpp" line="403"/>
         <source>Canceled finding game in &quot;%1&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="405"/>
+        <location filename="main.cpp" line="410"/>
         <source>%1 not identified in &quot;%2&quot;. The directory is required to contain the game binary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="414"/>
+        <location filename="main.cpp" line="419"/>
         <source>No game identified in &quot;%1&quot;. The directory is required to contain the game binary.&lt;br&gt;&lt;br&gt;&lt;b&gt;These are the games supported by Mod Organizer:&lt;/b&gt;&lt;ul&gt;%2&lt;/ul&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="628"/>
+        <location filename="main.cpp" line="620"/>
         <source>Please select the game edition you have (MO can&apos;t start the game correctly if this is set incorrectly!)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="671"/>
+        <location filename="main.cpp" line="667"/>
         <source>failed to start shortcut: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="692"/>
+        <location filename="main.cpp" line="695"/>
         <source>failed to start application: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="896"/>
-        <location filename="settingsdialogworkarounds.cpp" line="16"/>
+        <location filename="main.cpp" line="901"/>
+        <location filename="settingsdialogworkarounds.cpp" line="17"/>
         <source>Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="897"/>
+        <location filename="main.cpp" line="902"/>
         <source>An instance of Mod Organizer is already running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="main.cpp" line="916"/>
+        <location filename="main.cpp" line="924"/>
         <source>Failed to set up instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1248"/>
+        <location filename="mainwindow.cpp" line="197"/>
+        <source>&lt;Unmanaged&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="1329"/>
         <source>Please use &quot;Help&quot; from the toolbar to get usage instructions to all elements</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1756"/>
-        <location filename="mainwindow.cpp" line="5140"/>
+        <location filename="mainwindow.cpp" line="1859"/>
+        <location filename="mainwindow.cpp" line="5166"/>
         <source>&lt;Manage...&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1768"/>
+        <location filename="mainwindow.cpp" line="1871"/>
         <source>failed to parse profile %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5821,512 +6140,586 @@ If the folder was still in use, restart MO and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="153"/>
-        <source>This error typically happens because an antivirus has deleted critical files from Mod Organizer&apos;s installation folder or has made them generally inaccessible. Add an exclusion for Mod Organizer&apos;s installation folder in your antivirus, reinstall Mod Organizer and try again.</source>
+        <location filename="nxmaccessmanager.cpp" line="183"/>
+        <source>Connecting to Nexus...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="160"/>
-        <source>This error typically happens because an antivirus is preventing Mod Organizer from starting programs. Add an exclusion for Mod Organizer&apos;s installation folder in your antivirus and try again.</source>
+        <location filename="nxmaccessmanager.cpp" line="186"/>
+        <source>Waiting for Nexus...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="165"/>
-        <source>The file &apos;%1&apos; does not exist.</source>
+        <location filename="nxmaccessmanager.cpp" line="190"/>
+        <source>Opened Nexus in browser.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="181"/>
-        <location filename="spawn.cpp" line="182"/>
-        <location filename="spawn.cpp" line="212"/>
-        <location filename="spawn.cpp" line="213"/>
-        <source>Cannot start Steam</source>
+        <location filename="nxmaccessmanager.cpp" line="191"/>
+        <source>Switch to your browser and accept the request.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="183"/>
-        <source>The path to the Steam executable cannot be found. You might try reinstalling Steam.</source>
+        <location filename="nxmaccessmanager.cpp" line="194"/>
+        <source>Finished.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="189"/>
-        <location filename="spawn.cpp" line="218"/>
-        <location filename="spawn.cpp" line="326"/>
-        <source>Continue without starting Steam</source>
+        <location filename="nxmaccessmanager.cpp" line="198"/>
+        <source>No answer from Nexus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="190"/>
-        <location filename="spawn.cpp" line="219"/>
-        <source>The program may fail to launch.</source>
+        <location filename="nxmaccessmanager.cpp" line="199"/>
+        <location filename="nxmaccessmanager.cpp" line="204"/>
+        <source>A firewall might be blocking Mod Organizer.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="232"/>
-        <source>Cannot launch program</source>
+        <location filename="nxmaccessmanager.cpp" line="203"/>
+        <source>Nexus closed the connection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="234"/>
-        <location filename="spawn.cpp" line="259"/>
-        <location filename="spawn.cpp" line="278"/>
-        <source>Cannot start %1</source>
+        <location filename="nxmaccessmanager.cpp" line="207"/>
+        <source>Cancelled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="257"/>
-        <source>Cannot launch helper</source>
+        <location filename="nxmaccessmanager.cpp" line="395"/>
+        <source>Failed to request %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="281"/>
-        <source>This program is requesting to run as administrator but Mod Organizer itself is not running as administrator. Running programs as administrator is typically unnecessary as long as the game and Mod Organizer have been installed outside &quot;Program Files&quot;.<byte value="xd"/>
-<byte value="xd"/>
-You can restart Mod Organizer as administrator and try launching the program again.</source>
+        <location filename="nxmaccessmanager.cpp" line="417"/>
+        <location filename="nxmaccessmanager.cpp" line="740"/>
+        <source>Cancelled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="297"/>
-        <location filename="spawn.cpp" line="353"/>
-        <source>Restart Mod Organizer as administrator</source>
+        <location filename="nxmaccessmanager.cpp" line="463"/>
+        <source>Internal error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="298"/>
-        <location filename="spawn.cpp" line="354"/>
-        <source>You must allow &quot;helper.exe&quot; to make changes to the system.</source>
+        <location filename="nxmaccessmanager.cpp" line="498"/>
+        <source>HTTP code %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="311"/>
-        <source>Launch Steam</source>
+        <location filename="nxmaccessmanager.cpp" line="508"/>
+        <source>Invalid JSON</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="312"/>
-        <source>This program requires Steam</source>
+        <location filename="nxmaccessmanager.cpp" line="513"/>
+        <source>Bad response</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="313"/>
-        <source>Mod Organizer has detected that this program likely requires Steam to be running to function properly.</source>
+        <location filename="nxmaccessmanager.cpp" line="523"/>
+        <source>API key is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="323"/>
-        <source>Start Steam</source>
+        <location filename="nxmaccessmanager.cpp" line="545"/>
+        <source>SSL error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="327"/>
-        <location filename="spawn.cpp" line="358"/>
-        <source>The program might fail to run.</source>
+        <location filename="nxmaccessmanager.cpp" line="550"/>
+        <source>Timed out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="340"/>
-        <source>Steam is running as administrator</source>
+        <location filename="organizercore.cpp" line="421"/>
+        <source>One of the configured MO2 directories (profiles, mods, or overwrite) is on a path containing a symbolic (or other) link. This is likely to be incompatible with MO2&apos;s virtual filesystem.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="341"/>
-        <source>Running Steam as administrator is typically unnecessary and can cause problems when Mod Organizer itself is not running as administrator.<byte value="xd"/>
-<byte value="xd"/>
-You can restart Mod Organizer as administrator and try launching the program again.</source>
+        <location filename="plugincontainer.cpp" line="179"/>
+        <source>failed to initialize plugin %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="357"/>
-        <location filename="spawn.cpp" line="384"/>
-        <location filename="spawn.cpp" line="417"/>
-        <source>Continue</source>
+        <location filename="plugincontainer.cpp" line="265"/>
+        <source>Plugin error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="370"/>
-        <source>Event Log not running</source>
+        <location filename="plugincontainer.cpp" line="266"/>
+        <source>It appears the plugin &quot;%1&quot; failed to load last startup and caused MO to crash. Do you want to disable it?
+(Please note: If this is the first time you see this message for this plugin you may want to give it another try. The plugin may be able to recover from the problem)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="371"/>
-        <source>The Event Log service is not running</source>
+        <location filename="pluginlist.cpp" line="571"/>
+        <source>failed to access %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="372"/>
-        <source>The Windows Event Log service is not running. This can prevent USVFS from running properly and your mods may not be recognized by the program being launched.</source>
+        <location filename="pluginlist.cpp" line="585"/>
+        <source>failed to set file time %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="385"/>
-        <location filename="spawn.cpp" line="418"/>
-        <source>Your mods might not work.</source>
+        <location filename="processrunner.cpp" line="532"/>
+        <location filename="processrunner.cpp" line="585"/>
+        <location filename="processrunner.cpp" line="699"/>
+        <source>No profile set</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="398"/>
-        <source>Blacklisted program</source>
+        <location filename="profilesdialog.cpp" line="102"/>
+        <source>Before you can use ModOrganizer, you need to create at least one profile. ATTENTION: Run the game at least once before creating a profile!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="399"/>
-        <source>The program %1 is blacklisted</source>
+        <location filename="settings.cpp" line="1288"/>
+        <location filename="settings.cpp" line="1331"/>
+        <source>attempt to store setting for unknown plugin &quot;%1&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="401"/>
-        <source>The program you are attempting to launch is blacklisted in the virtual filesystem. This will likely prevent it from seeing any mods, INI files or any other virtualized files.</source>
+        <location filename="settings.cpp" line="1815"/>
+        <source>Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="421"/>
-        <source>Change the blacklist</source>
+        <location filename="settings.cpp" line="1816"/>
+        <source>Failed to start the helper application: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="637"/>
-        <source>Waiting</source>
+        <location filename="settingsdialogdiagnostics.cpp" line="34"/>
+        <location filename="settingsdialogdiagnostics.cpp" line="58"/>
+        <source>Debug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="638"/>
-        <source>Please press OK once you&apos;re logged into steam.</source>
+        <location filename="settingsdialogdiagnostics.cpp" line="35"/>
+        <location filename="settingsdialogdiagnostics.cpp" line="59"/>
+        <source>Info (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="469"/>
-        <source>One of the configured MO2 directories (profiles, mods, or overwrite) is on a path containing a symbolic (or other) link. This is incompatible with MO2&apos;s VFS system.</source>
+        <location filename="settingsdialogdiagnostics.cpp" line="57"/>
+        <source>Trace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1029"/>
-        <source>Select binary</source>
+        <location filename="settingsdialogdiagnostics.cpp" line="82"/>
+        <source>Mini (recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="organizercore.cpp" line="1030"/>
-        <source>Binary</source>
+        <location filename="settingsdialogdiagnostics.cpp" line="83"/>
+        <source>Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="178"/>
-        <source>failed to initialize plugin %1: %2</source>
+        <location filename="settingsdialogdiagnostics.cpp" line="84"/>
+        <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="264"/>
-        <source>Plugin error</source>
+        <location filename="settingsdialoggeneral.cpp" line="206"/>
+        <source>Confirm?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="plugincontainer.cpp" line="265"/>
-        <source>It appears the plugin &quot;%1&quot; failed to load last startup and caused MO to crash. Do you want to disable it?
-(Please note: If this is the first time you see this message for this plugin you may want to give it another try. The plugin may be able to recover from the problem)</source>
+        <location filename="settingsdialoggeneral.cpp" line="207"/>
+        <source>This will reset all the choices you made to dialogs and make them all visible again. Continue?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="546"/>
-        <source>failed to access %1</source>
+        <location filename="settingsdialognexus.cpp" line="116"/>
+        <source>Connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="pluginlist.cpp" line="560"/>
-        <source>failed to set file time %1</source>
+        <location filename="settingsdialognexus.cpp" line="118"/>
+        <source>Not connected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="profilesdialog.cpp" line="102"/>
-        <source>Before you can use ModOrganizer, you need to create at least one profile. ATTENTION: Run the game at least once before creating a profile!</source>
+        <location filename="settingsdialognexus.cpp" line="229"/>
+        <source>Disconnected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="spawn.cpp" line="276"/>
-        <location filename="spawn.cpp" line="339"/>
-        <source>Elevation required</source>
+        <location filename="settingsdialognexus.cpp" line="254"/>
+        <source>Checking API key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="43"/>
-        <source>This tracks the number of queued Nexus API requests, as well as the remaining daily and hourly requests. The Nexus API limits you to a pool of requests per day and requests per hour. It is dynamically updated every time a request is completed. If you run out of requests, you will be unable to queue downloads, check updates, parse mod info, or even log in. Both pools must be consumed before this happens.</source>
+        <location filename="settingsdialognexus.cpp" line="263"/>
+        <source>Received API key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="statusbar.cpp" line="62"/>
-        <source>Loading...</source>
+        <location filename="settingsdialognexus.cpp" line="288"/>
+        <source>Received user acount information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="texteditor.cpp" line="465"/>
-        <source>&amp;Save</source>
+        <location filename="settingsdialognexus.cpp" line="291"/>
+        <source>Linked with Nexus successfully.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="texteditor.cpp" line="472"/>
-        <source>&amp;Word wrap</source>
+        <location filename="settingsdialognexus.cpp" line="293"/>
+        <source>Failed to set API key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="texteditor.cpp" line="477"/>
-        <source>&amp;Open in Explorer</source>
+        <location filename="settingsdialognexus.cpp" line="342"/>
+        <location filename="settingsdialognexus.cpp" line="353"/>
+        <location filename="settingsdialogworkarounds.cpp" line="128"/>
+        <location filename="spawn.cpp" line="193"/>
+        <location filename="spawn.cpp" line="222"/>
+        <location filename="spawn.cpp" line="301"/>
+        <location filename="spawn.cpp" line="330"/>
+        <location filename="spawn.cpp" line="361"/>
+        <location filename="spawn.cpp" line="388"/>
+        <location filename="spawn.cpp" line="424"/>
+        <location filename="uilocker.cpp" line="305"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="apiuseraccount.cpp" line="8"/>
-        <source>Regular</source>
+        <location filename="settingsdialognexus.cpp" line="345"/>
+        <location filename="settingsdialognexus.cpp" line="361"/>
+        <location filename="settingsdialognexus.cpp" line="368"/>
+        <source>Enter API Key Manually</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="apiuseraccount.cpp" line="11"/>
-        <source>Premium</source>
+        <location filename="settingsdialognexus.cpp" line="350"/>
+        <location filename="settingsdialognexus.cpp" line="358"/>
+        <location filename="settingsdialognexus.cpp" line="365"/>
+        <source>Connect to Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="apiuseraccount.cpp" line="15"/>
-        <location filename="settingsdialogdiagnostics.cpp" line="54"/>
-        <source>None</source>
+        <location filename="settingsdialognexus.cpp" line="391"/>
+        <location filename="settingsdialognexus.cpp" line="392"/>
+        <location filename="settingsdialognexus.cpp" line="393"/>
+        <location filename="settingsdialognexus.cpp" line="394"/>
+        <location filename="settingsdialognexus.cpp" line="395"/>
+        <source>N/A</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="170"/>
-        <location filename="nxmaccessmanager.cpp" line="360"/>
-        <source>Connecting to Nexus...</source>
+        <location filename="settingsdialogpaths.cpp" line="72"/>
+        <source>Failed to create &quot;%1&quot;, you may not have the necessary permissions. Path remains unchanged.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="173"/>
-        <source>Waiting for Nexus...</source>
+        <location filename="settingsdialogpaths.cpp" line="107"/>
+        <source>Select base directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="176"/>
-        <source>Opened Nexus in browser.
-Switch to your browser and accept the request.</source>
+        <location filename="settingsdialogpaths.cpp" line="118"/>
+        <source>Select download directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="181"/>
-        <location filename="nxmaccessmanager.cpp" line="363"/>
-        <source>Finished.</source>
+        <location filename="settingsdialogpaths.cpp" line="129"/>
+        <source>Select mod directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="184"/>
-        <source>No answer from Nexus.
-A firewall might be blocking Mod Organizer.</source>
+        <location filename="settingsdialogpaths.cpp" line="140"/>
+        <source>Select cache directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="189"/>
-        <source>Nexus closed the connection.</source>
+        <location filename="settingsdialogpaths.cpp" line="151"/>
+        <source>Select profiles directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="192"/>
-        <source>Cancelled.</source>
+        <location filename="settingsdialogpaths.cpp" line="162"/>
+        <source>Select overwrite directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="366"/>
-        <source>Invalid JSON</source>
+        <location filename="settingsdialogpaths.cpp" line="172"/>
+        <source>Select game executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="369"/>
-        <source>Bad response</source>
+        <location filename="settingsdialogworkarounds.cpp" line="77"/>
+        <source>Executables Blacklist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="372"/>
-        <source>There was a timeout during the request</source>
+        <location filename="settingsdialogworkarounds.cpp" line="78"/>
+        <source>Enter one executable per line to be blacklisted from the virtual file system.
+Mods and other virtualized files will not be visible to these executables and
+any executables launched by them.
+
+Example:
+    Chrome.exe
+    Firefox.exe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="375"/>
-        <source>Cancelled</source>
+        <location filename="settingsdialogworkarounds.cpp" line="123"/>
+        <location filename="settingsdialogworkarounds.cpp" line="124"/>
+        <location filename="settingsdialogworkarounds.cpp" line="127"/>
+        <source>Restart Mod Organizer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="412"/>
-        <source>Failed to request %1</source>
+        <location filename="settingsdialogworkarounds.cpp" line="125"/>
+        <source>Geometries will be reset to their default values.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.cpp" line="1180"/>
-        <location filename="settings.cpp" line="1223"/>
-        <source>attempt to store setting for unknown plugin &quot;%1&quot;</source>
+        <location filename="spawn.cpp" line="153"/>
+        <source>This error typically happens because an antivirus has deleted critical files from Mod Organizer&apos;s installation folder or has made them generally inaccessible. Add an exclusion for Mod Organizer&apos;s installation folder in your antivirus, reinstall Mod Organizer and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.cpp" line="1705"/>
-        <source>Failed</source>
+        <location filename="spawn.cpp" line="160"/>
+        <source>This error typically happens because an antivirus is preventing Mod Organizer from starting programs. Add an exclusion for Mod Organizer&apos;s installation folder in your antivirus and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.cpp" line="1706"/>
-        <source>Failed to start the helper application</source>
+        <location filename="spawn.cpp" line="165"/>
+        <source>The file &apos;%1&apos; does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogdiagnostics.cpp" line="33"/>
-        <source>Debug</source>
+        <location filename="spawn.cpp" line="181"/>
+        <location filename="spawn.cpp" line="182"/>
+        <location filename="spawn.cpp" line="212"/>
+        <location filename="spawn.cpp" line="213"/>
+        <source>Cannot start Steam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogdiagnostics.cpp" line="34"/>
-        <source>Info (recommended)</source>
+        <location filename="spawn.cpp" line="183"/>
+        <source>The path to the Steam executable cannot be found. You might try reinstalling Steam.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogdiagnostics.cpp" line="35"/>
-        <source>Warning</source>
+        <location filename="spawn.cpp" line="189"/>
+        <location filename="spawn.cpp" line="218"/>
+        <location filename="spawn.cpp" line="326"/>
+        <source>Continue without starting Steam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogdiagnostics.cpp" line="55"/>
-        <source>Mini (recommended)</source>
+        <location filename="spawn.cpp" line="190"/>
+        <location filename="spawn.cpp" line="219"/>
+        <source>The program may fail to launch.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogdiagnostics.cpp" line="56"/>
-        <source>Data</source>
+        <location filename="spawn.cpp" line="232"/>
+        <source>Cannot launch program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogdiagnostics.cpp" line="57"/>
-        <source>Full</source>
+        <location filename="spawn.cpp" line="234"/>
+        <location filename="spawn.cpp" line="259"/>
+        <location filename="spawn.cpp" line="278"/>
+        <source>Cannot start %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialoggeneral.cpp" line="242"/>
-        <source>Confirm?</source>
+        <location filename="spawn.cpp" line="257"/>
+        <source>Cannot launch helper</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="276"/>
+        <location filename="spawn.cpp" line="339"/>
+        <source>Elevation required</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="281"/>
+        <source>This program is requesting to run as administrator but Mod Organizer itself is not running as administrator. Running programs as administrator is typically unnecessary as long as the game and Mod Organizer have been installed outside &quot;Program Files&quot;.<byte value="xd"/>
+<byte value="xd"/>
+You can restart Mod Organizer as administrator and try launching the program again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="297"/>
+        <location filename="spawn.cpp" line="353"/>
+        <source>Restart Mod Organizer as administrator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="298"/>
+        <location filename="spawn.cpp" line="354"/>
+        <source>You must allow &quot;helper.exe&quot; to make changes to the system.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="311"/>
+        <source>Launch Steam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="312"/>
+        <source>This program requires Steam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="313"/>
+        <source>Mod Organizer has detected that this program likely requires Steam to be running to function properly.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="323"/>
+        <source>Start Steam</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="327"/>
+        <location filename="spawn.cpp" line="358"/>
+        <source>The program might fail to run.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="340"/>
+        <source>Steam is running as administrator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="341"/>
+        <source>Running Steam as administrator is typically unnecessary and can cause problems when Mod Organizer itself is not running as administrator.<byte value="xd"/>
+<byte value="xd"/>
+You can restart Mod Organizer as administrator and try launching the program again.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="357"/>
+        <location filename="spawn.cpp" line="384"/>
+        <location filename="spawn.cpp" line="417"/>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="370"/>
+        <source>Event Log not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="spawn.cpp" line="371"/>
+        <source>The Event Log service is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialoggeneral.cpp" line="243"/>
-        <source>This will reset all the choices you made to dialogs and make them all visible again. Continue?</source>
+        <location filename="spawn.cpp" line="372"/>
+        <source>The Windows Event Log service is not running. This can prevent USVFS from running properly and your mods may not be recognized by the program being launched.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="223"/>
-        <source>Disconnected.</source>
+        <location filename="spawn.cpp" line="385"/>
+        <location filename="spawn.cpp" line="418"/>
+        <source>Your mods might not work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="252"/>
-        <source>Checking API key...</source>
+        <location filename="spawn.cpp" line="398"/>
+        <source>Blacklisted program</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="261"/>
-        <source>Received API key.</source>
+        <location filename="spawn.cpp" line="399"/>
+        <source>The program %1 is blacklisted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="301"/>
-        <source>Linked with Nexus successfully.</source>
+        <location filename="spawn.cpp" line="401"/>
+        <source>The program you are attempting to launch is blacklisted in the virtual filesystem. This will likely prevent it from seeing any mods, INI files or any other virtualized files.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="341"/>
-        <location filename="settingsdialognexus.cpp" line="352"/>
-        <location filename="spawn.cpp" line="193"/>
-        <location filename="spawn.cpp" line="222"/>
-        <location filename="spawn.cpp" line="301"/>
-        <location filename="spawn.cpp" line="330"/>
-        <location filename="spawn.cpp" line="361"/>
-        <location filename="spawn.cpp" line="388"/>
-        <location filename="spawn.cpp" line="424"/>
-        <source>Cancel</source>
+        <location filename="spawn.cpp" line="421"/>
+        <source>Change the blacklist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="344"/>
-        <location filename="settingsdialognexus.cpp" line="360"/>
-        <location filename="settingsdialognexus.cpp" line="367"/>
-        <source>Enter API Key Manually</source>
+        <location filename="spawn.cpp" line="649"/>
+        <source>Waiting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="349"/>
-        <location filename="settingsdialognexus.cpp" line="357"/>
-        <location filename="settingsdialognexus.cpp" line="364"/>
-        <source>Connect to Nexus</source>
+        <location filename="spawn.cpp" line="650"/>
+        <source>Please press OK once you&apos;re logged into steam.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialognexus.cpp" line="390"/>
-        <location filename="settingsdialognexus.cpp" line="391"/>
-        <location filename="settingsdialognexus.cpp" line="392"/>
-        <location filename="settingsdialognexus.cpp" line="393"/>
-        <location filename="settingsdialognexus.cpp" line="394"/>
-        <source>N/A</source>
+        <location filename="spawn.cpp" line="949"/>
+        <source>Select binary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogpaths.cpp" line="72"/>
-        <source>Failed to create &quot;%1&quot;, you may not have the necessary permissions. Path remains unchanged.</source>
+        <location filename="spawn.cpp" line="950"/>
+        <source>Binary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogpaths.cpp" line="107"/>
-        <source>Select base directory</source>
+        <location filename="statusbar.cpp" line="43"/>
+        <source>This tracks the number of queued Nexus API requests, as well as the remaining daily and hourly requests. The Nexus API limits you to a pool of requests per day and requests per hour. It is dynamically updated every time a request is completed. If you run out of requests, you will be unable to queue downloads, check updates, parse mod info, or even log in. Both pools must be consumed before this happens.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogpaths.cpp" line="118"/>
-        <source>Select download directory</source>
+        <location filename="statusbar.cpp" line="64"/>
+        <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogpaths.cpp" line="129"/>
-        <source>Select mod directory</source>
+        <location filename="texteditor.cpp" line="465"/>
+        <source>&amp;Save</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogpaths.cpp" line="140"/>
-        <source>Select cache directory</source>
+        <location filename="texteditor.cpp" line="472"/>
+        <source>&amp;Word wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogpaths.cpp" line="151"/>
-        <source>Select profiles directory</source>
+        <location filename="texteditor.cpp" line="477"/>
+        <source>&amp;Open in Explorer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogpaths.cpp" line="162"/>
-        <source>Select overwrite directory</source>
+        <location filename="uilocker.cpp" line="245"/>
+        <source>Mod Organizer is locked while the application is running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogpaths.cpp" line="172"/>
-        <source>Select game executable</source>
+        <location filename="uilocker.cpp" line="248"/>
+        <source>Mod Organizer is currently running an application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogworkarounds.cpp" line="76"/>
-        <source>Executables Blacklist</source>
+        <location filename="uilocker.cpp" line="258"/>
+        <source>The application must run to completion because its output is required.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogworkarounds.cpp" line="77"/>
-        <source>Enter one executable per line to be blacklisted from the virtual file system.
-Mods and other virtualized files will not be visible to these executables and
-any executables launched by them.
-
-Example:
-    Chrome.exe
-    Firefox.exe</source>
+        <location filename="uilocker.cpp" line="267"/>
+        <source>Mod Organizer is waiting on application to close before exiting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogworkarounds.cpp" line="121"/>
-        <source>Restart Mod Organizer?</source>
+        <location filename="uilocker.cpp" line="285"/>
+        <source>Unlock</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialogworkarounds.cpp" line="122"/>
-        <source>In order to reset the geometry, Mod Organizer must be restarted.
-Restart now?</source>
+        <location filename="uilocker.cpp" line="298"/>
+        <source>Exit Now</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6445,58 +6838,58 @@ Restart now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="selfupdater.cpp" line="179"/>
+        <location filename="selfupdater.cpp" line="189"/>
         <source>New update available (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="selfupdater.cpp" line="180"/>
+        <location filename="selfupdater.cpp" line="190"/>
         <source>Do you want to install update? All your mods and setup will be left untouched.
 Select Show Details option to see the full change-log.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="selfupdater.cpp" line="184"/>
+        <location filename="selfupdater.cpp" line="194"/>
         <source>Install</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="selfupdater.cpp" line="201"/>
+        <location filename="selfupdater.cpp" line="211"/>
         <source>Download failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="selfupdater.cpp" line="202"/>
+        <location filename="selfupdater.cpp" line="212"/>
         <source>Failed to find correct download, please try again later.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="selfupdater.cpp" line="217"/>
+        <location filename="selfupdater.cpp" line="227"/>
         <source>Update</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="selfupdater.cpp" line="218"/>
+        <location filename="selfupdater.cpp" line="228"/>
         <source>Download in progress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="selfupdater.cpp" line="309"/>
+        <location filename="selfupdater.cpp" line="319"/>
         <source>Download failed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="selfupdater.cpp" line="320"/>
+        <location filename="selfupdater.cpp" line="330"/>
         <source>Failed to install update: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="selfupdater.cpp" line="338"/>
-        <source>Failed to start %1</source>
+        <location filename="selfupdater.cpp" line="349"/>
+        <source>Failed to start %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="selfupdater.cpp" line="346"/>
+        <location filename="selfupdater.cpp" line="359"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -6514,473 +6907,488 @@ Select Show Details option to see the full change-log.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="32"/>
+        <location filename="settingsdialog.ui" line="43"/>
+        <source>User Interface</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="64"/>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="39"/>
-        <source>The display language</source>
+        <location filename="settingsdialog.ui" line="71"/>
+        <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="42"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;The display language. This will only displaye languages for which you have a translation installed.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location filename="settingsdialog.ui" line="78"/>
+        <location filename="settingsdialog.ui" line="81"/>
+        <source>Visual theme of the user interface.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="57"/>
-        <source>Style</source>
+        <location filename="settingsdialog.ui" line="88"/>
+        <source>Explore...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="64"/>
-        <source>graphical style</source>
+        <location filename="settingsdialog.ui" line="95"/>
+        <location filename="settingsdialog.ui" line="98"/>
+        <source>The language of the user interface.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="67"/>
-        <source>graphical style of the MO user interface</source>
+        <location filename="settingsdialog.ui" line="105"/>
+        <source>https://www.transifex.com/tannin/mod-organizer/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="76"/>
-        <source>Update to non-stable releases.</source>
+        <location filename="settingsdialog.ui" line="108"/>
+        <source>&lt;a href=&quot;https://www.transifex.com/tannin/mod-organizer/&quot;&gt;Help translate Mod Organizer&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="79"/>
-        <source>If this is enabled, the integrated update mechanism will notify of all releases, including pre-releases (alphas, betas). Please use this only if you&apos;re sufficiently tech-savvy to investigate issues, look for known problems in the issue tracker and create meaningful reports.</source>
-        <oldsource>If this is enabled, the integrated update mechanism will notify of all releases, including pre-releases (alphas, betas).
-
-Please use this only if you&apos;re sufficiently tech-savvy to investigate issues, look for known problems in the issue tracker and create meaningful reports.
-
-If you use pre-releases, never contact me directly by e-mail or via private messages!</oldsource>
+        <location filename="settingsdialog.ui" line="121"/>
+        <location filename="settingsdialog.ui" line="124"/>
+        <source>Dialogs will always be centered on the main window, but will remember their size.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="82"/>
-        <source>Install Pre-releases (Betas)</source>
+        <location filename="settingsdialog.ui" line="127"/>
+        <source>Always center dialogs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="89"/>
-        <source>User interface</source>
+        <location filename="settingsdialog.ui" line="134"/>
+        <source>Show confirmation when changing instance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="95"/>
-        <source>Colors</source>
+        <location filename="settingsdialog.ui" line="141"/>
+        <source>Whether double-clicking on a file opens the preview window or launches the program associated with it. This applies to the Data tab as well as the Conflicts and Filetree tabs in the mod info window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="101"/>
-        <location filename="settingsdialog.ui" line="104"/>
-        <source>When this is enabled, the color defined for a separator will be shown on the mod list scrollbar at the location of the separator.  This can be useful for quick navigation between separator sections or to a specific separator section.</source>
+        <location filename="settingsdialog.ui" line="144"/>
+        <source>Open previews on double-click</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="107"/>
-        <source>Show mod list separator colors on the scrollbar</source>
+        <location filename="settingsdialog.ui" line="157"/>
+        <location filename="settingsdialog.ui" line="160"/>
+        <source>Reset all choices made in dialogs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="117"/>
-        <source>Plugin is Contained in selected Mod</source>
+        <location filename="settingsdialog.ui" line="163"/>
+        <source>Reset Dialog Choices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="124"/>
-        <source>Is overwritten (loose files)</source>
+        <location filename="settingsdialog.ui" line="170"/>
+        <location filename="settingsdialog.ui" line="173"/>
+        <source>Modify the categories available to arrange your mods.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="131"/>
-        <source>Is overwriting (loose files)</source>
+        <location filename="settingsdialog.ui" line="176"/>
+        <source>Configure Mod Categories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="138"/>
-        <source>Reset Colors</source>
+        <location filename="settingsdialog.ui" line="199"/>
+        <source>Download List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="145"/>
-        <source>Mod Contains selected Plugin</source>
+        <location filename="settingsdialog.ui" line="205"/>
+        <location filename="settingsdialog.ui" line="208"/>
+        <source>Show meta information instead of file names in the download list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="152"/>
-        <source>Is overwritten (archive files)</source>
+        <location filename="settingsdialog.ui" line="211"/>
+        <source>Show Meta Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="159"/>
-        <source>Is overwriting (archive files)</source>
+        <location filename="settingsdialog.ui" line="218"/>
+        <location filename="settingsdialog.ui" line="221"/>
+        <source>Make the download list more compact.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="169"/>
-        <location filename="settingsdialog.ui" line="172"/>
-        <source>Modify the categories available to arrange your mods.</source>
+        <location filename="settingsdialog.ui" line="224"/>
+        <source>Compact List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="175"/>
-        <source>Configure Mod Categories</source>
+        <location filename="settingsdialog.ui" line="247"/>
+        <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="188"/>
-        <source>Reset stored information from dialogs.</source>
+        <location filename="settingsdialog.ui" line="299"/>
+        <location filename="settingsdialog.ui" line="302"/>
+        <source>Colors set on separators will also be shown in the mod list scrollbar at the location of the separator. This can be useful for quickly navigating to a specific separator.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="191"/>
-        <source>This will make all dialogs show up again where you checked the &quot;Remember selection&quot;-box.</source>
+        <location filename="settingsdialog.ui" line="305"/>
+        <source>Show mod list separator colors on the scrollbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="201"/>
-        <source>If checked, the download interface will be more compact.</source>
+        <location filename="settingsdialog.ui" line="328"/>
+        <location filename="settingsdialog.ui" line="331"/>
+        <source>Reset all colors to their default value.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="204"/>
-        <source>Compact Download Interface</source>
+        <location filename="settingsdialog.ui" line="334"/>
+        <source>Reset Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="224"/>
-        <source>If checked, the download list will display meta information instead of file names.</source>
+        <location filename="settingsdialog.ui" line="347"/>
+        <source>Updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="353"/>
+        <location filename="settingsdialog.ui" line="356"/>
+        <source>Check for Mod Organizer updates on Github on startup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="227"/>
-        <source>Download Meta Information</source>
+        <location filename="settingsdialog.ui" line="359"/>
+        <source>Check for updates</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="366"/>
+        <location filename="settingsdialog.ui" line="369"/>
+        <source>Update to non-stable releases.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="settingsdialog.ui" line="372"/>
+        <source>Install Pre-releases (Betas)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="238"/>
+        <location filename="settingsdialog.ui" line="396"/>
         <source>Paths</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="246"/>
-        <location filename="settingsdialog.ui" line="263"/>
-        <location filename="settingsdialog.ui" line="360"/>
-        <location filename="settingsdialog.ui" line="418"/>
+        <location filename="settingsdialog.ui" line="404"/>
+        <location filename="settingsdialog.ui" line="421"/>
+        <location filename="settingsdialog.ui" line="518"/>
+        <location filename="settingsdialog.ui" line="576"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="273"/>
+        <location filename="settingsdialog.ui" line="431"/>
         <source>Caches</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="280"/>
+        <location filename="settingsdialog.ui" line="438"/>
         <source>Overwrite</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="287"/>
-        <location filename="settingsdialog.ui" line="290"/>
+        <location filename="settingsdialog.ui" line="445"/>
+        <location filename="settingsdialog.ui" line="448"/>
         <source>Directory where downloads are stored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="307"/>
+        <location filename="settingsdialog.ui" line="465"/>
         <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="327"/>
+        <location filename="settingsdialog.ui" line="485"/>
         <source>Profiles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="350"/>
+        <location filename="settingsdialog.ui" line="508"/>
         <source>Directory where mods are stored.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="353"/>
+        <location filename="settingsdialog.ui" line="511"/>
         <source>Directory where mods are stored. Please note that changing this will break all associations of profiles with mods that don&apos;t exist in the new location (with the same name).</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="377"/>
+        <location filename="settingsdialog.ui" line="535"/>
         <source>Mods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="397"/>
+        <location filename="settingsdialog.ui" line="555"/>
         <source>Managed Game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="404"/>
+        <location filename="settingsdialog.ui" line="562"/>
         <source>Base Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="411"/>
+        <location filename="settingsdialog.ui" line="569"/>
         <source>Use %BASE_DIR% to refer to the Base Directory.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="440"/>
+        <location filename="settingsdialog.ui" line="598"/>
         <source>Important: All directories have to be writable!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="448"/>
+        <location filename="settingsdialog.ui" line="606"/>
         <source>Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="590"/>
-        <source>Connect to Nexus</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingsdialog.ui" line="597"/>
-        <source>Manually enter the API key and try to login</source>
+        <location filename="settingsdialog.ui" line="627"/>
+        <source>Nexus Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="600"/>
-        <source>Enter API Key Manually</source>
+        <location filename="settingsdialog.ui" line="636"/>
+        <source>User ID:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="607"/>
-        <source>Clear the stored Nexus API key and force reauthorization.</source>
+        <location filename="settingsdialog.ui" line="646"/>
+        <source>id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="610"/>
-        <source>Disconnect from Nexus</source>
+        <location filename="settingsdialog.ui" line="653"/>
+        <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="721"/>
-        <location filename="settingsdialog.ui" line="724"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, a counter is displayed in the bottom right corner.  This informs the user of their remaining API requests.  The Nexus API becomes unusable once these API requests run out.  Checking this option will hide that counter.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location filename="settingsdialog.ui" line="660"/>
+        <source>name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="745"/>
-        <source>Remove cache and cookies.</source>
+        <location filename="settingsdialog.ui" line="667"/>
+        <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="748"/>
-        <source>Clear Cache</source>
+        <location filename="settingsdialog.ui" line="674"/>
+        <source>account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="685"/>
-        <source>Disable automatic internet features</source>
+        <location filename="settingsdialog.ui" line="684"/>
+        <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="194"/>
-        <source>Reset Dialog Choices</source>
+        <location filename="settingsdialog.ui" line="693"/>
+        <source>Daily requests:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="469"/>
-        <source>Nexus Account</source>
+        <location filename="settingsdialog.ui" line="700"/>
+        <source>daily requests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="478"/>
-        <source>User ID:</source>
+        <location filename="settingsdialog.ui" line="707"/>
+        <source>Hourly requests:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="488"/>
-        <source>id</source>
+        <location filename="settingsdialog.ui" line="714"/>
+        <source>hourly requests</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="495"/>
-        <source>Name:</source>
+        <location filename="settingsdialog.ui" line="727"/>
+        <source>Nexus Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="502"/>
-        <source>name</source>
+        <location filename="settingsdialog.ui" line="748"/>
+        <source>Connect to Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="509"/>
-        <source>Account:</source>
+        <location filename="settingsdialog.ui" line="755"/>
+        <source>Manually enter the API key and try to login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="516"/>
-        <source>account</source>
+        <location filename="settingsdialog.ui" line="758"/>
+        <source>Enter API Key Manually</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="526"/>
-        <source>Statistics</source>
+        <location filename="settingsdialog.ui" line="765"/>
+        <source>Clear the stored Nexus API key and force reauthorization.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="535"/>
-        <source>Daily requests:</source>
+        <location filename="settingsdialog.ui" line="768"/>
+        <source>Disconnect from Nexus</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="542"/>
-        <source>daily requests</source>
+        <location filename="settingsdialog.ui" line="843"/>
+        <source>Disable automatic internet features</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="549"/>
-        <source>Hourly requests:</source>
+        <location filename="settingsdialog.ui" line="846"/>
+        <source>Disable automatic internet features. This does not affect features that are explicitly invoked by the user (like checking mods for updates, endorsing, opening the web browser)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="556"/>
-        <source>hourly requests</source>
+        <location filename="settingsdialog.ui" line="849"/>
+        <source>Offline Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="569"/>
-        <source>Nexus Connection</source>
+        <location filename="settingsdialog.ui" line="856"/>
+        <source>Use a proxy for network connections.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="688"/>
-        <source>Disable automatic internet features. This does not affect features that are explicitly invoked by the user (like checking mods for updates, endorsing, opening the web browser)</source>
+        <location filename="settingsdialog.ui" line="859"/>
+        <source>Use a proxy for network connections. This uses the system-wide settings which can be configured in Internet Explorer. Please note that MO will start up a few seconds slower on some systems when using a proxy.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="691"/>
-        <source>Offline Mode</source>
+        <location filename="settingsdialog.ui" line="862"/>
+        <source>Use HTTP Proxy (Uses System Settings)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="698"/>
-        <source>Use a proxy for network connections.</source>
+        <location filename="settingsdialog.ui" line="869"/>
+        <source>Endorsement Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="701"/>
-        <source>Use a proxy for network connections. This uses the system-wide settings which can be configured in Internet Explorer. Please note that MO will start up a few seconds slower on some systems when using a proxy.</source>
+        <location filename="settingsdialog.ui" line="879"/>
+        <location filename="settingsdialog.ui" line="882"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, a counter is displayed in the bottom right corner.  This informs the user of their remaining API requests.  The Nexus API becomes unusable once these API requests run out.  Checking this option will hide that counter.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="704"/>
-        <source>Use HTTP Proxy (Uses System Settings)</source>
+        <location filename="settingsdialog.ui" line="885"/>
+        <source>Hide API Request Counter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="711"/>
-        <source>Endorsement Integration</source>
+        <location filename="settingsdialog.ui" line="896"/>
+        <source>Associate with &quot;Download with manager&quot; links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="727"/>
-        <source>Hide API Request Counter</source>
+        <location filename="settingsdialog.ui" line="903"/>
+        <source>Remove cache and cookies.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="738"/>
-        <source>Associate with &quot;Download with manager&quot; links</source>
+        <location filename="settingsdialog.ui" line="906"/>
+        <source>Clear Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="781"/>
+        <location filename="settingsdialog.ui" line="939"/>
         <source>Known Servers (updated on download)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="802"/>
+        <location filename="settingsdialog.ui" line="960"/>
         <source>Preferred Servers (Drag &amp; Drop)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="824"/>
+        <location filename="settingsdialog.ui" line="982"/>
         <source>Steam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="830"/>
+        <location filename="settingsdialog.ui" line="988"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="856"/>
+        <location filename="settingsdialog.ui" line="1014"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If you save your steam user ID and password here, they will be used when logging into steam.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="866"/>
+        <location filename="settingsdialog.ui" line="1024"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="881"/>
+        <location filename="settingsdialog.ui" line="1039"/>
         <source>Plugins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="906"/>
+        <location filename="settingsdialog.ui" line="1064"/>
         <source>Author:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="920"/>
+        <location filename="settingsdialog.ui" line="1078"/>
         <source>Version:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="934"/>
+        <location filename="settingsdialog.ui" line="1092"/>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="972"/>
+        <location filename="settingsdialog.ui" line="1130"/>
         <source>Key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="977"/>
+        <location filename="settingsdialog.ui" line="1135"/>
         <source>Value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="989"/>
+        <location filename="settingsdialog.ui" line="1147"/>
         <source>Blacklisted Plugins (use &lt;del&gt; to remove):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1000"/>
+        <location filename="settingsdialog.ui" line="1158"/>
         <source>Workarounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1008"/>
+        <location filename="settingsdialog.ui" line="1166"/>
         <source>Steam App ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1028"/>
+        <location filename="settingsdialog.ui" line="1186"/>
         <source>The Steam AppID for your game</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1031"/>
+        <location filename="settingsdialog.ui" line="1189"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
@@ -6996,17 +7404,17 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1062"/>
+        <location filename="settingsdialog.ui" line="1220"/>
         <source>Load Mechanism</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1082"/>
+        <location filename="settingsdialog.ui" line="1240"/>
         <source>Select loading mechanism. See help for details.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1085"/>
+        <location filename="settingsdialog.ui" line="1243"/>
         <source>Mod Organizer needs a dll to be injected into the game so all mods are visible to it.
 There are several means to do this:
 *Mod Organizer* (default) In this mode the Mod Organizer itself injects the dll. The disadvantage is that you always have to start the game through MO or a link created by it.
@@ -7017,28 +7425,28 @@ If you use the Steam version of Oblivion the default will NOT work. In this case
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1105"/>
+        <location filename="settingsdialog.ui" line="1263"/>
         <source>Enforces that inactive ESPs and ESMs are never loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1108"/>
+        <location filename="settingsdialog.ui" line="1266"/>
         <source>It seems that the Games occasionally load ESP or ESM files even if they haven&apos;t been activated as plugins.
 I don&apos;t yet know what the circumstances are, but user reports imply it is in some cases unwanted. If this is checked, ESPs and ESMs not checked in the List are invisible to the game and can not be loaded.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1112"/>
+        <location filename="settingsdialog.ui" line="1270"/>
         <source>Hide inactive ESPs/ESMs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1119"/>
+        <location filename="settingsdialog.ui" line="1277"/>
         <source>Disable this to no longer display mods installed outside MO in the mod list (left pane). Assets from those mods will then be treated as having lowest mod priority together with the original game content.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1122"/>
+        <location filename="settingsdialog.ui" line="1280"/>
         <source>By default Mod Organizer will display esp+bsa bundles installed with foreign tools as mods (left pane). This allows you to control their priority in relation to other mods. This is particularly useful if you also use Steam Workshop to install mods.
 However, if you installed loose file mods outside MO which conflict with BSAs also installed outside MO those conflicts can&apos;t be resolved correctly.
 
@@ -7046,66 +7454,66 @@ If you disable this feature, MO will only display official DLCs this way. Please
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1128"/>
+        <location filename="settingsdialog.ui" line="1286"/>
         <source>Display mods installed outside MO</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1138"/>
+        <location filename="settingsdialog.ui" line="1296"/>
         <source>If checked, files (i.e. esps, esms and bsas) belonging to the core game can not be disabled in the UI. (default: on)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1141"/>
+        <location filename="settingsdialog.ui" line="1299"/>
         <source>If checked, files (i.e. esps, esms and bsas) belonging to the core game can not be disabled in the UI. (default: on)
 Uncheck this if you want to use Mod Organizer with total conversions (like Nehrim) but be aware that the game will crash if required files are not enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1145"/>
+        <location filename="settingsdialog.ui" line="1303"/>
         <source>Force-enable game files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1155"/>
-        <location filename="settingsdialog.ui" line="1158"/>
+        <location filename="settingsdialog.ui" line="1313"/>
+        <location filename="settingsdialog.ui" line="1316"/>
         <source>Disable this to prevent the GUI from being locked when running an executable.  This may result in abnormal behavior.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1161"/>
+        <location filename="settingsdialog.ui" line="1319"/>
         <source>Lock GUI when running executable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1171"/>
+        <location filename="settingsdialog.ui" line="1329"/>
         <source>Enable parsing of Archives. This is an Experimental Feature. Has negative effects on performance and known incorrectness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1174"/>
+        <location filename="settingsdialog.ui" line="1332"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;By default, MO will parse archive files (BSA, BA2) to calculate conflicts between the contents of the archive files and other loose files. This process has a noticeable cost in performance.&lt;/p&gt;&lt;p&gt;This feature should not be confused with the archive management feature offered by MO1. MO2 will only show conflicts with archives and will NOT load them into the game or program.&lt;/p&gt;&lt;p&gt;If you disable this feature, MO will only display conflicts between loose files.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1177"/>
+        <location filename="settingsdialog.ui" line="1335"/>
         <source>Enable parsing of Archives (Experimental Feature)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1189"/>
-        <location filename="settingsdialog.ui" line="1193"/>
+        <location filename="settingsdialog.ui" line="1347"/>
+        <location filename="settingsdialog.ui" line="1351"/>
         <source>For Skyrim, this can be used instead of Archive Invalidation. It should make AI redundant for all Profiles.
 For the other games this is not a sufficient replacement for AI!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1197"/>
+        <location filename="settingsdialog.ui" line="1355"/>
         <source>Back-date BSAs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1208"/>
+        <location filename="settingsdialog.ui" line="1366"/>
         <source>Add executables to the blacklist to prevent them from
 accessing the virtual file system. This is useful to prevent
 unintended programs from being hooked. Hooking unintended
@@ -7114,81 +7522,81 @@ programs you are intentionally running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1215"/>
+        <location filename="settingsdialog.ui" line="1373"/>
         <source>Add executables to the blacklist to prevent them from accessing the virtual file system.  This is useful to prevent unintended programs from being hooked.  Hooking unintended programs may affect the execution of these programs or the programs you are intentionally running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1218"/>
+        <location filename="settingsdialog.ui" line="1376"/>
         <source>Configure Executables Blacklist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1228"/>
-        <location filename="settingsdialog.ui" line="1231"/>
+        <location filename="settingsdialog.ui" line="1386"/>
+        <location filename="settingsdialog.ui" line="1389"/>
         <source>Resets the window geometries for all windows.  This can be useful if a window becomes too small or too large, if a column becomes too thin or too wide, and in similar situations.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1234"/>
+        <location filename="settingsdialog.ui" line="1392"/>
         <source>Reset Window Geometries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1254"/>
+        <location filename="settingsdialog.ui" line="1412"/>
         <source>These are workarounds for problems with Mod Organizer. Please make sure you read the help text before changing anything here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1265"/>
+        <location filename="settingsdialog.ui" line="1423"/>
         <source>Diagnostics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1273"/>
-        <source>Max Dumps To Keep</source>
+        <location filename="settingsdialog.ui" line="1445"/>
+        <source>Hint: right click link and copy link location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1293"/>
-        <source>Maximum number of crash dumps to keep on disk. Use 0 for unlimited.</source>
+        <location filename="settingsdialog.ui" line="1448"/>
+        <source>
+                            Logs and crash dumps are stored under your current instance in the &lt;a href=&quot;LOGS_FULL_PATH&quot;&gt;LOGS_DIR&lt;/a&gt;
+                            and &lt;a href=&quot;DUMPS_FULL_PATH&quot;&gt;DUMPS_DIR&lt;/a&gt; folders.
+                            Sending logs and/or crash dumps to the developers can help investigate issues.
+                            It is recommended to compress large log and dmp files before sending.
+                        </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1296"/>
-        <source>
-                                    Maximum number of crash dumps to keep on disk. Use 0 for unlimited.
-                                    Set &quot;Crash Dumps&quot; above to None to disable crash dump collection.
-                                </source>
+        <location filename="settingsdialog.ui" line="1474"/>
+        <source>Log Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1308"/>
-        <source>Hint: right click link and copy link location</source>
+        <location filename="settingsdialog.ui" line="1481"/>
+        <source>Decides the amount of data printed to &quot;ModOrganizer.log&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1311"/>
+        <location filename="settingsdialog.ui" line="1484"/>
         <source>
-                            Logs and crash dumps are stored under your current instance in the &lt;a href=&quot;LOGS_FULL_PATH&quot;&gt;LOGS_DIR&lt;/a&gt;
-                            and &lt;a href=&quot;DUMPS_FULL_PATH&quot;&gt;DUMPS_DIR&lt;/a&gt; folders.
-                            Sending logs and/or crash dumps to the developers can help investigate issues.
-                            It is recommended to compress large log and dmp files before sending.
-                        </source>
+                                    Decides the amount of data printed to &quot;ModOrganizer.log&quot;.
+                                    &quot;Debug&quot; produces very useful information for finding problems. There is usually no noteworthy performance impact but the file may become rather large. If this is a problem you may prefer the &quot;Info&quot; level for regular use. On the &quot;Error&quot; level the log file usually remains empty.
+                                </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1331"/>
+        <location filename="settingsdialog.ui" line="1494"/>
         <source>Crash Dumps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1338"/>
+        <location filename="settingsdialog.ui" line="1501"/>
         <source>Decides which type of crash dumps are collected when injected processes crash.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1341"/>
+        <location filename="settingsdialog.ui" line="1504"/>
         <source>
                                     Decides which type of crash dumps are collected when injected processes crash.
                                     &quot;None&quot; Disables the generation of crash dumps by MO.
@@ -7199,41 +7607,35 @@ programs you are intentionally running.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1374"/>
-        <source>Log Level</source>
+        <location filename="settingsdialog.ui" line="1517"/>
+        <source>Max Dumps To Keep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1381"/>
-        <source>Decides the amount of data printed to &quot;ModOrganizer.log&quot;</source>
+        <location filename="settingsdialog.ui" line="1524"/>
+        <source>Maximum number of crash dumps to keep on disk. Use 0 for unlimited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.ui" line="1384"/>
+        <location filename="settingsdialog.ui" line="1527"/>
         <source>
-                                    Decides the amount of data printed to &quot;ModOrganizer.log&quot;.
-                                    &quot;Debug&quot; produces very useful information for finding problems. There is usually no noteworthy performance impact but the file may become rather large. If this is a problem you may prefer the &quot;Info&quot; level for regular use. On the &quot;Error&quot; level the log file usually remains empty.
+                                    Maximum number of crash dumps to keep on disk. Use 0 for unlimited.
+                                    Set &quot;Crash Dumps&quot; above to None to disable crash dump collection.
                                 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="92"/>
-        <source>Restart Mod Organizer?</source>
+        <location filename="settingsdialog.ui" line="1537"/>
+        <source>LOOT Log Level</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="93"/>
-        <source>In order to finish configuration changes, MO must be restarted.
-Restart it now?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="settingsdialog.cpp" line="128"/>
+        <location filename="settingsdialog.cpp" line="123"/>
         <source>Confirm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settingsdialog.cpp" line="129"/>
+        <location filename="settingsdialog.cpp" line="124"/>
         <source>Changing the mod directory affects all your profiles! Mods not present (or named differently) in the new location will be disabled in all profiles. There is no way to undo this unless you backed up your profiles manually. Proceed?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7241,22 +7643,22 @@ Restart it now?</source>
 <context>
     <name>SingleInstance</name>
     <message>
-        <location filename="singleinstance.cpp" line="51"/>
+        <location filename="singleinstance.cpp" line="52"/>
         <source>SHM error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="singleinstance.cpp" line="85"/>
+        <location filename="singleinstance.cpp" line="86"/>
         <source>failed to connect to running instance: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="singleinstance.cpp" line="91"/>
+        <location filename="singleinstance.cpp" line="92"/>
         <source>failed to communicate with running instance: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="singleinstance.cpp" line="103"/>
+        <location filename="singleinstance.cpp" line="119"/>
         <source>failed to receive data from secondary instance: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7441,7 +7843,7 @@ On Windows XP:
 <context>
     <name>UsvfsConnector</name>
     <message>
-        <location filename="usvfsconnector.cpp" line="213"/>
+        <location filename="usvfsconnector.cpp" line="185"/>
         <source>Preparing vfs</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7449,41 +7851,29 @@ On Windows XP:
 <context>
     <name>ValidationProgressDialog</name>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="58"/>
+        <location filename="validationprogressdialog.ui" line="14"/>
         <source>Validating Nexus Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="nxmaccessmanager.cpp" line="66"/>
-        <source>Hide</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WaitingOnCloseDialog</name>
-    <message>
-        <location filename="waitingonclosedialog.ui" line="14"/>
-        <source>Waiting for virtualized processes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="waitingonclosedialog.ui" line="20"/>
-        <source>This dialog should disappear automatically if the application/game is done.</source>
+        <location filename="validationprogressdialog.ui" line="35"/>
+        <location filename="nxmaccessmanager.cpp" line="142"/>
+        <source>Connecting to Nexus...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="waitingonclosedialog.ui" line="23"/>
-        <source>Virtualized processes are still running, it is prefered to keep MO running until they are finished.</source>
+        <location filename="validationprogressdialog.ui" line="83"/>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="waitingonclosedialog.ui" line="77"/>
-        <source>Close Now</source>
+        <location filename="validationprogressdialog.ui" line="103"/>
+        <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="waitingonclosedialog.ui" line="97"/>
-        <source>Cancel</source>
+        <location filename="nxmaccessmanager.cpp" line="140"/>
+        <source>Trying again...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -7801,7 +8191,6 @@ Please open the &quot;Nexus&quot;-tab</source>
     <message>
         <location filename="tutorials/tutorial_firststeps_settings.js" line="19"/>
         <source>Use this interface to obtain an API key from NexusMods. This is used for all API connections - downloads, updates etc. MO2 uses the Windows Credential Manager to store this data securely. If the SSO page on Nexus is failing, use the manual entry and copy the API key from your profile.</source>
-        <oldsource>Use this interface to obtain an API key from NexusMods.This is used for all API connections - downloads, updatesetc. MO2 uses the Windows Credential Manager to storethis data securely. If the SSO page on Nexus is failing,use the manual entry and copy the API key from your profile.</oldsource>
         <translation type="unfinished"></translation>
     </message>
 </context>
-- 
cgit v1.3.1