[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [krita/berger-scripting] krita/plugins/extensions/pykrita/src: use correct debug area
From: Cyrille Berger <cberger () cberger ! net>
Date: 2015-12-09 21:13:30
Message-ID: E1a6m3G-0005XC-4J () scm ! kde ! org
[Download RAW message or body]
Git commit 7c5cb3b9f5240cb915c9f0e9f08cff8e2b0d1fce by Cyrille Berger, on behalf of \
Boudewijn Rempt. Committed on 09/12/2015 at 19:42.
Pushed by berger into branch 'berger-scripting'.
use correct debug area
M +4 -2 krita/plugins/extensions/pykrita/src/engine.cpp
M +4 -5 krita/plugins/extensions/pykrita/src/plugin.cpp
http://commits.kde.org/krita/7c5cb3b9f5240cb915c9f0e9f08cff8e2b0d1fce
diff --git a/krita/plugins/extensions/pykrita/src/engine.cpp \
b/krita/plugins/extensions/pykrita/src/engine.cpp index 6cabaaa..101407e 100644
--- a/krita/plugins/extensions/pykrita/src/engine.cpp
+++ b/krita/plugins/extensions/pykrita/src/engine.cpp
@@ -717,9 +717,11 @@ void PyKrita::Engine::setEnabledPlugins(const QStringList& \
enabled_plugins)
void PyKrita::Engine::tryLoadEnabledPlugins()
{
- for (int i = 0; i < m_plugins.size(); ++i)
- if (m_plugins[i].isEnabled() && ! m_plugins[i].isBroken())
+ for (int i = 0; i < m_plugins.size(); ++i) {
+ if (m_plugins[i].isEnabled() && ! m_plugins[i].isBroken()) {
loadModule(i);
+ }
+ }
}
void PyKrita::Engine::loadModule(const int idx)
diff --git a/krita/plugins/extensions/pykrita/src/plugin.cpp \
b/krita/plugins/extensions/pykrita/src/plugin.cpp index 02b192c..9aba275 100644
--- a/krita/plugins/extensions/pykrita/src/plugin.cpp
+++ b/krita/plugins/extensions/pykrita/src/plugin.cpp
@@ -54,14 +54,13 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const \
QVariantList &) PyKrita::Python py = PyKrita::Python();
PyObject* pykritaPackage = py.moduleImport("pykrita");
pykritaPackage = py.moduleImport("krita");
- if (pykritaPackage)
- {
- dbgKrita << "Loaded pykrita, now load plugins";
+
+ if (pykritaPackage) {
+ dbgScript << "Loaded pykrita, now load plugins";
m_engine.tryLoadEnabledPlugins();
py.functionCall("_pykritaLoaded", PyKrita::Python::PYKRITA_ENGINE);
}
- else
- {
+ else {
dbgScript << "Cannot load pykrita module";
m_engine.setBroken();
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic