Start updating the settings tab for extension.

* Remove SConscript related files.
* Update for libbsarch.
* Force-load translations from uibase and gamebryo/creation.
* Set option to use deprecated uibase include paths.
* Bring githubpp here and add a standalone preset.
* Full standalone build.

.github/ISSUE_TEMPLATE/game-support-request.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-**This template is useful to add basic support using https://github.com/ModOrganizer2/modorganizer-basic_games.**
+**This template is useful to add basic support using https://github.com/ModOrganizer2/modorganizer-basic_games.** 
 
 **If you are vaguely familiar with programming you can try following the instructions on that link to get something working yourself. If you have trouble with that please fill in this template.**
 

.github/workflows/build.yml

@@ -2,32 +2,51 @@ name: Build ModOrganizer 2
 
 on:
   push:
-    branches: [master]
+    branches: master
   pull_request:
     types: [opened, synchronize, reopened]
 
 env:
-  VCPKG_BINARY_SOURCES: ${{ vars.AZ_BLOB_VCPKG_URL != '' && format('clear;x-azblob,{0},{1},readwrite', vars.AZ_BLOB_VCPKG_URL, secrets.AZ_BLOB_SAS) || '' }}
+  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
 jobs:
   build:
     runs-on: windows-2022
     steps:
-      - name: Build ModOrganizer
-        id: build-modorganizer
-        uses: ModOrganizer2/build-with-mob-action@master
+      # https://learn.microsoft.com/en-us/vcpkg/consume/binary-caching-github-actions-cache
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v7
         with:
-          qt-modules: qtpositioning qtwebchannel qtwebengine qtwebsockets qtnetworkauth
-          mo2-dependencies: usvfs uibase bsatk esptk archive lootcli
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
 
-      - name: Install ModOrganizer
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: 6.7.1
+          modules: qtpositioning qtwebchannel qtwebengine qtwebsockets
+          cache: true
+
+      - uses: actions/checkout@v4
+
+      - name: "Set environmental variables"
+        shell: bash
+        run: |
+          echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV
+
+      - name: Configure ModOrganizer
         shell: pwsh
         run: |
-          cmake --install vsbuild --config RelWithDebInfo
-        working-directory: ./build/${{ github.event.repository.name }}
+          cmake --preset vs2022-windows-standalone `
+            "-DCMAKE_PREFIX_PATH=${env:QT_ROOT_DIR}\msvc2019_64" `
+            "-DCMAKE_INSTALL_PREFIX=install"
+
+      - name: Build ModOrganizer
+        run: cmake --build vsbuild --config RelWithDebInfo --target INSTALL
 
       - name: Package ModOrganizer
         uses: actions/upload-artifact@master
         with:
           name: modorganizer
-          path: ./install/bin
+          path: ./install

.gitignore

