Merge with branch1.1

some fixes towards qt5 compatibility
- bugfix: elevation dialog didn't offer a "yes" option
2026-07-27 14:03:33 -07:00 · 2014-04-05 15:36:42 +02:00 · 2014-03-16 20:04:57 +01:00 · 2014-01-29 21:06:55 +01:00 · 2014-01-27 21:31:10 +01:00 · 2013-09-15 15:20:00 +02:00
6 changed files with 10 additions and 8 deletions
@@ -178,7 +178,7 @@ QString ProxyPython::description() const

 VersionInfo ProxyPython::version() const
 {
-  return VersionInfo(1, 2, 0, VersionInfo::RELEASE_FINAL);
+  return VersionInfo(1, 2, 1, VersionInfo::RELEASE_FINAL);
 }

 bool ProxyPython::isActive() const
@@ -1,5 +1,4 @@
 #include "proxypluginwrappers.h"
-#include <boost/python.hpp>
 #include <utility.h>
 #include "error.h"
 #include "gilock.h"
@@ -45,3 +45,5 @@ LIBS += -lpython27

 INCLUDEPATH += ../uibase
 LIBS += -luibase
+
+QMAKE_POST_LINK += xcopy /y /I $$quote($$SRCDIR\\$${TARGET}*.pdb) $$quote($$DSTDIR)\\plugins $$escape_expand(\\n)
@@ -46,8 +46,9 @@ private:
 };


-IPythonRunner *CreatePythonRunner(const MOBase::IOrganizer *moInfo, const QString &pythonDir)
+IPythonRunner *CreatePythonRunner(MOBase::IOrganizer *moInfo, const QString &pythonDir)
 {
+  s_Organizer = moInfo;
  PythonRunner *result = new PythonRunner(moInfo);
  if (result->initPython(pythonDir)) {
    return result;
@@ -22,7 +22,7 @@ public:
 #define PYDLLEXPORT Q_DECL_IMPORT
 #endif // PYTHONRUNNER_LIBRARY

-extern "C" PYDLLEXPORT IPythonRunner *CreatePythonRunner(const MOBase::IOrganizer *moInfo, const QString &pythonDir);
+extern "C" PYDLLEXPORT IPythonRunner *CreatePythonRunner(MOBase::IOrganizer *moInfo, const QString &pythonDir);



@@ -65,8 +65,8 @@ public:

  void onRequestFailed(boost::python::object callback) {
    m_FailedHandler = callback;
-    connect(m_Wrapped, SIGNAL(requestFailed(int,QVariant,QString)),
-            this, SLOT(requestFailed(int,QVariant,QString)),
+    connect(m_Wrapped, SIGNAL(requestFailed(int,int,QVariant,QString)),
+            this, SLOT(requestFailed(int,int,QVariant,QString)),
            Qt::UniqueConnection);
  }

@@ -91,11 +91,11 @@ private slots:
 //    }
  }

-  void requestFailed(int modID, QVariant userData, const QString &errorMessage)
+  void requestFailed(int modID, int fileID, QVariant userData, const QString &errorMessage)
  {
    try {
      GILock lock;
-      m_FailedHandler(modID, userData, errorMessage);
+      m_FailedHandler(modID, fileID, userData, errorMessage);
    } catch (const boost::python::error_already_set&) {
      reportPythonError();
    }
Author	SHA1	Message	Date
Tannin	96081888f1	Merge with branch1.1	2014-04-05 15:36:42 +02:00
Tannin	af5958b0af	some fixes towards qt5 compatibility	2014-03-16 20:04:57 +01:00
Tannin	b33293e49a	- bugfix: elevation dialog didn't offer a "yes" option - bugfix: python plugins crashed the application when trying to create a nexus bridge - bugfix: python plugins couldn't register for failed requests correctly	2014-01-29 21:06:55 +01:00
Tannin	dc3b60e578	- bugfix: accessing profile without loading one when starting an app through the commandline - bugfix: locked-dialog was disabled	2014-01-27 21:31:10 +01:00
Tannin	fee774db45	- added support for mod page plugins - re-introduced the integrated browser - added a plugin to download from the tes alliance page - the download list now contains the file description - nexus interface now stores cookies persistently to reduce number of required log-ins	2013-09-15 15:20:00 +02:00