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

List:       kde-commits
Subject:    [krita/berger-scripting] krita/plugins/extensions/pykrita/src: Assume that python plugins are enable
From:       Cyrille Berger <cberger () cberger ! net>
Date:       2015-12-09 21:13:30
Message-ID: E1a6m3G-0005XC-Ev () scm ! kde ! org
[Download RAW message or body]

Git commit fa2cbbf70b254460978c5df75db221282ba6d1e9 by Cyrille Berger, on behalf of Boudewijn \
Rempt. Committed on 09/12/2015 at 19:42.
Pushed by berger into branch 'berger-scripting'.

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/krita/fa2cbbf70b254460978c5df75db221282ba6d1e9

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]