From ae8b6a39b066181bbe6b5ce37717626b95347027 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Sun, 27 Jul 2014 18:34:32 +0200
Subject: [PATCH] - browser dialog now has a hidden url-field (for testing
 only) - loot_cli is no longer part of this project. I will probably create a
 fork of loot that allows command-line usage instead - loot integration now
 works with such a modified loot version - integrated loot will now also
 integrate incompatibility messages in the MO UI - overwrite-markers are now
 updated as the list order is changed - fnis checker will now always allow the
 user to ignore fnis errors - plugin interface now has a function to wait for
 handles returned from startApplication (which can be job or process handles)
 - bugfix: non-mo mods sharing the name with regular mods now have a different
 internal name - bugfix: using hotkeys the vanilla game-plugins could be moved

---
 src/runner/pythonrunner.cpp | 1 +
 src/runner/uibasewrappers.h | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp
index a46e990..8c5760c 100644
--- a/src/runner/pythonrunner.cpp
+++ b/src/runner/pythonrunner.cpp
@@ -813,6 +813,7 @@ BOOST_PYTHON_MODULE(mobase)
   bpy::to_python_converter<IModList::ModStates, QFlags_to_int<IModList::ModState>>();
   Functor2_converter<const QString&, IModList::ModStates>(); // converter for the onModStateChanged-callback
   bpy::class_<IModListWrapper, boost::noncopyable>("IModList")
+      .def("displayName", bpy::pure_virtual(&MOBase::IModList::displayName))
       .def("state", bpy::pure_virtual(&MOBase::IModList::state))
       .def("priority", bpy::pure_virtual(&MOBase::IModList::priority))
       .def("setPriority", bpy::pure_virtual(&MOBase::IModList::setPriority))
diff --git a/src/runner/uibasewrappers.h b/src/runner/uibasewrappers.h
index 7c3c338..af25b6d 100644
--- a/src/runner/uibasewrappers.h
+++ b/src/runner/uibasewrappers.h
@@ -222,6 +222,7 @@ struct IOrganizerWrapper: MOBase::IOrganizer, boost::python::wrapper<MOBase::IOr
   virtual QStringList findFiles(const QString &path, const std::function<bool(const QString&)> &filter) const { return this->get_override("findFiles")(path, filter); }
   virtual QList<FileInfo> findFileInfos(const QString &path, const std::function<bool(const FileInfo&)> &filter) const { return this->get_override("findFileInfos")(path, filter); }
   virtual HANDLE startApplication(const QString &executable, const QStringList &args = QStringList(), const QString &cwd = "", const QString &profile = "") { return this->get_override("startApplication")(executable, args, cwd, profile); }
+  virtual bool waitForApplication(HANDLE handle, LPDWORD exitCode = NULL) const { return this->get_override("waitForApplication")(handle, exitCode); }
   virtual void refreshModList(bool saveChanges = true) { this->get_override("refreshModList")(saveChanges); }
   virtual bool onAboutToRun(const std::function<bool(const QString&)> &func) { return this->get_override("onAboutToRun")(func); }
   virtual bool onModInstalled(const std::function<void(const QString&)> &func) { return this->get_override("onModInstalled")(func); }
@@ -283,9 +284,10 @@ struct IPluginListWrapper: MOBase::IPluginList, boost::python::wrapper<MOBase::I
 
 
 struct IModListWrapper: MOBase::IModList, boost::python::wrapper<MOBase::IModList> {
-  virtual ModStates state(const QString &name) const{ return this->get_override("state")(name); }
-  virtual int priority(const QString &name) const{ return this->get_override("priority")(name); }
-  virtual bool setPriority(const QString &name, int newPriority){ return this->get_override("setPriority")(name, newPriority); }
+  virtual QString displayName(const QString &internalName) const { return this->get_override("displayName")(internalName); }
+  virtual ModStates state(const QString &name) const { return this->get_override("state")(name); }
+  virtual int priority(const QString &name) const { return this->get_override("priority")(name); }
+  virtual bool setPriority(const QString &name, int newPriority) { return this->get_override("setPriority")(name, newPriority); }
   virtual bool onModStateChanged(const std::function<void (const QString &, ModStates)> &func) { return this->get_override("onModStateChanged")(func); }
   virtual bool onModMoved(const std::function<void (const QString &, int, int)> &func) { return this->get_override("onModMoved")(func); }
 };