diff options
Diffstat (limited to 'chalk/plugins/viewplugins/scripting')
12 files changed, 37 insertions, 37 deletions
diff --git a/chalk/plugins/viewplugins/scripting/Makefile.am b/chalk/plugins/viewplugins/scripting/Makefile.am index 39c37392..7d7e76b8 100644 --- a/chalk/plugins/viewplugins/scripting/Makefile.am +++ b/chalk/plugins/viewplugins/scripting/Makefile.am @@ -1,9 +1,9 @@ -SUBDIRS = chaltdescripting chalkcore samples +SUBDIRS = chalkscripting chalkcore samples chalkrcdir = $(kde_datadir)/chalkplugins chalkrc_DATA = scripting.rc -kde_services_DATA = chaltdescripting.desktop +kde_services_DATA = chalkscripting.desktop INCLUDES = -I$(top_srcdir)/chalk/sdk \ @@ -15,17 +15,17 @@ INCLUDES = -I$(top_srcdir)/chalk/sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chaltdescripting_la_SOURCES = scripting.cc +chalkscripting_la_SOURCES = scripting.cc -kde_module_LTLIBRARIES = chaltdescripting.la +kde_module_LTLIBRARIES = chalkscripting.la noinst_HEADERS = scripting.h -chaltdescripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chaltdescripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chaltdescripting/libchaltdescripting.la \ +chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalkscripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la KDE_CXXFLAGS = $(USE_EXCEPTIONS) -chaltdescripting_la_METASOURCES = AUTO +chalkscripting_la_METASOURCES = AUTO diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am index b56a3d06..570154ba 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am +++ b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/chalk/plugins/viewplugins/scripting/chaltdescripting \ +INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/chalk/plugins/viewplugins/scripting/chalkscripting \ -I$(top_srcdir)/chalk $(KOFFICECORE_INCLUDES) $(KROSS_INCLUDES) \ -I$(top_srcdir)/chalk/ui -I$(top_srcdir)/chalk/core -I$(top_srcdir)/chalk/sdk \ -I$(top_srcdir)/chalk/chalkcolor $(all_includes) @@ -19,7 +19,7 @@ krosschalkcore_la_LIBADD = \ $(top_builddir)/lib/kross/api/libkrossapi.la \ $(top_builddir)/lib/kross/main/libkrossmain.la \ $(top_builddir)/chalk/libchalkcommon.la \ - $(top_builddir)/chalk/plugins/viewplugins/scripting/chaltdescripting/libchaltdescripting.la \ + $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la \ ../../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../../chalk/core/libchalkimage.la \ ../../../../../chalk/ui/libchalkui.la diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp index d137ab8c..45c1705a 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp @@ -247,11 +247,11 @@ ChalkCoreModule::ChalkCoreModule(Kross::Api::Manager* manager) } // Wrap ChalkScriptProgress TQString packagePath; - Kross::Api::Object::Ptr chaltdescriptprogress = manager->getChild("ChalkScriptProgress"); + Kross::Api::Object::Ptr chalkscriptprogress = manager->getChild("ChalkScriptProgress"); if(chalkdocument) { - Kross::Api::QtObject* chaltdescriptprogressqt = (Kross::Api::QtObject*)( chaltdescriptprogress.data() ); - if(chaltdescriptprogressqt) { - ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( chaltdescriptprogressqt->getObject() ); + Kross::Api::QtObject* chalkscriptprogressqt = (Kross::Api::QtObject*)( chalkscriptprogress.data() ); + if(chalkscriptprogressqt) { + ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( chalkscriptprogressqt->getObject() ); scriptprogress->activateAsSubject(); packagePath = scriptprogress->packagePath(); if(scriptprogress) { diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop b/chalk/plugins/viewplugins/scripting/chalkscripting.desktop index c4267097..eba3ea37 100644 --- a/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop +++ b/chalk/plugins/viewplugins/scripting/chalkscripting.desktop @@ -77,5 +77,5 @@ Comment[zh_CN]=允许执行脚本 Comment[zh_TW]=允許執行命令稿 ServiceTypes=Chalk/ViewPlugin Type=Service -X-TDE-Library=chaltdescripting +X-TDE-Library=chalkscripting X-Chalk-Version=2 diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am new file mode 100644 index 00000000..b805ef18 --- /dev/null +++ b/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am @@ -0,0 +1,19 @@ +INCLUDES = -I$(top_srcdir)/chalk/sdk \ + -I$(top_srcdir)/chalk/core \ + -I$(top_srcdir)/chalk/chalkcolor/ \ + -I$(top_srcdir)/chalk/ui \ + $(KROSS_INCLUDES) \ + $(KOFFICE_INCLUDES) \ + $(all_includes) + + +lib_LTLIBRARIES = libchalkscripting.la +libchalkscripting_la_SOURCES = kis_script_progress.cpp kis_script_monitor.cpp +noinst_HEADERS = kis_script_progress.h + +libchalkscripting_la_LDFLAGS = -no-undefined $(all_libraries) +libchalkscripting_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la + +KDE_CXXFLAGS = $(USE_EXCEPTIONS) + +libchalkscripting_la_METASOURCES = AUTO diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp index 3967ffe7..3967ffe7 100644 --- a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h index b2495d8b..b2495d8b 100644 --- a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h +++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp index d7af4eb4..d7af4eb4 100644 --- a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp +++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h index 48af433c..48af433c 100644 --- a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h +++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am b/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am deleted file mode 100644 index a38d8df0..00000000 --- a/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -INCLUDES = -I$(top_srcdir)/chalk/sdk \ - -I$(top_srcdir)/chalk/core \ - -I$(top_srcdir)/chalk/chalkcolor/ \ - -I$(top_srcdir)/chalk/ui \ - $(KROSS_INCLUDES) \ - $(KOFFICE_INCLUDES) \ - $(all_includes) - - -lib_LTLIBRARIES = libchaltdescripting.la -libchaltdescripting_la_SOURCES = kis_script_progress.cpp kis_script_monitor.cpp -noinst_HEADERS = kis_script_progress.h - -libchaltdescripting_la_LDFLAGS = -no-undefined $(all_libraries) -libchaltdescripting_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la - -KDE_CXXFLAGS = $(USE_EXCEPTIONS) - -libchaltdescripting_la_METASOURCES = AUTO diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc index 1a795434..c7e1db5f 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.cc +++ b/chalk/plugins/viewplugins/scripting/scripting.cc @@ -48,11 +48,11 @@ #include <kis_image.h> #include <kis_layer.h> -#include "chaltdescripting/kis_script_progress.h" -#include "chaltdescripting/kis_script_monitor.h" +#include "chalkscripting/kis_script_progress.h" +#include "chalkscripting/kis_script_monitor.h" typedef KGenericFactory<Scripting> ChalkScriptingFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdescripting, ChalkScriptingFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalkscripting, ChalkScriptingFactory( "chalk" ) ) Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) diff --git a/chalk/plugins/viewplugins/scripting/scripting.rc b/chalk/plugins/viewplugins/scripting/scripting.rc index b4978b4c..1b4999df 100644 --- a/chalk/plugins/viewplugins/scripting/scripting.rc +++ b/chalk/plugins/viewplugins/scripting/scripting.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui library="chaltdescripting" version="3"> +<kpartgui library="chalkscripting" version="3"> <MenuBar> <Menu name="Scripts"><text>S&cripts</text> <Separator/> |