Set version for new instances

Fix downloading files that have no file name
Somehow some mods on the Nexus have no file name in certain API responses. Previously, MO assumed the last part of the URL is the file name. This worked until the Nexus started adding URL query stuff to the URL (?md5=xxx). Now, strip out all the URL query stuff to get a valid file name.
2026-07-27 13:58:24 -07:00 · 2020-01-12 14:35:40 -07:00 · 2020-01-11 09:24:23 -07:00 · 2020-01-10 17:18:45 -07:00 · 2020-01-10 17:18:45 -07:00 · 2020-01-10 08:41:10 -07:00
307 changed files with 27199 additions and 27500 deletions
@@ -1,6 +1,10 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)

-ADD_COMPILE_OPTIONS($<$<CXX_COMPILER_ID:MSVC>:/MP> $<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELEASE>:/O2>> $<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELWITHDEBINFO>:/O2>>)
+ADD_COMPILE_OPTIONS(
+	$<$<CXX_COMPILER_ID:MSVC>:/MP>
+	$<$<CXX_COMPILER_ID:MSVC>:/D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING>
+	$<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELEASE>:/O2>>
+	$<$<CXX_COMPILER_ID:MSVC>:$<$<CONFIG:RELWITHDEBINFO>:/O2>>)

 PROJECT(organizer)

@@ -11,9 +15,11 @@ set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
 set(CMAKE_INSTALL_MESSAGE NEVER)

 SET(DEPENDENCIES_DIR CACHE PATH "")
+
 # hint to find qt in dependencies path
 LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
 LIST(APPEND CMAKE_PREFIX_PATH ${LZ4_ROOT}/dll)
+LIST(APPEND CMAKE_PREFIX_PATH ${FMT_ROOT}/build)

 ADD_SUBDIRECTORY(src)

@@ -43,44 +43,48 @@ MO2 consists of multiple repositories on github. The Umbrella project will downl
 Here is a complete list:

 * https://github.com/LePresidente/cpython-1
-* https://github.com/Modorganizer2/githubpp
-* https://github.com/Modorganizer2/modorganizer
-* https://github.com/Modorganizer2/modorganizer-archive
-* https://github.com/Modorganizer2/modorganizer-bsatk
-* https://github.com/Modorganizer2/modorganizer-bsa_extractor
-* https://github.com/Modorganizer2/modorganizer-check_fnis
-* https://github.com/Modorganizer2/modorganizer-diagnose_basic
-* https://github.com/Modorganizer2/modorganizer-esptk
+* https://github.com/ModOrganizer2/githubpp
+* https://github.com/ModOrganizer2/modorganizer
+* https://github.com/ModOrganizer2/modorganizer-archive
+* https://github.com/ModOrganizer2/modorganizer-bsatk
+* https://github.com/ModOrganizer2/modorganizer-bsa_extractor
+* https://github.com/ModOrganizer2/modorganizer-check_fnis
+* https://github.com/ModOrganizer2/modorganizer-diagnose_basic
+* https://github.com/ModOrganizer2/modorganizer-esptk
 * https://github.com/ModOrganizer2/modorganizer-fnistool
-* https://github.com/Modorganizer2/modorganizer-helper
-* https://github.com/Modorganizer2/modorganizer-game_fallout3
-* https://github.com/Modorganizer2/modorganizer-game_fallout4
-* https://github.com/Modorganizer2/modorganizer-game_fallout4vr
-* https://github.com/Modorganizer2/modorganizer-game_falloutnv
-* https://github.com/Modorganizer2/modorganizer-game_features
-* https://github.com/Modorganizer2/modorganizer-game_gamebryo
-* https://github.com/Modorganizer2/modorganizer-game_morrowind
-* https://github.com/Modorganizer2/modorganizer-game_oblivion
-* https://github.com/Modorganizer2/modorganizer-game_skyrim
-* https://github.com/Modorganizer2/modorganizer-game_skyrimSE
+* https://github.com/ModOrganizer2/modorganizer-helper
+* https://github.com/ModOrganizer2/modorganizer-game_enderal
+* https://github.com/ModOrganizer2/modorganizer-game_fallout3
+* https://github.com/ModOrganizer2/modorganizer-game_fallout4
+* https://github.com/ModOrganizer2/modorganizer-game_fallout4vr
+* https://github.com/ModOrganizer2/modorganizer-game_falloutnv
+* https://github.com/ModOrganizer2/modorganizer-game_features
+* https://github.com/ModOrganizer2/modorganizer-game_gamebryo
+* https://github.com/ModOrganizer2/modorganizer-game_morrowind
+* https://github.com/ModOrganizer2/modorganizer-game_oblivion
+* https://github.com/ModOrganizer2/modorganizer-game_skyrim
+* https://github.com/ModOrganizer2/modorganizer-game_skyrimSE
 * https://github.com/ModOrganizer2/modorganizer-game_skyrimVR
