[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/krita-scripting-rempt] krita/plugins/extensions: rename to pykrita
From: Boudewijn Rempt <boud () valdyas ! org>
Date: 2014-07-29 14:03:43
Message-ID: E1XC80F-0003UD-Hv () scm ! kde ! org
[Download RAW message or body]
Git commit 8ef6c592a97d7dda43c81f926c9b9dfaf85a0e13 by Boudewijn Rempt.
Committed on 29/07/2014 at 12:34.
Pushed by rempt into branch 'krita-scripting-rempt'.
rename to pykrita
M +1 -1 krita/plugins/extensions/CMakeLists.txt
R +1 -1 krita/plugins/extensions/pykrita/CMakeLists.txt [from: \
krita/plugins/extensions/pyqt/CMakeLists.txt - 090% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/CMakeLists.txt [from: \
krita/plugins/extensions/pyqt/libkis/CMakeLists.txt - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/application.cpp [from: \
krita/plugins/extensions/pyqt/libkis/application.cpp - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/application.h [from: \
krita/plugins/extensions/pyqt/libkis/application.h - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/document.cpp [from: \
krita/plugins/extensions/pyqt/libkis/document.cpp - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/document.h [from: \
krita/plugins/extensions/pyqt/libkis/document.h - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/image.cpp [from: \
krita/plugins/extensions/pyqt/libkis/image.cpp - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/image.h [from: \
krita/plugins/extensions/pyqt/libkis/image.h - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/mainwindow.cpp [from: \
krita/plugins/extensions/pyqt/libkis/mainwindow.cpp - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/mainwindow.h [from: \
krita/plugins/extensions/pyqt/libkis/mainwindow.h - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/module.cpp [from: \
krita/plugins/extensions/pyqt/libkis/module.cpp - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/module.h [from: \
krita/plugins/extensions/pyqt/libkis/module.h - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/node.cpp [from: \
krita/plugins/extensions/pyqt/libkis/node.cpp - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/node.h [from: \
krita/plugins/extensions/pyqt/libkis/node.h - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/view.cpp [from: \
krita/plugins/extensions/pyqt/libkis/view.cpp - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/libkis/view.h [from: \
krita/plugins/extensions/pyqt/libkis/view.h - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/sip/CMakeLists.txt [from: \
krita/plugins/extensions/pyqt/sip/CMakeLists.txt - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/sip/__init__.py [from: \
krita/plugins/extensions/pyqt/sip/__init__.py - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/sip/krita/application.sip [from: \
krita/plugins/extensions/pyqt/sip/krita/application.sip - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/sip/krita/document.sip [from: \
krita/plugins/extensions/pyqt/sip/krita/document.sip - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/sip/krita/image.sip [from: \
krita/plugins/extensions/pyqt/sip/krita/image.sip - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/sip/krita/kritamod.sip [from: \
krita/plugins/extensions/pyqt/sip/krita/kritamod.sip - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/sip/krita/mainwindow.sip [from: \
krita/plugins/extensions/pyqt/sip/krita/mainwindow.sip - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/sip/krita/module.sip [from: \
krita/plugins/extensions/pyqt/sip/krita/module.sip - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/sip/krita/node.sip [from: \
krita/plugins/extensions/pyqt/sip/krita/node.sip - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/sip/krita/view.sip [from: \
krita/plugins/extensions/pyqt/sip/krita/view.sip - 100% similarity] R +4 -4 \
krita/plugins/extensions/pykrita/src/CMakeLists.txt [from: \
krita/plugins/extensions/pyqt/src/CMakeLists.txt - 082% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/config.h.cmake [from: \
krita/plugins/extensions/pyqt/src/config.h.cmake - 100% similarity] R +13 -8 \
krita/plugins/extensions/pykrita/src/engine.cpp [from: \
krita/plugins/extensions/pyqt/src/engine.cpp - 098% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/engine.h [from: krita/plugins/extensions/pyqt/src/engine.h \
- 100% similarity] R +0 -0 krita/plugins/extensions/pykrita/src/info.ui [from: \
krita/plugins/extensions/pyqt/src/info.ui - 100% similarity] R +14 -6 \
krita/plugins/extensions/pykrita/src/krita/__init__.py [from: \
krita/plugins/extensions/pyqt/src/krita/__init__.py - 058% similarity] R +1 -1 \
krita/plugins/extensions/pykrita/src/kritapyqt.desktop [from: \
krita/plugins/extensions/pyqt/src/kritapyqt.desktop - 080% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/kritapyqtplugin.desktop [from: \
krita/plugins/extensions/pyqt/src/kritapyqtplugin.desktop - 100% similarity] R +1 -1 \
krita/plugins/extensions/pykrita/src/kritapyqtplugin.rc [from: \
krita/plugins/extensions/pyqt/src/kritapyqtplugin.rc - 059% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/manager.ui [from: \
krita/plugins/extensions/pyqt/src/manager.ui - 100% similarity] R +5 -2 \
krita/plugins/extensions/pykrita/src/plugin.cpp [from: \
krita/plugins/extensions/pyqt/src/plugin.cpp - 091% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/plugin.h [from: krita/plugins/extensions/pyqt/src/plugin.h \
- 100% similarity] R +0 -0 krita/plugins/extensions/pykrita/src/plugins/CMakeLists.txt \
[from: krita/plugins/extensions/pyqt/src/plugins/CMakeLists.txt - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/plugins/hello/__init__.py [from: \
krita/plugins/extensions/pyqt/src/plugins/hello/__init__.py - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/plugins/hello/hello.py [from: \
krita/plugins/extensions/pyqt/src/plugins/hello/hello.py - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/plugins/hello/hello_ui.rc [from: \
krita/plugins/extensions/pyqt/src/plugins/hello/hello_ui.rc - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/plugins/hello/kritapykrita_hello.desktop [from: \
krita/plugins/extensions/pyqt/src/plugins/hello/kritapykrita_hello.desktop - 100% similarity] R \
+1 -1 krita/plugins/extensions/pykrita/src/pyqtpluginsettings.cpp [from: \
krita/plugins/extensions/pyqt/src/pyqtpluginsettings.cpp - 098% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/pyqtpluginsettings.h [from: \
krita/plugins/extensions/pyqt/src/pyqtpluginsettings.h - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/test/CMakeLists.txt [from: \
krita/plugins/extensions/pyqt/src/test/CMakeLists.txt - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/test/version_checker_test.cpp [from: \
krita/plugins/extensions/pyqt/src/test/version_checker_test.cpp - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/test/version_checker_test.h [from: \
krita/plugins/extensions/pyqt/src/test/version_checker_test.h - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/utilities.cpp [from: \
krita/plugins/extensions/pyqt/src/utilities.cpp - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/utilities.h [from: \
krita/plugins/extensions/pyqt/src/utilities.h - 100% similarity] R +0 -0 \
krita/plugins/extensions/pykrita/src/version_checker.h [from: \
krita/plugins/extensions/pyqt/src/version_checker.h - 100% similarity]
http://commits.kde.org/calligra/8ef6c592a97d7dda43c81f926c9b9dfaf85a0e13
diff --git a/krita/plugins/extensions/CMakeLists.txt b/krita/plugins/extensions/CMakeLists.txt
index 4c2a9b0..2593d80 100644
--- a/krita/plugins/extensions/CMakeLists.txt
+++ b/krita/plugins/extensions/CMakeLists.txt
@@ -14,7 +14,7 @@ add_subdirectory( separate_channels )
add_subdirectory( shearimage )
add_subdirectory( dockers )
add_subdirectory( layergroupswitcher )
-add_subdirectory( pyqt )
+add_subdirectory( pykrita )
option(WITH_RESOURCE_MANAGER "Build the experimental resource manager" OFF)
if (WITH_RESOURCE_MANAGER)
diff --git a/krita/plugins/extensions/pyqt/CMakeLists.txt \
b/krita/plugins/extensions/pykrita/CMakeLists.txt similarity index 90%
rename from krita/plugins/extensions/pyqt/CMakeLists.txt
rename to krita/plugins/extensions/pykrita/CMakeLists.txt
index 02d2d1c..45b6329 100644
--- a/krita/plugins/extensions/pyqt/CMakeLists.txt
+++ b/krita/plugins/extensions/pykrita/CMakeLists.txt
@@ -13,7 +13,7 @@ macro_bool_to_01(PYQT4_FOUND HAVE_PYQT4)
if (HAVE_PYQT4 AND HAVE_SIP AND HAVE_PYTHONLIBS)
if (NOT EXISTS ${PYQT4_SIP_DIR}/QtCore/QtCoremod.sip)
- message(WARNING "krita-pyqt plugin needs the PyQt4 development sip file QtCoremod.sip")
+ message(WARNING "krita-pykrita plugin needs the PyQt4 development sip file QtCoremod.sip")
return()
endif()
diff --git a/krita/plugins/extensions/pyqt/libkis/CMakeLists.txt \
b/krita/plugins/extensions/pykrita/libkis/CMakeLists.txt similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/CMakeLists.txt
rename to krita/plugins/extensions/pykrita/libkis/CMakeLists.txt
diff --git a/krita/plugins/extensions/pyqt/libkis/application.cpp \
b/krita/plugins/extensions/pykrita/libkis/application.cpp similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/application.cpp
rename to krita/plugins/extensions/pykrita/libkis/application.cpp
diff --git a/krita/plugins/extensions/pyqt/libkis/application.h \
b/krita/plugins/extensions/pykrita/libkis/application.h similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/application.h
rename to krita/plugins/extensions/pykrita/libkis/application.h
diff --git a/krita/plugins/extensions/pyqt/libkis/document.cpp \
b/krita/plugins/extensions/pykrita/libkis/document.cpp similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/document.cpp
rename to krita/plugins/extensions/pykrita/libkis/document.cpp
diff --git a/krita/plugins/extensions/pyqt/libkis/document.h \
b/krita/plugins/extensions/pykrita/libkis/document.h similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/document.h
rename to krita/plugins/extensions/pykrita/libkis/document.h
diff --git a/krita/plugins/extensions/pyqt/libkis/image.cpp \
b/krita/plugins/extensions/pykrita/libkis/image.cpp similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/image.cpp
rename to krita/plugins/extensions/pykrita/libkis/image.cpp
diff --git a/krita/plugins/extensions/pyqt/libkis/image.h \
b/krita/plugins/extensions/pykrita/libkis/image.h similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/image.h
rename to krita/plugins/extensions/pykrita/libkis/image.h
diff --git a/krita/plugins/extensions/pyqt/libkis/mainwindow.cpp \
b/krita/plugins/extensions/pykrita/libkis/mainwindow.cpp similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/mainwindow.cpp
rename to krita/plugins/extensions/pykrita/libkis/mainwindow.cpp
diff --git a/krita/plugins/extensions/pyqt/libkis/mainwindow.h \
b/krita/plugins/extensions/pykrita/libkis/mainwindow.h similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/mainwindow.h
rename to krita/plugins/extensions/pykrita/libkis/mainwindow.h
diff --git a/krita/plugins/extensions/pyqt/libkis/module.cpp \
b/krita/plugins/extensions/pykrita/libkis/module.cpp similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/module.cpp
rename to krita/plugins/extensions/pykrita/libkis/module.cpp
diff --git a/krita/plugins/extensions/pyqt/libkis/module.h \
b/krita/plugins/extensions/pykrita/libkis/module.h similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/module.h
rename to krita/plugins/extensions/pykrita/libkis/module.h
diff --git a/krita/plugins/extensions/pyqt/libkis/node.cpp \
b/krita/plugins/extensions/pykrita/libkis/node.cpp similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/node.cpp
rename to krita/plugins/extensions/pykrita/libkis/node.cpp
diff --git a/krita/plugins/extensions/pyqt/libkis/node.h \
b/krita/plugins/extensions/pykrita/libkis/node.h similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/node.h
rename to krita/plugins/extensions/pykrita/libkis/node.h
diff --git a/krita/plugins/extensions/pyqt/libkis/view.cpp \
b/krita/plugins/extensions/pykrita/libkis/view.cpp similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/view.cpp
rename to krita/plugins/extensions/pykrita/libkis/view.cpp
diff --git a/krita/plugins/extensions/pyqt/libkis/view.h \
b/krita/plugins/extensions/pykrita/libkis/view.h similarity index 100%
rename from krita/plugins/extensions/pyqt/libkis/view.h
rename to krita/plugins/extensions/pykrita/libkis/view.h
diff --git a/krita/plugins/extensions/pyqt/sip/CMakeLists.txt \
b/krita/plugins/extensions/pykrita/sip/CMakeLists.txt similarity index 100%
rename from krita/plugins/extensions/pyqt/sip/CMakeLists.txt
rename to krita/plugins/extensions/pykrita/sip/CMakeLists.txt
diff --git a/krita/plugins/extensions/pyqt/sip/__init__.py \
b/krita/plugins/extensions/pykrita/sip/__init__.py similarity index 100%
rename from krita/plugins/extensions/pyqt/sip/__init__.py
rename to krita/plugins/extensions/pykrita/sip/__init__.py
diff --git a/krita/plugins/extensions/pyqt/sip/krita/application.sip \
b/krita/plugins/extensions/pykrita/sip/krita/application.sip similarity index 100%
rename from krita/plugins/extensions/pyqt/sip/krita/application.sip
rename to krita/plugins/extensions/pykrita/sip/krita/application.sip
diff --git a/krita/plugins/extensions/pyqt/sip/krita/document.sip \
b/krita/plugins/extensions/pykrita/sip/krita/document.sip similarity index 100%
rename from krita/plugins/extensions/pyqt/sip/krita/document.sip
rename to krita/plugins/extensions/pykrita/sip/krita/document.sip
diff --git a/krita/plugins/extensions/pyqt/sip/krita/image.sip \
b/krita/plugins/extensions/pykrita/sip/krita/image.sip similarity index 100%
rename from krita/plugins/extensions/pyqt/sip/krita/image.sip
rename to krita/plugins/extensions/pykrita/sip/krita/image.sip
diff --git a/krita/plugins/extensions/pyqt/sip/krita/kritamod.sip \
b/krita/plugins/extensions/pykrita/sip/krita/kritamod.sip similarity index 100%
rename from krita/plugins/extensions/pyqt/sip/krita/kritamod.sip
rename to krita/plugins/extensions/pykrita/sip/krita/kritamod.sip
diff --git a/krita/plugins/extensions/pyqt/sip/krita/mainwindow.sip \
b/krita/plugins/extensions/pykrita/sip/krita/mainwindow.sip similarity index 100%
rename from krita/plugins/extensions/pyqt/sip/krita/mainwindow.sip
rename to krita/plugins/extensions/pykrita/sip/krita/mainwindow.sip
diff --git a/krita/plugins/extensions/pyqt/sip/krita/module.sip \
b/krita/plugins/extensions/pykrita/sip/krita/module.sip similarity index 100%
rename from krita/plugins/extensions/pyqt/sip/krita/module.sip
rename to krita/plugins/extensions/pykrita/sip/krita/module.sip
diff --git a/krita/plugins/extensions/pyqt/sip/krita/node.sip \
b/krita/plugins/extensions/pykrita/sip/krita/node.sip similarity index 100%
rename from krita/plugins/extensions/pyqt/sip/krita/node.sip
rename to krita/plugins/extensions/pykrita/sip/krita/node.sip
diff --git a/krita/plugins/extensions/pyqt/sip/krita/view.sip \
b/krita/plugins/extensions/pykrita/sip/krita/view.sip similarity index 100%
rename from krita/plugins/extensions/pyqt/sip/krita/view.sip
rename to krita/plugins/extensions/pykrita/sip/krita/view.sip
diff --git a/krita/plugins/extensions/pyqt/src/CMakeLists.txt \
b/krita/plugins/extensions/pykrita/src/CMakeLists.txt similarity index 82%
rename from krita/plugins/extensions/pyqt/src/CMakeLists.txt
rename to krita/plugins/extensions/pykrita/src/CMakeLists.txt
index a2d7936..a1c7b57 100644
--- a/krita/plugins/extensions/pyqt/src/CMakeLists.txt
+++ b/krita/plugins/extensions/pykrita/src/CMakeLists.txt
@@ -15,16 +15,16 @@ kde4_add_ui_files(SOURCES
manager.ui
)
-kde4_add_plugin(kritapyqt ${SOURCES})
+kde4_add_plugin(kritapykrita ${SOURCES})
target_link_libraries(
- kritapyqt
+ kritapykrita
${PYTHON_LIBRARY}
kritaui
kritalibbrush
)
-install(TARGETS kritapyqt DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kritapykrita DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES kritapyqt.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra)
install(FILES kritapyqtplugin.rc DESTINATION ${DATA_INSTALL_DIR}/kritaplugins)
@@ -33,7 +33,7 @@ install(FILES kritapyqtplugin.desktop DESTINATION \
${SERVICETYPES_INSTALL_DIR}) # Install "built-in" plugins
install(
DIRECTORY krita
- DESTINATION ${DATA_INSTALL_DIR}/krita/plugins/pyqt
+ DESTINATION ${DATA_INSTALL_DIR}/krita/plugins/pykrita
FILES_MATCHING PATTERN "*.py"
)
diff --git a/krita/plugins/extensions/pyqt/src/config.h.cmake \
b/krita/plugins/extensions/pykrita/src/config.h.cmake similarity index 100%
rename from krita/plugins/extensions/pyqt/src/config.h.cmake
rename to krita/plugins/extensions/pykrita/src/config.h.cmake
diff --git a/krita/plugins/extensions/pyqt/src/engine.cpp \
b/krita/plugins/extensions/pykrita/src/engine.cpp similarity index 98%
rename from krita/plugins/extensions/pyqt/src/engine.cpp
rename to krita/plugins/extensions/pykrita/src/engine.cpp
index 0f544b1..fd43174 100644
--- a/krita/plugins/extensions/pyqt/src/engine.cpp
+++ b/krita/plugins/extensions/pykrita/src/engine.cpp
@@ -234,8 +234,9 @@ QString PyKrita::Engine::tryInitializeGetFailureReason()
<< QLatin1String(PYKRITA_PYTHON_SITE_PACKAGES_INSTALL_DIR)
;
dbgScript << "Plugin Directories: " << pluginDirectories;
- if (!py.prependPythonPaths(pluginDirectories))
+ if (!py.prependPythonPaths(pluginDirectories)) {
return i18nc("@info:tooltip ", "Cannot update Python paths");
+ }
PyRun_SimpleString(
"import sip\n"
@@ -466,15 +467,15 @@ bool PyKrita::Engine::setModuleProperties(PluginState& plugin)
// Find the module:
// 0) try to locate directory based plugin first
KUrl rel_path = QString(Python::PYKRITA_ENGINE);
- qDebug() << rel_path;
+ dbgScript << rel_path;
rel_path.addPath(plugin.moduleFilePathPart());
- qDebug() << rel_path;
+ dbgScript << rel_path;
rel_path.addPath("__init__.py");
- qDebug() << rel_path;
+ dbgScript << rel_path;
QString module_path = KGlobal::dirs()->findResource("appdata", rel_path.toLocalFile());
- qDebug() << module_path;
+ dbgScript << module_path;
if (module_path.isEmpty()) {
// 1) Nothing found, then try file based plugin
@@ -493,6 +494,7 @@ bool PyKrita::Engine::setModuleProperties(PluginState& plugin)
, "Unable to find the module specified \
<application>%1</application>" , plugin.m_service->library()
);
+ dbgScript << "Plugin is " << plugin.m_errorReason;
return false;
}
dbgScript << "Found module path:" << module_path;
@@ -687,15 +689,18 @@ void PyKrita::Engine::scanPlugins()
dbgScript << "Seeking for installed plugins...";
KService::List services = KoServiceLocator::instance()->entries("Krita/PythonPlugin");
Q_FOREACH(KService::Ptr service, services) {
- if (!isServiceUsable(service))
+
+ if (!isServiceUsable(service)) {
+ dbgScript << service->name() << "is not usable";
continue;
+ }
// Make a new state
PluginState plugin;
plugin.m_service = service;
if (!setModuleProperties(plugin)) {
- qDebug() << "Cannot load" << service->name() << ": broken"<< plugin.isBroken() << \
"because:" << plugin.errorReason(); + dbgScript << "Cannot load" << service->name() \
<< ": broken"<< plugin.isBroken() << "because:" << plugin.errorReason(); continue;
}
@@ -750,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/pyqt/src/engine.h \
b/krita/plugins/extensions/pykrita/src/engine.h similarity index 100%
rename from krita/plugins/extensions/pyqt/src/engine.h
rename to krita/plugins/extensions/pykrita/src/engine.h
diff --git a/krita/plugins/extensions/pyqt/src/info.ui \
b/krita/plugins/extensions/pykrita/src/info.ui similarity index 100%
rename from krita/plugins/extensions/pyqt/src/info.ui
rename to krita/plugins/extensions/pykrita/src/info.ui
diff --git a/krita/plugins/extensions/pyqt/src/krita/__init__.py \
b/krita/plugins/extensions/pykrita/src/krita/__init__.py similarity index 58%
rename from krita/plugins/extensions/pyqt/src/krita/__init__.py
rename to krita/plugins/extensions/pykrita/src/krita/__init__.py
index d660f7c..07cffa0 100644
--- a/krita/plugins/extensions/pyqt/src/krita/__init__.py
+++ b/krita/plugins/extensions/pykrita/src/krita/__init__.py
@@ -1,6 +1,14 @@
import pykrita
-@pateEventHandler('_pluginLoaded')
+def pykritaEventHandler(event):
+ def _decorator(func):
+ setattr(pykrita, event, func)
+ del func
+ return _decorator
+
+
+
+@pykritaEventHandler('_pluginLoaded')
def on_load(plugin):
if plugin in init.functions:
# Call registered init functions for the plugin
@@ -9,7 +17,7 @@ def on_load(plugin):
return True
-@pateEventHandler('_pluginUnloading')
+@pykritaEventHandler('_pluginUnloading')
def on_unload(plugin):
if plugin in unload.functions:
# Deinitialize plugin
@@ -18,14 +26,14 @@ def on_unload(plugin):
return True
-@pateEventHandler('_pykritaLoaded')
-def on_pate_loaded():
+@pykritaEventHandler('_pykritaLoaded')
+def on_pykrita_loaded():
kDebug('PYKRITA LOADED')
return True
-@pateEventHandler('_pykritaUnloading')
-def on_pate_unloading():
+@pykritaEventHandler('_pykritaUnloading')
+def on_pykrita_unloading():
kDebug('UNLOADING PYKRITA')
return True
diff --git a/krita/plugins/extensions/pyqt/src/kritapyqt.desktop \
b/krita/plugins/extensions/pykrita/src/kritapyqt.desktop similarity index 80%
rename from krita/plugins/extensions/pyqt/src/kritapyqt.desktop
rename to krita/plugins/extensions/pykrita/src/kritapyqt.desktop
index bf34dbd..28a61f0 100644
--- a/krita/plugins/extensions/pyqt/src/kritapyqt.desktop
+++ b/krita/plugins/extensions/pykrita/src/kritapyqt.desktop
@@ -2,6 +2,6 @@
Name=Python Plugin Manager
X-KDE-ServiceTypes=Krita/ViewPlugin
Type=Service
-X-KDE-Library=kritapyqt
+X-KDE-Library=kritapykrita
X-Krita-Version=28
diff --git a/krita/plugins/extensions/pyqt/src/kritapyqtplugin.desktop \
b/krita/plugins/extensions/pykrita/src/kritapyqtplugin.desktop similarity index 100%
rename from krita/plugins/extensions/pyqt/src/kritapyqtplugin.desktop
rename to krita/plugins/extensions/pykrita/src/kritapyqtplugin.desktop
diff --git a/krita/plugins/extensions/pyqt/src/kritapyqtplugin.rc \
b/krita/plugins/extensions/pykrita/src/kritapyqtplugin.rc similarity index 59%
rename from krita/plugins/extensions/pyqt/src/kritapyqtplugin.rc
rename to krita/plugins/extensions/pykrita/src/kritapyqtplugin.rc
index 18f97a1..c0b4399 100644
--- a/krita/plugins/extensions/pyqt/src/kritapyqtplugin.rc
+++ b/krita/plugins/extensions/pykrita/src/kritapyqtplugin.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui library="kritapyqtplugin" version="7">
+<kpartgui library="kritapykritaplugin" version="7">
<MenuBar>
</MenuBar>
</kpartgui>
diff --git a/krita/plugins/extensions/pyqt/src/manager.ui \
b/krita/plugins/extensions/pykrita/src/manager.ui similarity index 100%
rename from krita/plugins/extensions/pyqt/src/manager.ui
rename to krita/plugins/extensions/pykrita/src/manager.ui
diff --git a/krita/plugins/extensions/pyqt/src/plugin.cpp \
b/krita/plugins/extensions/pykrita/src/plugin.cpp similarity index 91%
rename from krita/plugins/extensions/pyqt/src/plugin.cpp
rename to krita/plugins/extensions/pykrita/src/plugin.cpp
index fedde9f..f25b3f0 100644
--- a/krita/plugins/extensions/pyqt/src/plugin.cpp
+++ b/krita/plugins/extensions/pykrita/src/plugin.cpp
@@ -31,10 +31,12 @@ K_PLUGIN_FACTORY(KritaPyQtPluginFactory, \
registerPlugin<KritaPyQtPlugin>();) K_EXPORT_PLUGIN(KritaPyQtPluginFactory("krita"))
KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
- : KisViewPlugin(parent, "kritaplugins/kritapyqtplugin.rc")
+ : KisViewPlugin(parent, "kritaplugins/kritapykritaplugin.rc")
, m_engineFailureReason(m_engine.tryInitializeGetFailureReason())
, m_autoReload(false)
{
+ qDebug() << ">>>>>>>>>>>>>>>" << m_engineFailureReason;
+
KisPreferenceSetRegistry *preferenceSetRegistry = KisPreferenceSetRegistry::instance();
PyQtPluginSettingsFactory* settingsFactory = new PyQtPluginSettingsFactory(&m_engine);
@@ -53,11 +55,12 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
// Try to import the `pykrita` module
PyKrita::Python py = PyKrita::Python();
PyObject* pykritaPackage = py.moduleImport("pykrita");
+ pykritaPackage = py.moduleImport("krita");
if (pykritaPackage)
{
dbgKrita << "Loaded pykrita, now load plugins";
m_engine.tryLoadEnabledPlugins();
- py.functionCall("_pykritaLoaded");
+ py.functionCall("_pykritaLoaded", "krita");
}
else
{
diff --git a/krita/plugins/extensions/pyqt/src/plugin.h \
b/krita/plugins/extensions/pykrita/src/plugin.h similarity index 100%
rename from krita/plugins/extensions/pyqt/src/plugin.h
rename to krita/plugins/extensions/pykrita/src/plugin.h
diff --git a/krita/plugins/extensions/pyqt/src/plugins/CMakeLists.txt \
b/krita/plugins/extensions/pykrita/src/plugins/CMakeLists.txt similarity index 100%
rename from krita/plugins/extensions/pyqt/src/plugins/CMakeLists.txt
rename to krita/plugins/extensions/pykrita/src/plugins/CMakeLists.txt
diff --git a/krita/plugins/extensions/pyqt/src/plugins/hello/__init__.py \
b/krita/plugins/extensions/pykrita/src/plugins/hello/__init__.py similarity index 100%
rename from krita/plugins/extensions/pyqt/src/plugins/hello/__init__.py
rename to krita/plugins/extensions/pykrita/src/plugins/hello/__init__.py
diff --git a/krita/plugins/extensions/pyqt/src/plugins/hello/hello.py \
b/krita/plugins/extensions/pykrita/src/plugins/hello/hello.py similarity index 100%
rename from krita/plugins/extensions/pyqt/src/plugins/hello/hello.py
rename to krita/plugins/extensions/pykrita/src/plugins/hello/hello.py
diff --git a/krita/plugins/extensions/pyqt/src/plugins/hello/hello_ui.rc \
b/krita/plugins/extensions/pykrita/src/plugins/hello/hello_ui.rc similarity index 100%
rename from krita/plugins/extensions/pyqt/src/plugins/hello/hello_ui.rc
rename to krita/plugins/extensions/pykrita/src/plugins/hello/hello_ui.rc
diff --git a/krita/plugins/extensions/pyqt/src/plugins/hello/kritapykrita_hello.desktop \
b/krita/plugins/extensions/pykrita/src/plugins/hello/kritapykrita_hello.desktop similarity \
index 100% rename from \
krita/plugins/extensions/pyqt/src/plugins/hello/kritapykrita_hello.desktop rename to \
krita/plugins/extensions/pykrita/src/plugins/hello/kritapykrita_hello.desktop
diff --git a/krita/plugins/extensions/pyqt/src/pyqtpluginsettings.cpp \
b/krita/plugins/extensions/pykrita/src/pyqtpluginsettings.cpp similarity index 98%
rename from krita/plugins/extensions/pyqt/src/pyqtpluginsettings.cpp
rename to krita/plugins/extensions/pykrita/src/pyqtpluginsettings.cpp
index e0118cf..589b2a4 100644
--- a/krita/plugins/extensions/pyqt/src/pyqtpluginsettings.cpp
+++ b/krita/plugins/extensions/pykrita/src/pyqtpluginsettings.cpp
@@ -56,7 +56,7 @@ PyQtPluginSettings::~PyQtPluginSettings()
QString PyQtPluginSettings::id()
{
- return QString("pyqtpluginmanager");
+ return QString("pykritapluginmanager");
}
QString PyQtPluginSettings::name()
diff --git a/krita/plugins/extensions/pyqt/src/pyqtpluginsettings.h \
b/krita/plugins/extensions/pykrita/src/pyqtpluginsettings.h similarity index 100%
rename from krita/plugins/extensions/pyqt/src/pyqtpluginsettings.h
rename to krita/plugins/extensions/pykrita/src/pyqtpluginsettings.h
diff --git a/krita/plugins/extensions/pyqt/src/test/CMakeLists.txt \
b/krita/plugins/extensions/pykrita/src/test/CMakeLists.txt similarity index 100%
rename from krita/plugins/extensions/pyqt/src/test/CMakeLists.txt
rename to krita/plugins/extensions/pykrita/src/test/CMakeLists.txt
diff --git a/krita/plugins/extensions/pyqt/src/test/version_checker_test.cpp \
b/krita/plugins/extensions/pykrita/src/test/version_checker_test.cpp similarity index 100%
rename from krita/plugins/extensions/pyqt/src/test/version_checker_test.cpp
rename to krita/plugins/extensions/pykrita/src/test/version_checker_test.cpp
diff --git a/krita/plugins/extensions/pyqt/src/test/version_checker_test.h \
b/krita/plugins/extensions/pykrita/src/test/version_checker_test.h similarity index 100%
rename from krita/plugins/extensions/pyqt/src/test/version_checker_test.h
rename to krita/plugins/extensions/pykrita/src/test/version_checker_test.h
diff --git a/krita/plugins/extensions/pyqt/src/utilities.cpp \
b/krita/plugins/extensions/pykrita/src/utilities.cpp similarity index 100%
rename from krita/plugins/extensions/pyqt/src/utilities.cpp
rename to krita/plugins/extensions/pykrita/src/utilities.cpp
diff --git a/krita/plugins/extensions/pyqt/src/utilities.h \
b/krita/plugins/extensions/pykrita/src/utilities.h similarity index 100%
rename from krita/plugins/extensions/pyqt/src/utilities.h
rename to krita/plugins/extensions/pykrita/src/utilities.h
diff --git a/krita/plugins/extensions/pyqt/src/version_checker.h \
b/krita/plugins/extensions/pykrita/src/version_checker.h similarity index 100%
rename from krita/plugins/extensions/pyqt/src/version_checker.h
rename to krita/plugins/extensions/pykrita/src/version_checker.h
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic