mirror of
https://github.com/ModOrganizer2/modorganizer-plugin_python.git
synced 2026-07-27 14:03:33 -07:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b33293e49a | ||
|
|
dc3b60e578 |
@@ -178,7 +178,7 @@ QString ProxyPython::description() const
|
|||||||
|
|
||||||
VersionInfo ProxyPython::version() 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
|
bool ProxyPython::isActive() const
|
||||||
|
|||||||
@@ -45,3 +45,5 @@ LIBS += -lpython27
|
|||||||
|
|
||||||
INCLUDEPATH += ../uibase
|
INCLUDEPATH += ../uibase
|
||||||
LIBS += -luibase
|
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);
|
PythonRunner *result = new PythonRunner(moInfo);
|
||||||
if (result->initPython(pythonDir)) {
|
if (result->initPython(pythonDir)) {
|
||||||
return result;
|
return result;
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public:
|
|||||||
#define PYDLLEXPORT Q_DECL_IMPORT
|
#define PYDLLEXPORT Q_DECL_IMPORT
|
||||||
#endif // PYTHONRUNNER_LIBRARY
|
#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) {
|
void onRequestFailed(boost::python::object callback) {
|
||||||
m_FailedHandler = callback;
|
m_FailedHandler = callback;
|
||||||
connect(m_Wrapped, SIGNAL(requestFailed(int,QVariant,QString)),
|
connect(m_Wrapped, SIGNAL(requestFailed(int,int,QVariant,QString)),
|
||||||
this, SLOT(requestFailed(int,QVariant,QString)),
|
this, SLOT(requestFailed(int,int,QVariant,QString)),
|
||||||
Qt::UniqueConnection);
|
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 {
|
try {
|
||||||
GILock lock;
|
GILock lock;
|
||||||
m_FailedHandler(modID, userData, errorMessage);
|
m_FailedHandler(modID, fileID, userData, errorMessage);
|
||||||
} catch (const boost::python::error_already_set&) {
|
} catch (const boost::python::error_already_set&) {
|
||||||
reportPythonError();
|
reportPythonError();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user