WIP: Extensions

.gitignore

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

CMakeLists.txt

@@ -5,17 +5,13 @@ set(MO2_CMAKE_DEPRECATED_UIBASE_INCLUDE 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"

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,36 +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:mo2::archive> 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
@@ -89,15 +83,15 @@ 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)
 	install(FILES $<TARGET_PDB_FILE:organizer> DESTINATION pdb)
 endif()
 
 mo2_deploy_qt(
-	DIRECTORY ${_bin}
+	DIRECTORY ${MO2_INSTALL_BIN}
 	BINARIES ModOrganizer.exe $<TARGET_FILE_NAME:mo2::uibase>)
 
 # set source groups for VS
@@ -127,20 +121,29 @@ 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
 	virtualfiletree
 	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
@@ -276,6 +279,7 @@ mo2_add_filter(NAME src/proxies GROUPS
 	downloadmanagerproxy
 	gamefeaturesproxy
 	modlistproxy
+	extensionlistproxy
 	organizerproxy
 	pluginlistproxy
 	proxyutils
@@ -292,6 +296,7 @@ mo2_add_filter(NAME src/register GROUPS
 )
 
 mo2_add_filter(NAME src/settings GROUPS
+	extensionsettings
 	settings
 	settingsutilities
 )
@@ -302,7 +307,9 @@ mo2_add_filter(NAME src/settingsdialog GROUPS
 	settingsdialoggeneral
 	settingsdialognexus
 	settingsdialogpaths
-	settingsdialogplugins
+	settingsdialogextensions
+	settingsdialogextensionrow
+	settingsdialogextensioninfo
 	settingsdialogworkarounds
 	settingsdialogmodlist
 	settingsdialogtheme

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 slots:
 
 private:
   Ui::CategoriesDialog* ui;
-  PluginContainer* m_PluginContainer;
   int m_ContextRow;
 
   int m_HighestID;

src/commandline.cpp

@@ -828,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 {};
 }

src/createinstancedialog.cpp

@@ -95,7 +95,7 @@ class DirectoryCreator
   std::vector<QDir> m_created;
 };
 
