[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/krita-scripting-rempt] krita/plugins/extensions/pykrita/src: Initialize the pykrita/krita 
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2014-07-29 14:03:43
Message-ID: E1XC80F-0003UD-Tq () scm ! kde ! org
[Download RAW message or body]

Git commit b4ebc00490f920805008370fb039fe9200059aa8 by Boudewijn Rempt.
Committed on 29/07/2014 at 12:41.
Pushed by rempt into branch 'krita-scripting-rempt'.

Initialize the pykrita/krita modules correctly.

M  +1    -1    krita/plugins/extensions/pykrita/src/engine.cpp
M  +10   -0    krita/plugins/extensions/pykrita/src/krita/__init__.py
M  +1    -1    krita/plugins/extensions/pykrita/src/plugin.cpp

http://commits.kde.org/calligra/b4ebc00490f920805008370fb039fe9200059aa8

diff --git a/krita/plugins/extensions/pykrita/src/engine.cpp \
b/krita/plugins/extensions/pykrita/src/engine.cpp index fd43174..86c9fff 100644
--- a/krita/plugins/extensions/pykrita/src/engine.cpp
+++ b/krita/plugins/extensions/pykrita/src/engine.cpp
@@ -755,7 +755,7 @@ void PyKrita::Engine::loadModule(const int idx)
         if (ins_result == 0) {
             // Initialize the module from Python's side
             PyObject* const args = Py_BuildValue("(s)", PQ(module_name));
-            PyObject* result = py.functionCall("_pluginLoaded", \
"Python::PYKRITA_ENGINE", args); +            PyObject* result = \
py.functionCall("_pluginLoaded", Python::PYKRITA_ENGINE, args);  Py_DECREF(args);
             if (result)
                 return;                                     // Success!
diff --git a/krita/plugins/extensions/pykrita/src/krita/__init__.py \
b/krita/plugins/extensions/pykrita/src/krita/__init__.py index 07cffa0..1c9a9d5 \
                100644
--- a/krita/plugins/extensions/pykrita/src/krita/__init__.py
+++ b/krita/plugins/extensions/pykrita/src/krita/__init__.py
@@ -1,4 +1,7 @@
 import pykrita
+import os
+import sys
+
 
 def pykritaEventHandler(event):
     def _decorator(func):
@@ -6,6 +9,13 @@ def pykritaEventHandler(event):
         del func
     return _decorator
 
+def kDebug(text):
+    '''Use KDE way to show debug info
+
+        TODO Add a way to control debug output from partucular plugins (?)
+    '''
+    plugin = sys._getframe(1).f_globals['__name__']
+    pykrita.kDebug('{}: {}'.format(plugin, text))
 
 
 @pykritaEventHandler('_pluginLoaded')
diff --git a/krita/plugins/extensions/pykrita/src/plugin.cpp \
b/krita/plugins/extensions/pykrita/src/plugin.cpp index f25b3f0..e767545 100644
--- a/krita/plugins/extensions/pykrita/src/plugin.cpp
+++ b/krita/plugins/extensions/pykrita/src/plugin.cpp
@@ -60,7 +60,7 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const \
QVariantList &)  {
         dbgKrita << "Loaded pykrita, now load plugins";
         m_engine.tryLoadEnabledPlugins();
-        py.functionCall("_pykritaLoaded", "krita");
+        py.functionCall("_pykritaLoaded", PyKrita::Python::PYKRITA_ENGINE);
     }
     else
     {


[prev in list] [next in list] [prev in thread] [next in thread]