1 files changed, 20 insertions, 45 deletions

diff --git a/src/organizercore.h b/src/organizercore.h
index 0d0a092c..6c9edb9f 100644
--- a/src/organizercore.h
+++ b/src/organizercore.h
@@ -3,7 +3,6 @@
 

 

 #include "selfupdater.h"

-#include "iuserinterface.h" //should be class IUserInterface;

 #include "settings.h"

 #include "modlist.h"

 #include "modinfo.h"

@@ -14,6 +13,8 @@
 #include "executableslist.h"

 #include "usvfsconnector.h"

 #include "moshortcut.h"

+#include "processrunner.h"

+#include "uilocker.h"

 #include <directoryentry.h>

 #include <imoinfo.h>

 #include <iplugindiagnose.h>

@@ -26,6 +27,8 @@
 class ModListSortProxy;

 class PluginListSortProxy;

 class Profile;

+class IUserInterface;

+

 namespace MOBase {

   template <typename T> class GuessedValue;

   class IModInterface;

@@ -89,19 +92,13 @@ private:
   typedef boost::signals2::signal<void (const QString&)> SignalModInstalled;

 

 public:

-  enum class FileExecutionTypes

-  {

-    Executable = 1,

-    Other = 2

-  };

-

   static bool isNxmLink(const QString &link) { return link.startsWith("nxm://", Qt::CaseInsensitive); }

 

   OrganizerCore(Settings &settings);

 

   ~OrganizerCore();

 

-  void setUserInterface(IUserInterface *userInterface, QWidget *widget);

+  void setUserInterface(IUserInterface* ui);

   void connectPlugins(PluginContainer *container);

   void disconnectPlugins();

 

@@ -138,7 +135,17 @@ public:
 

   bool saveCurrentLists();

 

-  void prepareStart();

+  ProcessRunner processRunner();

+

+  bool beforeRun(

+    const QFileInfo& binary, const QString& profileName,

+    const QString& customOverwrite,

+    const QList<MOBase::ExecutableForcedLoadSetting>& forcedLibraries);

+

+  void afterRun(const QFileInfo& binary, DWORD exitCode);

+

+  ProcessRunner::Results waitForAllUSVFSProcesses(

+    UILocker::Reasons reason=UILocker::PreventExit);

 

   void refreshESPList(bool force = false);

   void refreshBSAList();

@@ -150,37 +157,9 @@ public:
   void doAfterLogin(const std::function<void()> &function) { m_PostLoginTasks.append(function); }

   void loggedInAction(QWidget* parent, std::function<void ()> f);

 

-  static QString findJavaInstallation(const QString& jarFile={});

-

-  static bool getFileExecutionContext(

-    QWidget* parent,  const QFileInfo &targetInfo,

-    QFileInfo &binaryInfo, QString &arguments, FileExecutionTypes& type);

-

-  bool executeFileVirtualized(QWidget* parent, const QFileInfo& targetInfo);

   bool previewFileWithAlternatives(QWidget* parent, QString filename, int selectedOrigin=-1);

   bool previewFile(QWidget* parent, const QString& originName, const QString& path);

 

-  void spawnBinary(const QFileInfo &binary, const QString &arguments = "",

-                   const QDir &currentDirectory = QDir(),

-                   const QString &steamAppID = "",

-                   const QString &customOverwrite = "",

-                   const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries = QList<MOBase::ExecutableForcedLoadSetting>());

-

-  HANDLE spawnBinaryDirect(const QFileInfo &binary, const QString &arguments,

-                           const QString &profileName,

-                           const QDir &currentDirectory,

-                           const QString &steamAppID,

-                           const QString &customOverwrite,

-                           const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries = QList<MOBase::ExecutableForcedLoadSetting>(),

-                           LPDWORD exitCode = nullptr);

-

-  HANDLE spawnBinaryProcess(const QFileInfo &binary, const QString &arguments,

-                            const QString &profileName,

-                            const QDir &currentDirectory,

-                            const QString &steamAppID,

-                            const QString &customOverwrite,

-                            const QList<MOBase::ExecutableForcedLoadSetting> &forcedLibraries = QList<MOBase::ExecutableForcedLoadSetting>());

-

   void loginSuccessfulUpdate(bool necessary);

   void loginFailedUpdate(const QString &message);

 

@@ -234,10 +213,6 @@ public:
   DownloadManager *downloadManager();

   PluginList *pluginList();

   ModList *modList();

-  HANDLE runShortcut(const MOShortcut& shortcut);

-  HANDLE startApplication(const QString &executable, const QStringList &args, const QString &cwd, const QString &profile, const QString &forcedCustomOverwrite = "", bool ignoreCustomOverwrite = false);

-  bool waitForApplication(HANDLE processHandle, LPDWORD exitCode = nullptr);

-  HANDLE findAndOpenAUSVFSProcess(const std::vector<QString>& hiddenList, DWORD preferedParentPid);

   bool onModInstalled(const std::function<void (const QString &)> &func);

   bool onAboutToRun(const std::function<bool (const QString &)> &func);

   bool onFinishedRun(const std::function<void (const QString &, unsigned int)> &func);

@@ -288,6 +263,7 @@ signals:
 

 private:

 

+  void saveCurrentProfile();

   void storeSettings();

 

   bool queryApi(QString &apiKey);

@@ -313,8 +289,6 @@ private:
               const MOShared::DirectoryEntry *directoryEntry,

               int createDestination);

 

-  bool waitForProcessCompletion(HANDLE handle, LPDWORD exitCode, ILockedWaitingForProcess* uilock);

-

 private slots:

 

   void directory_refreshed();

@@ -328,8 +302,7 @@ private:
   static const unsigned int PROBLEM_MO1SCRIPTEXTENDERWORKAROUND = 1;

 

 private:

-

-  IUserInterface *m_UserInterface;

+  IUserInterface* m_UserInterface;

   PluginContainer *m_PluginContainer;

   QString m_GameName;

   MOBase::IPluginGame *m_GamePlugin;

@@ -371,6 +344,8 @@ private:
   MOBase::DelayedFileWriter m_PluginListsWriter;

   UsvfsConnector m_USVFS;

 

+  UILocker m_UILocker;

+

   static CrashDumpsType m_globalCrashDumpsType;

 };