-* https://github.com/Modorganizer2/modorganizer-game_ttw
-* https://github.com/Modorganizer2/modorganizer-installer_bain
-* https://github.com/Modorganizer2/modorganizer-installer_bundle
-* https://github.com/Modorganizer2/modorganizer-installer_fomod
-* https://github.com/Modorganizer2/modorganizer-installer_manual
-* https://github.com/Modorganizer2/modorganizer-installer_ncc
-* https://github.com/Modorganizer2/modorganizer-installer_quick
-* https://github.com/Modorganizer2/modorganizer-lootcli
-* https://github.com/Modorganizer2/modorganizer-NCC
-* https://github.com/Modorganizer2/modorganizer-nxmhandler
-* https://github.com/Modorganizer2/modorganizer-plugin_python
-* https://github.com/Modorganizer2/modorganizer-preview_base
-* https://github.com/Modorganizer2/modorganizer-tool_configurator
-* https://github.com/Modorganizer2/modorganizer-tool_inibakery
-* https://github.com/Modorganizer2/modorganizer-uibase
-* https://github.com/Modorganizer2/usvfs
+* https://github.com/ModOrganizer2/modorganizer-game_ttw
+* https://github.com/ModOrganizer2/modorganizer-installer_bain
+* https://github.com/ModOrganizer2/modorganizer-installer_bundle
+* https://github.com/ModOrganizer2/modorganizer-installer_fomod
+* https://github.com/ModOrganizer2/modorganizer-installer_manual
+* https://github.com/ModOrganizer2/modorganizer-installer_ncc
+* https://github.com/ModOrganizer2/modorganizer-installer_quick
+* https://github.com/ModOrganizer2/modorganizer-lootcli
+* https://github.com/ModOrganizer2/modorganizer-NCC
+* https://github.com/ModOrganizer2/modorganizer-nxmhandler
+* https://github.com/ModOrganizer2/modorganizer-plugin_python
+* https://github.com/ModOrganizer2/modorganizer-preview_base
+* https://github.com/ModOrganizer2/modorganizer-preview_dds
+* https://github.com/ModOrganizer2/modorganizer-form43_checker
+* https://github.com/ModOrganizer2/modorganizer-script_extender_plugin_checker
+* https://github.com/ModOrganizer2/modorganizer-tool_configurator
+* https://github.com/ModOrganizer2/modorganizer-tool_inibakery
+* https://github.com/ModOrganizer2/modorganizer-uibase
+* https://github.com/ModOrganizer2/usvfs

 ### Unused Repositories
-* https://github.com/Modorganizer2/modorganizer-hookdll
+* https://github.com/ModOrganizer2/modorganizer-hookdll
 * https://github.com/TanninOne/modorganizer-tool_nmmimport