-CreateInstanceDialog::CreateInstanceDialog(const PluginContainer& pc, Settings* s,
+CreateInstanceDialog::CreateInstanceDialog(const PluginManager& pc, Settings* s,
                                            QWidget* parent)
     : QDialog(parent), ui(new Ui::CreateInstanceDialog), m_pc(pc), m_settings(s),
       m_switching(false), m_singlePage(false)
@@ -133,13 +133,13 @@ CreateInstanceDialog::CreateInstanceDialog(const PluginContainer& pc, Settings*
 
   addShortcutAction(QKeySequence::Find, Actions::Find);
 
-  addShortcut(Qt::ALT + Qt::Key_Left, [&] {
+  addShortcut(Qt::ALT | Qt::Key_Left, [&] {
     back();
   });
-  addShortcut(Qt::ALT + Qt::Key_Right, [&] {
+  addShortcut(Qt::ALT | Qt::Key_Right, [&] {
     next(false);
   });
-  addShortcut(Qt::CTRL + Qt::Key_Return, [&] {
+  addShortcut(Qt::CTRL | Qt::Key_Return, [&] {
     next();
   });
 
@@ -161,7 +161,7 @@ Ui::CreateInstanceDialog* CreateInstanceDialog::getUI()
   return ui.get();
 }
 
-const PluginContainer& CreateInstanceDialog::pluginContainer()
+const PluginManager& CreateInstanceDialog::pluginManager()
 {
   return m_pc;
 }

src/createinstancedialog.h

@@ -16,7 +16,7 @@ namespace cid
 class Page;
 }
 
-class PluginContainer;
+class PluginManager;
 class Settings;
 
 // this is a wizard for creating a new instance, it is made out of Page objects,
@@ -90,13 +90,12 @@ class CreateInstanceDialog : public QDialog
     ProfileSettings profileSettings;
   };
 
-  CreateInstanceDialog(const PluginContainer& pc, Settings* s,
-                       QWidget* parent = nullptr);
+  CreateInstanceDialog(const PluginManager& pc, Settings* s, QWidget* parent = nullptr);
 
   ~CreateInstanceDialog();
 
   Ui::CreateInstanceDialog* getUI();
-  const PluginContainer& pluginContainer();
+  const PluginManager& pluginManager();
   Settings* settings();
 
   // disables all the pages except for the given one, used on startup when some
@@ -185,7 +184,7 @@ class CreateInstanceDialog : public QDialog
 
 private:
   std::unique_ptr<Ui::CreateInstanceDialog> ui;
-  const PluginContainer& m_pc;
+  const PluginManager& m_pc;
   Settings* m_settings;
   std::vector<std::unique_ptr<cid::Page>> m_pages;
   QString m_originalNext;

src/createinstancedialogpages.cpp

@@ -1,7 +1,7 @@
 #include "createinstancedialogpages.h"
 #include "filesystemutilities.h"
 #include "instancemanager.h"
-#include "plugincontainer.h"
+#include "pluginmanager.h"
 #include "settings.h"
 #include "settingsdialognexus.h"
 #include "shared/appconfig.h"
@@ -55,7 +55,7 @@ void PlaceholderLabel::setVisible(bool b)
 }
 
 Page::Page(CreateInstanceDialog& dlg)
-    : ui(dlg.getUI()), m_dlg(dlg), m_pc(dlg.pluginContainer()), m_skip(false),
+    : ui(dlg.getUI()), m_dlg(dlg), m_pc(dlg.pluginManager()), m_skip(false),
       m_firstActivation(true)
 {}
 

src/createinstancedialogpages.h

@@ -117,7 +117,7 @@ class Page
 protected:
   Ui::CreateInstanceDialog* ui;
   CreateInstanceDialog& m_dlg;
-  const PluginContainer& m_pc;
+  const PluginManager& m_pc;
   bool m_skip;
   bool m_firstActivation;
 

src/datatab.cpp

@@ -14,9 +14,9 @@ using namespace MOBase;
 // in mainwindow.cpp
 QString UnmanagedModName();
 
-DataTab::DataTab(OrganizerCore& core, PluginContainer& pc, QWidget* parent,
+DataTab::DataTab(OrganizerCore& core, PluginManager& pc, QWidget* parent,
                  Ui::MainWindow* mwui)
-    : m_core(core), m_pluginContainer(pc), m_parent(parent),
+    : m_core(core), m_pluginManager(pc), m_parent(parent),
       ui{mwui->tabWidget,
          mwui->dataTab,
          mwui->dataTabRefresh,
@@ -26,7 +26,7 @@ DataTab::DataTab(OrganizerCore& core, PluginContainer& pc, QWidget* parent,
          mwui->dataTabShowHiddenFiles},
       m_needUpdate(true)
 {
-  m_filetree.reset(new FileTree(core, m_pluginContainer, ui.tree));
+  m_filetree.reset(new FileTree(core, m_pluginManager, ui.tree));
   m_filter.setUseSourceSort(true);
   m_filter.setFilterColumn(FileTreeModel::FileName);
   m_filter.setEdit(mwui->dataTabFilter);

src/datatab.h

@@ -14,7 +14,7 @@ class MainWindow;
 }
 class OrganizerCore;
 class Settings;
-class PluginContainer;
+class PluginManager;
 class FileTree;
 
 namespace MOShared
@@ -27,8 +27,7 @@ class DataTab : public QObject
   Q_OBJECT;
 
 public:
-  DataTab(OrganizerCore& core, PluginContainer& pc, QWidget* parent,
-          Ui::MainWindow* ui);
+  DataTab(OrganizerCore& core, PluginManager& pc, QWidget* parent, Ui::MainWindow* ui);
 
   void saveState(Settings& s) const;
   void restoreState(const Settings& s);
@@ -58,7 +57,7 @@ class DataTab : public QObject
   };
 
   OrganizerCore& m_core;
-  PluginContainer& m_pluginContainer;
+  PluginManager& m_pluginManager;
   QWidget* m_parent;
   DataTabUi ui;
   std::unique_ptr<FileTree> m_filetree;