From d39184b18ee1b3e5c96c8fb03e292c4317dd664a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 2 Feb 2013 13:31:35 -0600 Subject: Fix unintended renaming --- chalk/plugins/tools/selectiontools/Makefile.am | 12 +-- .../selectiontools/chalkselectiontools.desktop | 52 ++++++++++++ .../selectiontools/chaltdeselectiontools.desktop | 52 ------------ .../tools/selectiontools/selection_tools.cc | 2 +- chalk/plugins/tools/tool_crop/Makefile.am | 12 +-- .../plugins/tools/tool_crop/chalktoolcrop.desktop | 47 +++++++++++ .../tools/tool_crop/chaltdetoolcrop.desktop | 47 ----------- chalk/plugins/tools/tool_crop/tool_crop.cc | 2 +- chalk/plugins/tools/tool_curves/Makefile.am | 12 +-- .../tools/tool_curves/chalktoolcurves.desktop | 36 +++++++++ .../tools/tool_curves/chaltdetoolcurves.desktop | 36 --------- chalk/plugins/tools/tool_curves/tool_curves.cc | 2 +- chalk/plugins/tools/tool_filter/Makefile.am | 12 +-- .../tools/tool_filter/chalktoolfilter.desktop | 92 ++++++++++++++++++++++ .../tools/tool_filter/chaltdetoolfilter.desktop | 92 ---------------------- chalk/plugins/tools/tool_filter/tool_filter.cc | 2 +- .../plugins/tools/tool_perspectivegrid/Makefile.am | 10 +-- .../chalktoolperspectivegrid.desktop | 35 ++++++++ .../chaltdetoolperspectivegrid.desktop | 35 -------- .../tool_perspectivegrid/tool_perspectivegrid.cc | 2 +- .../tools/tool_perspectivetransform/Makefile.am | 12 +-- .../chalktoolperspectivetransform.desktop | 37 +++++++++ .../chaltdetoolperspectivetransform.desktop | 37 --------- .../tool_perspectivetransform.cc | 2 +- chalk/plugins/tools/tool_polygon/Makefile.am | 12 +-- .../tools/tool_polygon/chalktoolpolygon.desktop | 52 ++++++++++++ .../tools/tool_polygon/chaltdetoolpolygon.desktop | 52 ------------ chalk/plugins/tools/tool_polygon/tool_polygon.cc | 2 +- chalk/plugins/tools/tool_polyline/Makefile.am | 12 +-- .../tools/tool_polyline/chalktoolpolyline.desktop | 49 ++++++++++++ .../tool_polyline/chaltdetoolpolyline.desktop | 49 ------------ chalk/plugins/tools/tool_polyline/tool_polyline.cc | 2 +- chalk/plugins/tools/tool_selectsimilar/Makefile.am | 12 +-- .../chalktoolselectsimilar.desktop | 43 ++++++++++ .../chaltdetoolselectsimilar.desktop | 43 ---------- .../tools/tool_selectsimilar/selectsimilar.cc | 2 +- chalk/plugins/tools/tool_star/Makefile.am | 12 +-- .../plugins/tools/tool_star/chalktoolstar.desktop | 52 ++++++++++++ .../tools/tool_star/chaltdetoolstar.desktop | 52 ------------ chalk/plugins/tools/tool_star/tool_star.cc | 2 +- chalk/plugins/tools/tool_transform/Makefile.am | 12 +-- .../tool_transform/chalktooltransform.desktop | 46 +++++++++++ .../tool_transform/chaltdetooltransform.desktop | 46 ----------- .../plugins/tools/tool_transform/tool_transform.cc | 2 +- chalk/plugins/viewplugins/scripting/Makefile.am | 14 ++-- .../viewplugins/scripting/chalkcore/Makefile.am | 4 +- .../scripting/chalkcore/chalkcoremodule.cpp | 8 +- .../viewplugins/scripting/chalkscripting.desktop | 81 +++++++++++++++++++ .../scripting/chalkscripting/Makefile.am | 19 +++++ .../chalkscripting/kis_script_monitor.cpp | 51 ++++++++++++ .../scripting/chalkscripting/kis_script_monitor.h | 51 ++++++++++++ .../chalkscripting/kis_script_progress.cpp | 64 +++++++++++++++ .../scripting/chalkscripting/kis_script_progress.h | 54 +++++++++++++ .../viewplugins/scripting/chaltdescripting.desktop | 81 ------------------- .../scripting/chaltdescripting/Makefile.am | 19 ----- .../chaltdescripting/kis_script_monitor.cpp | 51 ------------ .../chaltdescripting/kis_script_monitor.h | 51 ------------ .../chaltdescripting/kis_script_progress.cpp | 64 --------------- .../chaltdescripting/kis_script_progress.h | 54 ------------- chalk/plugins/viewplugins/scripting/scripting.cc | 6 +- chalk/plugins/viewplugins/scripting/scripting.rc | 2 +- chalk/plugins/viewplugins/selectopaque/Makefile.am | 12 +-- .../selectopaque/chalkselectopaque.desktop | 26 ++++++ .../selectopaque/chaltdeselectopaque.desktop | 26 ------ .../viewplugins/selectopaque/selectopaque.cc | 2 +- .../viewplugins/selectopaque/selectopaque.rc | 2 +- 66 files changed, 988 insertions(+), 988 deletions(-) create mode 100644 chalk/plugins/tools/selectiontools/chalkselectiontools.desktop delete mode 100644 chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop create mode 100644 chalk/plugins/tools/tool_crop/chalktoolcrop.desktop delete mode 100644 chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop create mode 100644 chalk/plugins/tools/tool_curves/chalktoolcurves.desktop delete mode 100644 chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop create mode 100644 chalk/plugins/tools/tool_filter/chalktoolfilter.desktop delete mode 100644 chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop create mode 100644 chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop delete mode 100644 chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop create mode 100644 chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop delete mode 100644 chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop create mode 100644 chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop delete mode 100644 chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop create mode 100644 chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop delete mode 100644 chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop create mode 100644 chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop delete mode 100644 chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop create mode 100644 chalk/plugins/tools/tool_star/chalktoolstar.desktop delete mode 100644 chalk/plugins/tools/tool_star/chaltdetoolstar.desktop create mode 100644 chalk/plugins/tools/tool_transform/chalktooltransform.desktop delete mode 100644 chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop create mode 100644 chalk/plugins/viewplugins/scripting/chalkscripting.desktop create mode 100644 chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am create mode 100644 chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp create mode 100644 chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h create mode 100644 chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp create mode 100644 chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h delete mode 100644 chalk/plugins/viewplugins/scripting/chaltdescripting.desktop delete mode 100644 chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am delete mode 100644 chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp delete mode 100644 chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h delete mode 100644 chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp delete mode 100644 chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h create mode 100644 chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop delete mode 100644 chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop (limited to 'chalk') diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am index 5bb87983..49d3f571 100644 --- a/chalk/plugins/tools/selectiontools/Makefile.am +++ b/chalk/plugins/tools/selectiontools/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chaltdeselectiontools.desktop +kde_services_DATA = chalkselectiontools.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,13 +9,13 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chaltdeselectiontools_la_SOURCES = kis_tool_move_selection.cc \ +chalkselectiontools_la_SOURCES = kis_tool_move_selection.cc \ kis_tool_select_brush.cc kis_tool_select_contiguous.cc kis_tool_select_elliptical.cc \ kis_tool_select_eraser.cc kis_tool_select_outline.cc kis_tool_select_polygonal.cc \ kis_tool_select_rectangular.cc selection_tools.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chaltdeselectiontools.la +kde_module_LTLIBRARIES = chalkselectiontools.la noinst_HEADERS = \ selection_tools.h \ @@ -28,13 +28,13 @@ noinst_HEADERS = \ kis_tool_select_elliptical.h -chaltdeselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chaltdeselectiontools_la_LIBADD = ../../../libchalkcommon.la \ +chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalkselectiontools_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chaltdeselectiontools_la_METASOURCES = AUTO +chalkselectiontools_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop b/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop new file mode 100644 index 00000000..f005126b --- /dev/null +++ b/chalk/plugins/tools/selectiontools/chalkselectiontools.desktop @@ -0,0 +1,52 @@ +[Desktop Entry] +Name=Selection Tools +Name[bg]=Инструмент за маркиране +Name[br]=Ostilhoù choazh +Name[ca]=Eines de selecció +Name[cy]=Offer Detholi +Name[da]=Markeringsværktøj +Name[de]=Auswahlwerkzeuge +Name[el]=Εργαλεία επιλογής +Name[eo]=Elektado-iloj +Name[es]=Herramientas de selección +Name[et]=Valikutööriistad +Name[eu]=Hautapen-tresnak +Name[fa]=ابزارهای گزینش +Name[fi]=Valintatyökalut +Name[fr]=Outils de sélection +Name[fy]=Seleksje-ark +Name[ga]=Uirlisí Roghnúcháin +Name[gl]=Ferramentas de Selección +Name[he]=כלי בחירה +Name[hu]=Kiválasztó eszközök +Name[is]=Valtól +Name[it]=Strumenti di selezione +Name[ja]=選択ツール +Name[km]=ឧបករណ៍​ជ្រើស​ +Name[lt]=Pažymėjimo įrankiai +Name[lv]=Izvēles rīki +Name[ms]=Alat Pemilihan +Name[nb]=Velgeverktøy +Name[nds]=Utwahlwarktüüch +Name[ne]=चयन उपकरण +Name[nl]=Selectiegereedschappen +Name[nn]=Veljeverktøy +Name[pl]=Narzędzia wyboru +Name[pt]=Ferramentas de Selecção +Name[pt_BR]=Ferramentas de Seleção +Name[ru]=Инструменты выделения +Name[se]=Válljenreaiddut +Name[sk]=Štetec výberu +Name[sl]=Orodja za izbiro +Name[sr]=Алати за избор +Name[sr@Latn]=Alati za izbor +Name[sv]=Markeringsverktyg +Name[uk]=Засоби виділення +Name[uz]=Tanlash vositalari +Name[uz@cyrillic]=Танлаш воситалари +Name[zh_CN]=选择工具 +Name[zh_TW]=選取區工具 +ServiceTypes=Chalk/Tool +Type=Service +X-TDE-Library=chalkselectiontools +X-Chalk-Version=2 diff --git a/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop b/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop deleted file mode 100644 index b18a857a..00000000 --- a/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop +++ /dev/null @@ -1,52 +0,0 @@ -[Desktop Entry] -Name=Selection Tools -Name[bg]=Инструмент за маркиране -Name[br]=Ostilhoù choazh -Name[ca]=Eines de selecció -Name[cy]=Offer Detholi -Name[da]=Markeringsværktøj -Name[de]=Auswahlwerkzeuge -Name[el]=Εργαλεία επιλογής -Name[eo]=Elektado-iloj -Name[es]=Herramientas de selección -Name[et]=Valikutööriistad -Name[eu]=Hautapen-tresnak -Name[fa]=ابزارهای گزینش -Name[fi]=Valintatyökalut -Name[fr]=Outils de sélection -Name[fy]=Seleksje-ark -Name[ga]=Uirlisí Roghnúcháin -Name[gl]=Ferramentas de Selección -Name[he]=כלי בחירה -Name[hu]=Kiválasztó eszközök -Name[is]=Valtól -Name[it]=Strumenti di selezione -Name[ja]=選択ツール -Name[km]=ឧបករណ៍​ជ្រើស​ -Name[lt]=Pažymėjimo įrankiai -Name[lv]=Izvēles rīki -Name[ms]=Alat Pemilihan -Name[nb]=Velgeverktøy -Name[nds]=Utwahlwarktüüch -Name[ne]=चयन उपकरण -Name[nl]=Selectiegereedschappen -Name[nn]=Veljeverktøy -Name[pl]=Narzędzia wyboru -Name[pt]=Ferramentas de Selecção -Name[pt_BR]=Ferramentas de Seleção -Name[ru]=Инструменты выделения -Name[se]=Válljenreaiddut -Name[sk]=Štetec výberu -Name[sl]=Orodja za izbiro -Name[sr]=Алати за избор -Name[sr@Latn]=Alati za izbor -Name[sv]=Markeringsverktyg -Name[uk]=Засоби виділення -Name[uz]=Tanlash vositalari -Name[uz@cyrillic]=Танлаш воситалари -Name[zh_CN]=选择工具 -Name[zh_TW]=選取區工具 -ServiceTypes=Chalk/Tool -Type=Service -X-TDE-Library=chaltdeselectiontools -X-Chalk-Version=2 diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cc index 2fdedc0c..fb0e6191 100644 --- a/chalk/plugins/tools/selectiontools/selection_tools.cc +++ b/chalk/plugins/tools/selectiontools/selection_tools.cc @@ -48,7 +48,7 @@ #include "kis_tool_move_selection.h" typedef KGenericFactory SelectionToolsFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdeselectiontools, SelectionToolsFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalkselectiontools, SelectionToolsFactory( "chalk" ) ) SelectionTools::SelectionTools(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am index fb7bcca7..9f46072e 100644 --- a/chalk/plugins/tools/tool_crop/Makefile.am +++ b/chalk/plugins/tools/tool_crop/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chaltdetoolcrop.desktop +kde_services_DATA = chalktoolcrop.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,25 +9,25 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chaltdetoolcrop_la_SOURCES = \ +chalktoolcrop_la_SOURCES = \ wdg_tool_crop.ui \ tool_crop.cc \ kis_tool_crop.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chaltdetoolcrop.la +kde_module_LTLIBRARIES = chalktoolcrop.la noinst_HEADERS = \ tool_crop.h \ kis_tool_crop.h -chaltdetoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chaltdetoolcrop_la_LIBADD = ../../../libchalkcommon.la \ +chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalktoolcrop_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chaltdetoolcrop_la_METASOURCES = AUTO +chalktoolcrop_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop b/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop new file mode 100644 index 00000000..325fbf78 --- /dev/null +++ b/chalk/plugins/tools/tool_crop/chalktoolcrop.desktop @@ -0,0 +1,47 @@ +[Desktop Entry] +Name=Crop Tool +Name[bg]=Инструмент за изрязване +Name[br]=Ostilh krennañ +Name[ca]=Eina de tall +Name[cy]=Hidlen Docio +Name[da]=Beskæringsværktøj +Name[de]=Zuschneidewerkzeug +Name[el]=Εργαλείο αποκοπής +Name[eo]=Tondado-ilo +Name[es]=Herramienta para recortar +Name[et]=Kärpimistööriist +Name[eu]=Ebaki tresna +Name[fa]=ابزار خط برش +Name[fr]=Outil découpage +Name[fy]=Bysnei-ark +Name[ga]=Uirlis Bhearrtha +Name[gl]=Ferramenta de Recorte +Name[he]=כלי חיתוך +Name[hu]=Levágó eszköz +Name[is]=Sniðtól +Name[it]=Strumento di taglio +Name[ja]=切り取りツール +Name[km]=ឧបករណ៍​ច្រឹប +Name[ms]=Alat Pangkas +Name[nb]=Beskjæringsverktøy +Name[nds]=Tosniedwarktüüch +Name[ne]=उपकरण काटछाँट गर्नुहोस् +Name[nl]=Snijgereedschap +Name[nn]=Beskjæringsverktøy +Name[pl]=Narzędzie przycinania +Name[pt]=Ferramenta de Recorte +Name[pt_BR]=Ferramenta de Recorte +Name[ru]=Обрезка +Name[se]=Čuohpanreaiddut +Name[sk]=Orezávač +Name[sl]=Orodje za obrezavo +Name[sr]=Алат за сасецање +Name[sr@Latn]=Alat za sasecanje +Name[sv]=Beskärningsverktyg +Name[uk]=Засіб обрізування +Name[zh_CN]=裁剪工具 +Name[zh_TW]=剪裁工具 +ServiceTypes=Chalk/Tool +Type=Service +X-TDE-Library=chalktoolcrop +X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop b/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop deleted file mode 100644 index c93b427e..00000000 --- a/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop +++ /dev/null @@ -1,47 +0,0 @@ -[Desktop Entry] -Name=Crop Tool -Name[bg]=Инструмент за изрязване -Name[br]=Ostilh krennañ -Name[ca]=Eina de tall -Name[cy]=Hidlen Docio -Name[da]=Beskæringsværktøj -Name[de]=Zuschneidewerkzeug -Name[el]=Εργαλείο αποκοπής -Name[eo]=Tondado-ilo -Name[es]=Herramienta para recortar -Name[et]=Kärpimistööriist -Name[eu]=Ebaki tresna -Name[fa]=ابزار خط برش -Name[fr]=Outil découpage -Name[fy]=Bysnei-ark -Name[ga]=Uirlis Bhearrtha -Name[gl]=Ferramenta de Recorte -Name[he]=כלי חיתוך -Name[hu]=Levágó eszköz -Name[is]=Sniðtól -Name[it]=Strumento di taglio -Name[ja]=切り取りツール -Name[km]=ឧបករណ៍​ច្រឹប -Name[ms]=Alat Pangkas -Name[nb]=Beskjæringsverktøy -Name[nds]=Tosniedwarktüüch -Name[ne]=उपकरण काटछाँट गर्नुहोस् -Name[nl]=Snijgereedschap -Name[nn]=Beskjæringsverktøy -Name[pl]=Narzędzie przycinania -Name[pt]=Ferramenta de Recorte -Name[pt_BR]=Ferramenta de Recorte -Name[ru]=Обрезка -Name[se]=Čuohpanreaiddut -Name[sk]=Orezávač -Name[sl]=Orodje za obrezavo -Name[sr]=Алат за сасецање -Name[sr@Latn]=Alat za sasecanje -Name[sv]=Beskärningsverktyg -Name[uk]=Засіб обрізування -Name[zh_CN]=裁剪工具 -Name[zh_TW]=剪裁工具 -ServiceTypes=Chalk/Tool -Type=Service -X-TDE-Library=chaltdetoolcrop -X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cc b/chalk/plugins/tools/tool_crop/tool_crop.cc index 9a836ec6..c624d62f 100644 --- a/chalk/plugins/tools/tool_crop/tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/tool_crop.cc @@ -39,7 +39,7 @@ typedef KGenericFactory ToolCropFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdetoolcrop, ToolCropFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalktoolcrop, ToolCropFactory( "chalk" ) ) ToolCrop::ToolCrop(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am index 704a975d..d2ddbf07 100644 --- a/chalk/plugins/tools/tool_curves/Makefile.am +++ b/chalk/plugins/tools/tool_curves/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chaltdetoolcurves.desktop +kde_services_DATA = chalktoolcurves.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,7 +9,7 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chaltdetoolcurves_la_SOURCES = \ +chalktoolcurves_la_SOURCES = \ kis_curve_framework.cc \ kis_tool_curve.cc \ tool_curves.cc \ @@ -21,7 +21,7 @@ chaltdetoolcurves_la_SOURCES = \ kis_tool_moutline.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chaltdetoolcurves.la +kde_module_LTLIBRARIES = chalktoolcurves.la noinst_HEADERS = \ kis_curve_framework.h \ @@ -33,13 +33,13 @@ noinst_HEADERS = \ kis_tool_bezier_select.h \ kis_tool_moutline.h -chaltdetoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chaltdetoolcurves_la_LIBADD = ../../../libchalkcommon.la \ +chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalktoolcurves_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chaltdetoolcurves_la_METASOURCES = AUTO +chalktoolcurves_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop b/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop new file mode 100644 index 00000000..76ea7b29 --- /dev/null +++ b/chalk/plugins/tools/tool_curves/chalktoolcurves.desktop @@ -0,0 +1,36 @@ +[Desktop Entry] +Name=Curves Tool +Name[bg]=Инструмент криви +Name[ca]=Eina de corbes +Name[da]=Kurveværktøj +Name[de]=Kurvenwerkzeug +Name[el]=Εργαλείο καμπύλων +Name[eo]=Kurvado-ilo +Name[es]=Herramienta Curvas +Name[et]=Kõverate tööriist +Name[fa]=ابزار منحنیها +Name[fy]=Krommings-ark +Name[gl]=Ferramenta de Curvas +Name[hu]=Görberajzoló +Name[it]=Strumento curve +Name[ja]=曲線ツール +Name[km]=ឧបករណ៍​ខ្សែ​កោង +Name[nb]=Kurveverktøy +Name[nds]=Bagenwarktüüch +Name[ne]=वक्र उपकरण +Name[nl]=Krommen-gereedschap +Name[pl]=Narzędzie krzywych +Name[pt]=Ferramenta de Curvas +Name[pt_BR]=Ferramenta de Curvas +Name[ru]=Кривые +Name[sk]=Krivky +Name[sl]=Orodje za krivulje +Name[sr]=Алат за криве +Name[sr@Latn]=Alat za krive +Name[sv]=Kurvverktyg +Name[uk]=Криві +Name[zh_TW]=曲線工具 +ServiceTypes=Chalk/Tool +Type=Service +X-TDE-Library=chalktoolcurves +X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop b/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop deleted file mode 100644 index 218abbf4..00000000 --- a/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop +++ /dev/null @@ -1,36 +0,0 @@ -[Desktop Entry] -Name=Curves Tool -Name[bg]=Инструмент криви -Name[ca]=Eina de corbes -Name[da]=Kurveværktøj -Name[de]=Kurvenwerkzeug -Name[el]=Εργαλείο καμπύλων -Name[eo]=Kurvado-ilo -Name[es]=Herramienta Curvas -Name[et]=Kõverate tööriist -Name[fa]=ابزار منحنیها -Name[fy]=Krommings-ark -Name[gl]=Ferramenta de Curvas -Name[hu]=Görberajzoló -Name[it]=Strumento curve -Name[ja]=曲線ツール -Name[km]=ឧបករណ៍​ខ្សែ​កោង -Name[nb]=Kurveverktøy -Name[nds]=Bagenwarktüüch -Name[ne]=वक्र उपकरण -Name[nl]=Krommen-gereedschap -Name[pl]=Narzędzie krzywych -Name[pt]=Ferramenta de Curvas -Name[pt_BR]=Ferramenta de Curvas -Name[ru]=Кривые -Name[sk]=Krivky -Name[sl]=Orodje za krivulje -Name[sr]=Алат за криве -Name[sr@Latn]=Alat za krive -Name[sv]=Kurvverktyg -Name[uk]=Криві -Name[zh_TW]=曲線工具 -ServiceTypes=Chalk/Tool -Type=Service -X-TDE-Library=chaltdetoolcurves -X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cc index 8e32617e..d941c2dc 100644 --- a/chalk/plugins/tools/tool_curves/tool_curves.cc +++ b/chalk/plugins/tools/tool_curves/tool_curves.cc @@ -42,7 +42,7 @@ typedef KGenericFactory ToolCurvesFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdetoolcurves, ToolCurvesFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalktoolcurves, ToolCurvesFactory( "chalk" ) ) ToolCurves::ToolCurves(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am index f8d69952..f775c435 100644 --- a/chalk/plugins/tools/tool_filter/Makefile.am +++ b/chalk/plugins/tools/tool_filter/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chaltdetoolfilter.desktop +kde_services_DATA = chalktoolfilter.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,26 +9,26 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chaltdetoolfilter_la_SOURCES = \ +chalktoolfilter_la_SOURCES = \ kis_filterop.cc \ kis_tool_filter.cc \ tool_filter.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chaltdetoolfilter.la +kde_module_LTLIBRARIES = chalktoolfilter.la noinst_HEADERS = \ kis_filterop.h \ kis_tool_filter.h \ tool_filter.h -chaltdetoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chaltdetoolfilter_la_LIBADD = ../../../libchalkcommon.la \ +chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalktoolfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chaltdetoolfilter_la_METASOURCES = AUTO +chalktoolfilter_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop b/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop new file mode 100644 index 00000000..991709b9 --- /dev/null +++ b/chalk/plugins/tools/tool_filter/chalktoolfilter.desktop @@ -0,0 +1,92 @@ +[Desktop Entry] +Name=Filter Tool +Name[bg]=Инструмент за филтриране +Name[br]=Ostil ar sil +Name[ca]=Eina de filtre +Name[cy]=Erfyn Hidlen +Name[da]=Filterværktøj +Name[de]=Filterwerkzeug +Name[el]=Εργαλείο φίλτρου +Name[eo]=Filtrado-ilo +Name[es]=Herramienta para filtrar +Name[et]=Filtritööriist +Name[eu]=Iragazkia tresna +Name[fa]=ابزار پالایه +Name[fi]=Suodintyökalu +Name[fr]=Outil filtre +Name[fy]=Filter-ark +Name[ga]=Uirlis Scagaire +Name[gl]=Ferramenta de Filtraxe +Name[he]=כלי סינון +Name[hu]=Szűrő eszköz +Name[is]=Síutól +Name[it]=Strumento di filtro +Name[ja]=フィルタツール +Name[km]=ឧបករណ៍​ត្រង +Name[lv]=Filtru rīki +Name[ms]=Alat Penapis +Name[nb]=Filterverktøy +Name[nds]=Filterwarktüüch +Name[ne]=फिल्टर उपकरण +Name[nl]=Filtergereedschap +Name[nn]=Filterverktøy +Name[pl]=Narzędzie filtru +Name[pt]=Ferramenta de Filtragem +Name[pt_BR]=Ferramenta de Filtragem +Name[ru]=Фильтр +Name[se]=Sillenreaidu +Name[sk]=Filter +Name[sl]=Orodje za filtriranje +Name[sr]=Филтерски алат +Name[sr@Latn]=Filterski alat +Name[sv]=Filtreringsverktyg +Name[uk]=Засіб фільтрування +Name[uz]=Filter vositasi +Name[uz@cyrillic]=Филтер воситаси +Name[zh_CN]=过滤工具 +Name[zh_TW]=濾鏡工具 +Comment=Filter tool and paint operation +Comment[bg]=Инструмент за филтриране и рисуване +Comment[ca]=Operació d'eina de filtre i pintura +Comment[cy]=Erfyn hidlen a gweithrediadau paent +Comment[da]=Filterværktøj og maleoperation +Comment[de]=Filterwerkzeug und Maloperation +Comment[el]=Εργαλείο φίλτρου και λειτουργία ζωγραφικής +Comment[eo]=Escepto ĉe kalkulado kun realaj nombroj. +Comment[es]=Herramienta de filtrado y operaciones de pintado +Comment[et]=Filtritööriist ja joonistamistoiming +Comment[eu]=Iragazkia tresna eta margotze-eragiketa +Comment[fa]=ابزار پالایه و عمل رنگ‌آمیزی +Comment[fi]=Suodintyökalu ja väritystoimepinde +Comment[fr]=Outil de filtrage et opération de dessin +Comment[fy]=Filter-ark en skildersaksje +Comment[gl]=Ferramenta de filtraxe e operación de pintura +Comment[he]=כלי סינון ופעולת ציור +Comment[hu]=Szűrő eszköz és festési művelet +Comment[is]=Síutól og málunaraðgerðir +Comment[it]=Strumento di filtro e operazione di disegno +Comment[ja]=フィルタツールと画像操作 +Comment[km]=ដំណើរ​ការ​គូរ និង​ឧបករណ៍​តម្រង +Comment[ms]=Alat penapis dan operasi warna +Comment[nb]=Filterverktøy og maleteknikker +Comment[nds]=Filterwarktüüch un Malen +Comment[ne]=फिल्टर उपकरण र पेन्ट अपरेसन +Comment[nl]=Filtergereedschap en schilderoperatie +Comment[nn]=Filterverktøy og måleoperasjon +Comment[pl]=Narzędzie filtrat oraz operacje malowania +Comment[pt]=Ferramenta de filtragem e operação de pintura +Comment[pt_BR]=Ferramenta de filtragem e operação de pintura +Comment[ru]=Фильтр обработки изображения +Comment[se]=Sillenreaidu ja málendoaibma +Comment[sk]=Nástroj filter a operácie kreslenia +Comment[sl]=Orodje za filtriranje in operacije za slikanje +Comment[sr]=Филтерски алат и операција цртања +Comment[sr@Latn]=Filterski alat i operacija crtanja +Comment[sv]=Filtreringsverktyg och målningsåtgärd +Comment[uk]=Засіб фільтрування та дій малювання +Comment[zh_CN]=过滤器工具和绘图集成 +Comment[zh_TW]=濾鏡工具與繪圖操作 +ServiceTypes=Chalk/Tool +Type=Service +X-TDE-Library=chalktoolfilter +X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop b/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop deleted file mode 100644 index f20c3cca..00000000 --- a/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop +++ /dev/null @@ -1,92 +0,0 @@ -[Desktop Entry] -Name=Filter Tool -Name[bg]=Инструмент за филтриране -Name[br]=Ostil ar sil -Name[ca]=Eina de filtre -Name[cy]=Erfyn Hidlen -Name[da]=Filterværktøj -Name[de]=Filterwerkzeug -Name[el]=Εργαλείο φίλτρου -Name[eo]=Filtrado-ilo -Name[es]=Herramienta para filtrar -Name[et]=Filtritööriist -Name[eu]=Iragazkia tresna -Name[fa]=ابزار پالایه -Name[fi]=Suodintyökalu -Name[fr]=Outil filtre -Name[fy]=Filter-ark -Name[ga]=Uirlis Scagaire -Name[gl]=Ferramenta de Filtraxe -Name[he]=כלי סינון -Name[hu]=Szűrő eszköz -Name[is]=Síutól -Name[it]=Strumento di filtro -Name[ja]=フィルタツール -Name[km]=ឧបករណ៍​ត្រង -Name[lv]=Filtru rīki -Name[ms]=Alat Penapis -Name[nb]=Filterverktøy -Name[nds]=Filterwarktüüch -Name[ne]=फिल्टर उपकरण -Name[nl]=Filtergereedschap -Name[nn]=Filterverktøy -Name[pl]=Narzędzie filtru -Name[pt]=Ferramenta de Filtragem -Name[pt_BR]=Ferramenta de Filtragem -Name[ru]=Фильтр -Name[se]=Sillenreaidu -Name[sk]=Filter -Name[sl]=Orodje za filtriranje -Name[sr]=Филтерски алат -Name[sr@Latn]=Filterski alat -Name[sv]=Filtreringsverktyg -Name[uk]=Засіб фільтрування -Name[uz]=Filter vositasi -Name[uz@cyrillic]=Филтер воситаси -Name[zh_CN]=过滤工具 -Name[zh_TW]=濾鏡工具 -Comment=Filter tool and paint operation -Comment[bg]=Инструмент за филтриране и рисуване -Comment[ca]=Operació d'eina de filtre i pintura -Comment[cy]=Erfyn hidlen a gweithrediadau paent -Comment[da]=Filterværktøj og maleoperation -Comment[de]=Filterwerkzeug und Maloperation -Comment[el]=Εργαλείο φίλτρου και λειτουργία ζωγραφικής -Comment[eo]=Escepto ĉe kalkulado kun realaj nombroj. -Comment[es]=Herramienta de filtrado y operaciones de pintado -Comment[et]=Filtritööriist ja joonistamistoiming -Comment[eu]=Iragazkia tresna eta margotze-eragiketa -Comment[fa]=ابزار پالایه و عمل رنگ‌آمیزی -Comment[fi]=Suodintyökalu ja väritystoimepinde -Comment[fr]=Outil de filtrage et opération de dessin -Comment[fy]=Filter-ark en skildersaksje -Comment[gl]=Ferramenta de filtraxe e operación de pintura -Comment[he]=כלי סינון ופעולת ציור -Comment[hu]=Szűrő eszköz és festési művelet -Comment[is]=Síutól og málunaraðgerðir -Comment[it]=Strumento di filtro e operazione di disegno -Comment[ja]=フィルタツールと画像操作 -Comment[km]=ដំណើរ​ការ​គូរ និង​ឧបករណ៍​តម្រង -Comment[ms]=Alat penapis dan operasi warna -Comment[nb]=Filterverktøy og maleteknikker -Comment[nds]=Filterwarktüüch un Malen -Comment[ne]=फिल्टर उपकरण र पेन्ट अपरेसन -Comment[nl]=Filtergereedschap en schilderoperatie -Comment[nn]=Filterverktøy og måleoperasjon -Comment[pl]=Narzędzie filtrat oraz operacje malowania -Comment[pt]=Ferramenta de filtragem e operação de pintura -Comment[pt_BR]=Ferramenta de filtragem e operação de pintura -Comment[ru]=Фильтр обработки изображения -Comment[se]=Sillenreaidu ja málendoaibma -Comment[sk]=Nástroj filter a operácie kreslenia -Comment[sl]=Orodje za filtriranje in operacije za slikanje -Comment[sr]=Филтерски алат и операција цртања -Comment[sr@Latn]=Filterski alat i operacija crtanja -Comment[sv]=Filtreringsverktyg och målningsåtgärd -Comment[uk]=Засіб фільтрування та дій малювання -Comment[zh_CN]=过滤器工具和绘图集成 -Comment[zh_TW]=濾鏡工具與繪圖操作 -ServiceTypes=Chalk/Tool -Type=Service -X-TDE-Library=chaltdetoolfilter -X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cc b/chalk/plugins/tools/tool_filter/tool_filter.cc index 912686c1..b5d7c4b5 100644 --- a/chalk/plugins/tools/tool_filter/tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/tool_filter.cc @@ -41,7 +41,7 @@ typedef KGenericFactory ToolFilterFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdetoolfilter, ToolFilterFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalktoolfilter, ToolFilterFactory( "chalk" ) ) ToolFilter::ToolFilter(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am index df749152..53475991 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am +++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chaltdetoolperspectivegrid.desktop +kde_services_DATA = chalktoolperspectivegrid.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,19 +9,19 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chaltdetoolperspectivegrid_la_SOURCES = \ +chalktoolperspectivegrid_la_SOURCES = \ tool_perspectivegrid.cc \ kis_tool_perspectivegrid.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chaltdetoolperspectivegrid.la +kde_module_LTLIBRARIES = chalktoolperspectivegrid.la noinst_HEADERS = \ tool_perspectivegrid.h \ kis_tool_perspectivegrid.h -chaltdetoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chaltdetoolperspectivegrid_la_LIBADD = ../../../libchalkcommon.la \ +chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalktoolperspectivegrid_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la diff --git a/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop b/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop new file mode 100644 index 00000000..9899e284 --- /dev/null +++ b/chalk/plugins/tools/tool_perspectivegrid/chalktoolperspectivegrid.desktop @@ -0,0 +1,35 @@ +[Desktop Entry] +Name=Perspective Grid Tool +Name[bg]=Инструмент мрежа +Name[ca]=Eina de graella de perspectiva +Name[da]=Perspektivgitterværktøj +Name[de]=Perspektive-Raster-Werkzeug +Name[el]=Εργαλείο προοπτικού πλέγματος +Name[eo]=Perspektivkrado-ilo +Name[es]=Herramienta Cuadrícula de perspectiva +Name[et]=Perspektiivvõrgu tööriist +Name[fa]=ابزار توری بُعدنما +Name[fy]=Perspeksjeraster-ark +Name[hu]=Perspektívarács +Name[it]=Strumento di reticolo prospettico +Name[ja]=遠近法グリッドツール +Name[km]=ឧបករណ៍​ក្រឡា​ចត្រង្គ​យថាទស្សន៍ +Name[nb]=Perspektivnett-verktøy +Name[nds]=Kietwinkelgadder-Warktüüch +Name[ne]=दृश्यात्मक ग्रीड उपकरण +Name[nl]=Perspectiefraster-gereedschap +Name[pl]=Narzędzie siatki perspektywy +Name[pt]=Ferramenta de Grelha em Perspectiva +Name[pt_BR]=Ferramenta de Grade em Perspectiva +Name[ru]=Перспектива +Name[sk]=Perspektívna mriežka +Name[sl]=Orodja Mreža za perspektivo +Name[sr]=Алат за мрежу у перспективи +Name[sr@Latn]=Alat za mrežu u perspektivi +Name[sv]=Perspektivrutnätsverktyg +Name[uk]=Засіб ґратки перспективи +Name[zh_TW]=透視格工具 +ServiceTypes=Chalk/Tool +Type=Service +X-TDE-Library=chalktoolperspectivegrid +X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop b/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop deleted file mode 100644 index 1538be0b..00000000 --- a/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop +++ /dev/null @@ -1,35 +0,0 @@ -[Desktop Entry] -Name=Perspective Grid Tool -Name[bg]=Инструмент мрежа -Name[ca]=Eina de graella de perspectiva -Name[da]=Perspektivgitterværktøj -Name[de]=Perspektive-Raster-Werkzeug -Name[el]=Εργαλείο προοπτικού πλέγματος -Name[eo]=Perspektivkrado-ilo -Name[es]=Herramienta Cuadrícula de perspectiva -Name[et]=Perspektiivvõrgu tööriist -Name[fa]=ابزار توری بُعدنما -Name[fy]=Perspeksjeraster-ark -Name[hu]=Perspektívarács -Name[it]=Strumento di reticolo prospettico -Name[ja]=遠近法グリッドツール -Name[km]=ឧបករណ៍​ក្រឡា​ចត្រង្គ​យថាទស្សន៍ -Name[nb]=Perspektivnett-verktøy -Name[nds]=Kietwinkelgadder-Warktüüch -Name[ne]=दृश्यात्मक ग्रीड उपकरण -Name[nl]=Perspectiefraster-gereedschap -Name[pl]=Narzędzie siatki perspektywy -Name[pt]=Ferramenta de Grelha em Perspectiva -Name[pt_BR]=Ferramenta de Grade em Perspectiva -Name[ru]=Перспектива -Name[sk]=Perspektívna mriežka -Name[sl]=Orodja Mreža za perspektivo -Name[sr]=Алат за мрежу у перспективи -Name[sr@Latn]=Alat za mrežu u perspektivi -Name[sv]=Perspektivrutnätsverktyg -Name[uk]=Засіб ґратки перспективи -Name[zh_TW]=透視格工具 -ServiceTypes=Chalk/Tool -Type=Service -X-TDE-Library=chaltdetoolperspectivegrid -X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc index f9f4a5aa..12615387 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc @@ -39,7 +39,7 @@ typedef KGenericFactory ToolPerspectiveGridFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdetoolperspectivegrid, ToolPerspectiveGridFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivegrid, ToolPerspectiveGridFactory( "chalk" ) ) ToolPerspectiveGrid::ToolPerspectiveGrid(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am index 48c1fe7a..c34b906c 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am +++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chaltdetoolperspectivetransform.desktop +kde_services_DATA = chalktoolperspectivetransform.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,24 +9,24 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chaltdetoolperspectivetransform_la_SOURCES = \ +chalktoolperspectivetransform_la_SOURCES = \ tool_perspectivetransform.cc \ kis_tool_perspectivetransform.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chaltdetoolperspectivetransform.la +kde_module_LTLIBRARIES = chalktoolperspectivetransform.la noinst_HEADERS = \ tool_perspectivetransform.h \ kis_tool_perspectivetransform.h -chaltdetoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chaltdetoolperspectivetransform_la_LIBADD = ../../../libchalkcommon.la \ +chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalktoolperspectivetransform_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chaltdetoolperspectivetransform_la_METASOURCES = AUTO +chalktoolperspectivetransform_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop b/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop new file mode 100644 index 00000000..9f1a9b9c --- /dev/null +++ b/chalk/plugins/tools/tool_perspectivetransform/chalktoolperspectivetransform.desktop @@ -0,0 +1,37 @@ +[Desktop Entry] +Icon= +Name=Perspective transform Tool +Name[bg]=Инструмент трансформиране +Name[ca]=Eina de transformació de perspectiva +Name[da]=Perspectivetransformeringsværktøj +Name[de]=Perspektive-Transformationswerkzeug +Name[el]=Εργαλείο προοπτικού μετασχηματισμού +Name[eo]=Perspektivŝanĝo-ilo +Name[es]=Herramienta Transformar perspectiva +Name[et]=Perspektiivteisenduse tööriist +Name[fa]=ابزار تبدیل بُعدنما +Name[fr]=Outils de transformation de perspective +Name[fy]=Perspeksje oerset ark +Name[hu]=Perspektívaátalakító eszköz +Name[it]=Strumento di trasformazione della prospettiva +Name[ja]=視点変更ツール +Name[km]=ឧបករណ៍​ប្លែង​យថាទស្សន៍ +Name[nb]=Verktøy for perspektivtransformasjon +Name[nds]=Warktüüch för't Kietwinkeltopassen +Name[ne]=दृश्यात्मक रूपान्तरण उपकरण +Name[nl]=Perspectiefrooster-gereedschap +Name[pl]=Narzędzie zmiany perspektywy +Name[pt]=Ferramenta de Transformação em Perspectiva +Name[pt_BR]=Ferramentas de Transformação em Perspectiva +Name[ru]=Перспектива +Name[sk]=Perspektívna transformácia +Name[sl]=Orodje za transformacijo perspektive +Name[sr]=Алати за трансформацију перспективе +Name[sr@Latn]=Alati za transformaciju perspektive +Name[sv]=Perspektivtransformverktyg +Name[uk]=Засіб перспективи +Name[zh_TW]=透視轉換工具 +ServiceTypes=Chalk/Tool +Type=Service +X-TDE-Library=chalktoolperspectivetransform +X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop b/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop deleted file mode 100644 index 0717f235..00000000 --- a/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop +++ /dev/null @@ -1,37 +0,0 @@ -[Desktop Entry] -Icon= -Name=Perspective transform Tool -Name[bg]=Инструмент трансформиране -Name[ca]=Eina de transformació de perspectiva -Name[da]=Perspectivetransformeringsværktøj -Name[de]=Perspektive-Transformationswerkzeug -Name[el]=Εργαλείο προοπτικού μετασχηματισμού -Name[eo]=Perspektivŝanĝo-ilo -Name[es]=Herramienta Transformar perspectiva -Name[et]=Perspektiivteisenduse tööriist -Name[fa]=ابزار تبدیل بُعدنما -Name[fr]=Outils de transformation de perspective -Name[fy]=Perspeksje oerset ark -Name[hu]=Perspektívaátalakító eszköz -Name[it]=Strumento di trasformazione della prospettiva -Name[ja]=視点変更ツール -Name[km]=ឧបករណ៍​ប្លែង​យថាទស្សន៍ -Name[nb]=Verktøy for perspektivtransformasjon -Name[nds]=Warktüüch för't Kietwinkeltopassen -Name[ne]=दृश्यात्मक रूपान्तरण उपकरण -Name[nl]=Perspectiefrooster-gereedschap -Name[pl]=Narzędzie zmiany perspektywy -Name[pt]=Ferramenta de Transformação em Perspectiva -Name[pt_BR]=Ferramentas de Transformação em Perspectiva -Name[ru]=Перспектива -Name[sk]=Perspektívna transformácia -Name[sl]=Orodje za transformacijo perspektive -Name[sr]=Алати за трансформацију перспективе -Name[sr@Latn]=Alati za transformaciju perspektive -Name[sv]=Perspektivtransformverktyg -Name[uk]=Засіб перспективи -Name[zh_TW]=透視轉換工具 -ServiceTypes=Chalk/Tool -Type=Service -X-TDE-Library=chaltdetoolperspectivetransform -X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc index be96be71..24d71620 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc +++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc @@ -39,7 +39,7 @@ typedef KGenericFactory ToolPerspectiveTransformFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdetoolperspectivetransform, ToolPerspectiveTransformFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivetransform, ToolPerspectiveTransformFactory( "chalk" ) ) ToolPerspectiveTransform::ToolPerspectiveTransform(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am index c72db700..ad69e2cc 100644 --- a/chalk/plugins/tools/tool_polygon/Makefile.am +++ b/chalk/plugins/tools/tool_polygon/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chaltdetoolpolygon.desktop +kde_services_DATA = chalktoolpolygon.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,24 +9,24 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chaltdetoolpolygon_la_SOURCES = \ +chalktoolpolygon_la_SOURCES = \ tool_polygon.cc \ kis_tool_polygon.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chaltdetoolpolygon.la +kde_module_LTLIBRARIES = chalktoolpolygon.la noinst_HEADERS = \ tool_polygon.h \ kis_tool_polygon.h -chaltdetoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chaltdetoolpolygon_la_LIBADD = ../../../libchalkcommon.la \ +chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalktoolpolygon_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chaltdetoolpolygon_la_METASOURCES = AUTO +chalktoolpolygon_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop b/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop new file mode 100644 index 00000000..2b10ed9d --- /dev/null +++ b/chalk/plugins/tools/tool_polygon/chalktoolpolygon.desktop @@ -0,0 +1,52 @@ +[Desktop Entry] +Name=Polygon Tool +Name[bg]=Инструмент многоъгълник +Name[br]=Ostilh liestueg +Name[ca]=Eina de polígon +Name[cy]=Erfyn Polygon +Name[da]=Polygonværktøj +Name[de]=Vieleck-Werkzeug +Name[el]=Εργαλείο πολυγώνου +Name[eo]=Poligon-ilo +Name[es]=Herramienta Polígono +Name[et]=Hulknurga tööriist +Name[eu]=Poligonoa tresna +Name[fa]=ابزار چندضلعی +Name[fi]=Monikulmiotyökalu +Name[fr]=Outil polygone +Name[fy]=Meardere-hoek-ark +Name[ga]=Uirlis Pholagáin +Name[gl]=Ferramenta de Polígonos +Name[he]=כלי מצולע +Name[hu]=Sokszög eszköz +Name[is]=Marghyrnitól +Name[it]=Strumento poligono +Name[ja]=多角形ツール +Name[km]=ឧបករណ៍​រាង​ពហុកោណ +Name[lt]=Daugiakampio įrankis +Name[lv]=Poligonu rīks +Name[ms]=Alat Poligon +Name[nb]=Verktøy for mangekanter +Name[nds]=Veeleck-Warktüüch +Name[ne]=बहुभुज उपकरण +Name[nl]=Veelhoeksgereedschap +Name[nn]=Verktøy for mangekant +Name[pl]=Narzędzie do rysowania wielokątów +Name[pt]=Ferramenta de Polígonos +Name[pt_BR]=Ferramenta Polígono +Name[ru]=Многоугольник +Name[se]=Moanáčiegareaidu +Name[sk]=Mnohouholník +Name[sl]=Orodje za poligon +Name[sr]=Алат за полигоне +Name[sr@Latn]=Alat za poligone +Name[sv]=Polygonverktyg +Name[uk]=Засіб багатокутника +Name[uz]=Pligon vositasi +Name[uz@cyrillic]=Плигон воситаси +Name[zh_CN]=多边形工具 +Name[zh_TW]=多邊形工具 +ServiceTypes=Chalk/Tool +Type=Service +X-TDE-Library=chalktoolpolygon +X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop b/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop deleted file mode 100644 index f58ddc8a..00000000 --- a/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop +++ /dev/null @@ -1,52 +0,0 @@ -[Desktop Entry] -Name=Polygon Tool -Name[bg]=Инструмент многоъгълник -Name[br]=Ostilh liestueg -Name[ca]=Eina de polígon -Name[cy]=Erfyn Polygon -Name[da]=Polygonværktøj -Name[de]=Vieleck-Werkzeug -Name[el]=Εργαλείο πολυγώνου -Name[eo]=Poligon-ilo -Name[es]=Herramienta Polígono -Name[et]=Hulknurga tööriist -Name[eu]=Poligonoa tresna -Name[fa]=ابزار چندضلعی -Name[fi]=Monikulmiotyökalu -Name[fr]=Outil polygone -Name[fy]=Meardere-hoek-ark -Name[ga]=Uirlis Pholagáin -Name[gl]=Ferramenta de Polígonos -Name[he]=כלי מצולע -Name[hu]=Sokszög eszköz -Name[is]=Marghyrnitól -Name[it]=Strumento poligono -Name[ja]=多角形ツール -Name[km]=ឧបករណ៍​រាង​ពហុកោណ -Name[lt]=Daugiakampio įrankis -Name[lv]=Poligonu rīks -Name[ms]=Alat Poligon -Name[nb]=Verktøy for mangekanter -Name[nds]=Veeleck-Warktüüch -Name[ne]=बहुभुज उपकरण -Name[nl]=Veelhoeksgereedschap -Name[nn]=Verktøy for mangekant -Name[pl]=Narzędzie do rysowania wielokątów -Name[pt]=Ferramenta de Polígonos -Name[pt_BR]=Ferramenta Polígono -Name[ru]=Многоугольник -Name[se]=Moanáčiegareaidu -Name[sk]=Mnohouholník -Name[sl]=Orodje za poligon -Name[sr]=Алат за полигоне -Name[sr@Latn]=Alat za poligone -Name[sv]=Polygonverktyg -Name[uk]=Засіб багатокутника -Name[uz]=Pligon vositasi -Name[uz@cyrillic]=Плигон воситаси -Name[zh_CN]=多边形工具 -Name[zh_TW]=多邊形工具 -ServiceTypes=Chalk/Tool -Type=Service -X-TDE-Library=chaltdetoolpolygon -X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cc b/chalk/plugins/tools/tool_polygon/tool_polygon.cc index c5783cba..5ace6079 100644 --- a/chalk/plugins/tools/tool_polygon/tool_polygon.cc +++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cc @@ -39,7 +39,7 @@ typedef KGenericFactory ToolPolygonFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdetoolpolygon, ToolPolygonFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalktoolpolygon, ToolPolygonFactory( "chalk" ) ) ToolPolygon::ToolPolygon(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am index bd778616..a058dc58 100644 --- a/chalk/plugins/tools/tool_polyline/Makefile.am +++ b/chalk/plugins/tools/tool_polyline/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chaltdetoolpolyline.desktop +kde_services_DATA = chalktoolpolyline.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,24 +9,24 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chaltdetoolpolyline_la_SOURCES = \ +chalktoolpolyline_la_SOURCES = \ tool_polyline.cc \ kis_tool_polyline.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chaltdetoolpolyline.la +kde_module_LTLIBRARIES = chalktoolpolyline.la noinst_HEADERS = \ tool_polyline.h \ kis_tool_polyline.h -chaltdetoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chaltdetoolpolyline_la_LIBADD = ../../../libchalkcommon.la \ +chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalktoolpolyline_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chaltdetoolpolyline_la_METASOURCES = AUTO +chalktoolpolyline_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop b/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop new file mode 100644 index 00000000..b68aa879 --- /dev/null +++ b/chalk/plugins/tools/tool_polyline/chalktoolpolyline.desktop @@ -0,0 +1,49 @@ +[Desktop Entry] +Name=Polyline Tool +Name[bg]=Инструмент съставна линия +Name[br]=Ostilh lieslinenn +Name[ca]=Eina de polilínia +Name[cy]=Erfyn Polylinell +Name[da]=Flerlinjeværktøj +Name[de]=Linienketten-Werkzeug +Name[el]=Εργαλείο συνεχούς γραμμής +Name[eo]=Plurlinio-ilo +Name[es]=Herramienta Polilínea +Name[et]=Kompleksjoone tööriist +Name[eu]=Polilerroa tresna +Name[fa]=ابزار چندخطی +Name[fr]=Outil lignes multiples +Name[fy]=Brútsen-streek-ark +Name[ga]=Uirlis Il-líne +Name[gl]=Ferramenta de Liñas Poligonais +Name[he]=כלי קו שבור +Name[hu]=Sokszögvonal eszköz +Name[is]=Fjöllínutól +Name[it]=Strumento polilinea +Name[ja]=ポリラインツール +Name[km]=ឧបករណ៍​ពហុបន្ទាត់ +Name[ms]=Alat Poligaris +Name[nb]=Verktøy for flerstrekslinje +Name[nds]=Lienenkeden-Warktüüch (Polygon-Tog) +Name[ne]=बहुरेखा उपकरण +Name[nl]=Gebroken-lijngereedschap +Name[nn]=Verktøy for fleirstrekslinje +Name[pl]=Narzędzie do rysowania łamanej +Name[pt]=Ferramenta de Linhas Poligonais +Name[pt_BR]=Ferramenta Poli-linha +Name[ru]=Ломаная +Name[se]=Moanálinnjáreaidu +Name[sk]=Lomená čiara +Name[sl]=Orodje za lomljeno črto +Name[sr]=Алат за полилиније +Name[sr@Latn]=Alat za polilinije +Name[sv]=Flerlinjesverktyg +Name[uk]=Засіб ламаної лінії +Name[uz]=Koʻpburchak asbobi +Name[uz@cyrillic]=Кўпбурчак асбоби +Name[zh_CN]=折线工具 +Name[zh_TW]=任意線工具 +ServiceTypes=Chalk/Tool +Type=Service +X-TDE-Library=chalktoolpolyline +X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop b/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop deleted file mode 100644 index 37846b0e..00000000 --- a/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop +++ /dev/null @@ -1,49 +0,0 @@ -[Desktop Entry] -Name=Polyline Tool -Name[bg]=Инструмент съставна линия -Name[br]=Ostilh lieslinenn -Name[ca]=Eina de polilínia -Name[cy]=Erfyn Polylinell -Name[da]=Flerlinjeværktøj -Name[de]=Linienketten-Werkzeug -Name[el]=Εργαλείο συνεχούς γραμμής -Name[eo]=Plurlinio-ilo -Name[es]=Herramienta Polilínea -Name[et]=Kompleksjoone tööriist -Name[eu]=Polilerroa tresna -Name[fa]=ابزار چندخطی -Name[fr]=Outil lignes multiples -Name[fy]=Brútsen-streek-ark -Name[ga]=Uirlis Il-líne -Name[gl]=Ferramenta de Liñas Poligonais -Name[he]=כלי קו שבור -Name[hu]=Sokszögvonal eszköz -Name[is]=Fjöllínutól -Name[it]=Strumento polilinea -Name[ja]=ポリラインツール -Name[km]=ឧបករណ៍​ពហុបន្ទាត់ -Name[ms]=Alat Poligaris -Name[nb]=Verktøy for flerstrekslinje -Name[nds]=Lienenkeden-Warktüüch (Polygon-Tog) -Name[ne]=बहुरेखा उपकरण -Name[nl]=Gebroken-lijngereedschap -Name[nn]=Verktøy for fleirstrekslinje -Name[pl]=Narzędzie do rysowania łamanej -Name[pt]=Ferramenta de Linhas Poligonais -Name[pt_BR]=Ferramenta Poli-linha -Name[ru]=Ломаная -Name[se]=Moanálinnjáreaidu -Name[sk]=Lomená čiara -Name[sl]=Orodje za lomljeno črto -Name[sr]=Алат за полилиније -Name[sr@Latn]=Alat za polilinije -Name[sv]=Flerlinjesverktyg -Name[uk]=Засіб ламаної лінії -Name[uz]=Koʻpburchak asbobi -Name[uz@cyrillic]=Кўпбурчак асбоби -Name[zh_CN]=折线工具 -Name[zh_TW]=任意線工具 -ServiceTypes=Chalk/Tool -Type=Service -X-TDE-Library=chaltdetoolpolyline -X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cc b/chalk/plugins/tools/tool_polyline/tool_polyline.cc index 34592d5c..fe9eb002 100644 --- a/chalk/plugins/tools/tool_polyline/tool_polyline.cc +++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cc @@ -40,7 +40,7 @@ typedef KGenericFactory ToolPolylineFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdetoolpolyline, ToolPolylineFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalktoolpolyline, ToolPolylineFactory( "chalk" ) ) ToolPolyline::ToolPolyline(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am index c7ac5a2e..84bb341e 100644 --- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am +++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chaltdetoolselectsimilar.desktop +kde_services_DATA = chalktoolselectsimilar.desktop INCLUDES = -I$(srcdir)/../../../sdk \ -I$(srcdir)/../../../core \ @@ -9,18 +9,18 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(all_includes) -chaltdetoolselectsimilar_la_SOURCES = selectsimilar.cc kis_tool_selectsimilar.cc +chalktoolselectsimilar_la_SOURCES = selectsimilar.cc kis_tool_selectsimilar.cc noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h -kde_module_LTLIBRARIES = chaltdetoolselectsimilar.la +kde_module_LTLIBRARIES = chalktoolselectsimilar.la -chaltdetoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chaltdetoolselectsimilar_la_LIBADD = ../../../libchalkcommon.la \ +chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalktoolselectsimilar_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chaltdetoolselectsimilar_la_METASOURCES = AUTO +chalktoolselectsimilar_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop b/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop new file mode 100644 index 00000000..cc83dccc --- /dev/null +++ b/chalk/plugins/tools/tool_selectsimilar/chalktoolselectsimilar.desktop @@ -0,0 +1,43 @@ +[Desktop Entry] +Name=Select Similar Colors Tool +Name[bg]=Инструмент за маркиране на подобни цветове +Name[ca]=Selecciona eines de colors similars +Name[cy]=Offer Detholi Lliwiau Tebyg +Name[da]=Vælg lignende farve-værktøjer +Name[de]="Auswahl nach ähnlichen Farben"-Werkzeug +Name[el]=Εργαλείο επιλογής παρόμοιων χρωμάτων +Name[en_GB]=Select Similar Colours Tool +Name[eo]=Similkolorelekto-ilo +Name[es]=Herramienta de selección de colores similares +Name[et]=Sarnase värvi valimise tööriist +Name[fa]=برگزیدن ابزار رنگهای مشابه +Name[fr]=Outils de sélection des couleurs similaires +Name[fy]=Lykense kleur seleksje ark +Name[gl]=Ferramenta de Selección de Cores Semellantes +Name[he]=בחירת כלי צבעים דומים +Name[hu]=Hasonló színeket kiválasztó eszköz +Name[is]=Velja svipaða liti tól +Name[it]=Strumento per la selezione dei colori simili +Name[ja]=類似色選択ツール +Name[km]=ឧបករណ៍​ជ្រើស​ពណ៌​ស្រដៀង​គ្នា +Name[nb]=Verktøy som velger liknende farger +Name[nds]=Warktüüch för de Utwahl vun lieke Klören +Name[ne]=समान रङ उपकरणहरू चयन गर्नुहोस् +Name[nl]=Gereedschap voor soortgelijke kleuren +Name[pl]=Narzędzie wyboru podobnych kolorów +Name[pt]=Ferramenta de Selecção de Cores Semelhantes +Name[pt_BR]=Ferramenta de Seleção de Cores Semelhantes +Name[ru]=Выделение по цвету +Name[se]=Reaidu mii vállje sullosaš ivnniid +Name[sk]=Výber podobných farieb +Name[sl]=Orodje za izbiro podobnih barv +Name[sr]=Алат за избор сличних боја +Name[sr@Latn]=Alat za izbor sličnih boja +Name[sv]=Välj liknande färg-verktyg +Name[uk]=Засіб вибору подібних кольорів +Name[zh_CN]=选择相似颜色工具 +Name[zh_TW]=選取近似色彩工具 +ServiceTypes=Chalk/Tool +Type=Service +X-TDE-Library=chalktoolselectsimilar +X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop b/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop deleted file mode 100644 index 32d28701..00000000 --- a/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop +++ /dev/null @@ -1,43 +0,0 @@ -[Desktop Entry] -Name=Select Similar Colors Tool -Name[bg]=Инструмент за маркиране на подобни цветове -Name[ca]=Selecciona eines de colors similars -Name[cy]=Offer Detholi Lliwiau Tebyg -Name[da]=Vælg lignende farve-værktøjer -Name[de]="Auswahl nach ähnlichen Farben"-Werkzeug -Name[el]=Εργαλείο επιλογής παρόμοιων χρωμάτων -Name[en_GB]=Select Similar Colours Tool -Name[eo]=Similkolorelekto-ilo -Name[es]=Herramienta de selección de colores similares -Name[et]=Sarnase värvi valimise tööriist -Name[fa]=برگزیدن ابزار رنگهای مشابه -Name[fr]=Outils de sélection des couleurs similaires -Name[fy]=Lykense kleur seleksje ark -Name[gl]=Ferramenta de Selección de Cores Semellantes -Name[he]=בחירת כלי צבעים דומים -Name[hu]=Hasonló színeket kiválasztó eszköz -Name[is]=Velja svipaða liti tól -Name[it]=Strumento per la selezione dei colori simili -Name[ja]=類似色選択ツール -Name[km]=ឧបករណ៍​ជ្រើស​ពណ៌​ស្រដៀង​គ្នា -Name[nb]=Verktøy som velger liknende farger -Name[nds]=Warktüüch för de Utwahl vun lieke Klören -Name[ne]=समान रङ उपकरणहरू चयन गर्नुहोस् -Name[nl]=Gereedschap voor soortgelijke kleuren -Name[pl]=Narzędzie wyboru podobnych kolorów -Name[pt]=Ferramenta de Selecção de Cores Semelhantes -Name[pt_BR]=Ferramenta de Seleção de Cores Semelhantes -Name[ru]=Выделение по цвету -Name[se]=Reaidu mii vállje sullosaš ivnniid -Name[sk]=Výber podobných farieb -Name[sl]=Orodje za izbiro podobnih barv -Name[sr]=Алат за избор сличних боја -Name[sr@Latn]=Alat za izbor sličnih boja -Name[sv]=Välj liknande färg-verktyg -Name[uk]=Засіб вибору подібних кольорів -Name[zh_CN]=选择相似颜色工具 -Name[zh_TW]=選取近似色彩工具 -ServiceTypes=Chalk/Tool -Type=Service -X-TDE-Library=chaltdetoolselectsimilar -X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc index 85cf98be..95c315d8 100644 --- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc @@ -39,7 +39,7 @@ #include "kis_tool_selectsimilar.h" typedef KGenericFactory SelectSimilarFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdetoolselectsimilar, SelectSimilarFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalktoolselectsimilar, SelectSimilarFactory( "chalk" ) ) SelectSimilar::SelectSimilar(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am index c3de3a0d..c8f65857 100644 --- a/chalk/plugins/tools/tool_star/Makefile.am +++ b/chalk/plugins/tools/tool_star/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chaltdetoolstar.desktop +kde_services_DATA = chalktoolstar.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,25 +9,25 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chaltdetoolstar_la_SOURCES = \ +chalktoolstar_la_SOURCES = \ wdg_tool_star.ui \ tool_star.cc \ kis_tool_star.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chaltdetoolstar.la +kde_module_LTLIBRARIES = chalktoolstar.la noinst_HEADERS = \ tool_star.h \ kis_tool_star.h -chaltdetoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chaltdetoolstar_la_LIBADD = ../../../libchalkcommon.la \ +chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalktoolstar_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chaltdetoolstar_la_METASOURCES = AUTO +chalktoolstar_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_star/chalktoolstar.desktop b/chalk/plugins/tools/tool_star/chalktoolstar.desktop new file mode 100644 index 00000000..f2b68b7a --- /dev/null +++ b/chalk/plugins/tools/tool_star/chalktoolstar.desktop @@ -0,0 +1,52 @@ +[Desktop Entry] +Name=Star Tool +Name[bg]=Инструмент звезда +Name[br]=Ostilh steredenn +Name[ca]=Eina d'estrella +Name[cy]=Erfyn Seren +Name[da]=Stjerneværktøj +Name[de]=Stern-Werkzeug +Name[el]=Εργαλείο αστεριού +Name[eo]=Stelo-ilo +Name[es]=Herramienta Estrella +Name[et]=Tähe tööriist +Name[eu]=Izarra tresna +Name[fa]=ابزار ستاره +Name[fi]=Tähtityökalu +Name[fr]=Outil étoile +Name[fy]=Sjer-ark +Name[ga]=Uirlis Réiltín +Name[gl]=Ferramenta de Estrelas +Name[he]=כלי כוכב +Name[hu]=Csillag eszköz +Name[is]=Stjörnutól +Name[it]=Strumento stella +Name[ja]=星型ツール +Name[km]=ឧបករណ៍​រាង​ផ្កាយ +Name[lt]=Žvaigždės įrankis +Name[lv]=Zvaigznes rīks +Name[ms]=Alat Bintang +Name[nb]=Stjerneverktøy +Name[nds]=Steern-Warktüüch +Name[ne]=तारा उपकरण +Name[nl]=Stergereedschap +Name[nn]=Stjerneverktøy +Name[pl]=Narzędzie do rysowania gwiazdki +Name[pt]=Ferramenta de Estrelas +Name[pt_BR]=Ferramenta Estrela +Name[ru]=Звезда +Name[se]=Nástereaidu +Name[sk]=Hviezda +Name[sl]=Zvezdno orodje +Name[sr]=Алат за звезде +Name[sr@Latn]=Alat za zvezde +Name[sv]=Stjärnverktyg +Name[uk]=Інструмент зірки +Name[uz]=Yulduz vositasi +Name[uz@cyrillic]=Юлдуз воситаси +Name[zh_CN]=星形工具 +Name[zh_TW]=星形工具 +ServiceTypes=Chalk/Tool +Type=Service +X-TDE-Library=chalktoolstar +X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop b/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop deleted file mode 100644 index 0f6bc2eb..00000000 --- a/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop +++ /dev/null @@ -1,52 +0,0 @@ -[Desktop Entry] -Name=Star Tool -Name[bg]=Инструмент звезда -Name[br]=Ostilh steredenn -Name[ca]=Eina d'estrella -Name[cy]=Erfyn Seren -Name[da]=Stjerneværktøj -Name[de]=Stern-Werkzeug -Name[el]=Εργαλείο αστεριού -Name[eo]=Stelo-ilo -Name[es]=Herramienta Estrella -Name[et]=Tähe tööriist -Name[eu]=Izarra tresna -Name[fa]=ابزار ستاره -Name[fi]=Tähtityökalu -Name[fr]=Outil étoile -Name[fy]=Sjer-ark -Name[ga]=Uirlis Réiltín -Name[gl]=Ferramenta de Estrelas -Name[he]=כלי כוכב -Name[hu]=Csillag eszköz -Name[is]=Stjörnutól -Name[it]=Strumento stella -Name[ja]=星型ツール -Name[km]=ឧបករណ៍​រាង​ផ្កាយ -Name[lt]=Žvaigždės įrankis -Name[lv]=Zvaigznes rīks -Name[ms]=Alat Bintang -Name[nb]=Stjerneverktøy -Name[nds]=Steern-Warktüüch -Name[ne]=तारा उपकरण -Name[nl]=Stergereedschap -Name[nn]=Stjerneverktøy -Name[pl]=Narzędzie do rysowania gwiazdki -Name[pt]=Ferramenta de Estrelas -Name[pt_BR]=Ferramenta Estrela -Name[ru]=Звезда -Name[se]=Nástereaidu -Name[sk]=Hviezda -Name[sl]=Zvezdno orodje -Name[sr]=Алат за звезде -Name[sr@Latn]=Alat za zvezde -Name[sv]=Stjärnverktyg -Name[uk]=Інструмент зірки -Name[uz]=Yulduz vositasi -Name[uz@cyrillic]=Юлдуз воситаси -Name[zh_CN]=星形工具 -Name[zh_TW]=星形工具 -ServiceTypes=Chalk/Tool -Type=Service -X-TDE-Library=chaltdetoolstar -X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_star/tool_star.cc b/chalk/plugins/tools/tool_star/tool_star.cc index 040eaf99..dc40edf9 100644 --- a/chalk/plugins/tools/tool_star/tool_star.cc +++ b/chalk/plugins/tools/tool_star/tool_star.cc @@ -39,7 +39,7 @@ typedef KGenericFactory ToolStarFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdetoolstar, ToolStarFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalktoolstar, ToolStarFactory( "chalk" ) ) ToolStar::ToolStar(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am index 016988f8..78aab31b 100644 --- a/chalk/plugins/tools/tool_transform/Makefile.am +++ b/chalk/plugins/tools/tool_transform/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chaltdetooltransform.desktop +kde_services_DATA = chalktooltransform.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,25 +9,25 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chaltdetooltransform_la_SOURCES = \ +chalktooltransform_la_SOURCES = \ wdg_tool_transform.ui \ tool_transform.cc \ kis_tool_transform.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chaltdetooltransform.la +kde_module_LTLIBRARIES = chalktooltransform.la noinst_HEADERS = \ tool_transform.h \ kis_tool_transform.h -chaltdetooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chaltdetooltransform_la_LIBADD = ../../../libchalkcommon.la \ +chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalktooltransform_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chaltdetooltransform_la_METASOURCES = AUTO +chalktooltransform_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_transform/chalktooltransform.desktop b/chalk/plugins/tools/tool_transform/chalktooltransform.desktop new file mode 100644 index 00000000..48fe8042 --- /dev/null +++ b/chalk/plugins/tools/tool_transform/chalktooltransform.desktop @@ -0,0 +1,46 @@ +[Desktop Entry] +Name=Transform Tool +Name[bg]=Инструмент за трансформиране +Name[br]=Ostilh treuzfurmiñ +Name[ca]=Eina de transformació +Name[cy]=Erfyn Trawsffurfio +Name[da]=Transformeringsværktøj +Name[de]=Transformation-Werkzeug +Name[el]=Εργαλείο μετασχηματισμού +Name[eo]=Transform-ilo +Name[es]=Herramienta para transformar +Name[et]=Transformeermistööriist +Name[fa]=ابزار تبدیل +Name[fr]=Outil transformation +Name[fy]=ferfoarmingsark +Name[ga]=Uirlis Trasfhoirmithe +Name[gl]=Ferramenta de Transformación +Name[hu]=Átalakító eszköz +Name[is]=Ummyndunartól +Name[it]=Strumento di trasformazione +Name[ja]=変換ツール +Name[km]=ឧបករណ៍​ប្លែង +Name[lt]=Transformavimo įrankis +Name[lv]=Transformāciju rīks +Name[nb]=Transformeringsverktøy +Name[nds]=Ümwanneln-Warktüüch +Name[ne]=रूपान्तरण उपकरण +Name[nl]=Vervormgereedschap +Name[pl]=Narzędzie przekształcania +Name[pt]=Ferramenta de Transformação +Name[pt_BR]=Ferramenta de Transformação +Name[ru]=Преобразование +Name[sk]=Transformácia +Name[sl]=Orodje za pretvorbo +Name[sr]=Алат за трансформацију +Name[sr@Latn]=Alat za transformaciju +Name[sv]=Transformeringsverktyg +Name[uk]=Засіб перетворення +Name[uz]=Aylantirish asbobi +Name[uz@cyrillic]=Айлантириш асбоби +Name[zh_CN]=变形工具 +Name[zh_TW]=變形工具 +ServiceTypes=Chalk/Tool +Type=Service +X-TDE-Library=chalktooltransform +X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop b/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop deleted file mode 100644 index 74a2eebe..00000000 --- a/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop +++ /dev/null @@ -1,46 +0,0 @@ -[Desktop Entry] -Name=Transform Tool -Name[bg]=Инструмент за трансформиране -Name[br]=Ostilh treuzfurmiñ -Name[ca]=Eina de transformació -Name[cy]=Erfyn Trawsffurfio -Name[da]=Transformeringsværktøj -Name[de]=Transformation-Werkzeug -Name[el]=Εργαλείο μετασχηματισμού -Name[eo]=Transform-ilo -Name[es]=Herramienta para transformar -Name[et]=Transformeermistööriist -Name[fa]=ابزار تبدیل -Name[fr]=Outil transformation -Name[fy]=ferfoarmingsark -Name[ga]=Uirlis Trasfhoirmithe -Name[gl]=Ferramenta de Transformación -Name[hu]=Átalakító eszköz -Name[is]=Ummyndunartól -Name[it]=Strumento di trasformazione -Name[ja]=変換ツール -Name[km]=ឧបករណ៍​ប្លែង -Name[lt]=Transformavimo įrankis -Name[lv]=Transformāciju rīks -Name[nb]=Transformeringsverktøy -Name[nds]=Ümwanneln-Warktüüch -Name[ne]=रूपान्तरण उपकरण -Name[nl]=Vervormgereedschap -Name[pl]=Narzędzie przekształcania -Name[pt]=Ferramenta de Transformação -Name[pt_BR]=Ferramenta de Transformação -Name[ru]=Преобразование -Name[sk]=Transformácia -Name[sl]=Orodje za pretvorbo -Name[sr]=Алат за трансформацију -Name[sr@Latn]=Alat za transformaciju -Name[sv]=Transformeringsverktyg -Name[uk]=Засіб перетворення -Name[uz]=Aylantirish asbobi -Name[uz@cyrillic]=Айлантириш асбоби -Name[zh_CN]=变形工具 -Name[zh_TW]=變形工具 -ServiceTypes=Chalk/Tool -Type=Service -X-TDE-Library=chaltdetooltransform -X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cc b/chalk/plugins/tools/tool_transform/tool_transform.cc index a5aead78..32810020 100644 --- a/chalk/plugins/tools/tool_transform/tool_transform.cc +++ b/chalk/plugins/tools/tool_transform/tool_transform.cc @@ -39,7 +39,7 @@ typedef KGenericFactory ToolTransformFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdetooltransform, ToolTransformFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalktooltransform, ToolTransformFactory( "chalk" ) ) ToolTransform::ToolTransform(TQObject *parent, const char *name, const TQStringList &) 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/chalkscripting.desktop b/chalk/plugins/viewplugins/scripting/chalkscripting.desktop new file mode 100644 index 00000000..eba3ea37 --- /dev/null +++ b/chalk/plugins/viewplugins/scripting/chalkscripting.desktop @@ -0,0 +1,81 @@ +[Desktop Entry] +Name=Scripting plugin +Name[bg]=Приставка за скриптове +Name[ca]=Connector de seqüenciació +Name[da]=Scriptplugin +Name[de]=Skripting-Modul +Name[el]=Πρόσθετο γραφής σεναρίων +Name[eo]=Skriptad-kromaĵo +Name[es]=Complemento para guiones +Name[et]=Skriptiplugin +Name[fa]=وصلۀ دست‌نوشته +Name[fr]=Module de scriptage +Name[fy]=Skriptplugin +Name[ga]=Breiseán scriptithe +Name[gl]=Plugin de programación +Name[he]=תוסף לתסריטים +Name[hu]=Szkript modul +Name[is]=Skriftu íforrit +Name[it]=Plugin di scripting +Name[ja]=スクリプトプラグイン +Name[km]=កម្មវិធី​ជំនួយ​សម្រាប់​ស្គ្រីប +Name[nb]=Programtillegg for skripting +Name[nds]=Skriptmoduul +Name[ne]=प्लगइन स्क्रिप्ट गर्दै +Name[nl]=Scriptplugin +Name[pl]=Wtyczka obsługi języków skryptowych +Name[pt]='Plugin' de programação +Name[pt_BR]=Plugin de programação +Name[ru]=Модуль поддержки сценариев +Name[sk]=Modul pre skripty +Name[sl]=Vstavek za skripte +Name[sr]=Прикључак за скриптовање +Name[sr@Latn]=Priključak za skriptovanje +Name[sv]=Skriptinsticksprogram +Name[uk]=Втулок для скриптів +Name[uz]=Skriptlash plagini +Name[uz@cyrillic]=Скриптлаш плагини +Name[zh_CN]=脚本插件 +Name[zh_TW]=命令稿外掛程式 +Comment=Allow execution of scripts +Comment[bg]=Изпълнение на скриптове +Comment[ca]=Permet l'execució de seqüències +Comment[da]=Tillad kørsel af script +Comment[de]=Ermöglicht das Ausführen von Skripten +Comment[el]=Επιτρέπει την εκτέλεση σεναρίων +Comment[eo]=Permesi ruligon de skriptoj +Comment[es]=Permite la ejecución de guiones +Comment[et]=Võimaldab skriptide käivitamist +Comment[fa]=اجازۀ اجرای دست‌نوشته‌ها +Comment[fr]=Permet d'exécuter des scripts +Comment[fy]=Hjirmei kinne skripts útfierd wurde +Comment[gl]=Permite executar guións +Comment[he]=אפשרות להרצת תסריטים +Comment[hu]=Lehetővé teszi szkriptek végrehajtását +Comment[is]=Leyfa að skriftur séu keyrðar +Comment[it]=Permette di eseguire script +Comment[ja]=スクリプトの実行を可能にします +Comment[km]=អនុញ្ញាត​ឲ្យ​ប្រតិបត្តិ​ស្គ្រីប +Comment[lv]=Atļaut skriptu izpildi +Comment[nb]=Tillater skriptkjøring +Comment[nds]=Skripten utföhren +Comment[ne]=स्क्रिप्टको कार्यान्वयनलाई अनुमति दिनुहोस् +Comment[nl]=Hiermee kunnen scripts uitgevoerd worden +Comment[pl]=Zezwala na wykonywanie skryptów +Comment[pt]=Permitir executar programas ou 'scripts' +Comment[pt_BR]=Permitir executar programas ou 'scripts' +Comment[ru]=Возможность выполнения сценариев +Comment[sk]=Povoliť vykonávanie skriptov +Comment[sl]=Dovoli izvedbo skriptov +Comment[sr]=Омогући извршавање скрипти +Comment[sr@Latn]=Omogući izvršavanje skripti +Comment[sv]=Tillåt körning av skript +Comment[uk]=Дає змогу виконувати скрипти +Comment[uz]=Skriptlarni ishga tushirishga ruxsat berish +Comment[uz@cyrillic]=Скриптларни ишга туширишга рухсат бериш +Comment[zh_CN]=允许执行脚本 +Comment[zh_TW]=允許執行命令稿 +ServiceTypes=Chalk/ViewPlugin +Type=Service +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/chalkscripting/kis_script_monitor.cpp b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp new file mode 100644 index 00000000..3967ffe7 --- /dev/null +++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2006 Cyrille Berger + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "kis_script_monitor.h" + +#include
+#include
+ + +KisScriptMonitor::KisScriptMonitor() +{ +} + + +KisScriptMonitor::~KisScriptMonitor() +{ + s_instance = 0; +} + +void KisScriptMonitor::monitor(Kross::Api::ScriptGUIClient* guiClient) +{ + connect(guiClient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* ))); + connect(guiClient, TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* ))); +} + +KisScriptMonitor* KisScriptMonitor::s_instance = 0; + +KisScriptMonitor* KisScriptMonitor::instance() +{ + if(s_instance == 0) + s_instance = new KisScriptMonitor(); + return s_instance; +} + +#include "kis_script_monitor.moc" + diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h new file mode 100644 index 00000000..b2495d8b --- /dev/null +++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2006 Cyrille Berger + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef KIS_SCRIPT_MONITOR_H +#define KIS_SCRIPT_MONITOR_H + +#include + +namespace Kross { + namespace Api { + class ScriptGUIClient; + class ScriptAction; + } +} + +/** + @author Cyrille Berger +*/ +class KisScriptMonitor : public TQObject { + Q_OBJECT + + private: + KisScriptMonitor(); + ~KisScriptMonitor(); + public: + static KisScriptMonitor* instance(); + void monitor(Kross::Api::ScriptGUIClient* guiClient); + signals: + void executionFinished(const Kross::Api::ScriptAction* ); + void executionStarted(const Kross::Api::ScriptAction* ); + private: + static KisScriptMonitor* s_instance; + +}; + +#endif diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp new file mode 100644 index 00000000..d7af4eb4 --- /dev/null +++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2005 Cyrille Berger + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "kis_script_progress.h" + +#include +#include + +void KisScriptProgress::activateAsSubject() +{ + m_view->canvasSubject()->progressDisplay()->setSubject( this, true, false /* TODO: how to cancel a script ? */ ); +} + +void KisScriptProgress::setProgressTotalSteps(TQ_INT32 totalSteps) +{ + m_progressTotalSteps = totalSteps; + m_progressSteps = 0; + m_lastProgressPerCent = 0; + emit notifyProgress(0); +} + +void KisScriptProgress::setProgress(TQ_INT32 progress) +{ + m_progressSteps = progress; + TQ_INT32 progressPerCent = (m_progressSteps * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1); + + if (progressPerCent != m_lastProgressPerCent) { + + m_lastProgressPerCent = progressPerCent; + emit notifyProgress(progressPerCent); + } +} + +void KisScriptProgress::incProgress() +{ + setProgress( ++m_progressSteps ); +} + +void KisScriptProgress::setProgressStage(const TQString& stage, TQ_INT32 progress) +{ + TQ_INT32 progressPerCent = (progress * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1); + m_lastProgressPerCent = progress; + emit notifyProgressStage( stage, progressPerCent); +} + +void KisScriptProgress::progressDone() +{ + emit notifyProgressDone(); +} diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h new file mode 100644 index 00000000..48af433c --- /dev/null +++ b/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2005 Cyrille Berger + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef _KIS_SCRIPT_PROGRESS_H_ +#define _KIS_SCRIPT_PROGRESS_H_ + +#include + +class KisView; + +/** + * TODO: clarify the situation, while, in the future, multiple scripts could be running at a same time, + * some of the functions are global to all script and some aren't. + */ +class KisScriptProgress : public KisProgressSubject +{ + public: + KisScriptProgress(KisView* view) : m_view(view) {}; + public: + /** + * This function will set this class as the KisProgressSubject in view + */ + void activateAsSubject(); + virtual void cancel() {}; + public: + void setProgressTotalSteps(TQ_INT32 totalSteps); + void setProgress(TQ_INT32 progress); + void incProgress(); + void setProgressStage(const TQString& stage, TQ_INT32 progress); + void progressDone(); + inline void setPackagePath(TQString path) { m_packagePath = path; }; + inline TQString packagePath() { return m_packagePath; } + private: + TQ_INT32 m_progressSteps, m_progressTotalSteps, m_lastProgressPerCent; + KisView * m_view; + TQString m_packagePath; +}; + +#endif diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop b/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop deleted file mode 100644 index c4267097..00000000 --- a/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop +++ /dev/null @@ -1,81 +0,0 @@ -[Desktop Entry] -Name=Scripting plugin -Name[bg]=Приставка за скриптове -Name[ca]=Connector de seqüenciació -Name[da]=Scriptplugin -Name[de]=Skripting-Modul -Name[el]=Πρόσθετο γραφής σεναρίων -Name[eo]=Skriptad-kromaĵo -Name[es]=Complemento para guiones -Name[et]=Skriptiplugin -Name[fa]=وصلۀ دست‌نوشته -Name[fr]=Module de scriptage -Name[fy]=Skriptplugin -Name[ga]=Breiseán scriptithe -Name[gl]=Plugin de programación -Name[he]=תוסף לתסריטים -Name[hu]=Szkript modul -Name[is]=Skriftu íforrit -Name[it]=Plugin di scripting -Name[ja]=スクリプトプラグイン -Name[km]=កម្មវិធី​ជំនួយ​សម្រាប់​ស្គ្រីប -Name[nb]=Programtillegg for skripting -Name[nds]=Skriptmoduul -Name[ne]=प्लगइन स्क्रिप्ट गर्दै -Name[nl]=Scriptplugin -Name[pl]=Wtyczka obsługi języków skryptowych -Name[pt]='Plugin' de programação -Name[pt_BR]=Plugin de programação -Name[ru]=Модуль поддержки сценариев -Name[sk]=Modul pre skripty -Name[sl]=Vstavek za skripte -Name[sr]=Прикључак за скриптовање -Name[sr@Latn]=Priključak za skriptovanje -Name[sv]=Skriptinsticksprogram -Name[uk]=Втулок для скриптів -Name[uz]=Skriptlash plagini -Name[uz@cyrillic]=Скриптлаш плагини -Name[zh_CN]=脚本插件 -Name[zh_TW]=命令稿外掛程式 -Comment=Allow execution of scripts -Comment[bg]=Изпълнение на скриптове -Comment[ca]=Permet l'execució de seqüències -Comment[da]=Tillad kørsel af script -Comment[de]=Ermöglicht das Ausführen von Skripten -Comment[el]=Επιτρέπει την εκτέλεση σεναρίων -Comment[eo]=Permesi ruligon de skriptoj -Comment[es]=Permite la ejecución de guiones -Comment[et]=Võimaldab skriptide käivitamist -Comment[fa]=اجازۀ اجرای دست‌نوشته‌ها -Comment[fr]=Permet d'exécuter des scripts -Comment[fy]=Hjirmei kinne skripts útfierd wurde -Comment[gl]=Permite executar guións -Comment[he]=אפשרות להרצת תסריטים -Comment[hu]=Lehetővé teszi szkriptek végrehajtását -Comment[is]=Leyfa að skriftur séu keyrðar -Comment[it]=Permette di eseguire script -Comment[ja]=スクリプトの実行を可能にします -Comment[km]=អនុញ្ញាត​ឲ្យ​ប្រតិបត្តិ​ស្គ្រីប -Comment[lv]=Atļaut skriptu izpildi -Comment[nb]=Tillater skriptkjøring -Comment[nds]=Skripten utföhren -Comment[ne]=स्क्रिप्टको कार्यान्वयनलाई अनुमति दिनुहोस् -Comment[nl]=Hiermee kunnen scripts uitgevoerd worden -Comment[pl]=Zezwala na wykonywanie skryptów -Comment[pt]=Permitir executar programas ou 'scripts' -Comment[pt_BR]=Permitir executar programas ou 'scripts' -Comment[ru]=Возможность выполнения сценариев -Comment[sk]=Povoliť vykonávanie skriptov -Comment[sl]=Dovoli izvedbo skriptov -Comment[sr]=Омогући извршавање скрипти -Comment[sr@Latn]=Omogući izvršavanje skripti -Comment[sv]=Tillåt körning av skript -Comment[uk]=Дає змогу виконувати скрипти -Comment[uz]=Skriptlarni ishga tushirishga ruxsat berish -Comment[uz@cyrillic]=Скриптларни ишга туширишга рухсат бериш -Comment[zh_CN]=允许执行脚本 -Comment[zh_TW]=允許執行命令稿 -ServiceTypes=Chalk/ViewPlugin -Type=Service -X-TDE-Library=chaltdescripting -X-Chalk-Version=2 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/chaltdescripting/kis_script_monitor.cpp b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp deleted file mode 100644 index 3967ffe7..00000000 --- a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2006 Cyrille Berger - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "kis_script_monitor.h" - -#include
-#include
- - -KisScriptMonitor::KisScriptMonitor() -{ -} - - -KisScriptMonitor::~KisScriptMonitor() -{ - s_instance = 0; -} - -void KisScriptMonitor::monitor(Kross::Api::ScriptGUIClient* guiClient) -{ - connect(guiClient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* ))); - connect(guiClient, TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* ))); -} - -KisScriptMonitor* KisScriptMonitor::s_instance = 0; - -KisScriptMonitor* KisScriptMonitor::instance() -{ - if(s_instance == 0) - s_instance = new KisScriptMonitor(); - return s_instance; -} - -#include "kis_script_monitor.moc" - diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h deleted file mode 100644 index b2495d8b..00000000 --- a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2006 Cyrille Berger - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KIS_SCRIPT_MONITOR_H -#define KIS_SCRIPT_MONITOR_H - -#include - -namespace Kross { - namespace Api { - class ScriptGUIClient; - class ScriptAction; - } -} - -/** - @author Cyrille Berger -*/ -class KisScriptMonitor : public TQObject { - Q_OBJECT - - private: - KisScriptMonitor(); - ~KisScriptMonitor(); - public: - static KisScriptMonitor* instance(); - void monitor(Kross::Api::ScriptGUIClient* guiClient); - signals: - void executionFinished(const Kross::Api::ScriptAction* ); - void executionStarted(const Kross::Api::ScriptAction* ); - private: - static KisScriptMonitor* s_instance; - -}; - -#endif diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp deleted file mode 100644 index d7af4eb4..00000000 --- a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2005 Cyrille Berger - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "kis_script_progress.h" - -#include -#include - -void KisScriptProgress::activateAsSubject() -{ - m_view->canvasSubject()->progressDisplay()->setSubject( this, true, false /* TODO: how to cancel a script ? */ ); -} - -void KisScriptProgress::setProgressTotalSteps(TQ_INT32 totalSteps) -{ - m_progressTotalSteps = totalSteps; - m_progressSteps = 0; - m_lastProgressPerCent = 0; - emit notifyProgress(0); -} - -void KisScriptProgress::setProgress(TQ_INT32 progress) -{ - m_progressSteps = progress; - TQ_INT32 progressPerCent = (m_progressSteps * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1); - - if (progressPerCent != m_lastProgressPerCent) { - - m_lastProgressPerCent = progressPerCent; - emit notifyProgress(progressPerCent); - } -} - -void KisScriptProgress::incProgress() -{ - setProgress( ++m_progressSteps ); -} - -void KisScriptProgress::setProgressStage(const TQString& stage, TQ_INT32 progress) -{ - TQ_INT32 progressPerCent = (progress * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1); - m_lastProgressPerCent = progress; - emit notifyProgressStage( stage, progressPerCent); -} - -void KisScriptProgress::progressDone() -{ - emit notifyProgressDone(); -} diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h deleted file mode 100644 index 48af433c..00000000 --- a/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2005 Cyrille Berger - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef _KIS_SCRIPT_PROGRESS_H_ -#define _KIS_SCRIPT_PROGRESS_H_ - -#include - -class KisView; - -/** - * TODO: clarify the situation, while, in the future, multiple scripts could be running at a same time, - * some of the functions are global to all script and some aren't. - */ -class KisScriptProgress : public KisProgressSubject -{ - public: - KisScriptProgress(KisView* view) : m_view(view) {}; - public: - /** - * This function will set this class as the KisProgressSubject in view - */ - void activateAsSubject(); - virtual void cancel() {}; - public: - void setProgressTotalSteps(TQ_INT32 totalSteps); - void setProgress(TQ_INT32 progress); - void incProgress(); - void setProgressStage(const TQString& stage, TQ_INT32 progress); - void progressDone(); - inline void setPackagePath(TQString path) { m_packagePath = path; }; - inline TQString packagePath() { return m_packagePath; } - private: - TQ_INT32 m_progressSteps, m_progressTotalSteps, m_lastProgressPerCent; - KisView * m_view; - TQString m_packagePath; -}; - -#endif 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 #include -#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 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 @@ - + S&cripts diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am index 295f6980..20333271 100644 --- a/chalk/plugins/viewplugins/selectopaque/Makefile.am +++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am @@ -5,23 +5,23 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -kde_module_LTLIBRARIES = chaltdeselectopaque.la +kde_module_LTLIBRARIES = chalkselectopaque.la -chaltdeselectopaque_la_SOURCES = selectopaque.cc +chalkselectopaque_la_SOURCES = selectopaque.cc noinst_HEADERS = selectopaque.h -chaltdeselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ +chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chaltdeselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts chalkrcdir = $(kde_datadir)/chalkplugins chalkrc_DATA = selectopaque.rc EXTRA_DIST = $(chalkrc_DATA) -kde_services_DATA = chaltdeselectopaque.desktop +kde_services_DATA = chalkselectopaque.desktop -chaltdeselectopaque_la_METASOURCES = AUTO +chalkselectopaque_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop b/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop new file mode 100644 index 00000000..654e809c --- /dev/null +++ b/chalk/plugins/viewplugins/selectopaque/chalkselectopaque.desktop @@ -0,0 +1,26 @@ +[Desktop Entry] +Name=SelectOpaque +Name[bg]=Негатив +Name[da]=Markér ugennemsigtig +Name[de]=UndurchsichtigeAuswählen +Name[et]=Läbipaistmatute pikslite valik +Name[fy]=Untrochsichtige selektearje +Name[it]=Seleziona i pixel opachi +Name[km]=ជ្រើស​ស្រអាប់ +Name[nds]=Decken utsöken +Name[ne]=अपारदर्शी चयन +Name[nl]=Ondoorzichtige selecteren +Name[pl]=Zaznaczanie nieprzezroczystości +Name[pt]=Selecção Opaca +Name[pt_BR]=Seleção Opaca +Name[ru]=Выделение непрозрачных областей +Name[sk]=Invertovať Výber +Name[sr]=Избор непрозирног +Name[sr@Latn]=Izbor neprozirnog +Name[sv]=Markera ogenomskinliga +Name[uk]=Виділення непрозорих ділянок +Name[zh_TW]=選擇不透明 +ServiceTypes=Chalk/ViewPlugin +Type=Service +X-TDE-Library=chalkselectopaque +X-Chalk-Version=2 diff --git a/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop b/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop deleted file mode 100644 index db8e883c..00000000 --- a/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop +++ /dev/null @@ -1,26 +0,0 @@ -[Desktop Entry] -Name=SelectOpaque -Name[bg]=Негатив -Name[da]=Markér ugennemsigtig -Name[de]=UndurchsichtigeAuswählen -Name[et]=Läbipaistmatute pikslite valik -Name[fy]=Untrochsichtige selektearje -Name[it]=Seleziona i pixel opachi -Name[km]=ជ្រើស​ស្រអាប់ -Name[nds]=Decken utsöken -Name[ne]=अपारदर्शी चयन -Name[nl]=Ondoorzichtige selecteren -Name[pl]=Zaznaczanie nieprzezroczystości -Name[pt]=Selecção Opaca -Name[pt_BR]=Seleção Opaca -Name[ru]=Выделение непрозрачных областей -Name[sk]=Invertovať Výber -Name[sr]=Избор непрозирног -Name[sr@Latn]=Izbor neprozirnog -Name[sv]=Markera ogenomskinliga -Name[uk]=Виділення непрозорих ділянок -Name[zh_TW]=選擇不透明 -ServiceTypes=Chalk/ViewPlugin -Type=Service -X-TDE-Library=chaltdeselectopaque -X-Chalk-Version=2 diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc index ced4fd9a..57e32dce 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc @@ -51,7 +51,7 @@ #include "selectopaque.h" typedef KGenericFactory SelectOpaqueFactory; -K_EXPORT_COMPONENT_FACTORY( chaltdeselectopaque, SelectOpaqueFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chalkselectopaque, SelectOpaqueFactory( "chalk" ) ) SelectOpaque::SelectOpaque(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.rc b/chalk/plugins/viewplugins/selectopaque/selectopaque.rc index 6ff21abf..a4809d59 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.rc +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.rc @@ -1,5 +1,5 @@ - + Select -- cgit v1.2.1