Merge pull request #1313 from Holt59/load-plugin-without-restart

Implement loading/unloading of plugins without restarting

1 files changed, 38 insertions, 1 deletions

diff --git a/src/organizerproxy.h b/src/organizerproxy.h
index 3097adf0..7a91a347 100644
--- a/src/organizerproxy.h
+++ b/src/organizerproxy.h
@@ -6,7 +6,8 @@
 #include <iplugin.h>

 #include <imoinfo.h>

 

-class OrganizerCore;

+#include "organizercore.h"

+

 class PluginContainer;

 class DownloadManagerProxy;

 class ModListProxy;

@@ -18,12 +19,17 @@ class OrganizerProxy : public MOBase::IOrganizer
 public:

 

   OrganizerProxy(OrganizerCore *organizer, PluginContainer *pluginContainer, MOBase::IPlugin *plugin);

+  ~OrganizerProxy();

+

+public:

 

   /**

    * @return the plugin corresponding to this proxy.

    */

   MOBase::IPlugin* plugin() const { return m_Plugin;  }

 

+public: // IOrganizer interface

+

   virtual MOBase::IModRepositoryBridge *createNexusBridge() const;

   virtual QString profileName() const;

   virtual QString profilePath() const;

@@ -76,6 +82,24 @@ public:
 

   virtual MOBase::IPluginGame const *managedGame() const;

 

+protected:

+

+  // The container needs access to some callbacks to simulate startup.

+  friend class PluginContainer;

+

+  /**

+   * @brief Connect the signals from this proxy and all the child proxies (plugin list, mod

+   *   list, etc.) to the actual implementation. Before this call, plugins can register signals

+   *   but they won't be triggered.

+   */

+  void connectSignals();

+

+  /**

+   * @brief Disconnect the signals from this proxy and all the child proxies (plugin list, mod

+   *   list, etc.) from the actual implementation.

+   */

+  void disconnectSignals();

+

 private:

 

   OrganizerCore *m_Proxied;

@@ -83,6 +107,19 @@ private:
 

   MOBase::IPlugin *m_Plugin;

 

+  OrganizerCore::SignalAboutToRunApplication m_AboutToRun;

+  OrganizerCore::SignalFinishedRunApplication m_FinishedRun;

+  OrganizerCore::SignalUserInterfaceInitialized m_UserInterfaceInitialized;

+  OrganizerCore::SignalProfileCreated m_ProfileCreated;

+  OrganizerCore::SignalProfileRenamed m_ProfileRenamed;

+  OrganizerCore::SignalProfileRemoved m_ProfileRemoved;

+  OrganizerCore::SignalProfileChanged m_ProfileChanged;

+  OrganizerCore::SignalPluginSettingChanged m_PluginSettingChanged;

+  OrganizerCore::SignalPluginEnabled m_PluginEnabled;

+  OrganizerCore::SignalPluginEnabled m_PluginDisabled;

+

+  std::vector<boost::signals2::connection> m_Connections;

+

   std::unique_ptr<DownloadManagerProxy> m_DownloadManagerProxy;

   std::unique_ptr<ModListProxy> m_ModListProxy;

   std::unique_ptr<PluginListProxy> m_PluginListProxy;