@@ -37,7 +37,15 @@ SET(organizer_SRCS
    spawn.cpp
    singleinstance.cpp
    settingsdialog.cpp
+	settingsdialogdiagnostics.cpp
+	settingsdialoggeneral.cpp
+	settingsdialognexus.cpp
+	settingsdialogpaths.cpp
+	settingsdialogplugins.cpp
+	settingsdialogsteam.cpp
+	settingsdialogworkarounds.cpp
    settings.cpp
+	settingsutilities.cpp
    selfupdater.cpp
    selectiondialog.cpp
    queryoverwritedialog.cpp
@@ -73,13 +81,9 @@ SET(organizer_SRCS
    mainwindow.cpp
    main.cpp
    loghighlighter.cpp
-    logbuffer.cpp
-    lockeddialogbase.cpp
-    lockeddialog.cpp
-    waitingonclosedialog.cpp
+    loglist.cpp
    loadmechanism.cpp
    installationmanager.cpp
-    helper.cpp
    filedialogmemory.cpp
    executableslist.cpp
    editexecutablesdialog.cpp
@@ -110,6 +114,7 @@ SET(organizer_SRCS
    previewdialog.cpp
    aboutdialog.cpp
    modflagicondelegate.cpp
+    modconflicticondelegate.cpp
    genericicondelegate.cpp
    organizerproxy.cpp
    viewmarkingscrollbar.cpp
@@ -128,7 +133,19 @@ SET(organizer_SRCS
 	apiuseraccount.cpp
 	filerenamer.cpp
 	texteditor.cpp
-	expanderwidget.cpp
+	env.cpp
+	envmetrics.cpp
+	envmodule.cpp
+	envsecurity.cpp
+	envshortcut.cpp
+	envwindows.cpp
+	colortable.cpp
+	sanitychecks.cpp
+	processrunner.cpp
+	uilocker.cpp
+	loot.cpp
+	lootdialog.cpp
+	filterlist.cpp

    shared/windows_error.cpp
    shared/error_report.cpp
@@ -145,7 +162,15 @@ SET(organizer_HDRS
    spawn.h
    singleinstance.h
    settingsdialog.h
+	settingsdialogdiagnostics.h
+	settingsdialoggeneral.h
+	settingsdialognexus.h
+	settingsdialogpaths.h
+	settingsdialogplugins.h
+	settingsdialogsteam.h
+	settingsdialogworkarounds.h
    settings.h
+	settingsutilities.h
    selfupdater.h
    selectiondialog.h
    queryoverwritedialog.h
@@ -181,13 +206,9 @@ SET(organizer_HDRS
    messagedialog.h
    mainwindow.h
    loghighlighter.h
-    logbuffer.h
-    lockeddialogbase.h
-    lockeddialog.h
-    waitingonclosedialog.h
+    loglist.h
    loadmechanism.h
    installationmanager.h
-    helper.h
    filedialogmemory.h
    executableslist.h
    editexecutablesdialog.h
@@ -218,12 +239,12 @@ SET(organizer_HDRS
    previewdialog.h
    aboutdialog.h
    modflagicondelegate.h
+    modconflicticondelegate.h
    genericicondelegate.h
    organizerproxy.h
    viewmarkingscrollbar.h
    plugincontainer.h
    organizercore.h
-    ilockedwaitingforprocess.h
    iuserinterface.h
    instancemanager.h
    usvfsconnector.h
@@ -238,7 +259,19 @@ SET(organizer_HDRS
 	apiuseraccount.h
 	filerenamer.h
 	texteditor.h
-	expanderwidget.h
+	env.h
+	envmetrics.h
+	envmodule.h
+	envsecurity.h
+	envshortcut.h
+	envwindows.h
+	colortable.h
+	processrunner.h
+	uilocker.h
+	loot.h
+	lootdialog.h
+	json.h
+	filterlist.h

    shared/windows_error.h
    shared/error_report.h
@@ -262,8 +295,6 @@ SET(organizer_UIS
    modinfodialog.ui
    messagedialog.ui
    mainwindow.ui
-    lockeddialog.ui
-    waitingonclosedialog.ui
    editexecutablesdialog.ui
    credentialsdialog.ui
    categoriesdialog.ui
@@ -293,11 +324,13 @@ SET(organizer_RCS
 source_group(src REGULAR_EXPRESSION ".*\\.(h|cpp|ui)")

 set(application
+	filterlist
 	iuserinterface
 	main
 	mainwindow
 	moapplication
 	moshortcut
+	sanitychecks
 	selfupdater
 	singleinstance
 	statusbar
@@ -320,6 +353,8 @@ set(core
 	organizercore
 	organizerproxy
 	apiuseraccount
+	processrunner
+	uilocker
 )

 set(dialogs
@@ -350,15 +385,23 @@ set(downloads
 	downloadmanager
 )

+set(env
+	env
+	envmetrics
+	envmodule
+	envsecurity
+	envshortcut
+	envwindows
+)
+
 set(executables
 	executableslist
 	editexecutablesdialog
 )

-set(locking
-	ilockedwaitingforprocess
-	lockeddialog
-	lockeddialogbase
+set(loot
+	loot
+	lootdialog
 )

 set(modinfo
@@ -409,7 +452,18 @@ set(profiles

 set(settings
 	settings
+	settingsutilities
+)
+
+set(settingsdialog
 	settingsdialog
+	settingsdialogdiagnostics
+	settingsdialoggeneral
+	settingsdialognexus
+	settingsdialogpaths
+	settingsdialogplugins
+	settingsdialogsteam
+	settingsdialogworkarounds
 )

 set(utilities
@@ -418,7 +472,6 @@ set(utilities
 	csvbuilder
 	shared/error_report
 	eventfilter
-	helper
 	shared/leaktrace
 	persistentcookiejar
 	serverinfo
@@ -427,18 +480,20 @@ set(utilities
 	shared/util
 	usvfsconnector
 	shared/windows_error
+	json
 )

 set(widgets
-	expanderwidget
+	colortable
 	genericicondelegate
 	filerenamer
 	filterwidget
 	icondelegate
 	lcdnumber
-	logbuffer
+	loglist
 	loghighlighter
 	modflagicondelegate
+	modconflicticondelegate
 	modidlineedit
 	noeditdelegate
 	qtgroupingproxy
@@ -447,8 +502,9 @@ 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 loot modinfo
+	modinfo\\dialog modlist plugins previews profiles settings settingsdialog
+	utilities widgets
 )

 foreach(filter in list ${src_filters})
@@ -520,15 +576,20 @@ 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
                    ${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})
@@ -551,10 +612,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}
@@ -610,6 +672,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)
@@ -620,4 +686,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)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qdds.dll DESTINATION bin/dlls/imageformats)
+
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/markdown.html DESTINATION bin/resources)
@@ -20,6 +20,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.

 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
+#include "util.h"
 #include <utility.h>

 #include <QApplication>
@@ -85,6 +86,8 @@ AboutDialog::AboutDialog(const QString &version, QWidget *parent)
  ui->revisionLabel->setText(ui->revisionLabel->text() + " unknown");
 #endif

+
+  ui->usvfsLabel->setText(ui->usvfsLabel->text() + " " + MOShared::getUsvfsVersionString());
  ui->licenseText->setFont(QFontDatabase::systemFont(QFontDatabase::FixedFont));
 }

@@ -104,6 +104,13 @@
           </property>
          </widget>
         </item>
+         <item>
+          <widget class="QLabel" name="usvfsLabel">
+           <property name="text">
+            <string>usvfs:</string>
+           </property>
+          </widget>
+         </item>
         <item>
          <spacer name="verticalSpacer">
           <property name="orientation">
@@ -151,9 +158,9 @@
          </spacer>
         </item>
         <item>
-          <widget class="QLabel" name="sourceText">
+          <widget class="LinkLabel" name="sourceText">
           <property name="text">
-            <string>&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;</string>
+            <string>&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;</string>
           </property>
          </widget>
         </item>
@@ -208,6 +215,11 @@
                <string notr="true">LostDragonist</string>
               </property>
              </item>
+              <item>
+               <property name="text">
+                <string notr="true">isanae</string>
+               </property>
+              </item>
             </widget>
            </item>
           </layout>
@@ -234,11 +246,6 @@
                <string notr="true">erasmux</string>
               </property>
              </item>
-              <item>
-               <property name="text">
-                <string notr="true">isanae</string>
-               </property>
-              </item>
              <item>
               <property name="text">
                <string notr="true">Project579</string>
@@ -320,6 +327,11 @@
                <string notr="true">pndrev (German)</string>
               </property>
              </item>
+              <item>
+               <property name="text">
+                <string notr="true">Xahtax (German)</string>
+               </property>
+              </item>
              <item>
               <property name="text">
                <string>yohru (Japanese)</string>
@@ -462,6 +474,11 @@
                <string notr="true">outdatedtv</string>
               </property>
              </item>
+              <item>
+               <property name="text">
+                <string notr="true">reedts</string>
+               </property>
+              </item>
              <item>
               <property name="text">
                <string notr="true">Schilduin</string>
@@ -529,6 +546,13 @@
   </item>
  </layout>
 </widget>
+ <customwidgets>
+  <customwidget>
+   <class>LinkLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">linklabel.h</header>
+  </customwidget>
+ </customwidgets>
 <resources>
  <include location="resources.qrc"/>
 </resources>
@@ -1,10 +1,37 @@
 #include "apiuseraccount.h"

+QString localizedUserAccountType(APIUserAccountTypes t)
+{
+  switch (t)
+  {
+    case APIUserAccountTypes::Regular:
+      return QObject::tr("Regular");
+
+    case APIUserAccountTypes::Premium:
+      return QObject::tr("Premium");
+
+    case APIUserAccountTypes::None:  // fall-through
+    default:
+      return QObject::tr("None");
+  }
+}
+
+
 APIUserAccount::APIUserAccount()
  : m_type(APIUserAccountTypes::None)
 {
 }

+bool APIUserAccount::isValid() const
+{
+  return !m_key.isEmpty();
+}
+
+const QString& APIUserAccount::apiKey() const
+{
+  return m_key;
+}
+
 const QString& APIUserAccount::id() const
 {
  return m_id;
@@ -25,6 +52,12 @@ const APILimits& APIUserAccount::limits() const
  return m_limits;
 }

+APIUserAccount& APIUserAccount::apiKey(const QString& key)
+{
+  m_key = key;
+  return *this;
+}
+
 APIUserAccount& APIUserAccount::id(const QString& id)
 {
  m_id = id;
@@ -63,5 +96,5 @@ bool APIUserAccount::shouldThrottle() const

 bool APIUserAccount::exhausted() const
 {
-  return (remainingRequests() <= 0);
+  return isValid() && (remainingRequests() <= 0);
 }
@@ -18,6 +18,8 @@ enum class APIUserAccountTypes
  Premium
 };

+QString localizedUserAccountType(APIUserAccountTypes t);
+

 /**
 * current limits imposed on the user account
@@ -49,17 +51,28 @@ struct APIStats


 /**
-* represents a user account on the mod provier website
+* represents a user account on the mod provider website
 */
 class APIUserAccount
 {
 public:
-  // when the number of remanining requests is under this number, further
+  // when the number of remaining requests is under this number, further
  // requests will be throttled by avoiding non-critical ones
  static const int ThrottleThreshold = 200;

  APIUserAccount();

+
+  /**
+   * whether the user is logged in
+   */
+  bool isValid() const;
+
+  /**
+  * api key
+  */
+  const QString& apiKey() const;
+
  /**
  * user id
  */
@@ -81,6 +94,11 @@ public:
  const APILimits& limits() const;


+  /**
+   * sets the api key
+   */
+  APIUserAccount& apiKey(const QString& key);
+
  /**
  * sets the user id
  */
@@ -92,7 +110,7 @@ public:
  APIUserAccount& name(const QString& name);

  /**
-  * sets the acount type
+  * sets the account type
  */
  APIUserAccount& type(APIUserAccountTypes type);

@@ -120,10 +138,9 @@ public:
  bool exhausted() const;

 private:
-  QString m_id, m_name;
+  QString m_key, m_id, m_name;
  APIUserAccountTypes m_type;
  APILimits m_limits;
-  APIStats m_stats;
 };

 #endif // APIUSERACCOUNT_H
@@ -18,13 +18,13 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */

 #include "bbcode.h"
-
+#include <log.h>
 #include <QRegExp>
 #include <map>

-
 namespace BBCode {

+namespace log = MOBase::log;

 class BBCodeMap {

@@ -88,7 +88,7 @@ public:
                return temp.replace(tagIter->second.first, QString("<font style=\"color: #%1;\">%2</font>").arg(color, content));
              }
            } else {
-              qWarning("don't know how to deal with tag %s", qUtf8Printable(tagName));
+              log::warn("don't know how to deal with tag {}", tagName);
            }
          } else {
            if (tagName == "*") {
@@ -99,8 +99,7 @@ public:
        } else {
          // expression doesn't match. either the input string is invalid
          // or the expression is
-          qWarning("%s doesn't match the expression for %s",
-                   qUtf8Printable(temp), qUtf8Printable(tagName));
+          log::warn("{} doesn't match the expression for {}", temp, tagName);
          length = 0;
          return QString();
        }
@@ -24,9 +24,10 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "messagedialog.h"
 #include "report.h"
 #include "persistentcookiejar.h"
+#include "settings.h"

 #include <utility.h>
-#include "settings.h"
+#include <log.h>

 #include <QWebEngineSettings>
 #include <QNetworkCookieJar>
@@ -35,9 +36,9 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QInputDialog>
 #include <QWebEngineHistory>
 #include <QDir>
-#include <QDesktopWidget>
 #include <QKeyEvent>

+using namespace MOBase;


 BrowserDialog::BrowserDialog(QWidget *parent)
@@ -48,7 +49,7 @@ BrowserDialog::BrowserDialog(QWidget *parent)
  ui->setupUi(this);

  m_AccessManager->setCookieJar(new PersistentCookieJar(
-      QDir::fromNativeSeparators(Settings::instance().getCacheDirectory() + "/cookies.dat")));
+    QDir::fromNativeSeparators(Settings::instance().paths().cache() + "/cookies.dat")));

  Qt::WindowFlags flags = windowFlags() | Qt::WindowMaximizeButtonHint | Qt::WindowMinimizeButtonHint;
  Qt::WindowFlags helpFlag = Qt::WindowContextHelpButtonHint;
@@ -71,7 +72,7 @@ BrowserDialog::~BrowserDialog()

 void BrowserDialog::closeEvent(QCloseEvent *event)
 {
-//  m_AccessManager->showCookies();
+  Settings::instance().geometry().saveGeometry(this);
  QDialog::closeEvent(event);
 }

@@ -125,6 +126,7 @@ void BrowserDialog::urlChanged(const QUrl &url)
 void BrowserDialog::openUrl(const QUrl &url)
 {
  if (isHidden()) {
+    Settings::instance().geometry().restoreGeometry(this);
    show();
  }
  openInNewTab(url);
@@ -138,9 +140,8 @@ void BrowserDialog::maximizeWidth()

  int contentWidth = getCurrentView()->page()->contentsSize().width();

-  QDesktopWidget screen;
-  int currentScreen = screen.screenNumber(this);
-  int screenWidth = screen.screenGeometry(currentScreen).size().width();
+  QScreen* screen = this->window()->windowHandle()->screen();
+  int screenWidth = screen->geometry().size().width();

  int targetWidth = std::min<int>(std::max<int>(viewportWidth, contentWidth) + frameWidth, screenWidth);
  this->resize(targetWidth, height());
@@ -192,12 +193,12 @@ void BrowserDialog::unsupportedContent(QNetworkReply *reply)
  try {
    QWebEnginePage *page = qobject_cast<QWebEnginePage*>(sender());
    if (page == nullptr) {
-      qCritical("sender not a page");
+      log::error("sender not a page");
      return;
    }
    BrowserView *view = qobject_cast<BrowserView*>(page->view());
    if (view == nullptr) {
-      qCritical("no view?");
+      log::error("no view?");
      return;
    }

@@ -206,14 +207,14 @@ void BrowserDialog::unsupportedContent(QNetworkReply *reply)
    if (isVisible()) {
      MessageDialog::showMessage(tr("failed to start download"), this);
    }
-    qCritical("exception downloading unsupported content: %s", e.what());
+    log::error("exception downloading unsupported content: {}", e.what());
  }
 }


 void BrowserDialog::downloadRequested(const QNetworkRequest &request)
 {
-  qCritical("download request %s ignored", request.url().toString().toUtf8().constData());
+  log::error("download request {} ignored", request.url().toString());
 }


@@ -21,6 +21,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.

 #include <utility.h>
 #include <report.h>
+#include <log.h>

 #include <QObject>
 #include <QFile>
@@ -61,8 +62,9 @@ void CategoryFactory::loadCategories()
      ++lineNum;
      QList<QByteArray> cells = line.split('|');
      if (cells.count() != 4) {
-        qCritical("invalid category line %d: %s (%d cells)",
-                  lineNum, line.constData(), cells.count());
+        log::error(
+          "invalid category line {}: {} ({} cells)",
+          lineNum, line.constData(), cells.count());
      } else {
        std::vector<int> nexusIDs;
        if (cells[2].length() > 0) {
@@ -72,7 +74,7 @@ void CategoryFactory::loadCategories()
            bool ok = false;
            int temp = iter->toInt(&ok);
            if (!ok) {
-              qCritical("invalid category id %s", iter->constData());
+              log::error("invalid category id {}", iter->constData());
            }
            nexusIDs.push_back(temp);
          }
@@ -82,8 +84,7 @@ void CategoryFactory::loadCategories()
        int id = cells[0].toInt(&cell0Ok);
        int parentID = cells[3].trimmed().toInt(&cell3Ok);
        if (!cell0Ok || !cell3Ok) {
-          qCritical("invalid category line %d: %s",
-                    lineNum, line.constData());
+          log::error("invalid category line {}: {}", lineNum, line.constData());
        }
        addCategory(id, QString::fromUtf8(cells[1].constData()), nexusIDs, parentID);
      }
@@ -294,7 +295,7 @@ bool CategoryFactory::isDecendantOf(int id, int parentID) const
      return isDecendantOf(m_Categories[index].m_ParentID, parentID);
    }
  } else {
-    qWarning("%d is no valid category id", id);
+    log::warn("{} is no valid category id", id);
    return false;
  }
 }
@@ -319,6 +320,41 @@ QString CategoryFactory::getCategoryName(unsigned int index) const
  return m_Categories[index].m_Name;
 }

+QString CategoryFactory::getSpecialCategoryName(SpecialCategories type) const
+{
+  QString label;
+  switch (type)
+  {
+    case Checked:         label = QObject::tr("Active"); break;
+    case UpdateAvailable: label = QObject::tr("Update available"); break;
+    case HasCategory:     label = QObject::tr("Has category"); break;
+    case Conflict:        label = QObject::tr("Conflicted"); break;
+    case Endorsed:        label = QObject::tr("Endorsed"); break;
+    case Backup:          label = QObject::tr("Has backup"); break;
+    case Managed:         label = QObject::tr("Managed"); break;
+    case HasGameData:     label = QObject::tr("Has valid game data"); break;
+    case HasNexusID:      label = QObject::tr("Has Nexus ID"); break;
+    case Tracked:         label = QObject::tr("Tracked on Nexus"); break;
+    default: return {};
+  }
+  return QString("<%1>").arg(label);
+}
+
+QString CategoryFactory::getCategoryNameByID(int id) const
+{
+  auto itor = m_IDMap.find(id);
+
+  if (itor == m_IDMap.end()) {
+    return getSpecialCategoryName(static_cast<SpecialCategories>(id));
+  } else {
+    const auto index = itor->second;
+    if (index >= m_Categories.size()) {
+      return {};
+    }
+
+    return m_Categories[index].m_Name;
+  }
+}

 int CategoryFactory::getCategoryID(unsigned int index) const
 {
@@ -359,10 +395,10 @@ unsigned int CategoryFactory::resolveNexusID(int nexusID) const
 {
  std::map<int, unsigned int>::const_iterator iter = m_NexusMap.find(nexusID);
  if (iter != m_NexusMap.end()) {
-    qDebug("nexus category id %d maps to internal %d", nexusID, iter->second);
+    log::debug("nexus category id {} maps to internal {}", nexusID, iter->second);
    return iter->second;
  } else {
-    qDebug("nexus category id %d not mapped", nexusID);
+    log::debug("nexus category id {} not mapped", nexusID);
    return 0U;
  }
 }
@@ -37,23 +37,21 @@ class CategoryFactory {
  friend class CategoriesDialog;

 public:
-
-  static const int CATEGORY_NONE = 0;
-
-  static const int CATEGORY_SPECIAL_FIRST = 10000;
-  static const int CATEGORY_SPECIAL_CHECKED = CATEGORY_SPECIAL_FIRST;
-  static const int CATEGORY_SPECIAL_UNCHECKED = 10001;
-  static const int CATEGORY_SPECIAL_UPDATEAVAILABLE = 10002;
-  static const int CATEGORY_SPECIAL_NOCATEGORY = 10003;
-  static const int CATEGORY_SPECIAL_CONFLICT = 10004;
-  static const int CATEGORY_SPECIAL_NOTENDORSED = 10005;
-  static const int CATEGORY_SPECIAL_BACKUP = 10006;
-  static const int CATEGORY_SPECIAL_MANAGED = 10007;
-  static const int CATEGORY_SPECIAL_UNMANAGED = 10008;
-
+  enum SpecialCategories
+  {
+    Checked = 10000,
+    UpdateAvailable,
+    HasCategory,
+    Conflict,
+    Endorsed,
+    Backup,
+    Managed,
+    HasGameData,
+    HasNexusID,
+    Tracked
+  };

 public:
-
  struct Category {
    Category(int sortValue, int id, const QString &name, const std::vector<int> &nexusIDs, int parentID)
      : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false),
@@ -142,6 +140,8 @@ public:
   * @return QString name of the category
   **/
  QString getCategoryName(unsigned int index) const;
+  QString getSpecialCategoryName(SpecialCategories type) const;
+  QString getCategoryNameByID(int id) const;

  /**
   * @brief look up the id of a category by its index
@@ -21,6 +21,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "ui_categoriesdialog.h"
 #include "categories.h"
 #include "utility.h"
+#include "settings.h"
 #include <QItemDelegate>
 #include <QRegExpValidator>
 #include <QLineEdit>
@@ -109,6 +110,12 @@ CategoriesDialog::~CategoriesDialog()
  delete ui;
 }

+int CategoriesDialog::exec()
+{
+  GeometrySaver gs(Settings::instance(), this);
+  return QDialog::exec();
+}
+

 void CategoriesDialog::cellChanged(int row, int)
 {
@@ -33,12 +33,16 @@ class CategoriesDialog;
 class CategoriesDialog : public MOBase::TutorableDialog
 {
  Q_OBJECT
-  
+
 public:

  explicit CategoriesDialog(QWidget *parent = 0);
  ~CategoriesDialog();

+  // also saves and restores geometry
+  //
+  int exec() override;
+
  /**
   * @brief store changes here to the global categories store (categories.h)
   *
@@ -0,0 +1,334 @@
+#include "colortable.h"
+#include "modflagicondelegate.h"
+#include "modconflicticondelegate.h"
+#include "settings.h"
+
+class ColorItem;
+ColorItem* colorItemForRow(QTableWidget* table, int row);
+
+void paintBackground(
+  QTableWidget* table, QPainter* p, const QStyleOptionViewItem& option,
+  const QModelIndex& index);
+
+
+// delegate for the sample text column; paints the background color
+//
+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);
+
+    // paint the default stuff like text, but override the state to avoid
+    // destroying the background for selected items, etc.
+    itemOption.state = QStyle::State_Enabled;
+
+    QStyledItemDelegate::paint(p, itemOption, index);
+  }
+
+private:
+  QTableWidget* m_table;
+};
+
+
+// delegate for the icons column; paints the background and icons
+//
+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_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;
+};
+
+
+// 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();
+  }
+
+private:
+  QTableWidget* m_table;
+};
+
+
+// item used in the first column of the 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());
+  }
+
+  // color caption
+  //
+  const QString& caption() const
+  {
+    return m_caption;
+  }
+
+  // the current color
+  //
+  QColor get() const
+  {
+    return m_temp;
+  }
+
+  // sets the current color, commit() must be called to save it
+  //
+  bool set(const QColor& c)
+  {
+    if (m_temp != c) {
+      m_temp = c;
+      return true;
+    }
+
+    return false;
+  }
+
+  // resets the current color, commit() must be called to save it
+  //
+  bool reset()
+  {
+    return set(m_default);
+  }
+
+  // saves the current color
+  //
+  void commit()
+  {
+    m_commit(m_temp);
+  }
+
+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(4);
+  setHorizontalHeaderLabels({"", "", "", ""});
+
+  setItemDelegateForColumn(1, new ColoredBackgroundDelegate(this));
+  setItemDelegateForColumn(2, new FakeModConflictIconDelegate(this));
+  setItemDelegateForColumn(3, 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);
+
+  setItem(r, 0, new ColorItem(text, defaultColor, get, commit));
+  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));
+  }
+}
@@ -0,0 +1,39 @@
+#ifndef COLORTABLE_H
+#define COLORTABLE_H
+
+#include <QTableWidget>
+
+class Settings;
+
+// a QTableWidget to view and modify color settings
+//
+class ColorTable : public QTableWidget
+{
+public:
+  ColorTable(QWidget* parent=nullptr);
+
+  // adds colors to the table from the settings
+  //
+  void load(Settings& s);
+
+  // resets the colors to their default values; commitColors() must be called
+  // to save them
+  //
+  void resetColors();
+
+  // commits any changes
+  //
+  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
@@ -127,7 +127,7 @@ void DirectoryRefresher::addModFilesToStructure(DirectoryEntry *directoryStructu
    FilesOrigin &origin = directoryStructure->createOrigin(ToWString(modName), directoryW, priority);
    for (const QString &filename : stealFiles) {
      if (filename.isEmpty()) {
-        qWarning("Trying to find file with no name");
+        log::warn("Trying to find file with no name");
        continue;
      }
      QFileInfo fileInfo(filename);
@@ -143,7 +143,7 @@ void DirectoryRefresher::addModFilesToStructure(DirectoryEntry *directoryStructu
        QString warnStr = fileInfo.absolutePath();
        if (warnStr.isEmpty())
          warnStr = filename;
-        qWarning("file not found: %s", qUtf8Printable(warnStr));
+        log::warn("file not found: {}", warnStr);
      }
    }
  } else {
@@ -19,12 +19,14 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.

 #include "downloadlist.h"
 #include "downloadmanager.h"
+#include <utility.h>
+#include <log.h>
 #include <QEvent>
 #include <QColor>
 #include <QIcon>
-
 #include <QSortFilterProxyModel>

+using namespace MOBase;

 DownloadList::DownloadList(DownloadManager *manager, QObject *parent)
  : QAbstractTableModel(parent), m_Manager(manager)
@@ -75,6 +77,7 @@ QVariant DownloadList::headerData(int section, Qt::Orientation orientation, int
      case COL_SIZE: return tr("Size");
      case COL_STATUS: return tr("Status");
      case COL_FILETIME: return tr("Filetime");
+      case COL_SOURCEGAME: return tr("Source Game");
      default: return QVariant();
    }
  } else {
@@ -116,11 +119,17 @@ QVariant DownloadList::data(const QModelIndex &index, int role) const
          if (m_Manager->isInfoIncomplete(index.row())) {
            return {};
          } else {
-            const MOBase::ModRepositoryFileInfo *info = m_Manager->getFileInfo(index.row());
            return QString("%1").arg(m_Manager->getModID(index.row()));
          }
        }
-        case COL_SIZE: return sizeFormat(m_Manager->getFileSize(index.row()));
+        case COL_SOURCEGAME: {
+          if (m_Manager->isInfoIncomplete(index.row())) {
+            return {};
+          } else {
+            return QString("%1").arg(m_Manager->getDisplayGameName(index.row()));
+          }
+        }
+        case COL_SIZE: return MOBase::localizedByteSize(m_Manager->getFileSize(index.row()));
        case COL_FILETIME: return m_Manager->getFileTime(index.row());
        case COL_STATUS:
          switch (m_Manager->getState(index.row())) {
@@ -192,23 +201,5 @@ void DownloadList::update(int row)
  else if (row < this->rowCount())
    emit dataChanged(this->index(row, 0, QModelIndex()), this->index(row, this->columnCount(QModelIndex())-1, QModelIndex()));
  else
-    qCritical("invalid row %d in download list, update failed", row);
-}
-
-QString DownloadList::sizeFormat(quint64 size) const
-{
-  qreal calc = size;
-  QStringList list;
-  list << "MB" << "GB" << "TB";
-
-  QStringListIterator i(list);
-  QString unit("KB");
-
-  calc /= 1024.0;
-  while (calc >= 1024.0 && i.hasNext()) {
-    unit = i.next();
-    calc /= 1024.0;
-  }
-
-  return QString().setNum(calc, 'f', 2) + " " + unit;
+    log::error("invalid row {} in download list, update failed", row);
 }
@@ -43,6 +43,7 @@ public:
    COL_MODNAME,
    COL_VERSION,
    COL_ID,
+    COL_SOURCEGAME,

    // number of columns
    COL_COUNT
@@ -99,8 +100,6 @@ private:

  DownloadManager *m_Manager;
  bool m_MetaDisplay;
-
-  QString sizeFormat(quint64 size) const;
 };

 #endif // DOWNLOADLIST_H
@@ -96,6 +96,8 @@ bool DownloadListSortProxy::lessThan(const QModelIndex &left,
      return m_Manager->getFileSize(left.row()) < m_Manager->getFileSize(right.row());
    } else if (left.column() == DownloadList::COL_FILETIME) {
      return m_Manager->getFileTime(left.row()) < m_Manager->getFileTime(right.row());
+    } else if (left.column() == DownloadList::COL_SOURCEGAME) {
+      return m_Manager->getDisplayGameName(left.row()) < m_Manager->getDisplayGameName(right.row());
    } else {
      return leftIndex < rightIndex;
    }
@@ -110,7 +112,7 @@ bool DownloadListSortProxy::filterAcceptsRow(int sourceRow, const QModelIndex&)
  if (m_CurrentFilter.length() == 0) {
    return true;
  } else if (sourceRow < m_Manager->numTotalDownloads()) {
-    QString displayedName = Settings::instance().metaDownloads()
+    QString displayedName = Settings::instance().interface().metaDownloads()
        ? m_Manager->getDisplayName(sourceRow)
        : m_Manager->getFileName(sourceRow);
    return displayedName.contains(m_CurrentFilter, Qt::CaseInsensitive);
@@ -19,6 +19,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.

 #include "downloadlist.h"
 #include "downloadlistwidget.h"
+#include <log.h>
 #include <QPainter>
 #include <QMouseEvent>
 #include <QMenu>
@@ -29,6 +30,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QCheckBox>
 #include <QWidgetAction>

+using namespace MOBase;
+
 void DownloadProgressDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
  QModelIndex sourceIndex = m_SortProxy->mapToSource(index);
@@ -132,6 +135,7 @@ void DownloadListWidget::setManager(DownloadManager *manager)
  header()->hideSection(DownloadList::COL_MODNAME);
  header()->hideSection(DownloadList::COL_VERSION);
  header()->hideSection(DownloadList::COL_ID);
+  header()->hideSection(DownloadList::COL_SOURCEGAME);
 }

 void DownloadListWidget::setSourceModel(DownloadList *sourceModel)
@@ -201,40 +205,49 @@ void DownloadListWidget::onCustomContextMenu(const QPoint &point)
  QModelIndex index = indexAt(point);
  bool hidden = false;

-  if (index.row() >= 0) {
-    m_ContextRow = qobject_cast<QSortFilterProxyModel*>(model())->mapToSource(index).row();
-    DownloadManager::DownloadState state = m_Manager->getState(m_ContextRow);
-    hidden = m_Manager->isHidden(m_ContextRow);
+  try
+  {
+    if (index.row() >= 0) {
+      m_ContextRow = qobject_cast<QSortFilterProxyModel*>(model())->mapToSource(index).row();
+      DownloadManager::DownloadState state = m_Manager->getState(m_ContextRow);

-    if (state >= DownloadManager::STATE_READY) {
-      menu.addAction(tr("Install"), this, SLOT(issueInstall()));
-      if (m_Manager->isInfoIncomplete(m_ContextRow))
-        menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfoMd5()));
-      else
-        menu.addAction(tr("Visit on Nexus"), this, SLOT(issueVisitOnNexus()));
-      menu.addAction(tr("Open File"), this, SLOT(issueOpenFile()));
-      menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
+      hidden = m_Manager->isHidden(m_ContextRow);
+
+      if (state >= DownloadManager::STATE_READY) {
+        menu.addAction(tr("Install"), this, SLOT(issueInstall()));
+        if (m_Manager->isInfoIncomplete(m_ContextRow))
+          menu.addAction(tr("Query Info"), this, SLOT(issueQueryInfoMd5()));
+        else
+          menu.addAction(tr("Visit on Nexus"), this, SLOT(issueVisitOnNexus()));
+        menu.addAction(tr("Open File"), this, SLOT(issueOpenFile()));
+        menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
+
+        menu.addSeparator();
+
+        menu.addAction(tr("Delete"), this, SLOT(issueDelete()));
+        if (hidden)
+          menu.addAction(tr("Un-Hide"), this, SLOT(issueRestoreToView()));
+        else
+          menu.addAction(tr("Hide"), this, SLOT(issueRemoveFromView()));
+      } else if (state == DownloadManager::STATE_DOWNLOADING) {
+        menu.addAction(tr("Cancel"), this, SLOT(issueCancel()));
+        menu.addAction(tr("Pause"), this, SLOT(issuePause()));
+        menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
+      } else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR)
+                || (state == DownloadManager::STATE_PAUSING)) {
+        menu.addAction(tr("Delete"), this, SLOT(issueDelete()));
+        menu.addAction(tr("Resume"), this, SLOT(issueResume()));
+        menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
+      }

      menu.addSeparator();
-
-      menu.addAction(tr("Delete"), this, SLOT(issueDelete()));
-      if (hidden)
-        menu.addAction(tr("Un-Hide"), this, SLOT(issueRestoreToView()));
-      else
-        menu.addAction(tr("Hide"), this, SLOT(issueRemoveFromView()));
-    } else if (state == DownloadManager::STATE_DOWNLOADING) {
-      menu.addAction(tr("Cancel"), this, SLOT(issueCancel()));
-      menu.addAction(tr("Pause"), this, SLOT(issuePause()));
-      menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
-    } else if ((state == DownloadManager::STATE_PAUSED) || (state == DownloadManager::STATE_ERROR)
-              || (state == DownloadManager::STATE_PAUSING)) {
-      menu.addAction(tr("Delete"), this, SLOT(issueDelete()));
-      menu.addAction(tr("Resume"), this, SLOT(issueResume()));
-      menu.addAction(tr("Show in Folder"), this, SLOT(issueOpenInDownloadsFolder()));
    }
-
-    menu.addSeparator();
+  } catch(std::exception&)
+  {
+    // this happens when the download index is not found, ignore it and don't
+    // display download-specific actions
  }
+
  menu.addAction(tr("Delete Installed Downloads..."), this, SLOT(issueDeleteCompleted()));
  menu.addAction(tr("Delete Uninstalled Downloads..."), this, SLOT(issueDeleteUninstalled()));
  menu.addAction(tr("Delete All Downloads..."), this, SLOT(issueDeleteAll()));
@@ -277,7 +290,7 @@ void DownloadListWidget::issueDelete()

 void DownloadListWidget::issueRemoveFromView()
 {
-  qDebug() << "removing from view: " << m_ContextRow;
+  log::debug("removing from view: {}", m_ContextRow);
  emit removeDownload(m_ContextRow, false);
 }

--- a/Show More
+++ b/Show More