[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: Assume that python plugins ar
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2014-07-31 9:30:37
Message-ID: E1XCmh3-0005Sh-LY () scm ! kde ! org
[Download RAW message or body]

Git commit 5d2ea65edf57e0d541c7e14dbf967dde9a59ba8a by Boudewijn Rempt.
Committed on 31/07/2014 at 09:27.
Pushed by rempt into branch 'krita-scripting-rempt'.

Assume that python plugins are enabled

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

http://commits.kde.org/calligra/5d2ea65edf57e0d541c7e14dbf967dde9a59ba8a

diff --git a/krita/plugins/extensions/pykrita/src/engine.cpp \
b/krita/plugins/extensions/pykrita/src/engine.cpp index 101407e..05f6b66 100644
--- a/krita/plugins/extensions/pykrita/src/engine.cpp
+++ b/krita/plugins/extensions/pykrita/src/engine.cpp
@@ -391,8 +391,9 @@ QStringList PyKrita::Engine::enabledPlugins() const
     /// filtered and transformed view from boost
     QStringList result;
     Q_FOREACH(const PluginState & plugin, m_plugins)
-    if (plugin.isEnabled())
+    if (plugin.isEnabled()) {
         result.append(plugin.m_service->name());
+    }
     return result;
 }
 
@@ -711,14 +712,19 @@ void PyKrita::Engine::scanPlugins()
 
 void PyKrita::Engine::setEnabledPlugins(const QStringList& enabled_plugins)
 {
-    for (int i = 0; i < m_plugins.size(); ++i)
+    for (int i = 0; i < m_plugins.size(); ++i) {
         m_plugins[i].m_enabled = \
enabled_plugins.indexOf(m_plugins[i].m_service->name()) != -1; +    }
 }
 
 void PyKrita::Engine::tryLoadEnabledPlugins()
 {
     for (int i = 0; i < m_plugins.size(); ++i) {
-        if (m_plugins[i].isEnabled() && ! m_plugins[i].isBroken()) {
+        dbgScript << "Trying to load plugin" << m_plugins[i].pythonModuleName()
+                  << ". Enabled:" << m_plugins[i].isEnabled()
+                  << ". Broken: " << m_plugins[i].isBroken();
+        if (!m_plugins[i].isBroken()) {
+            m_plugins[i].m_enabled = true;
             loadModule(i);
         }
     }
@@ -760,8 +766,8 @@ void PyKrita::Engine::loadModule(const int idx)
             PyObject* result = py.functionCall("_pluginLoaded", \
Python::PYKRITA_ENGINE, args);  Py_DECREF(args);
             if (result) {
+                dbgScript << "\t" << "success!";
                 return;
-                // Success!
             }
         }
         plugin.m_errorReason = i18nc("@info:tooltip", "Internal engine failure");
diff --git a/krita/plugins/extensions/pykrita/src/plugins/hello/__init__.py \
b/krita/plugins/extensions/pykrita/src/plugins/hello/__init__.py index \
                43dc36c..de744cb 100644
--- a/krita/plugins/extensions/pykrita/src/plugins/hello/__init__.py
+++ b/krita/plugins/extensions/pykrita/src/plugins/hello/__init__.py
@@ -1 +1,2 @@
 # let's make a module
+from .hello import *
diff --git a/krita/plugins/extensions/pykrita/src/plugins/hello/hello.py \
b/krita/plugins/extensions/pykrita/src/plugins/hello/hello.py index 65768b4..3db2975 \
                100644
--- a/krita/plugins/extensions/pykrita/src/plugins/hello/hello.py
+++ b/krita/plugins/extensions/pykrita/src/plugins/hello/hello.py
@@ -1,9 +1,10 @@
 from PyQt4.QtGui import *
 from PyKrita4.krita import *
-from krita import *
+
+import krita
 
 def hello():
     QMessageBox.information(QWidget(), "Test", "Hello World")
 
-QAction ac = Krita.createAction("Hello")
-ac.triggered.conect(hello)
+ac = Krita().createAction("Hello")
+ac.triggered.connect(hello)


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