@@ -12,5 +12,6 @@ edit
 /msbuild.log
 /*std*.log
 /*build
+.vscode
 
 /src/version.aps

.pre-commit-config.yaml

@@ -1,20 +0,0 @@
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v6.0.0
-    hooks:
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
-      - id: check-merge-conflict
-      - id: check-case-conflict
-  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v22.1.2
-    hooks:
-    - id: clang-format
-      'types_or': [c++, c]
-
-ci:
-  autofix_commit_msg: "[pre-commit.ci] Auto fixes from pre-commit.com hooks."
-  autofix_prs: true
-  autoupdate_commit_msg: "[pre-commit.ci] Pre-commit autoupdate."
-  autoupdate_schedule: quarterly
-  submodules: false

CMakeLists.txt

@@ -3,22 +3,15 @@ cmake_minimum_required(VERSION 3.16)
 # TODO: clean include directives
 set(MO2_CMAKE_DEPRECATED_UIBASE_INCLUDE ON)
 
-# Remove tutorials until Qt is fixed
-set(MO2_SKIP_TUTORIALS_INSTALL ON)
-
 project(organizer)
 
-# if MO2_INSTALL_IS_BIN is set, this means that we should install directly into the
-# installation prefix, without the bin/ subfolder, typically for a standalone build
-# to update an existing install
-if (MO2_INSTALL_IS_BIN)
-	set(_bin ".")
-else()
-	set(_bin bin)
-endif()
+find_package(mo2-cmake CONFIG REQUIRED)
+
+set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
 
 add_subdirectory(src)
+add_subdirectory(themes)
 
 set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT organizer)
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dump_running_process.bat DESTINATION ${_bin})
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dump_running_process.bat DESTINATION ${MO2_INSTALL_BIN})

CMakePresets.json

@@ -29,7 +29,7 @@
         "value": "x64"
       },
       "cacheVariables": {
-        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4",
+        "CMAKE_CXX_FLAGS": "/EHsc /MP /W3",
         "VCPKG_TARGET_TRIPLET": {
           "type": "STRING",
           "value": "x64-windows-static-md"
@@ -55,17 +55,5 @@
       "name": "vs2022-windows-standalone"
     }
   ],
-  "buildPresets": [
-    {
-      "name": "vs2022-windows",
-      "resolvePackageReferences": "on",
-      "configurePreset": "vs2022-windows"
-    },
-    {
-      "name": "vs2022-windows-standalone",
-      "resolvePackageReferences": "on",
-      "configurePreset": "vs2022-windows-standalone"
-    }
-  ],
   "version": 4
 }

LICENSE

@@ -671,4 +671,4 @@ into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

readme.md

@@ -12,8 +12,8 @@ The project took up speed again after a few more coders showed up in late 2017,
 ## Help Wanted!
 Mod Organizer 2 is an open project in the hands of the community, there are problems that need to be solved and things that could be added. MO2 really needs developers and if you have the programming skills and some free time you can really improve the experience of the modding community.
 
-To have more information, please join the open MO2 Development Discord server: [Mod Organizer 2](https://discord.gg/ewUVAqyrQX)
-If you want to help translate MO2 to your language you should join the Discord server too and head to the #translation channel.
+To have more information, please join the open MO2 Development discord server: [Mod Organizer 2](https://discord.gg/ewUVAqyrQX)
+If you want to help translate MO2 to your language you should join the discord server too and head to the #translation channel.
 To setup a development environment on your machine, there is the [mob project](https://github.com/modorganizer2/mob) that handles that.
 If you want to submit your code changes, please use a good formatting style like the default one in Visual Studio.
 
@@ -22,7 +22,7 @@ Through the work of a few people of the community MO2 has come quite far, now it
 ## Reporting Issues:
 Issues should be reported to the GitHub page or on the open discord server: [Mod Organizer 2](https://discord.gg/ewUVAqyrQX). Here is also where dev builds are tested, bugs are reported and investigated, suggestions are discussed and a lot more.
 
-Credits to Tannin, LePresidente, Silarn, erasmux, AL12, LostDragonist, AnyOldName3, isa, Holt59, Project579, przester, Qudix, RJ, Jonathan Feenstra and many others for the development.
+Credits to Tannin, LePresidente, Silarn, erasmux, AL12, LostDragonist, AnyOldName3, isa, Holt59 and many others for the development.
 
 ## Download Location
 
@@ -39,7 +39,7 @@ Please refer to [Modorganizer2/mob](https://github.com/modorganizer2/mob) for bu
 
 ## Other Repositories
 
-MO2 consists of multiple repositories on GitHub. The mob project will download them automatically as required. They should however also be buildable individually.
+MO2 consists of multiple repositories on github. The mob project will download them automatically as required. They should however also be buildable individually.
 Here is a complete list:
 
 * https://github.com/LePresidente/cpython-1
@@ -67,7 +67,6 @@ Here is a complete list:
 * 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_starfield
 * https://github.com/ModOrganizer2/modorganizer-game_ttw
 * https://github.com/ModOrganizer2/modorganizer-installer_bain
 * https://github.com/ModOrganizer2/modorganizer-installer_wizard

src/CMakeLists.txt

@@ -25,16 +25,16 @@ set_target_properties(organizer PROPERTIES
 
 # disable translations because we want to be able to install somewhere else if
 # required
-mo2_configure_target(organizer WARNINGS 4 TRANSLATIONS OFF)
+mo2_configure_target(organizer WARNINGS 3 TRANSLATIONS OFF)
 
 # we add translations "manually" to handle MO2_INSTALL_IS_BIN
 mo2_add_translations(organizer
 	INSTALL_RELEASE
-	INSTALL_DIRECTORY "${_bin}/translations"
+	INSTALL_DIRECTORY "${MO2_INSTALL_BIN}/translations"
 	SOURCES ${CMAKE_CURRENT_SOURCE_DIR})
 
 mo2_set_project_to_run_from_install(
-	organizer EXECUTABLE ${CMAKE_INSTALL_PREFIX}/${_bin}/ModOrganizer.exe)
+	organizer EXECUTABLE ${CMAKE_INSTALL_PREFIX}/${MO2_INSTALL_BIN}/ModOrganizer.exe)
 
 target_link_libraries(organizer PRIVATE
 	Shlwapi Bcrypt
@@ -44,35 +44,30 @@ target_link_libraries(organizer PRIVATE
 	Qt6::WebEngineWidgets Qt6::WebSockets Version Dbghelp)
 
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt6"
-		DESTINATION ${_bin}/dlls
+		DESTINATION ${MO2_INSTALL_BIN}/dlls
 		CONFIGURATIONS Release RelWithDebInfo
 		RENAME dlls.manifest)
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.debug.qt6"
-		DESTINATION ${_bin}/dlls
+		DESTINATION ${MO2_INSTALL_BIN}/dlls
 		CONFIGURATIONS Debug
 		RENAME dlls.manifest)
 
-if (NOT MO2_SKIP_STYLESHEETS_INSTALL)
-	install(
-		DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/stylesheets"
-		DESTINATION ${_bin})
-endif()
-
 if (NOT MO2_SKIP_TUTORIALS_INSTALL)
 	install(
 		DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/tutorials"
-		DESTINATION ${_bin})
+		DESTINATION ${MO2_INSTALL_BIN})
 endif()
 
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/resources/markdown.html"
-	DESTINATION ${_bin}/resources)
+	DESTINATION ${MO2_INSTALL_BIN}/resources)
 
 # install ModOrganizer.exe itself
-install(FILES $<TARGET_FILE:organizer> DESTINATION ${_bin})
+install(FILES $<TARGET_FILE:organizer> DESTINATION ${MO2_INSTALL_BIN})
 
 # install dependencies DLLs
-install(FILES $<TARGET_FILE:mo2::libbsarch> DESTINATION ${_bin}/dlls)
-install(FILES $<TARGET_FILE:7zip::7zip> DESTINATION ${_bin}/dlls)
+install(FILES $<TARGET_FILE:mo2::libbsarch> DESTINATION ${MO2_INSTALL_BIN}/dlls)
+install(FILES $<TARGET_FILE:mo2::archive> DESTINATION ${MO2_INSTALL_BIN}/dlls)
+install(FILES $<TARGET_FILE:7zip::7zip> DESTINATION ${MO2_INSTALL_BIN}/dlls)
 
 # this may copy over the ones from uibase/usvfs
 # - when building with mob, this should not matter as the files should be identical
@@ -88,7 +83,7 @@ install(FILES
 	$<TARGET_FILE:usvfs_x86::usvfs_dll>
 	$<TARGET_FILE:usvfs_x64::usvfs_proxy>
 	$<TARGET_FILE:usvfs_x86::usvfs_proxy>
-DESTINATION ${_bin})
+DESTINATION ${MO2_INSTALL_BIN})
 
 # do not install PDB if CMAKE_INSTALL_PREFIX is "bin"
 if (NOT MO2_INSTALL_IS_BIN)
@@ -96,7 +91,7 @@ if (NOT MO2_INSTALL_IS_BIN)
 endif()
 
 mo2_deploy_qt(
-	DIRECTORY ${_bin}
+	DIRECTORY ${MO2_INSTALL_BIN}
 	BINARIES ModOrganizer.exe $<TARGET_FILE_NAME:mo2::uibase>)
 
 # set source groups for VS
@@ -109,7 +104,6 @@ mo2_add_filter(NAME src/application GROUPS
 	multiprocess
 	sanitychecks
 	selfupdater
-	systemtraymanager
 	updatedialog
 )
 
@@ -127,13 +121,12 @@ mo2_add_filter(NAME src/categories GROUPS
 
 mo2_add_filter(NAME src/core GROUPS
 	archivefiletree
-	githubpp
+	github
+	inibakery
 	installationmanager
 	nexusinterface
 	nxmaccessmanager
 	organizercore
-	game_features
-	plugincontainer
 	apiuseraccount
 	processrunner
 	qdirfiletree
@@ -141,6 +134,16 @@ mo2_add_filter(NAME src/core GROUPS
 	uilocker
 )
 
+mo2_add_filter(NAME src/extensions GROUPS
+	game_features
+	thememanager
+	translationmanager
+	extensionmanager
+	extensionwatcher
+	pluginmanager
+	proxyqt
+)
+
 mo2_add_filter(NAME src/dialogs GROUPS
 	aboutdialog
 	activatemodsdialog
@@ -274,10 +277,9 @@ mo2_add_filter(NAME src/profiles GROUPS
 
 mo2_add_filter(NAME src/proxies GROUPS
 	downloadmanagerproxy
-	executableslistproxy
 	gamefeaturesproxy
-	instancemanagerproxy
 	modlistproxy
+	extensionlistproxy
 	organizerproxy
 	pluginlistproxy
 	proxyutils
@@ -294,6 +296,7 @@ mo2_add_filter(NAME src/register GROUPS
 )
 
 mo2_add_filter(NAME src/settings GROUPS
+	extensionsettings
 	settings
 	settingsutilities
 )
@@ -304,7 +307,9 @@ mo2_add_filter(NAME src/settingsdialog GROUPS
 	settingsdialoggeneral
 	settingsdialognexus
 	settingsdialogpaths
-	settingsdialogplugins
+	settingsdialogextensions
+	settingsdialogextensionrow
+	settingsdialogextensioninfo
 	settingsdialogworkarounds
 	settingsdialogmodlist
 	settingsdialogtheme

src/aboutdialog.cpp

@@ -45,6 +45,7 @@ AboutDialog::AboutDialog(const QString& version, QWidget* parent)
   m_LicenseFiles[LICENSE_CCBY3]   = "BY-SA-v3.0.txt";
   m_LicenseFiles[LICENSE_ZLIB]    = "zlib.txt";
   m_LicenseFiles[LICENSE_PYTHON]  = "python.txt";
+  m_LicenseFiles[LICENSE_SSL]     = "openssl.txt";
   m_LicenseFiles[LICENSE_CPPTOML] = "cpptoml.txt";
   m_LicenseFiles[LICENSE_UDIS]    = "udis86.txt";
   m_LicenseFiles[LICENSE_SPDLOG]  = "spdlog.txt";
@@ -68,6 +69,7 @@ AboutDialog::AboutDialog(const QString& version, QWidget* parent)
   addLicense("ANTLR", LICENSE_ANTLR);
   addLicense("LOOT", LICENSE_GPL3);
   addLicense("Python", LICENSE_PYTHON);
+  addLicense("OpenSSL", LICENSE_SSL);
   addLicense("cpptoml", LICENSE_CPPTOML);
   addLicense("Udis86", LICENSE_UDIS);
   addLicense("spdlog", LICENSE_SPDLOG);

src/aboutdialog.h

@@ -51,6 +51,7 @@ private:
     LICENSE_BOOST,
     LICENSE_CCBY3,
     LICENSE_PYTHON,
+    LICENSE_SSL,
     LICENSE_CPPTOML,
     LICENSE_7ZIP,
     LICENSE_ZLIB,

src/aboutdialog.ui

@@ -127,7 +127,7 @@
          <item>
           <widget class="QLabel" name="label_3">
            <property name="text">
-            <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copyright © 2011-2016 Sebastian Herbord&lt;br/&gt;Copyright © 2016-2026 Mod Organizer 2 Contributors&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Copyright © 2011-2016 Sebastian Herbord&lt;br/&gt;Copyright © 2016-2023 Mod Organizer 2 Contributors&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
           </widget>
          </item>
@@ -222,7 +222,7 @@
               </item>
               <item>
                <property name="text">
-                <string notr="true">Holt59</string>
+                <string>Holt59</string>
                </property>
               </item>
              </widget>
@@ -266,16 +266,6 @@
                 <string notr="true">Qudix</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">RJ</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">Jonathan Feenstra</string>
-               </property>
-              </item>
              </widget>
             </item>
            </layout>
@@ -412,7 +402,7 @@
               </item>
               <item>
                <property name="text">
-                <string>Dasinho (Portuguese)</string>
+                <string>zDas (Portuguese)</string>
                </property>
               </item>
               <item>
@@ -484,21 +474,6 @@
                 <string notr="true">6788</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">AkiraJkr</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">AmeliaCute</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">ashemedai</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">blacksol</string>
@@ -519,16 +494,6 @@
                 <string notr="true">Brixified</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">CheffieGithub</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">daescha</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">ddbb07</string>
@@ -539,31 +504,11 @@
                 <string notr="true">deathneko11</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">Deewens</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">DefinitelyNotSade</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">dekart811</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">Deorder</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">diegofesanto</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">DoubleYou</string>
@@ -574,11 +519,6 @@
                 <string notr="true">Drew Warwick</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">Eddoursul</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">erri120</string>
@@ -629,66 +569,11 @@
                 <string notr="true">jimfcarroll</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">Jonny_Bro</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">ju5tA1ex</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">Kane Dou</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">KenJyn76</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">Ketsuban</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">LaughingHyena</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">Luca|EzioTheDeadPoet</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">mick-lue</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">ModZero</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">mopioid</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">mrudat</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">Nikirack</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">ogrotten</string>
@@ -704,96 +589,36 @@
                 <string notr="true">Patchier</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">Paynamia</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">PurpleFez</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">Ra2-IFV</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">reedts</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">RodolfoFigueroa</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">Ryan Young</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">Schilduin</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">shellbj</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">SuperSandro2000</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">Syer10</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">The Conceptionist</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">TheForgotten69</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">TheUnlocked</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string notr="true">thosrtanner</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">Trosski</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">Twinki</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">Uhuru</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">uwx</string>
-               </property>
-              </item>
               <item>
                <property name="text">
                 <string notr="true">Wolverine2710</string>
@@ -801,7 +626,7 @@
               </item>
               <item>
                <property name="text">
-                <string notr="true">xieve</string>
+                <string notr="true">thosrtanner</string>
                </property>
               </item>
               <item>
@@ -809,11 +634,6 @@
                 <string notr="true">z929669</string>
                </property>
               </item>
-              <item>
-               <property name="text">
-                <string notr="true">Zash</string>
-               </property>
-              </item>
              </widget>
             </item>
            </layout>

src/archivefiletree.h

@@ -17,8 +17,8 @@ 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 ARCHIVEFILETREE_H
-#define ARCHIVEFILETREE_H
+#ifndef ARCHIVEFILENETRY_H
+#define ARCHIVEFILENTRY_H
 
 #include <archive/archive.h>
 #include <uibase/ifiletree.h>

src/categoriesdialog.cpp

@@ -97,11 +97,6 @@ public:
     int pos          = 0;
     QString editText = edit->text();
     if (m_Validator->validate(editText, pos) == QValidator::Acceptable) {
-      // Set ID and Parent ID as ints so sorting works as expected
-      if (index.column() == 0 || index.column() == 2) {
-        model->setData(index, editText.toInt());
-        return;
-      }
       QItemDelegate::setModelData(editor, model, index);
     }
   }
@@ -203,8 +198,8 @@ void CategoriesDialog::fillTable()
   table->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Stretch);
   table->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Fixed);
   table->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Stretch);
+  table->verticalHeader()->setSectionsMovable(true);
   table->verticalHeader()->setSectionResizeMode(QHeaderView::Fixed);
-  table->verticalHeader()->setVisible(false);
   table->setItemDelegateForColumn(
       0, new ValidatingDelegate(this, new NewIDValidator(m_IDs)));
   table->setItemDelegateForColumn(
@@ -222,6 +217,7 @@ void CategoriesDialog::fillTable()
     }
     ++row;
     table->insertRow(row);
+    //    table->setVerticalHeaderItem(row, new QTableWidgetItem("  "));
 
     QScopedPointer<QTableWidgetItem> idItem(new QTableWidgetItem());
     idItem->setData(Qt::DisplayRole, category.ID());
@@ -258,26 +254,19 @@ void CategoriesDialog::fillTable()
     }
   }
 
-  table->setSortingEnabled(true);
   refreshIDs();
 }
 
 void CategoriesDialog::addCategory_clicked()
 {
   int row = m_ContextRow >= 0 ? m_ContextRow : 0;
-  ui->categoriesTable->setSortingEnabled(false);
   ui->categoriesTable->insertRow(row);
-
-  QScopedPointer<QTableWidgetItem> idItem(new QTableWidgetItem());
-  idItem->setData(Qt::DisplayRole, ++m_HighestID);
-  QScopedPointer<QTableWidgetItem> parentIDItem(new QTableWidgetItem());
-  parentIDItem->setData(Qt::DisplayRole, 0);
-
-  ui->categoriesTable->setItem(row, 0, idItem.take());
+  ui->categoriesTable->setVerticalHeaderItem(row, new QTableWidgetItem("  "));
+  ui->categoriesTable->setItem(row, 0,
+                               new QTableWidgetItem(QString::number(++m_HighestID)));
   ui->categoriesTable->setItem(row, 1, new QTableWidgetItem("new"));
-  ui->categoriesTable->setItem(row, 2, parentIDItem.take());
+  ui->categoriesTable->setItem(row, 2, new QTableWidgetItem("0"));
   ui->categoriesTable->setItem(row, 3, new QTableWidgetItem(""));
-  ui->categoriesTable->setSortingEnabled(true);
 }
 
 void CategoriesDialog::removeCategory_clicked()
@@ -311,7 +300,6 @@ void CategoriesDialog::nexusImport_clicked()
       m_HighestID = 0;
     }
     int row = 0;
-    table->setSortingEnabled(false);
     for (int i = 0; i < list->count(); ++i) {
       QString name = list->item(i)->data(Qt::DisplayRole).toString();
       int nexusID  = list->item(i)->data(Qt::UserRole).toInt();
@@ -328,6 +316,7 @@ void CategoriesDialog::nexusImport_clicked()
       if (!table->findItems(name, Qt::MatchExactly).size()) {
         row = table->rowCount();
         table->insertRow(table->rowCount());
+        //    table->setVerticalHeaderItem(row, new QTableWidgetItem("  "));
 
         QScopedPointer<QTableWidgetItem> idItem(new QTableWidgetItem());
         idItem->setData(Qt::DisplayRole, ++m_HighestID);
@@ -355,7 +344,6 @@ void CategoriesDialog::nexusImport_clicked()
         }
       }
     }
-    table->setSortingEnabled(true);
     refreshIDs();
   }
 }

src/categoriesdialog.h

@@ -21,7 +21,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #define CATEGORIESDIALOG_H
 
 #include "categories.h"
-#include "plugincontainer.h"
 #include "tutorabledialog.h"
 #include <set>
 
@@ -71,7 +70,6 @@ private:
 
 private:
   Ui::CategoriesDialog* ui;
-  PluginContainer* m_PluginContainer;
   int m_ContextRow;
 
   int m_HighestID;

src/categoriesdialog.ui

@@ -79,6 +79,9 @@
      <property name="gridStyle">
       <enum>Qt::DashLine</enum>
      </property>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
      <property name="wordWrap">
       <bool>false</bool>
      </property>

src/colortable.cpp

@@ -233,12 +233,12 @@ void ColorTable::load(Settings& s)
       });
 
   addColor(
-      QObject::tr("Mod contains selected file"), QColor(0, 0, 255, 64),
+      QObject::tr("Mod contains selected plugin"), QColor(0, 0, 255, 64),
       [this] {
-        return m_settings->colors().modlistContainsFile();
+        return m_settings->colors().modlistContainsPlugin();
       },
       [this](auto&& v) {
-        m_settings->colors().setModlistContainsFile(v);
+        m_settings->colors().setModlistContainsPlugin(v);
       });
 
   addColor(

src/commandline.cpp

@@ -10,8 +10,6 @@
 #include <log.h>
 #include <report.h>
 
-#include <boost/optional/optional_io.hpp>
-
 namespace cl
 {
 
@@ -223,12 +221,8 @@ std::optional<int> CommandLine::runEarly()
 
 std::optional<int> CommandLine::runPostApplication(MOApplication& a)
 {
-  const auto instanceArg = m_vm.find("instance");
-  if (instanceArg != m_vm.end() &&
-      !instanceArg->second.as<boost::optional<std::string>>().has_value()) {
-
-    // handle -i with no arguments (distinct from -i "", which will launch the
-    // portable instance if it exists, hence the use of boost::optional)
+  // handle -i with no arguments
+  if (m_vm.count("instance") && m_vm["instance"].as<std::string>() == "") {
     env::Console c;
 
     if (auto i = InstanceManager::singleton().currentInstance()) {
@@ -320,9 +314,7 @@ void CommandLine::createOptions()
 
               ("logs", "duplicates the logs to stdout")
 
-                  ("instance,i",
-                   po::value<boost::optional<std::string>>()->implicit_value(
-                       boost::none),
+                  ("instance,i", po::value<std::string>()->implicit_value(""),
                    "use the given instance (defaults to last used)")
 
                       ("profile,p", po::value<std::string>(),
@@ -410,14 +402,8 @@ std::optional<QString> CommandLine::instance() const
 
   if (m_shortcut.isValid() && m_shortcut.hasInstance()) {
     return m_shortcut.instanceName();
-  } else {
-    const auto instanceArg = m_vm.find("instance");
-    if (instanceArg != m_vm.end()) {
-      const auto& instanceVal = instanceArg->second.as<boost::optional<std::string>>();
-      if (instanceVal.has_value()) {
-        return QString::fromStdString(instanceVal.value());
-      }
-    }
+  } else if (m_vm.count("instance")) {
+    return QString::fromStdString(m_vm["instance"].as<std::string>());
   }
 
   return {};
@@ -842,8 +828,9 @@ std::optional<int> ReloadPluginCommand::runPostOrganizer(OrganizerCore& core)
       QDir(qApp->applicationDirPath() + "/" + ToQString(AppConfig::pluginPath()))
           .absoluteFilePath(name);
 
+  // TODO: reload extension, not plugin
   log::debug("reloading plugin from {}", filepath);
-  core.pluginContainer().reloadPlugin(filepath);
+  // core.pluginManager().reloadPlugin(filepath);
 
   return {};
 }
@@ -853,18 +840,6 @@ Command::Meta DownloadFileCommand::meta() const
   return {"download", "downloads a file", "URL", ""};
 }
 
-po::options_description DownloadFileCommand::getVisibleOptions() const
-{
-  po::options_description d;
-
-  d.add_options()("name,n", po::value<std::string>(), "(optional) the download name")(
-      "modname,m", po::value<std::string>(), "(optional) the mod name")(
-      "version,v", po::value<std::string>(), "(optional) the download / mod version")(
-      "source,s", po::value<std::string>(), "(optional) the download source");
-
-  return d;
-}
-
 po::options_description DownloadFileCommand::getInternalOptions() const
 {
   po::options_description d;
@@ -891,33 +866,16 @@ bool DownloadFileCommand::canForwardToPrimary() const
 std::optional<int> DownloadFileCommand::runPostOrganizer(OrganizerCore& core)
 {
   const QString url = QString::fromStdString(vm()["URL"].as<std::string>());
-  QString name, modName, version, source;
 
   if (!url.startsWith("https://")) {
     reportError(QObject::tr("Download URL must start with https://"));
     return 1;
   }
 
-  if (vm().count("name")) {
-    name = QString::fromStdString(vm()["name"].as<std::string>());
-  }
-
-  if (vm().count("modname")) {
-    modName = QString::fromStdString(vm()["modname"].as<std::string>());
-  }
-
-  if (vm().count("version")) {
-    version = QString::fromStdString(vm()["version"].as<std::string>());
-  }
-
-  if (vm().count("source")) {
-    source = QString::fromStdString(vm()["source"].as<std::string>());
-  }
-
   log::debug("starting direct download from command line: {}", url.toStdString());
   MessageDialog::showMessage(QObject::tr("Download started"), qApp->activeWindow(),
                              false);
-  core.downloadManager()->startDownloadURLWithMeta(url, name, modName, version, source);
+  core.downloadManager()->startDownloadURLs(QStringList() << url);
 
   return {};
 }

src/commandline.h

@@ -212,7 +212,6 @@ class DownloadFileCommand : public Command
 protected:
   Meta meta() const override;
 
-  po::options_description getVisibleOptions() const override;
   po::options_description getInternalOptions() const override;
   po::positional_options_description getPositional() const override;