From 2fb700f92bb787fab0845a63a541cd5640daa449 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:18:13 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- ChangeLog | 8 +- Doxyfile | 8 +- buildtools/ada/adaproject_widget.cpp | 2 +- buildtools/autotools/autoprojectpart.cpp | 2 +- buildtools/autotools/kfilednddetailview.cpp | 2 +- buildtools/autotools/kfiledndiconview.cpp | 2 +- buildtools/autotools/misc.cpp | 2 +- buildtools/custommakefiles/customprojectpart.cpp | 2 +- buildtools/lib/base/Makefile.am | 2 +- buildtools/lib/parsers/autotools/Makefile.am | 2 +- buildtools/lib/parsers/qmake/Makefile.am | 2 +- buildtools/lib/widgets/Makefile.am | 4 +- buildtools/pascal/pascalproject_widget.cpp | 2 +- buildtools/qmake/trollprojectpart.cpp | 2 +- buildtools/qmake/trollprojectwidget.cpp | 2 +- doc/api/FutureTasks.dox | 2 +- doc/kde_app_devel/index.docbook | 6 +- doc/kdearch/index.docbook | 10 +- doc/tdevelop/setup.docbook | 4 +- kdevdesigner/designer/CMakeLists.txt | 2 +- kdevdesigner/designer/kdevdesigner_part.h | 4 +- kdevdesigner/src/CMakeLists.txt | 2 +- kdevdesigner/src/Makefile.am | 2 +- kdevdesigner/src/kdevdesigner.h | 2 +- languages/ada/problemreporter.cpp | 10 +- languages/bash/bashsupport_part.cpp | 2 +- languages/bash/bashsupport_part.h | 6 +- languages/cpp/addattributedialog.cpp | 4 +- languages/cpp/addmethoddialog.cpp | 4 +- languages/cpp/app_templates/CMakeLists.txt | 4 +- languages/cpp/app_templates/Makefile.am | 2 +- .../cpp/app_templates/chello_gba/app.tdevelop | 2 +- languages/cpp/app_templates/kapp/README | 2 +- languages/cpp/app_templates/kapp/appview.h | 2 +- languages/cpp/app_templates/kconfig35/README | 2 +- languages/cpp/app_templates/kdecpp.appwizard | 2 +- .../cpp/app_templates/kdevpart/kdevpart_widget.cpp | 2 +- .../app_templates/kdevpart2/kdevpart_widget.cpp | 2 +- languages/cpp/app_templates/kpartapp/app.h | 2 +- languages/cpp/app_templates/kpartapp/app_part.h | 4 +- .../cpp/app_templates/kpartplugin/plugin_app.cpp | 2 +- .../cpp/app_templates/kpartplugin/plugin_app.h | 4 +- .../cpp/app_templates/kpartplugin/src-Makefile.am | 2 +- .../cpp/app_templates/kscons_kmdi/CMakeLists.txt | 30 -- languages/cpp/app_templates/kscons_kmdi/INSTALL | 83 ----- .../cpp/app_templates/kscons_kmdi/Makefile.am | 21 -- languages/cpp/app_templates/kscons_kmdi/QUICKSTART | 164 --------- languages/cpp/app_templates/kscons_kmdi/README | 111 ------ .../cpp/app_templates/kscons_kmdi/SConscript-doc | 92 ----- .../cpp/app_templates/kscons_kmdi/SConscript-src | 60 ---- languages/cpp/app_templates/kscons_kmdi/SConstruct | 112 ------ languages/cpp/app_templates/kscons_kmdi/VERSION | 1 - languages/cpp/app_templates/kscons_kmdi/app.kcfg | 12 - .../cpp/app_templates/kscons_kmdi/app.tdevelop | 169 --------- .../cpp/app_templates/kscons_kmdi/app_part.cpp | 159 --------- languages/cpp/app_templates/kscons_kmdi/app_part.h | 75 ---- .../cpp/app_templates/kscons_kmdi/app_part.rc | 17 - .../cpp/app_templates/kscons_kmdi/app_shell.rc | 33 -- .../cpp/app_templates/kscons_kmdi/appkmdi.cpp | 394 --------------------- languages/cpp/app_templates/kscons_kmdi/appkmdi.h | 83 ----- .../cpp/app_templates/kscons_kmdi/appkmdiView.cpp | 63 ---- .../cpp/app_templates/kscons_kmdi/appkmdiView.h | 30 -- .../cpp/app_templates/kscons_kmdi/kmdikonsole.cpp | 76 ---- .../cpp/app_templates/kscons_kmdi/kmdikonsole.h | 33 -- .../kscons_kmdi/kscons_kmdi.kdevtemplate | 271 -------------- .../cpp/app_templates/kscons_kmdi/kscons_kmdi.png | Bin 13151 -> 0 bytes languages/cpp/app_templates/kscons_kmdi/main.cpp | 60 ---- .../cpp/app_templates/kscons_kmdi/messages.sh | 60 ---- languages/cpp/app_templates/kscons_kmdi/prefs.ui | 30 -- .../cpp/app_templates/kscons_kmdi/settings.kcfgc | 6 - languages/cpp/app_templates/kscons_kmdi/tips | 6 - languages/cpp/app_templates/kscons_kxt/README | 2 +- .../cpp/app_templates/kscons_tdemdi/CMakeLists.txt | 30 ++ languages/cpp/app_templates/kscons_tdemdi/INSTALL | 83 +++++ .../cpp/app_templates/kscons_tdemdi/Makefile.am | 21 ++ .../cpp/app_templates/kscons_tdemdi/QUICKSTART | 164 +++++++++ languages/cpp/app_templates/kscons_tdemdi/README | 111 ++++++ .../cpp/app_templates/kscons_tdemdi/SConscript-doc | 92 +++++ .../cpp/app_templates/kscons_tdemdi/SConscript-src | 60 ++++ .../cpp/app_templates/kscons_tdemdi/SConstruct | 112 ++++++ languages/cpp/app_templates/kscons_tdemdi/VERSION | 1 + languages/cpp/app_templates/kscons_tdemdi/app.kcfg | 12 + .../cpp/app_templates/kscons_tdemdi/app.tdevelop | 169 +++++++++ .../cpp/app_templates/kscons_tdemdi/app_part.cpp | 159 +++++++++ .../cpp/app_templates/kscons_tdemdi/app_part.h | 75 ++++ .../cpp/app_templates/kscons_tdemdi/app_part.rc | 17 + .../cpp/app_templates/kscons_tdemdi/app_shell.rc | 33 ++ .../cpp/app_templates/kscons_tdemdi/apptdemdi.cpp | 394 +++++++++++++++++++++ .../cpp/app_templates/kscons_tdemdi/apptdemdi.h | 83 +++++ .../app_templates/kscons_tdemdi/apptdemdiView.cpp | 63 ++++ .../app_templates/kscons_tdemdi/apptdemdiView.h | 30 ++ .../kscons_tdemdi/kscons_tdemdi.kdevtemplate | 271 ++++++++++++++ .../app_templates/kscons_tdemdi/kscons_tdemdi.png | Bin 0 -> 13151 bytes languages/cpp/app_templates/kscons_tdemdi/main.cpp | 60 ++++ .../cpp/app_templates/kscons_tdemdi/messages.sh | 60 ++++ languages/cpp/app_templates/kscons_tdemdi/prefs.ui | 30 ++ .../cpp/app_templates/kscons_tdemdi/settings.kcfgc | 6 + .../app_templates/kscons_tdemdi/tdemdikonsole.cpp | 76 ++++ .../app_templates/kscons_tdemdi/tdemdikonsole.h | 33 ++ languages/cpp/app_templates/kscons_tdemdi/tips | 6 + .../cpp/app_templates/kscreensaver/.kdev_ignore | 0 .../cpp/app_templates/kscreensaver/CMakeLists.txt | 27 -- .../cpp/app_templates/kscreensaver/Makefile.am | 19 - .../app_templates/kscreensaver/kscreensaver.cpp | 107 ------ .../kscreensaver/kscreensaver.desktop | 124 ------- .../cpp/app_templates/kscreensaver/kscreensaver.h | 37 -- .../kscreensaver/kscreensaver.kdevtemplate | 203 ----------- .../app_templates/kscreensaver/kscreensaver.png | Bin 12032 -> 0 bytes .../kscreensaver/kscreensaver.tdevelop | 113 ------ .../app_templates/kscreensaver/kscreensaverui.ui | 79 ----- .../cpp/app_templates/kscreensaver/src-Makefile.am | 24 -- languages/cpp/app_templates/kscreensaver/subdirs | 3 - languages/cpp/app_templates/kxt/README | 2 +- languages/cpp/app_templates/tdecmodule/module.cpp | 2 +- .../cpp/app_templates/tdescreensaver/.kdev_ignore | 0 .../app_templates/tdescreensaver/CMakeLists.txt | 27 ++ .../cpp/app_templates/tdescreensaver/Makefile.am | 19 + .../app_templates/tdescreensaver/src-Makefile.am | 24 ++ languages/cpp/app_templates/tdescreensaver/subdirs | 3 + .../tdescreensaver/tdescreensaver.cpp | 107 ++++++ .../tdescreensaver/tdescreensaver.desktop | 124 +++++++ .../app_templates/tdescreensaver/tdescreensaver.h | 37 ++ .../tdescreensaver/tdescreensaver.kdevtemplate | 203 +++++++++++ .../tdescreensaver/tdescreensaver.png | Bin 0 -> 12032 bytes .../tdescreensaver/tdescreensaver.tdevelop | 113 ++++++ .../tdescreensaver/tdescreensaverui.ui | 79 +++++ languages/cpp/ast_utils.cpp | 2 +- languages/cpp/backgroundparser.cpp | 8 +- languages/cpp/codecompletionentry.h | 2 +- languages/cpp/codeinformationrepository.h | 2 +- languages/cpp/cppcodecompletion.cpp | 4 +- languages/cpp/cppcodecompletion.h | 12 +- languages/cpp/cppsupportpart.cpp | 16 +- languages/cpp/createpcsdialog.cpp | 2 +- languages/cpp/debugger/debuggerpart.cpp | 4 +- languages/cpp/doc/kde2book.toc | 12 +- .../tdelibsimporter/kdevtdelibsimporter.cpp | 4 +- languages/cpp/problemreporter.cpp | 12 +- languages/cpp/qtdesignercppintegration.cpp | 6 +- languages/cpp/typedesc.h | 2 +- languages/java/backgroundparser.cpp | 8 +- languages/java/javasupportpart.cpp | 16 +- languages/java/problemreporter.cpp | 12 +- languages/kjssupport/jscodecompletion.cpp | 2 +- languages/kjssupport/jscodecompletion.h | 6 +- languages/kjssupport/kjssupport_part.cpp | 2 +- languages/lib/debugger/CMakeLists.txt | 2 +- languages/lib/debugger/Makefile.am | 4 +- languages/lib/debugger/debugger.cpp | 2 +- languages/lib/debugger/debugger.h | 6 +- languages/lib/designer_integration/Makefile.am | 2 +- languages/lib/interfaces/Makefile.am | 2 +- languages/pascal/problemreporter.cpp | 10 +- languages/php/phpcodecompletion.h | 10 +- languages/php/phperrorview.cpp | 12 +- languages/php/phpfile.h | 4 +- languages/php/phpsupportpart.cpp | 4 +- languages/php/phpsupportpart.h | 2 +- languages/python/qtdesignerpythonintegration.cpp | 6 +- languages/ruby/app_templates/kapp/README | 2 +- languages/ruby/debugger/debuggerpart.cpp | 4 +- languages/ruby/qtdesignerrubyintegration.cpp | 6 +- languages/ruby/rubysupport_part.cpp | 4 +- languages/sql/sqlsupport_part.cpp | 4 +- lib/CMakeLists.txt | 2 +- lib/Makefile.am | 2 +- lib/catalog/Makefile.am | 2 +- lib/cppparser/Makefile.am | 2 +- lib/interfaces/Makefile.am | 4 +- lib/interfaces/extensions/Makefile.am | 2 +- lib/interfaces/external/CMakeLists.txt | 2 +- lib/interfaces/external/Makefile.am | 2 +- lib/interfaces/external/designer.h | 2 +- lib/interfaces/extras/Makefile.am | 2 +- lib/interfaces/kdevpartcontroller.h | 2 +- lib/util/CMakeLists.txt | 4 +- lib/util/Makefile.am | 6 +- lib/util/kdeveditorutil.cpp | 10 +- lib/util/kdevshellwidget.cpp | 2 +- lib/util/kscriptactionmanager.cpp | 177 --------- lib/util/kscriptactionmanager.h | 141 -------- lib/util/tdescriptactionmanager.cpp | 177 +++++++++ lib/util/tdescriptactionmanager.h | 141 ++++++++ lib/widgets/CMakeLists.txt | 2 +- lib/widgets/Makefile.am | 2 +- lib/widgets/kdevhtmlpart.cpp | 4 +- lib/widgets/kdevhtmlpart.h | 2 +- lib/widgets/propeditor/Makefile.am | 2 +- parts/abbrev/abbrevpart.cpp | 10 +- parts/abbrev/abbrevpart.h | 2 +- parts/appwizard/appwizarddlg.cpp | 2 +- parts/appwizard/common/incadmin/ltmain.sh | 2 +- parts/appwizard/importdlg.cpp | 2 +- parts/astyle/astyle_part.cpp | 12 +- parts/astyle/astyle_part.h | 2 +- parts/bookmarks/bookmarks_part.cpp | 6 +- parts/bookmarks/bookmarks_part.h | 2 +- parts/bookmarks/bookmarks_widget.cpp | 2 +- parts/classview/classviewpart.cpp | 12 +- parts/classview/navigator.cpp | 2 +- parts/ctags2/ctags2_part.cpp | 8 +- parts/diff/diffpart.cpp | 4 +- parts/diff/diffwidget.cpp | 4 +- parts/distpart/distpart_widget.cpp | 2 +- parts/documentation/CMakeLists.txt | 2 +- parts/documentation/bookmarkview.cpp | 4 +- parts/documentation/docglobalconfigwidget.cpp | 4 +- parts/documentation/documentation_part.cpp | 4 +- parts/documentation/documentation_widget.cpp | 2 +- parts/documentation/interfaces/Makefile.am | 2 +- parts/documentation/protocols/chm/Makefile.am | 2 +- parts/documentation/protocols/chm/kchmpart.h | 8 +- parts/documentation/tools/htdig/Makefile.am | 2 +- parts/doxygen/doxygenpart.cpp | 8 +- parts/filecreate/filecreate_widget2.cpp | 2 +- parts/filecreate/filecreate_widget3.cpp | 2 +- parts/filelist/filelist_widget.cpp | 2 +- parts/filelist/projectviewpart.cpp | 6 +- parts/fileselector/fileselector_widget.cpp | 2 +- parts/filter/filterpart.cpp | 8 +- parts/grepview/grepdlg.cpp | 2 +- parts/grepview/grepviewpart.cpp | 2 +- parts/grepview/grepviewwidget.cpp | 4 +- parts/konsole/konsoleviewwidget.cpp | 2 +- parts/outputviews/appoutputviewpart.cpp | 2 +- parts/outputviews/makeactionfilter.cpp | 4 +- parts/outputviews/makeitem.cpp | 2 +- parts/outputviews/makewidget.cpp | 6 +- parts/quickopen/quickopen_part.cpp | 4 +- parts/regexptest/regexptestdlg.cpp | 8 +- parts/replace/replace_widget.cpp | 14 +- parts/replace/replace_widget.h | 2 +- parts/replace/replacedlgimpl.cpp | 2 +- parts/scripting/scriptingpart.cpp | 2 +- parts/snippet/snippet_widget.cpp | 10 +- parts/snippet/snippet_widget.h | 4 +- parts/texttools/texttoolspart.cpp | 2 +- parts/texttools/texttoolspart.h | 2 +- parts/texttools/texttoolswidget.cpp | 8 +- parts/tools/kapplicationtree.cpp | 2 +- parts/tools/tools_part.cpp | 4 +- parts/valgrind/valgrind_widget.cpp | 2 +- src/Makefile.am | 8 +- src/core.h | 2 +- src/editorproxy.cpp | 22 +- src/editorproxy.h | 6 +- src/kconf_update/Makefile.am | 2 +- src/mainwindowshare.cpp | 10 +- src/multibuffer.cpp | 10 +- src/newui/CMakeLists.txt | 2 +- src/newui/dmainwindow.h | 2 +- src/partcontroller.cpp | 18 +- src/plugincontroller.cpp | 2 +- src/profileengine/lib/Makefile.am | 2 +- src/projectmanager.cpp | 2 +- src/projectsession.cpp | 8 +- src/simplemainwindow.cpp | 6 +- src/statusbar.cpp | 6 +- vcs/cvsservice/CMakeLists.txt | 2 +- vcs/cvsservice/cvspart.cpp | 2 +- vcs/cvsservice/diffwidget.cpp | 4 +- vcs/perforce/perforcepart.cpp | 2 +- vcs/subversion/subversion_core.cpp | 2 +- vcs/subversion/subversion_part.cpp | 2 +- vcs/subversion/subversion_widget.cpp | 2 +- 265 files changed, 3690 insertions(+), 3690 deletions(-) delete mode 100644 languages/cpp/app_templates/kscons_kmdi/CMakeLists.txt delete mode 100644 languages/cpp/app_templates/kscons_kmdi/INSTALL delete mode 100644 languages/cpp/app_templates/kscons_kmdi/Makefile.am delete mode 100644 languages/cpp/app_templates/kscons_kmdi/QUICKSTART delete mode 100644 languages/cpp/app_templates/kscons_kmdi/README delete mode 100644 languages/cpp/app_templates/kscons_kmdi/SConscript-doc delete mode 100644 languages/cpp/app_templates/kscons_kmdi/SConscript-src delete mode 100644 languages/cpp/app_templates/kscons_kmdi/SConstruct delete mode 100644 languages/cpp/app_templates/kscons_kmdi/VERSION delete mode 100644 languages/cpp/app_templates/kscons_kmdi/app.kcfg delete mode 100644 languages/cpp/app_templates/kscons_kmdi/app.tdevelop delete mode 100644 languages/cpp/app_templates/kscons_kmdi/app_part.cpp delete mode 100644 languages/cpp/app_templates/kscons_kmdi/app_part.h delete mode 100644 languages/cpp/app_templates/kscons_kmdi/app_part.rc delete mode 100644 languages/cpp/app_templates/kscons_kmdi/app_shell.rc delete mode 100644 languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp delete mode 100644 languages/cpp/app_templates/kscons_kmdi/appkmdi.h delete mode 100644 languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp delete mode 100644 languages/cpp/app_templates/kscons_kmdi/appkmdiView.h delete mode 100644 languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp delete mode 100644 languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h delete mode 100644 languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate delete mode 100644 languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.png delete mode 100644 languages/cpp/app_templates/kscons_kmdi/main.cpp delete mode 100755 languages/cpp/app_templates/kscons_kmdi/messages.sh delete mode 100644 languages/cpp/app_templates/kscons_kmdi/prefs.ui delete mode 100644 languages/cpp/app_templates/kscons_kmdi/settings.kcfgc delete mode 100644 languages/cpp/app_templates/kscons_kmdi/tips create mode 100644 languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt create mode 100644 languages/cpp/app_templates/kscons_tdemdi/INSTALL create mode 100644 languages/cpp/app_templates/kscons_tdemdi/Makefile.am create mode 100644 languages/cpp/app_templates/kscons_tdemdi/QUICKSTART create mode 100644 languages/cpp/app_templates/kscons_tdemdi/README create mode 100644 languages/cpp/app_templates/kscons_tdemdi/SConscript-doc create mode 100644 languages/cpp/app_templates/kscons_tdemdi/SConscript-src create mode 100644 languages/cpp/app_templates/kscons_tdemdi/SConstruct create mode 100644 languages/cpp/app_templates/kscons_tdemdi/VERSION create mode 100644 languages/cpp/app_templates/kscons_tdemdi/app.kcfg create mode 100644 languages/cpp/app_templates/kscons_tdemdi/app.tdevelop create mode 100644 languages/cpp/app_templates/kscons_tdemdi/app_part.cpp create mode 100644 languages/cpp/app_templates/kscons_tdemdi/app_part.h create mode 100644 languages/cpp/app_templates/kscons_tdemdi/app_part.rc create mode 100644 languages/cpp/app_templates/kscons_tdemdi/app_shell.rc create mode 100644 languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp create mode 100644 languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h create mode 100644 languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp create mode 100644 languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h create mode 100644 languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate create mode 100644 languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.png create mode 100644 languages/cpp/app_templates/kscons_tdemdi/main.cpp create mode 100755 languages/cpp/app_templates/kscons_tdemdi/messages.sh create mode 100644 languages/cpp/app_templates/kscons_tdemdi/prefs.ui create mode 100644 languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc create mode 100644 languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp create mode 100644 languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h create mode 100644 languages/cpp/app_templates/kscons_tdemdi/tips delete mode 100644 languages/cpp/app_templates/kscreensaver/.kdev_ignore delete mode 100644 languages/cpp/app_templates/kscreensaver/CMakeLists.txt delete mode 100644 languages/cpp/app_templates/kscreensaver/Makefile.am delete mode 100644 languages/cpp/app_templates/kscreensaver/kscreensaver.cpp delete mode 100644 languages/cpp/app_templates/kscreensaver/kscreensaver.desktop delete mode 100644 languages/cpp/app_templates/kscreensaver/kscreensaver.h delete mode 100644 languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate delete mode 100644 languages/cpp/app_templates/kscreensaver/kscreensaver.png delete mode 100644 languages/cpp/app_templates/kscreensaver/kscreensaver.tdevelop delete mode 100644 languages/cpp/app_templates/kscreensaver/kscreensaverui.ui delete mode 100644 languages/cpp/app_templates/kscreensaver/src-Makefile.am delete mode 100644 languages/cpp/app_templates/kscreensaver/subdirs create mode 100644 languages/cpp/app_templates/tdescreensaver/.kdev_ignore create mode 100644 languages/cpp/app_templates/tdescreensaver/CMakeLists.txt create mode 100644 languages/cpp/app_templates/tdescreensaver/Makefile.am create mode 100644 languages/cpp/app_templates/tdescreensaver/src-Makefile.am create mode 100644 languages/cpp/app_templates/tdescreensaver/subdirs create mode 100644 languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp create mode 100644 languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop create mode 100644 languages/cpp/app_templates/tdescreensaver/tdescreensaver.h create mode 100644 languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate create mode 100644 languages/cpp/app_templates/tdescreensaver/tdescreensaver.png create mode 100644 languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop create mode 100644 languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui delete mode 100644 lib/util/kscriptactionmanager.cpp delete mode 100644 lib/util/kscriptactionmanager.h create mode 100644 lib/util/tdescriptactionmanager.cpp create mode 100644 lib/util/tdescriptactionmanager.h diff --git a/ChangeLog b/ChangeLog index 45a74e29..ff5fbb5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -546,7 +546,7 @@ 2003-11-20 F@lk Brettschneider * latest sync with KMdi of tdelibs-cvsHead (fixes some crashes) - * enabled kmdiguiclient.h/cpp for KDE less version 3.2 too + * enabled tdemdiguiclient.h/cpp for KDE less version 3.2 too (-> this introduces KDE-accels Ctrl+Shift+Alt+L/R/B/T for IDEAl-docks and Ctrl+Alt+CursorLeft/CursorRight for cycling IDEAl-toolviews) * bugfix: proper names of View menu * now save the docking state to another section of tdeveloprc (to let people (who tried KMdi alpha versions) escape a vicious cycle) @@ -567,7 +567,7 @@ 2003-11-09 F@lk Brettschneider * as planned and decided months ago, now I removed KDevelop's own special implementation of IDEAl UI mode. - This has been replaced by KDE's IDEAl UI mode, globally implemented in tdelibs/kmdi. + This has been replaced by KDE's IDEAl UI mode, globally implemented in tdelibs/tdemdi. Now we increase maintainance, KDE-comformity and can switch all KDevelop UI modes on the fly. 2003-10-29 Alexander Dymo @@ -1986,14 +1986,14 @@ 2002-05-20 Matthias Hlzer-Klpfel * Welcome in the 2000's: the Tools menu config - now uses ksycoca... + now uses tdesycoca... 2002-05-20 Harald Fernengel * Outputviews: Uses bright font colors if widget background is dark * Extended Tools Config: Show App-Tree to make it more comfortable 2002-05-20 Roberto Raggi - * Ported qeditor to ktexteditor interface + * Ported qeditor to tdetexteditor interface * Fixed text insertion in abbreviation part 2002-05-20 Bernd Gehrmann diff --git a/Doxyfile b/Doxyfile index fe8215aa..1ef8ee85 100644 --- a/Doxyfile +++ b/Doxyfile @@ -235,12 +235,12 @@ TAGFILES = $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/dcop/dc $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdecore/tdecore.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdecore/html/ \ $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdefx/tdefx.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdefx/html/ \ $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeui/tdeui.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeui/html/ \ - $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/khtml/khtml.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/khtml/html/ \ + $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdehtml/tdehtml.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdehtml/html/ \ $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kio/kio.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kio/html/ \ $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kjs/kjs.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kjs/html/ \ - $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kparts/kparts.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kparts/html/ \ - $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kmdi/kmdi.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kmdi/html/ \ - $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kutils/kutils.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/kutils/html/ \ + $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeparts/tdeparts.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeparts/html/ \ + $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdemdi/tdemdi.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdemdi/html/ \ + $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeutils/tdeutils.tag=$(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/tdeutils/html/ \ $(TDEDIR)/share/doc/tde/HTML/en/tdelibs-apidocs/qt/qt.tag=$(QTDIR)/doc/html GENERATE_TAGFILE = ALLEXTERNALS = NO diff --git a/buildtools/ada/adaproject_widget.cpp b/buildtools/ada/adaproject_widget.cpp index 2e5d818a..f5016e8c 100644 --- a/buildtools/ada/adaproject_widget.cpp +++ b/buildtools/ada/adaproject_widget.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 0375c6f2..0e665eb7 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/kfilednddetailview.cpp index 915891dc..405ff249 100644 --- a/buildtools/autotools/kfilednddetailview.cpp +++ b/buildtools/autotools/kfilednddetailview.cpp @@ -160,7 +160,7 @@ void KFileDnDDetailView::startDrag(){ } TQPixmap pixmap; if( urls.count() > 1 ){ - pixmap = DesktopIcon( "kmultiple", 16 ); + pixmap = DesktopIcon( "tdemultiple", 16 ); } if( pixmap.isNull() ) pixmap = currentFileItem()->pixmap( 16 ); diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp index c68a1f58..e7b727e5 100644 --- a/buildtools/autotools/kfiledndiconview.cpp +++ b/buildtools/autotools/kfiledndiconview.cpp @@ -149,7 +149,7 @@ TQDragObject* KFileDnDIconView::dragObject() { } TQPixmap pixmap; if( urls.count() > 1 ) - pixmap = DesktopIcon( "kmultiple", iconSize() ); + pixmap = DesktopIcon( "tdemultiple", iconSize() ); if( pixmap.isNull() ) pixmap = currentFileItem()->pixmap( iconSize() ); TQPoint hotspot; diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index 9f6e1cb5..71d6cf09 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "misc.h" diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index e7883961..b39dc00f 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/buildtools/lib/base/Makefile.am b/buildtools/lib/base/Makefile.am index be6b9576..dbb9850b 100644 --- a/buildtools/lib/base/Makefile.am +++ b/buildtools/lib/base/Makefile.am @@ -9,7 +9,7 @@ libkdevbuildbase_la_SOURCES = kdevbuildtool.cpp tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/base tdevelopbuildtoolsinclude_HEADERS = kdevbuildtool.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevextensions +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions DOXYGEN_PROJECTNAME = KDevelop Buildtool Base Library DOXYGEN_DOCDIRPREFIX = kdevbt include ../../../Doxyfile.am diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am index 929f089a..fc8cdc9a 100644 --- a/buildtools/lib/parsers/autotools/Makefile.am +++ b/buildtools/lib/parsers/autotools/Makefile.am @@ -18,7 +18,7 @@ parser: EXTRA_DIST = autotools.yy autotools.ll -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils DOXYGEN_PROJECTNAME = KDevelop AutoTools Parser DOXYGEN_DOCDIRPREFIX = kdevparser include ../../../../Doxyfile.am diff --git a/buildtools/lib/parsers/qmake/Makefile.am b/buildtools/lib/parsers/qmake/Makefile.am index 8dde1ed2..5f7ec787 100644 --- a/buildtools/lib/parsers/qmake/Makefile.am +++ b/buildtools/lib/parsers/qmake/Makefile.am @@ -23,7 +23,7 @@ parser: EXTRA_DIST = qmake.yy qmake.ll -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils DOXYGEN_PROJECTNAME = KDevelop QMake parser DOXYGEN_DOCDIRPREFIX = kdevparser include ../../../../Doxyfile.am diff --git a/buildtools/lib/widgets/Makefile.am b/buildtools/lib/widgets/Makefile.am index d640a831..5528ab85 100644 --- a/buildtools/lib/widgets/Makefile.am +++ b/buildtools/lib/widgets/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ lib_LTLIBRARIES = libkdevbuildtoolswidgets.la libkdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries) libkdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \ - $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lktexteditor + $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltdetexteditor libkdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \ environmentdisplaydialog.cpp environmentdisplaydialogbase.ui environmentvariableswidget.cpp \ environmentvariableswidgetbase.ui envvartools.cpp makeoptionswidget.cpp makeoptionswidgetbase.ui \ @@ -23,7 +23,7 @@ tdevelopbuildtoolsinclude_HEADERS = addenvvardlg.h addfilesdialog.h \ makeoptionswidgetbase.h removesubprojectdialog.h removesubprojectdlgbase.h runoptionswidget.h \ runoptionswidgetbase.h subclassesdlg.h subclassesdlgbase.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevutil +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevutil DOXYGEN_PROJECTNAME = KDevelop Buildtool Widgets Library DOXYGEN_DOCDIRPREFIX = kdevbt include ../../../Doxyfile.am diff --git a/buildtools/pascal/pascalproject_widget.cpp b/buildtools/pascal/pascalproject_widget.cpp index 9e0c533c..a8671023 100644 --- a/buildtools/pascal/pascalproject_widget.cpp +++ b/buildtools/pascal/pascalproject_widget.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 7086ae1e..58c4ba22 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 86a485f6..5b1f528b 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/doc/api/FutureTasks.dox b/doc/api/FutureTasks.dox index 5e2b8268..c738a3f3 100644 --- a/doc/api/FutureTasks.dox +++ b/doc/api/FutureTasks.dox @@ -99,7 +99,7 @@ - cd's when selecting a file, but doesn't when selecting a dir, desired: a menu option to "cd" to that directory - QEditor - - Replace editors/qeditor/koReplace.* and editors/qeditor/koFind.* with tdelibs/kutils/kreplace.* and tdelibs/kutils/kfind.* + - Replace editors/qeditor/koReplace.* and editors/qeditor/koFind.* with tdelibs/tdeutils/kreplace.* and tdelibs/tdeutils/kfind.* \section extensiontodo Extensions / New Functionality: diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook index bfade594..a73c681a 100644 --- a/doc/kde_app_devel/index.docbook +++ b/doc/kde_app_devel/index.docbook @@ -542,7 +542,7 @@ Additionally, for specific solutions KDE offers the following libraries: the tdefx library, containing pixmaps, image effects the KStyle extension to QStyle -the khtml library, containing KDE's html component +the tdehtml library, containing KDE's html component the kjs library, containing KDE's Javascript support @@ -551,7 +551,7 @@ the kjs library, containing KDE's Javascript support the kio library, containing low level access to network files -the kparts library, containing support for re-usable embeddable extendable applications +the tdeparts library, containing support for re-usable embeddable extendable applications @@ -1131,7 +1131,7 @@ KIconView: a graphical viewer of icon files -The khtml library, on the other hand, offers a complete HTML-interpreting widget that is ready to use. +The tdehtml library, on the other hand, offers a complete HTML-interpreting widget that is ready to use. It is scrollable already, so you don't even have to take care for that. A possible use could be to integrate it as a preview widget for an HTML editor; used by applications such as Konqueror to display HTML files. diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index e5942974..7bccb9fa 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -87,9 +87,9 @@ The kjs library provides an implementation of JavaScript. -khtml +tdehtml -The khtml library contains the KHTML part, a HTML browsing +The tdehtml library contains the KHTML part, a HTML browsing widget, DOM API and parser, including interfaces to Java and JavaScript. @@ -592,7 +592,7 @@ A GUI fragment consisting of an action collection and a DOM tree representing th -<ulink url="kdeapi:kparts/KPartManager">KPartManager</ulink> +<ulink url="kdeapi:tdeparts/KPartManager">KPartManager</ulink> Manages the activation of XMLGUI clients. @@ -2004,9 +2004,9 @@ The type of the factory class DoxygenFactory depends on the specific service type the service implements. In our example of a TDevelop plugin, the factory must be a KDevFactory (which inherits KLibFactory). More common examples are -KParts::Factory +KParts::Factory which is supposed to produce -KParts::ReadOnlyPart +KParts::ReadOnlyPart objects or in most cases the generic KLibFactory. diff --git a/doc/tdevelop/setup.docbook b/doc/tdevelop/setup.docbook index 366f25a7..0c078a3b 100644 --- a/doc/tdevelop/setup.docbook +++ b/doc/tdevelop/setup.docbook @@ -540,7 +540,7 @@ The active toolview window must be shown fixed (non-overlap mode), sharing the w -To select a new editor, click on the arrow on the drop down list field. Depending on the editor parts interfaces your &kde; version has compiled in you will be provided with a list of editors you may select from (see the Important note below for this). Click on the editor of your liking and click OK. Currently there are two possibilities: +To select a new editor, click on the arrow on the drop down list field. Depending on the editor parts interfaces your &kde; version has compiled in you will be provided with a list of editors you may select from (see the Important note below for this). Click on the editor of your liking and click OK. Currently there are two possibilities: @@ -567,7 +567,7 @@ These editor interfaces are fully integrated in the &tdevelop; IDE concept. Part Changing the editor will not effect already open files. There are two possibilities to proceed. Either close all open text windows and reopen them one by one. Or simply close the whole project and reopen it again. The windows will then automatically open under the new text editor interface. - + KDevelop lets you use editor interfaces which have registered with &kde; and that provide a KatePart interface. If you miss one one of the selections shown above check your &kde; installation if the corresponding KPart was correctly installed. diff --git a/kdevdesigner/designer/CMakeLists.txt b/kdevdesigner/designer/CMakeLists.txt index c0f54fe8..298fb20d 100644 --- a/kdevdesigner/designer/CMakeLists.txt +++ b/kdevdesigner/designer/CMakeLists.txt @@ -102,6 +102,6 @@ tde_add_kpart( libkdevdesignerpart AUTOMOC SOURCES ${SRCS} LINK kdevqui-static shared-static kinterfacedesigner-shared - kio-shared kparts-shared qassistantclient + kio-shared tdeparts-shared qassistantclient DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h index 32537653..48c0205e 100644 --- a/kdevdesigner/designer/kdevdesigner_part.h +++ b/kdevdesigner/designer/kdevdesigner_part.h @@ -23,8 +23,8 @@ #include -#include -#include +#include +#include #include "designer.h" diff --git a/kdevdesigner/src/CMakeLists.txt b/kdevdesigner/src/CMakeLists.txt index 726a91d1..c232cd2f 100644 --- a/kdevdesigner/src/CMakeLists.txt +++ b/kdevdesigner/src/CMakeLists.txt @@ -31,6 +31,6 @@ install( FILES kdevdesigner_shell.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdesigne tde_add_executable( kdevdesigner AUTOMOC SOURCES main.cpp kdevdesigner.cpp - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kdevdesigner/src/Makefile.am b/kdevdesigner/src/Makefile.am index a241ff66..be773bda 100644 --- a/kdevdesigner/src/Makefile.am +++ b/kdevdesigner/src/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = kdevdesigner # the application source, library search path, and link libraries kdevdesigner_SOURCES = main.cpp kdevdesigner.cpp -kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kdevdesigner_LDADD = $(LIB_KPARTS) # this is where the desktop file will go diff --git a/kdevdesigner/src/kdevdesigner.h b/kdevdesigner/src/kdevdesigner.h index 5930cf2a..2fda0a78 100644 --- a/kdevdesigner/src/kdevdesigner.h +++ b/kdevdesigner/src/kdevdesigner.h @@ -27,7 +27,7 @@ #include #include -#include +#include class KToggleAction; diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index d27d0796..cf816ca1 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -27,12 +27,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include #include diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index ebd483a4..4ac60e3e 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include diff --git a/languages/bash/bashsupport_part.h b/languages/bash/bashsupport_part.h index 5c1dce74..284e4f4c 100644 --- a/languages/bash/bashsupport_part.h +++ b/languages/bash/bashsupport_part.h @@ -16,9 +16,9 @@ #include #include -#include -#include -#include +#include +#include +#include //class BashSupportWidget; diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index 8d12b40f..885aad6d 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index 07ecde2b..ae4b5a61 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -29,8 +29,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt index c8c21605..94a914ac 100644 --- a/languages/cpp/app_templates/CMakeLists.txt +++ b/languages/cpp/app_templates/CMakeLists.txt @@ -19,7 +19,7 @@ add_subdirectory( kdevpart ) add_subdirectory( kdevpart2 ) add_subdirectory( chello ) add_subdirectory( cpphello ) -add_subdirectory( kscreensaver ) +add_subdirectory( tdescreensaver ) add_subdirectory( kofficepart ) add_subdirectory( chello_gba ) add_subdirectory( dcopservice ) @@ -58,7 +58,7 @@ add_subdirectory( cmakesimplec ) add_subdirectory( cmakelibcpp ) add_subdirectory( cmakelibc ) add_subdirectory( kscons_kxt ) -add_subdirectory( kscons_kmdi ) +add_subdirectory( kscons_tdemdi ) add_subdirectory( qt4hello ) add_subdirectory( qmakeempty ) add_subdirectory( automakeempty ) diff --git a/languages/cpp/app_templates/Makefile.am b/languages/cpp/app_templates/Makefile.am index d77ef765..09e63e1a 100644 --- a/languages/cpp/app_templates/Makefile.am +++ b/languages/cpp/app_templates/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker kioslave kdevpart kdevpart2 chello cpphello kscreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello kconfig35 kdevlang noatunvisual noatunui kmod kfileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_kmdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app +SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker kioslave kdevpart kdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello kconfig35 kdevlang noatunvisual noatunui kmod kfileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app profilescdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE profilesc_DATA = c.appwizard diff --git a/languages/cpp/app_templates/chello_gba/app.tdevelop b/languages/cpp/app_templates/chello_gba/app.tdevelop index 2f59c978..88e5395f 100644 --- a/languages/cpp/app_templates/chello_gba/app.tdevelop +++ b/languages/cpp/app_templates/chello_gba/app.tdevelop @@ -24,7 +24,7 @@ --host=arm-gcc-elf --build=i386 - -T lnkscript crt0.o + -T lntdescript crt0.o kdevgccoptions kdevgppoptions kdevg77options diff --git a/languages/cpp/app_templates/kapp/README b/languages/cpp/app_templates/kapp/README index 1db7896b..1ddb40a1 100644 --- a/languages/cpp/app_templates/kapp/README +++ b/languages/cpp/app_templates/kapp/README @@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play in your app. For more details, consult : -http://www-106.ibm.com/developerworks/library/l-kparts/ +http://www-106.ibm.com/developerworks/library/l-tdeparts/ http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h index be484fec..79513a9d 100644 --- a/languages/cpp/app_templates/kapp/appview.h +++ b/languages/cpp/app_templates/kapp/appview.h @@ -4,7 +4,7 @@ #define _%{APPNAMEUC}VIEW_H_ #include -#include +#include #include <%{APPNAMELC}iface.h> class TQPainter; diff --git a/languages/cpp/app_templates/kconfig35/README b/languages/cpp/app_templates/kconfig35/README index 6f91629b..a27cdb29 100644 --- a/languages/cpp/app_templates/kconfig35/README +++ b/languages/cpp/app_templates/kconfig35/README @@ -62,7 +62,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play in your app. For more details, consult : -http://www-106.ibm.com/developerworks/library/l-kparts/ +http://www-106.ibm.com/developerworks/library/l-tdeparts/ http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html diff --git a/languages/cpp/app_templates/kdecpp.appwizard b/languages/cpp/app_templates/kdecpp.appwizard index ad9bb0d2..1823e891 100644 --- a/languages/cpp/app_templates/kdecpp.appwizard +++ b/languages/cpp/app_templates/kdecpp.appwizard @@ -1,2 +1,2 @@ [General] -List=kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,kscreensaver,kscons_kxt,kscons_kmdi +List=kdedcop,kioslave,kxt,kdevlang,kmake,kapp,kconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,kfileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,tdescreensaver,kscons_kxt,kscons_tdemdi diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp index 1fe3558c..65bb996e 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp index 1fe3558c..65bb996e 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h index 91207694..6b470b92 100644 --- a/languages/cpp/app_templates/kpartapp/app.h +++ b/languages/cpp/app_templates/kpartapp/app.h @@ -7,7 +7,7 @@ #endif #include -#include +#include class KToggleAction; diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h index 418d7327..6ea44663 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.h +++ b/languages/cpp/app_templates/kpartapp/app_part.h @@ -2,8 +2,8 @@ #ifndef _%{APPNAMEUC}PART_H_ #define _%{APPNAMEUC}PART_H_ -#include -#include +#include +#include class TQWidget; class TQPainter; diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index c5bdb434..c9717c29 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -1,7 +1,7 @@ #include "plugin_%{APPNAMELC}.h" -#include +#include #include #include #include diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h index 132ce724..16142b33 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.h +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h @@ -2,8 +2,8 @@ #ifndef _PLUGIN_%{APPNAMEUC}_H_ #define _PLUGIN_%{APPNAMEUC}_H_ -#include -#include +#include +#include class Plugin%{APPNAME} : public KParts::Plugin { diff --git a/languages/cpp/app_templates/kpartplugin/src-Makefile.am b/languages/cpp/app_templates/kpartplugin/src-Makefile.am index 633ca883..a0da7254 100644 --- a/languages/cpp/app_templates/kpartplugin/src-Makefile.am +++ b/languages/cpp/app_templates/kpartplugin/src-Makefile.am @@ -14,7 +14,7 @@ lib%{APPNAMELC}plugin_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PL # Install the .rc file in the Part's directory (in this case, the part # is KHTMLPart) -pluginsdir = $(kde_datadir)/khtml/kpartplugins +pluginsdir = $(kde_datadir)/tdehtml/kpartplugins plugins_DATA = plugin_%{APPNAMELC}.rc messages: rc.cpp diff --git a/languages/cpp/app_templates/kscons_kmdi/CMakeLists.txt b/languages/cpp/app_templates/kscons_kmdi/CMakeLists.txt deleted file mode 100644 index c42fac4f..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_custom_target( kscons_kmdi.tar.gz ALL - COMMAND tar zcf kscons_kmdi.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - app.kcfg app.tdevelop appkmdi.cpp appkmdi.h appkmdiView.cpp - appkmdiView.h INSTALL kmdikonsole.cpp kmdikonsole.h - main.cpp messages.sh prefs.ui QUICKSTART README - SConscript-doc SConscript-src SConstruct settings.kcfgc - tips VERSION app_part.cpp app_part.h app_part.rc - app_shell.rc -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/kscons_kmdi.tar.gz kscons_kmdi.png - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) - - -install( FILES - kscons_kmdi.kdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kscons_kmdi/INSTALL b/languages/cpp/app_templates/kscons_kmdi/INSTALL deleted file mode 100644 index e61a3acc..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/INSTALL +++ /dev/null @@ -1,83 +0,0 @@ -REQUIREMENTS ------------- - -* TDE headers & libraries for tdelibs -* A Python interpreter for the compilation - -scons v0.96.1 or newer is recommended, but it's not required since a -minimum scons distribution is included in the package. - -BUILDING AND INSTALLING ------------------------ - -For configuring, compiling and installing the application and -if you do have Scons 0.96.1 or newer installed, just run: - -$ scons -$ scons install (as root user) - -In case you don't have Scons installed, you can use -the accompanying minimum scons by running: - -$ tar xjvf admin/scons-mini.tar.bz2 -$ ./scons -$ ./scons install - -ADVANCED BUILD FEATURES & DEINSTALLING --------------------------------------- - -In case you want to execute many compilation jobs in parallel (because you -want to make use of a SMP system or a compile cluster, for instance), -you can use ('N' is the number of jobs which should be run in parallel): - -$ scons -jN - -A debug build of the program can be created by running: - -$ scons configure debug=1 -$ scons - -Finally, the software can be removed from your system by running - -$ scons -c install - -CONFIGURATION NOTES -------------------- - -The installation scripts are relying on the tde-config program. -The programs tde-config, qmake, uic and moc must be accesssible -through your PATH. - -Qt and kde may not be installed as expected (in QTDIR and TDEDIR) -So until tde-config is able to give that information, you may -have to give those paths. You may also want to tune the build. - -In these cases, you must first run "scons configure" with some options -before running "scons" and "scons install" - -Here are some examples : -On Fedora/Redhat -$ scons configure kdeincludes=/usr/include/tde/ -On Debian -$ scons configure qtincludes=/usr/include/qt/ kdeinclude=/usr/include/tde/ -To install in some particular location with additional include paths -$ scons configure prefix=~/tmp extraincludes=/tmp/include:/usr/local/include -For AMD64 and platforms where folders are like /usr/lib64 -$ scons configure libsuffix=64 - -For more options, run -scons --help - -The build system is based on bksys, a build system that replaces -autoconf, automake and make in a row. Feel free to report your opinion -about it to the bksys authors. - -PACKAGE CREATION ----------------- - -RPM packagers can use the DESTDIR environment variable -$ DESTDIR=/tmp/build-rpm/ scons install - -To use checkinstall, pass the following option -$ checkinstall --fstrans=no --nodoc scons install - diff --git a/languages/cpp/app_templates/kscons_kmdi/Makefile.am b/languages/cpp/app_templates/kscons_kmdi/Makefile.am deleted file mode 100644 index e349e104..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -dataFiles = app.kcfg app.tdevelop appkmdi.cpp appkmdi.h appkmdiView.cpp \ -appkmdiView.h INSTALL kmdikonsole.cpp kmdikonsole.h main.cpp \ -messages.sh prefs.ui QUICKSTART README SConscript-doc SConscript-src \ -SConstruct settings.kcfgc tips VERSION \ -app_part.cpp app_part.h app_part.rc app_shell.rc - -templateName= kscons_kmdi - -### no need to change below: -template_DATA = $(templateName).kdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/kdevappwizard -$(templateName).tar.gz: ${dataFiles} ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - $(GZIP_COMMAND) -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz ${templateName}.png - -CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART b/languages/cpp/app_templates/kscons_kmdi/QUICKSTART deleted file mode 100644 index a5fbba33..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/QUICKSTART +++ /dev/null @@ -1,164 +0,0 @@ ------------------------------------------- -SUMMARY : - -scons -scons install - - -The online documentation of bksys can be found at: -http://freehackers.org/~tnagy/bksys_manual.html - - ... and now for the quickstart: - -CONFIGURING AND COMPILING THE PROJECT(S) -SCONS TIPS -MOC PROCESSING -SCONS MINIMUM DISTRIBUTION -MORE TIPS - ------------------------------------------- -CONFIGURING AND COMPILING THE PROJECT(S) - -The program scons is usually launched as "scons" -When it is not intalled globally, one can run -"./scons" instead of "scons" (ie : to use the local scons -that comes with bksys - see below SCONS MINIMUM DISTRIBUTION -if you do not have scons already) - -To compile the project, you will then only need to launch -scons on the top-level directory, the scripts find and -cache the environment detected *automatically* : --> scons - -To clean the project -> scons -c - -To install the project -> scons install -To install as root user -> su -c 'scons install' -To uninstall the project -> scons -c install -To uninstall (as root) -> su -c 'scons -c install' -To consult the help -> scons -h - -To (re)configure the project and give particular arguments, use : - -> scons configure debug=1 - -The variables are saved automatically after the first run -in files named *.cache.py (look at kde.cache.py, ..) - ------------------------------------------- -SCONS TIPS - -In a subdirectory, it is necessary to launch scons with the -u flag : -scons -u - -This is annoying and you probably want to add this to your .bashrc -export SCONSFLAGS=-u -and forget about it :) - -To make .deb or .rpm packages of your program, use : -checkinstall --fstrans=no --nodoc scons install -(if you have checkinstall on your system of course) - -To make scons run (much) faster, consult ./addons/README in bksys - ------------------------------------------- -MOC PROCESSING - -In qt programs, when a header 'foo.h' contains a class that has -Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT -in order to compile. foo_moc.cpp is usually generated, and is -used to produce foo_moc.o which is linked with the -program or the library. - -In kde programs, 'foo.moc' is generated instead of foo_moc.cpp, -and it must be included at the very end of foo.cpp -(add #include "foo.moc" : this increases the speed of -compilation a *lot* and makes less object files. - -Both modes are provided though, see test6-mocfiesta/ - ------------------------------------------- -MINIMUM SCONS DISTRIBUTION - -A minimum scons distribution is included in the archive -for convenience to those who do not have scons packages -for their operating system or their linux -distribution. For a full and more recent version of scons, -please consult http://www.scons.org - -Including this scons distribution to your archive will add -about 63kb (compressed) , while including the necessary -kdescripts (admin/ directory, configure, autom4 cache stuff, -Makefile.in) can add easily 500kb (compressed). - -To compile with the scons distribution : -* unpack it with : - tar xjvf admin/scons-mini.tar.bz2 -* compile the program with : - ./scons (instead of just 'scons') -* install the program with : - ./scons install (instead of just 'scons install') - -More options : -* clean the object files with : - ./scons -c -* uninstall the program with with : - ./scons -c install -* create a package : - ./scons dist - ------------------------------------------- -MORE TIPS - -** static libraries ** -With Makefile.am, one had to make static libraries all the time -because it did not allow having source code in other directories. -This is not the case anymore with scons, so you can specify -sources in other directories relative to the sconscript file, ie: - test1_sources = ['mainfiles/main.cpp', 'otherfile/program.cpp'] - myenv.Program( target = "test1", source = test1_sources ) -To encourage you to switch to the new scheme, the static library -helper has been omitted (look at the end of kde.py if you need one) - -** libtool ** -The LaFile build tool is a cheat that allows klibloader to load -.so files without complaints. If you need real libtool support -you can have a look to the libtool directory : it can work but -remember that libtool is broken on many systems (invalid flags -among others), so when you can work without libtool -(small projects especially), just do it. - -** moc processing ** -As stated above, you should always add #include "foo.moc" -for your qt classes (Q_OBJECT) to save precious compilation time. - -** using a cache ** -It is a good idea to enable the cache feature in SConstruct, -especially if you are doing experiments (it saves your computer -from recompiling the same files over and over again ..). - -** threading ** -myenv.AppendUnique( CPPFLAGS = ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] ) - -** final notes *** -A medium-sized project containing several targets, libraries and data -files can be converted very quickly. -Also, remember that SConscript files are actually python scripts .. -you can use whatever python feature you want in them, ie: "for" loops, -this is how the kde helpers work (TDEprogram, TDEshlib ..). - -If you are stuck, you can also have a look at more complicated -bksys-based projects like kdissert or kshaderdesigner - -The scons man page and the wiki can be very useful, do not forget to -consult them when you encounter an issue - ------------------------------------------- - -I hope you will enjoy this alternative to the autotools -scripts for kde programming, at least as much as I do : -http://freehackers.org/~tnagy/kdissert/index.html - -Happy kde hacking, - -Thomas Nagy, 2004, 2005 - diff --git a/languages/cpp/app_templates/kscons_kmdi/README b/languages/cpp/app_templates/kscons_kmdi/README deleted file mode 100644 index bf4edf71..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/README +++ /dev/null @@ -1,111 +0,0 @@ ------------------------------------------------ -Kde scons template quickstart -Author: Thomas Nagy -Date: 2005-04-04 ------------------------------------------------ - -This README file explains basic concepts necessary -for starting with this application template. - - -** Building and installing ** - -* To configure the application run "scons configure" - In some rare cases you may need to add flags: - scons configure qtincludes=/usr/include/qt3/include kdeincludes=/usr/lib/trinity/include - -* After building, launch the application and test the dcop - interface by using the command (search a bit) : - dcop - dcop appname-... - dcop appname-... instancenumber - dcop appname-... instancenumber switch_colors - dcop appname switch_colors - Or launch kdcop and search in the menus for your program - name and double-click on 'switch_colors()' - -* The usual targets call the following scons commands : - make -> scons - make clean -> scons -c - make install -> scons install - make uninstall -> scons -c install - make dist -> scons dist - -* To build apps, use TDEprogram, TDEshlib, etc. - these functions are documented at the bottom of kde.py - More information can be found in the QUICKSTART - -* The scons scripts for building kde applications originate - from the 'bksys' distribution. It contains several other examples - that detail the kpart building and the dcop interface - processing : - http://www.kde-apps.org/content/show.php?content=19243 - -* Extending the scons scripts for building the application : - The scons scripts are actually python scripts, so all the - usual tricks apply : 'for' and 'while' loops, 'if', 'else' .. - consult : - http://www.python.org for more information about python - http://www.scons.org for more informationabout scons - -* Simplify your life : install the project in your home directory for -testing purposes. -scons configure prefix=/home/user/dummyfolder/ -In the end when you finished the development you can -rm -rf /home/user/dummyfolder/ -without fear. - - -** Technologies ** - -* Build the menus of your application easily -kde applications now use an xml file (*ui.rc file) to build the menus. -This allow a great customization of the application. However, when -programming the menu is shown only after a "make install" - -For more details, consult : -http://devel-home.kde.org/~larrosa/tutorial/p9.html -http://developer.kde.org/documentation/tutorials/xmlui/preface.html - -* Use TDEConfig XT to create your configuration dialogs and make -them more maintainable. - -For that, you will need to write two simple configuration files -in the src directory : .kcfg and a .kcfgc -The configure.in.in will need to be modified : change the line #MIN_CONFIG(3.0.0) -into #MIN_CONFIG(3.2.0) - -Take an example on the many apps found in the tdegames source package and consult : -http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html - -* With KParts, you can embed other kde components in your program, or make your program -embeddable in other apps. For example, the kmplayer kpart can be called to play videos -in your app. - -For more details, consult : -http://www-106.ibm.com/developerworks/library/l-kparts/ -http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html -http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html - -* With dcop, you can control your app from other applications -Make sure to include K_DCOP and a kdcop: section in your .h file -http://developer.kde.org/documentation/tutorials/dot/dcopiface/dcop-interface.html - - -** Documentation ** - -* For the translations : -refer to the file po/SConscript and po/messages.sh - -1. Download a patched gettext which can be found at: - http://public.kde.planetmirror.com/pub/kde/devel/gettext-kde/ -2. Install that gettext in ~/bin/ -3. cd ~/yourproject, export PATH=~/bin:$PATH, export -TDEDIR=/where_your_TDE3_is -4. make -f admin/Makefile.common package-messages -5. make package-messages -6. Translate the po files (not the pot!!) with kbabel or xemacs - -* Do not forget to write the documentation for your kde app -edit the documentation template index.docbook in doc/ - diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-doc b/languages/cpp/app_templates/kscons_kmdi/SConscript-doc deleted file mode 100644 index 0c3e07e7..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/SConscript-doc +++ /dev/null @@ -1,92 +0,0 @@ -#! /usr/bin/env python -## This script demonstrates to build and install -## the documentation of a kde program with scons -## -## Thomas Nagy, 2005 - -## This file can be reused freely for any project (see COPYING) - -## First load the environment set in the top-level SConstruct file -Import( 'env' ) -myenv=env.Copy() - -## The following looks complicated but it is not -## We first define a function to install all files as documentation -## The documentation is of course lying in subfolders from here -## * normal files are installed under TDEDOC/destination -## * meinproc files are not installed, but processed into a single -## index.cache.bz2 which is installed afterwards - -## This is far more maintainable to have *one* file than -## having lots of almost empty SConscript in several folders - -################################################################### -# COMMON PART FOR PROCESSING DOCUMENTATION FOLDERS -################################################################### - -import os -import sys -import glob -import SCons.Util - -## Define this to 1 if you are writing documentation else to 0 :) -i_am_a_documentation_writer = 0 - -## This function uses env imported above -def processfolder(folder, lang, destination=""): - # folder is the folder to process - # lang is the language - # destination is the subdirectory in TDEDOC - - docfiles = glob.glob(folder+"/???*.*") # file files that are at least 4 chars wide :) - - # warn about errors - #if len(lang) != 2: - # print "error, lang must be a two-letter string, like 'en'" - - # when the destination is not given, use the folder - if len(destination) == 0: - destination=folder - - docbook_list = [] - for file in docfiles: - - # do not process folders - if not os.path.isfile(file): - continue - # do not process the cache file - if file == 'index.cache.bz2': - continue - # ignore invalid files (TODO??) - if len( SCons.Util.splitext( file ) ) <= 1 : - continue - - ext = SCons.Util.splitext( file )[1] - - # docbook files are processed by meinproc - if ext == '.docbook': - docbook_list.append( file ) - continue - - myenv.TDEinstall('TDEDOC', lang+'/'+destination, file) - - # Now process the index.docbook files .. - if len(docbook_list) == 0: - return - if not os.path.isfile( folder+'/index.docbook' ): - print "Error, index.docbook was not found in "+folder+'/index.docbook' - return - if i_am_a_documentation_writer: - for file in docbook_list: - myenv.Depends( folder+'index.cache.bz2', file ) - myenv.Meinproc( folder+'/index.cache.bz2', folder+'/index.docbook' ) - myenv.TDEinstall( 'TDEDOC', lang+'/'+destination, folder+'/index.cache.bz2' ) - -################################################################### -# TELL WHICH FOLDERS TO PROCESS -################################################################### - -## Use processfolder for each documentation directory -processfolder('en/', 'en', '%{APPNAMELC}') -processfolder('fr/', 'fr', '%{APPNAMELC}') - diff --git a/languages/cpp/app_templates/kscons_kmdi/SConscript-src b/languages/cpp/app_templates/kscons_kmdi/SConscript-src deleted file mode 100644 index c1f9742d..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/SConscript-src +++ /dev/null @@ -1,60 +0,0 @@ -#! /usr/bin/env python -## This script is a quick test to demonstrate (and test) -## the bksys moc handling '#include "file.moc"' can be added .. or not -## -## Thomas Nagy, 2005 -## This file can be reused freely for any project (see COPYING) - -Import('env') -myenv=env.Copy() - -## First build : the shell -## Each tab in it will hold an instance of the part .. - -%{APPNAMELC}_sources=""" -main.cpp -%{APPNAMELC}kmdi.cpp -%{APPNAMELC}kmdiView.cpp -kmdikonsole.cpp -settings.kcfgc -prefs.ui -""" -# Now that we have our list of sources we can build the program -myenv.TDEprogram( '%{APPNAMELC}', %{APPNAMELC}_sources ) # main program -myenv.TDEaddpaths_includes( './ ../' ) # additional paths -myenv.TDEaddlibs( 'qt-mt tdecore kio kparts kmdi' ) # additional libraries - -## Next, the kpart library -## using TDEshlib, the .so and .la are installed automatically when needed - -myenv2=env.Copy() -%{APPNAMELC}part_sources = '%{APPNAMELC}_part.cpp' -myenv2.TDEshlib( 'lib%{APPNAMELC}part', %{APPNAMELC}part_sources) -myenv2.TDEaddpaths_includes( './ #/' ) # the '#' means the top-level directory -myenv2.TDEaddlibs( 'qt-mt kio tdecore tdeprint kparts' ) -# myenv2.TDEaddflags_link( '-DQT_THREAD_SUPPORT' ) - -############################# -## Data files to install - -## NOTE: TDEinstall( resource_type, subdir, list of files ) - -## the .kcfg file -myenv.TDEinstall( 'TDEKCFG', '', '%{APPNAMELC}.kcfg' ) - -## the program .desktop file -myenv.TDEinstall( 'TDEMENU', '/Utilities', '%{APPNAMELC}.desktop' ) - -## the rc file - named *_shell.rc instead of *ui.rc for kpart apps -myenv.TDEinstall( 'TDEDATA', '/%{APPNAMELC}', '%{APPNAMELC}_shell.rc' ) - -## this servicetype desktop file goes in TDEXDG whether the other one goes in TDEMENU -myenv.TDEinstall( 'TDEXDG', '', '%{APPNAMELC}_part.desktop' ) - -## the kpart resource file -myenv.TDEinstall( 'TDEDATA', '/%{APPNAMELC}part', '%{APPNAMELC}_part.rc' ) - -## Installing icons is easy (hi-16-app-%{APPNAMELC}.png, hi-22-app-%{APPNAMELC}.png) -#myenv.TDEicon() - -## do not forget that this is a python script so even loops are allowed... :) diff --git a/languages/cpp/app_templates/kscons_kmdi/SConstruct b/languages/cpp/app_templates/kscons_kmdi/SConstruct deleted file mode 100644 index 3954247c..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/SConstruct +++ /dev/null @@ -1,112 +0,0 @@ -#! /usr/bin/env python - -""" -help -> scons -h -compile -> scons -clean -> scons -c -install -> scons install -uninstall -> scons -c install -configure -> scons configure prefix=/tmp/ita debug=full extraincludes=/usr/local/include:/tmp/include prefix=/usr/local - -Run from a subdirectory -> scons -u -The variables are saved automatically after the first run (look at cache/kde.cache.py, ..) -""" - -################################################################### -# LOAD THE ENVIRONMENT AND SET UP THE TOOLS -################################################################### - -## Load the builders in config -env = Environment( tools=['default', 'generic', 'kde'], toolpath=['./', './admin']) -#env = Environment( tools=['default', 'generic', 'kde', 'othertool'], toolpath=['./', './admin']) - -env.TDEuse("environ rpath") -#env.TDEuse("environ rpath lang_qt thread nohelp") - -################################################################### -# SCRIPTS FOR BUILDING THE TARGETS -################################################################### - -dirs=""" -src -doc -""" -env.subdirs(dirs) - -## Process the translations in the po/ directory -env.TDElang('po/', '%{APPNAMELC}') - -################################################################### -# CONVENIENCE FUNCTIONS TO EMULATE 'make dist' and 'make distclean' -################################################################### - -### To make a tarball of your masterpiece, use 'scons dist' -if 'dist' in COMMAND_LINE_TARGETS: - - ## The target scons dist requires the python module shutil which is in 2.3 - env.EnsurePythonVersion(2, 3) - - import os - APPNAME = 'bksys' - VERSION = os.popen("cat VERSION").read().rstrip() - FOLDER = APPNAME+'-'+VERSION - ARCHIVE = FOLDER+'.tar.bz2' - - ## If your app name and version number are defined in 'version.h', use this instead: - ## (contributed by Dennis Schridde devurandom@gmx@net) - #import re - #INFO = dict( re.findall( '(?m)^#define\s+(\w+)\s+(.*)(?<=\S)', open(r"version.h","rb").read() ) ) - #APPNAME = INFO['APPNAME'] - #VERSION = INFO['VERSION'] - - import shutil - import glob - - ## check if the temporary directory already exists - if os.path.isdir(FOLDER): - shutil.rmtree(FOLDER) - if os.path.isfile(ARCHIVE): - os.remove(ARCHIVE) - - ## create a temporary directory - startdir = os.getcwd() - shutil.copytree(startdir, FOLDER) - - ## remove our object files first - os.popen("find "+FOLDER+" -name \"*cache*\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \"*.pyc\" | xargs rm -f") - #os.popen("pushd %s && scons -c " % FOLDER) # TODO - - ## CVS cleanup - os.popen("find "+FOLDER+" -name \"CVS\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") - - ## Subversion cleanup - os.popen("find %s -name .svn -type d | xargs rm -rf" % FOLDER) - - ## GNU Arch cleanup - os.popen("find "+FOLDER+" -name \"{arch}\" | xargs rm -rf") - os.popen("find "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") - - ## Create the tarball (coloured output) - print "\033[92m"+"Writing archive "+ARCHIVE+"\033[0m" - os.popen("tar cjf "+ARCHIVE+" "+FOLDER) - - ## Remove the temporary directory - if os.path.isdir(FOLDER): - shutil.rmtree(FOLDER) - - env.Default(None) - env.Exit(0) - -### Emulate "make distclean" -if 'distclean' in COMMAND_LINE_TARGETS: - ## Remove the cache directory - import os, shutil - if os.path.isdir(env['CACHEDIR']): - shutil.rmtree(env['CACHEDIR']) - os.popen("find . -name \"*.pyc\" | xargs rm -rf") - - env.Default(None) - env.Exit(0) - diff --git a/languages/cpp/app_templates/kscons_kmdi/VERSION b/languages/cpp/app_templates/kscons_kmdi/VERSION deleted file mode 100644 index 2e293c30..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/VERSION +++ /dev/null @@ -1 +0,0 @@ -%{VERSION} diff --git a/languages/cpp/app_templates/kscons_kmdi/app.kcfg b/languages/cpp/app_templates/kscons_kmdi/app.kcfg deleted file mode 100644 index f2c46b64..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/app.kcfg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - true - - - diff --git a/languages/cpp/app_templates/kscons_kmdi/app.tdevelop b/languages/cpp/app_templates/kscons_kmdi/app.tdevelop deleted file mode 100644 index 317a4cbc..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/app.tdevelop +++ /dev/null @@ -1,169 +0,0 @@ - - - - %{AUTHOR} - %{EMAIL} - %{VERSION} - KDevTDEAutoProject - C++ - - C++ - Code - Qt - TDE - - . - false - - - - - - 3 - true - 3 - EmbeddedKDevDesigner - - - - - - src/%{APPNAMELC} - debug - - - src/%{APPNAMELC} - false - - - - - - - false - 1 - false - - - - - optimized - kdevgccoptions - kdevgppoptions - kdevg77options - -O2 -g0 - - - --enable-debug=full - debug - kdevgccoptions - kdevgppoptions - kdevg77options - -O0 -g3 - - - - - - - - - - - - - false - *.o,*.lo,CVS - - - - - ada - ada_bugs_gcc - bash - bash_bugs - clanlib - w3c-dom-level2-html - fortran_bugs_gcc - gnome1 - gnustep - gtk - gtk_bugs - haskell - haskell_bugs_ghc - java_bugs_gcc - java_bugs_sun - pascal_bugs_fp - php - php_bugs - perl - perl_bugs - python - python_bugs - ruby - ruby_bugs - sdl - w3c-svg - sw - w3c-uaag10 - wxwidgets_bugs - - - qmake User Guide - - - - - libtool - - - true - false - false - true - - - false - true - - - - - - - - - - - - -f - - -dP - - -f - -u3 -p - - - - - - - false - - - .h - .cpp - true - - - - true - 2 - - - - Doxygen Documentation Collection - %{APPNAMELC}.tag - - - diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp deleted file mode 100644 index 70f13d98..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp +++ /dev/null @@ -1,159 +0,0 @@ -%{CPP_TEMPLATE} - -#include "%{APPNAMELC}_part.h" - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory; -K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); - -%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList & /*args*/) - : KParts::ReadWritePart(parent) -{ - // we need an instance - setInstance( %{APPNAMELC}PartFactory::instance() ); - - // this should be your custom internal widget - m_widget = new TQMultiLineEdit( parentWidget, widgetName ); - - // notify the part that this is our internal widget - setWidget(m_widget); - - // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); - - // set our XML-UI resource file - setXMLFile("%{APPNAMELC}_part.rc"); - - // we are read-write by default - setReadWrite(true); - - // we are not modified since we haven't done anything yet - setModified(false); -} - -%{APPNAMELC}Part::~%{APPNAMELC}Part() -{ -} - -TDEAboutData *%{APPNAMELC}Part::createAboutData() -{ - // The non-i18n name here must be the same as the directory in - // which the part's rc file is installed - TDEAboutData *aboutData = new TDEAboutData("%{APPNAMELC}part", I18N_NOOP("%{APPNAMELC}Part"), "0.0.1"); - aboutData->addAuthor("%{AUTHOR}", 0, "%{EMAIL}"); - return aboutData; -} - -void %{APPNAMELC}Part::setReadWrite(bool rw) -{ - // notify your internal widget of the read-write state - m_widget->setReadOnly(!rw); - if (rw) - connect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); - else - { - disconnect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); - } - - ReadWritePart::setReadWrite(rw); -} - -void %{APPNAMELC}Part::setModified(bool modified) -{ - // get a handle on our Save action and make sure it is valid - KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); - if (!save) - return; - - // if so, we either enable or disable it based on the current - // state - if (modified) - save->setEnabled(true); - else - save->setEnabled(false); - - // in any event, we want our parent to do it's thing - ReadWritePart::setModified(modified); -} - -bool %{APPNAMELC}Part::openFile() -{ - // m_file is always local so we can use TQFile on it - TQFile file(m_file); - if (file.open(IO_ReadOnly) == false) - return false; - - // our example widget is text-based, so we use TQTextStream instead - // of a raw TQDataStream - TQTextStream stream(&file); - TQString str; - while (!stream.eof()) - str += stream.readLine() + "\n"; - - file.close(); - - // now that we have the entire file, display it - m_widget->setText(str); - - // just for fun, set the status bar - emit setStatusBarText( m_url.prettyURL() ); - - return true; -} - -bool %{APPNAMELC}Part::saveFile() -{ - // if we aren't read-write, return immediately - if (isReadWrite() == false) - return false; - - // m_file is always local, so we use TQFile - TQFile file(m_file); - if (file.open(IO_WriteOnly) == false) - return false; - - // use TQTextStream to dump the text to the file - TQTextStream stream(&file); - stream << m_widget->text(); - - file.close(); - - return true; -} - -void %{APPNAMELC}Part::fileOpen() -{ - // this slot is called whenever the File->Open menu is selected, - // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar - // button is clicked - TQString file_name = KFileDialog::getOpenFileName(); - - if (file_name.isEmpty() == false) - openURL(file_name); -} - -void %{APPNAMELC}Part::fileSaveAs() -{ - // this slot is called whenever the File->Save As menu is selected, - TQString file_name = KFileDialog::getSaveFileName(); - if (file_name.isEmpty() == false) - saveAs(file_name); -} - -#include "%{APPNAMELC}_part.moc" diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h deleted file mode 100644 index 42d1b22c..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.h +++ /dev/null @@ -1,75 +0,0 @@ -%{H_TEMPLATE} - -#ifndef _%{APPNAMEUC}PART_H_ -#define _%{APPNAMEUC}PART_H_ - -#include -#include - -class TQMultiLineEdit; -class TQWidget; -class TQPainter; -class KURL; -class TDEAboutData; - -/** - * This is a "Part". It that does all the real work in a KPart - * application. - * - * @short Main Part - * @author %{AUTHOR} - * @version %{VERSION} - */ -class %{APPNAMELC}Part : public KParts::ReadWritePart -{ - Q_OBJECT - -public: - /** - * Default constructor - */ - %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList & /*args*/); - - /** - * Destructor - */ - virtual ~%{APPNAMELC}Part(); - - /** - * This is a virtual function inherited from KParts::ReadWritePart. - * A shell will use this to inform this Part if it should act - * read-only - */ - virtual void setReadWrite(bool rw); - - /** - * Reimplemented to disable and enable Save action - */ - virtual void setModified(bool modified); - - /** - * About data for the part - */ - static TDEAboutData *createAboutData(); - -protected: - /** - * This must be implemented by each part - */ - virtual bool openFile(); - - /** - * This must be implemented by each read-write part - */ - virtual bool saveFile(); - -protected slots: - void fileOpen(); - void fileSaveAs(); - -private: - TQMultiLineEdit *m_widget; -}; - -#endif // _%{APPNAMEUC}PART_H_ diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.rc b/languages/cpp/app_templates/kscons_kmdi/app_part.rc deleted file mode 100644 index cec8ec5c..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.rc +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/languages/cpp/app_templates/kscons_kmdi/app_shell.rc b/languages/cpp/app_templates/kscons_kmdi/app_shell.rc deleted file mode 100644 index c8b2bb98..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/app_shell.rc +++ /dev/null @@ -1,33 +0,0 @@ - - - - &File - - - - - - - - &View - - &Settings - - - - - - - - - - - - -Main Toolbar - - - - - - diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp deleted file mode 100644 index 30e6647c..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp +++ /dev/null @@ -1,394 +0,0 @@ -%{CPP_TEMPLATE} - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "settings.h" -#include "prefs.h" -#include "%{APPNAMELC}kmdiView.h" -#include "kmdikonsole.h" -#include "%{APPNAMELC}kmdi.h" - -%{APPNAMELC}kmdi::%{APPNAMELC}kmdi(KMdi::MdiMode mode) - : KMdiMainFrm( 0, "%{APPNAMELC}", mode ) -{ - resize( 800, 600 ); // start at 800x600 the first time - - setManagedDockPositionModeEnabled(true); - setStandardMDIMenuEnabled(false); - - m_manager = new KParts::PartManager(this); - connect(m_manager, TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(createGUI(KParts::Part*)) ); - -#if KDE_IS_VERSION(3, 3, 0) - setToolviewStyle( KMdi::TextAndIcon ); - tabWidget()->setHoverCloseButton( false ); -#endif - - setMenuForSDIModeSysButtons( menuBar() ); - setManagedDockPositionModeEnabled(true); - - m_console = NULL; - - // accept dnd - setAcceptDrops(true); - - // then, setup our actions - setupActions(); - - //createShellGUI( true ); - - // and a status bar - statusBar()->show(); - - connect( this, TQT_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQT_SLOT( currentChanged( KMdiChildView * ) ) ); - - m_console = new kmdikonsole(this, "konsole"); - m_console->setIcon( SmallIcon("konsole") ); - m_console->setCaption( i18n("Terminal") ); - addToolWindow( m_console, KDockWidget::DockBottom, getMainDockWidget(), 20 ); - - -#if KDE_IS_VERSION(3, 3, 0) - if (Settings::showCloseTabsButton()) - { - TQToolButton *but = new TQToolButton(tabWidget()); - but->setIconSet(SmallIcon("tab_remove")); - but->adjustSize(); - but->hide(); - connect(but, TQT_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQT_SIGNAL(activated())); - tabWidget()->setCornerWidget(but, TopRight); - } -#endif - - // apply the saved mainwindow settings, if any, and ask the mainwindow - // to automatically save settings if changed: window size, toolbar - // position, icon size, etc. - setAutoSaveSettings(); - - // Read the dock config only if the app was started at least only once - kmdi is tricky - TDEConfig *cfg = new TDEConfig("%{APPNAMELC}_dockposrc"); - if (cfg->readNumEntry("%{APPNAMELC}_main_dock_settings", 0) == 1) manager()->readConfig(cfg); - cfg->writeEntry("%{APPNAMELC}_main_dock_settings", 1); - delete cfg; - - showTipOnStart(); -} - -%{APPNAMELC}kmdi::~%{APPNAMELC}kmdi() -{ - // Write the dock config on exit - TDEConfig *cfg = new TDEConfig("%{APPNAMELC}_dockposrc"); - manager()->writeConfig(cfg); - delete cfg; - delete m_console; -} - -void %{APPNAMELC}kmdi::setupActions() -{ - setXMLFile("%{APPNAMELC}_shell.rc"); - - KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); - - KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() - )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); - - KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); - - m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); - - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); - - KAction* action = KStdAction::configureToolbars(this, - TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - - createGUI( NULL ); -} - -void %{APPNAMELC}kmdi::showTip() -{ - KTipDialog::showTip(this,TQString(),true); -} - -void %{APPNAMELC}kmdi::showTipOnStart() -{ - KTipDialog::showTip(this); -} - -void %{APPNAMELC}kmdi::slotFileNew() -{ - %{APPNAMELC}kmdiView *view = new %{APPNAMELC}kmdiView(this); - m_manager->addPart( view->part() ); - - addWindow( view ); - - // add the tree view to the widget stack - m_views += view; - - currentChanged( view ); -} - -void %{APPNAMELC}kmdi::openURL(const KURL & url) -{ - // check if the url is not already opened first - TQValueList<%{APPNAMELC}kmdiView*>::iterator it = m_views.begin(); - TQValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end(); - for (; it != end; ++it) - { - %{APPNAMELC}kmdiView *view = *it; - if (view->part()->url() == url) - { - activateView(view); - return; - } - } - - %{APPNAMELC}kmdiView *view = new %{APPNAMELC}kmdiView(this); - m_manager->addPart( view->part() ); - - addWindow( view ); - - m_views += view; - - view->part()->openURL(url); - currentChanged( view ); -} - -void %{APPNAMELC}kmdi::currentChanged( KMdiChildView *current ) -{ - //kdWarning()<<"current view changed"<setActivePart(NULL); - //setCaption("()"); - return; - } - - // switch to the corresponding document - if ( m_views.contains( (%{APPNAMELC}kmdiView*) current ) ) - { - %{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) current; - //view->updateCaption(); - m_manager->setActivePart( view->part() ); - } -} - -void %{APPNAMELC}kmdi::slotFileClose() -{ - requestClose( activeWindow() ); -} - -bool %{APPNAMELC}kmdi::requestClose(KMdiChildView* v) -{ - // kdWarning()<<"closing view"<part()->queryClose()) - { - m_manager->removePart( view->part() ); - - closeWindow( view ); - m_views.clear(); - setCaption("kdissert"); - return true; - } - return false; - } - return true; - } - - %{APPNAMELC}kmdiView *view = (%{APPNAMELC}kmdiView*) v; - if ( m_views.contains( view ) ) - { - m_views.remove( view ); - if ( view->part()->queryClose() ) - { - m_manager->removePart( view->part() ); - - closeWindow( view ); - return true; - } - return false; - } - return true; -} - -void %{APPNAMELC}kmdi::slotFileQuit() -{ - close(); -} - -void %{APPNAMELC}kmdi::optionsShowToolbar() -{ - if (m_toolbarAction->isChecked()) - toolBar()->show(); - else - toolBar()->hide(); -} - -void %{APPNAMELC}kmdi::optionsShowStatusbar() -{ - if (m_statusbarAction->isChecked()) - statusBar()->show(); - else - statusBar()->hide(); -} - -void %{APPNAMELC}kmdi::optionsConfigureKeys() -{ - //KKeyDialog::configure(actionCollection()); - KKeyDialog dlg( false, this ); - TQPtrList clients = guiFactory()->clients(); - - for( TQPtrListIterator it( clients ); it.current(); ++it ) - dlg.insert ( (*it)->actionCollection(), (*it)->instance()->aboutData()->programName() ); - - dlg.configure(); - - for (int i=0; ipart()->reloadXML(); - } -} - -void %{APPNAMELC}kmdi::optionsConfigureToolbars() -{ - //saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); -} - -void %{APPNAMELC}kmdi::newToolbarConfig() -{ - // This slot is called when user clicks "Ok" or "Apply" in the toolbar editor. - // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) - //createGUI(); - //applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); -} - -void %{APPNAMELC}kmdi::optionsPreferences() -{ - // The preference dialog is derived from prefs-base.ui which is subclassed into Prefs - // - // compare the names of the widgets in the .ui file - // to the names of the variables in the .kcfg file - if (TDEConfigDialog::showDialog("settings")) - return; - - TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); - dialog->addPage(new prefs(), i18n("General"), "package_settings"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged())); - dialog->show(); -} - -void %{APPNAMELC}kmdi::settingsChanged() -{ - // propagate the changes to our views - /*TQValueList<%{APPNAMELC}kmdiView*>::iterator it = m_views.begin(); - TQValueList<%{APPNAMELC}kmdiView*>::iterator end = m_views.end(); - for (; it != end; ++it) - { - %{APPNAMELC}kmdiView *view = *it; - view->settingsChanged(); - }*/ -} - -void %{APPNAMELC}kmdi::changeStatusbar(const TQString& text) -{ - // display the text on the statusbar - statusBar()->message(text, 2000); -} - -void %{APPNAMELC}kmdi::dragEnterEvent(TQDragEnterEvent *event) -{ - // accept uri drops only - event->accept(KURLDrag::canDecode(event)); -} - -void %{APPNAMELC}kmdi::dropEvent(TQDropEvent *event) -{ - KURL::List urls; - - // see if we can decode a URI.. if not, just ignore it - if (KURLDrag::decode(event, urls) && !urls.isEmpty()) - { - // okay, we have a URI.. process it - const KURL &url = urls.first(); - - // load in the file - openURL(url); - } -} - -bool %{APPNAMELC}kmdi::queryClose() -{ - TQValueList<%{APPNAMELC}kmdiView*>::iterator it; - - // check if we can close all documents - for (it = m_views.begin(); it != m_views.end(); ++it) - { - // kdWarning()<<"searching for the part"<part()->queryClose()) - { - return false; - } - } - - // and now close the documents - for (it = m_views.begin(); it != m_views.end(); ++it) - { - // now close all views - %{APPNAMELC}kmdiView *view = *it; - - m_manager->removePart( view->part() ); - closeWindow( view ); - } - - return true; -} - -#include "%{APPNAMELC}kmdi.moc" diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h b/languages/cpp/app_templates/kscons_kmdi/appkmdi.h deleted file mode 100644 index fc4d73aa..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.h +++ /dev/null @@ -1,83 +0,0 @@ -%{H_TEMPLATE} - -#ifndef _%{APPNAMEUC}KMDI_H -#define _%{APPNAMEUC}KMDI_H - -#include - -#include -#include -#include - -class KToggleAction; -class KRecentFilesAction; - -class kmdikonsole; -class KMdiChildView; -class TQWidgetStack; -class %{APPNAMELC}kmdiView; -class TextProperties; -class MiscProperties; - -/** - * This class serves as the main window for %{APPNAMELC}kmdi. It handles the - * menus, toolbars, and status bars. - * - * @short Main window class - */ -class %{APPNAMELC}kmdi : public KMdiMainFrm -{ - Q_OBJECT - - public: - %{APPNAMELC}kmdi( KMdi::MdiMode mode ); - virtual ~%{APPNAMELC}kmdi(); - void showTipOnStart(); - - public slots: - void openURL( const KURL& ); - - protected: - virtual void dragEnterEvent(TQDragEnterEvent *event); - virtual void dropEvent(TQDropEvent *event); - virtual bool queryClose(); - - private slots: - void slotFileNew(); - void slotFileClose(); - void slotFileQuit(); - - /// this is called when a new file is saved - void showTip(); - - void optionsShowToolbar(); - void optionsShowStatusbar(); - void optionsConfigureKeys(); - void optionsConfigureToolbars(); - void optionsPreferences(); - void newToolbarConfig(); - - - void changeStatusbar(const TQString& text); - - void currentChanged( KMdiChildView *current ); - bool requestClose(KMdiChildView* view); - - void settingsChanged(); - - private: - void setupAccel(); - void setupActions(); - - TQValueList<%{APPNAMELC}kmdiView*> m_views; - - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; - - KParts::PartManager *m_manager; - - kmdikonsole *m_console; -}; - -#endif // _%{APPNAMEUC}KMDI_H - diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp deleted file mode 100644 index d7c00001..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.cpp +++ /dev/null @@ -1,63 +0,0 @@ -%{CPP_TEMPLATE} - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "%{APPNAMELC}kmdiView.h" - - - %{APPNAMELC}kmdiView::%{APPNAMELC}kmdiView( TQWidget *parentWidget, const char *name ) -: KMdiChildView( parentWidget, name ) -{ - m_part = NULL; - - // this routine will find and load our Part. it finds the Part by - // name which is a bad idea usually.. but it's alright in this - // case since our Part is made for this Shell - KLibFactory *factory = KLibLoader::self()->factory("lib%{APPNAMELC}part"); - //KLibFactory *factory = KLibLoader::self()->factory("libkatepart"); - if (factory) - { - // now that the Part is loaded, we cast it to a Part to get - // our hands on it - m_part = static_cast(factory->create( - this, "katepart", "KParts::ReadWritePart" )); - - if (m_part) - { - part()->widget()->setFocus(); - setFocusProxy(part()->widget()); - - TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" ); - part()->widget()->reparent( this, TQPoint(0, 0) ); - layout->addWidget( part()->widget() ); - - // connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) ); - } - else - { - KMessageBox::error(this, i18n("Could not find our part.")); - } - } - else - { - // if we couldn't find our Part, we exit since the Shell by - // itself can't do anything useful - KMessageBox::error(this, i18n("Could not find our part.")); - return; - } -} - -%{APPNAMELC}kmdiView::~%{APPNAMELC}kmdiView() -{ - delete m_part->widget(); -} - -#include "%{APPNAMELC}kmdiView.moc" diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h b/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h deleted file mode 100644 index d0fde2f8..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/appkmdiView.h +++ /dev/null @@ -1,30 +0,0 @@ -%{H_TEMPLATE} - -#ifndef _%{APPNAMEUC}KMDIVIEW_H -#define _%{APPNAMEUC}KMDIVIEW_H - -#include -#include -#include - -/** - * This class serves as the %{APPNAMELC}kmdi view. - * - * @short main view class - */ -class %{APPNAMELC}kmdiView : public KMdiChildView -{ - Q_OBJECT - - public: - %{APPNAMELC}kmdiView( TQWidget *parentWidget=0L, const char *name=0L ); - virtual ~%{APPNAMELC}kmdiView(); - - KParts::ReadWritePart *part() { return m_part; } - - private: - KParts::ReadWritePart *m_part; -}; - -#endif // _%{APPNAMEUC}KMDIVIEW_H - diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp deleted file mode 100644 index 5bd6b949..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp +++ /dev/null @@ -1,76 +0,0 @@ -%{CPP_TEMPLATE} - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "kmdikonsole.h" - -kmdikonsole::kmdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name) -{ - m_haskonsole = false; - respawn(); -} - -kmdikonsole::~kmdikonsole() -{ -} - -void kmdikonsole::respawn() -{ - KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart"); - - if (!factory) return; - m_part = (KParts::ReadOnlyPart *) factory->create(this); - - if (!m_part) return; - - if (m_part->widget()->inherits(TQFRAME_OBJECT_NAME_STRING)) - ((TQFrame*)m_part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); - - m_haskonsole=true; - connect( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); - - m_part->widget()->show(); - show(); -} - -void kmdikonsole::setDirectory(const TQString &dirname) -{ - if (m_haskonsole) - { - KURL url(dirname); - if (m_part->url() != url) - m_part->openURL(url); - } -} - -void kmdikonsole::showEvent(TQShowEvent *ev) -{ - TQWidget::showEvent(ev); - activate(); -} - -void kmdikonsole::activate() -{ - if (m_haskonsole) - { - m_part->widget()->show(); - setFocusProxy(m_part->widget()); - m_part->widget()->setFocus(); - } -} - -void kmdikonsole::slotDestroyed() -{ - m_haskonsole=false; - respawn(); -} - -#include "kmdikonsole.moc" diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h deleted file mode 100644 index df3a1526..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h +++ /dev/null @@ -1,33 +0,0 @@ -%{H_TEMPLATE} - -#ifndef KMDIKONSOLE_H -#define KMDIKONSOLE_H - -#include - -class kmdikonsole : public TQVBox -{ - Q_OBJECT - - - public: - kmdikonsole( TQWidget* parent, const char* name=0); - ~kmdikonsole(); - - public slots: - void setDirectory(const TQString & dir); - void activate(); - - private slots: - void slotDestroyed(); - void respawn(); - - protected: - void showEvent(TQShowEvent *ev); - - private: - KParts::ReadOnlyPart *m_part; - bool m_haskonsole; -}; - -#endif // KMDIKONSOLE_H diff --git a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate b/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate deleted file mode 100644 index 8f8fb599..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.kdevtemplate +++ /dev/null @@ -1,271 +0,0 @@ -# TDE Config File -[General] -Name=Scons-based KMDI application -Name[ca]=Aplicació per a KMDI basada en Scons -Name[da]=Scons-baseret KMDI-program -Name[de]=Auf Scons basierende KMDI-Anwendung -Name[el]=Μια εφαρμογή KMDI βασισμένης στο Scons -Name[es]=Aplicación KMDI basada en Scons -Name[et]=KMDI rakendus Sconsi põhjal -Name[eu]=Scons-en oinarritutako KMDI aplikazioa -Name[fa]=کاربرد KMDI بر مبنای Scons -Name[fr]=Application KMDI basée sur Scons -Name[ga]=Feidhmchlár KMDI bunaithe ar Scons -Name[gl]=Aplicación KMDI baseada en Scons -Name[hu]=Scons-alapú KMDI-alkalmazás -Name[it]=Applicazione KMDI basata su scons -Name[ja]=Scons ベースの KMDI アプリケーション -Name[nds]=Op "scons" opbuut KMDI-Programm -Name[ne]=स्कोन-आधारित KMDI अनुप्रयोग -Name[nl]=Scons gebaseerde KMDI-toepassing -Name[pl]=Program KMDI wykorzystujący Scons -Name[pt]=Aplicação KMDI usando Scons -Name[pt_BR]=Aplicação KMDI usando Scons -Name[ru]=Многооконное приложение TDE на базе Scons -Name[sk]=KMDI aplikácia založená na Scons -Name[sr]=KMDI програм на основу Scons-а -Name[sr@Latn]=KMDI program na osnovu Scons-a -Name[sv]=Scons-baserat KMDI-program -Name[tr]=Scons tabanlı KMDI uygulaması -Name[zh_CN]=基于 Scons 的 KMDI 应用程序 -Name[zh_TW]=Scons 為基礎的 KMDI 應用程式 -Category=C++/TDE -Icon=kscons_kmdi.png -Comment=Generates a complex KMDI application. Scons scripts are provided for compiling and installing the application. -Comment[ca]=Genera una complexa aplicació per a KMDI. Els scripts en Scons són proveïts per a compilar i instal·lar l'aplicació. -Comment[da]=Genererer et komplekst TDE-program. Der sørges for scons-scripter til at kompilere og installere programmet. -Comment[de]=Erstellt eine aufwändige KMDI-Anwendung. Scons-Skripte zum Kompilieren und Installieren der Anwendung werden zur Verfügung gestellt. -Comment[el]=Δημιουργεί μια πολύπλοκη εφαρμογή KMDI. Προσφέρονται σενάρια Scons για τη μεταγλώττιση και εγκατάσταση της εφαρμογής. -Comment[es]=Genera una aplicación KMDI compleja. Se proporcionan guiones en Scons para compilar e instalar la aplicación. -Comment[et]=Keerulise KMDI rakenduse loomine. Luuakse ka Sconsi skriptid rakenduse kompileerimiseks ja paigaldamiseks. -Comment[eu]=KMDI aplikazio konplexu bat sortzen du. Aplikazioak konpilatu eta aplikazioa instalatzeko Scons script-ak sortzen ditu. -Comment[fa]=یک کاربرد پیچیدۀ KMDI تولید می‌کند. دست‌نوشته‌های Scons برای ترجمه و نصب کاربرد فراهم می‌شوند. -Comment[fr]=Génère une application KMDI évoluée. Des scripts Scons sont fournis pour compiler et installer l'application. -Comment[gl]=Xera unha aplicación complexa KMDI. Os scripts Scons proporciónanse para compilar e instalar a aplicación. -Comment[hu]=Létrehoz egy komplex KMDI alkalmazást. Az alkalmazás lefordításához és telepítéséhez Scons-szkriptek állnak rendelkezésre. -Comment[it]=Genera una applicazione KMDI complessa. Gli script scons sono forniti per compilare e istallare l'applicazione. -Comment[nds]=Stellt en vigeliensch KMDI-Programm op. Stellt Scons-Skripten för't Kompileren un Installeren vun't Programm praat. -Comment[ne]=जटिल KMDI अनुप्रयोग उत्पन्न गर्दछ । स्कोन स्क्रिप्टहरू अनुप्रयोग स्थापना र कम्पाइल गर्नका लागि प्रदान गरिन्छ । -Comment[nl]=Genereert een complexe KMDI-applicatie. Scons-scripts worden gebruikt voor compilatie en installatie. -Comment[pl]=Generuje złożony program z powłoką KMDI. Do kompilacji i instalacji wykorzystywany jest skrypt Scons. -Comment[pt]=Gera uma aplicação complexa com KMDI. Os ficheiros do Scons são fornecidos para compilar e instalar a aplicação. -Comment[pt_BR]=Gera uma aplicação complexa com KMDI. Os ficheiros do Scons são fornecidos para compilar e instalar a aplicação. -Comment[ru]=Создание полноценного многооконного приложения TDE. Для сборки и установки этого приложения будут использованы скрипты Scons. -Comment[sk]=Vygeneruje komplexnú KMDI aplikáciu. K dispozícii je Scons skriptna kompiláciu a inštaláciu aplikácie. -Comment[sr]=Прави сложени KMDI програм. Дате су Scons скрипте за превођење и инсталирање програма. -Comment[sr@Latn]=Pravi složeni KMDI program. Date su Scons skripte za prevođenje i instaliranje programa. -Comment[sv]=Skapar ett komplext KMDI-program. Scons-skript tillhandahålls för att kompilera och installera programmet. -Comment[tr]=Karmaşık bir KMDI uygulaması yaratır. Uygulamayı derlemek ve kurmak için scons betikleri sağlanmıştır. -Comment[zh_CN]=生成一个复杂的 KMDI 应用程序。此时会提供 Scons 脚本以供编译并安装应用程序。 -Comment[zh_TW]=產生一個複雜的 KMDI 應用程式。Scons 文稿是用於編譯與安裝應用程式。 -FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=%{dest}/QUICKSTART -Archive=kscons_kmdi.tar.gz - -[SCONS] -Type=include -File=%{tdevelop}/template-common/scons.kdevtemplate - -[MKDIR_DOCBOOK1] -Type=mkdir -Dir=%{dest}/doc - -[MKDIR_DOCBOOK2] -Type=mkdir -Dir=%{dest}/doc/en - -[FILE1] -Type=install -Source=%{src}/SConscript-doc -Dest=%{dest}/doc/SConscript - -[FILE2] -Type=install -EscapeXML=true -Source=%{tdevelop}/template-common/kde-index.docbook -Dest=%{dest}/doc/en/index.docbook - -[FILE3] -Type=install -EscapeXML=true -Source=%{src}/app.tdevelop -Dest=%{dest}/%{APPNAMELC}.tdevelop - -[FILE4] -Type=install -Source=%{src}/SConstruct -Dest=%{dest}/SConstruct - -[MkDir3] -Type=mkdir -Dir=%{dest}/src - -[FILE6] -Type=install -Source=%{tdevelop}/template-common/tde-app.desktop -Dest=%{dest}/src/%{APPNAMELC}.desktop - -[FILE7] -Type=install -Source=%{tdevelop}/template-common/hi16-app-app.png -Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png -Process=false - -[FILE8] -Type=install -Source=%{tdevelop}/template-common/hi32-app-app.png -Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png -Process=false - -[MkDir4] -Type=mkdir -Dir=%{dest}/po - -[FILE10] -Type=install -Source=%{src}/SConscript-src -Dest=%{dest}/src/SConscript - -[FILE11] -Type=install -Source=%{src}/appkmdi.cpp -Dest=%{dest}/src/%{APPNAMELC}kmdi.cpp - -[FILE12] -Type=install -Source=%{src}/appkmdi.h -Dest=%{dest}/src/%{APPNAMELC}kmdi.h - -[FILE13] -Type=install -EscapeXML=true -Source=%{src}/prefs.ui -Dest=%{dest}/src/prefs.ui - -[FILE14] -Type=install -Source=%{src}/appkmdiView.cpp -Dest=%{dest}/src/%{APPNAMELC}kmdiView.cpp - -[FILE15] -Type=install -Source=%{src}/appkmdiView.h -Dest=%{dest}/src/%{APPNAMELC}kmdiView.h - -[FILE19] -Type=install -Source=%{src}/main.cpp -Dest=%{dest}/src/main.cpp - -[FILE20] -Type=install -EscapeXML=true -Source=%{src}/app_shell.rc -Dest=%{dest}/src/%{APPNAMELC}_shell.rc - -[FILE21] -Type=install -Source=%{src}/README -Dest=%{dest}/src/README - -[FILE22] -Type=install -Source=%{src}/app.kcfg -Dest=%{dest}/src/%{APPNAMELC}.kcfg - -[FILE23] -Type=install -Source=%{src}/settings.kcfgc -Dest=%{dest}/src/settings.kcfgc - -[FILE25] -Type=install -Source=%{src}/tips -Dest=%{dest}/src/tips - -[FILE27] -Type=install -Source=%{src}/VERSION -Dest=%{dest}/VERSION - -[FILE28] -Type=install -Source=%{src}/INSTALL -Dest=%{dest}/INSTALL - -[FILE29] -Type=install -Source=%{src}/QUICKSTART -Dest=%{dest}/QUICKSTART - -[FILE30] -Type=install -Source=%{src}/messages.sh -Dest=%{dest}/po/messages.sh - -[FILE31] -Type=install -Source=%{src}/kmdikonsole.cpp -Dest=%{dest}/src/kmdikonsole.cpp - -[FILE32] -Type=install -Source=%{src}/kmdikonsole.h -Dest=%{dest}/src/kmdikonsole.h - -[FILE34] -Type=install -Source=%{src}/app_part.cpp -Dest=%{dest}/src/%{APPNAMELC}_part.cpp - -[FILE35] -Type=install -Source=%{src}/app_part.h -Dest=%{dest}/src/%{APPNAMELC}_part.h - -[FILE36] -Type=install -Source=%{tdevelop}/template-common/tde-app.desktop -Dest=%{dest}/src/%{APPNAMELC}.desktop - -[FILE37] -Type=install -Source=%{tdevelop}/template-common/tde-part.desktop -Dest=%{dest}/src/%{APPNAMELC}_part.desktop - -[FILE38] -Type=install -Source=%{src}/app_part.rc -Dest=%{dest}/src/%{APPNAMELC}_part.rc - -[MSG] -Type=message -Comment=A TDE application with scons scripts was created in %{dest} -Comment[ca]=Una aplicació per al TDE amb scripts en Scons ha estat creada e n %{dest} -Comment[da]=Et TDE program med scons-scripter blev oprette i %{dest} -Comment[de]=Eine TDE-Anwendung mit Scons-Skripten wurde in %{dest} erstellt. -Comment[el]=Μια εφαρμογή TDE με σενάρια scons δημιουργήθηκε στο %{dest} -Comment[es]=Una aplicación para TDE con guiones de Scons ha sido creada en %{dest} -Comment[et]=TDE rakendus Sconsi skriptidega loodi asukohta %{dest} -Comment[eu]=Scons script-dun TDE aplikazio bat sortu da hemen: %{dest} -Comment[fa]=یک کاربرد TDE با دست‌نوشته‌های scons در %{dest} ایجاد شد -Comment[fr]=Une application TDE comprenant des scripts Scons a été créée dans %{dest} -Comment[ga]=Cruthaíodh feidhmchlár TDE le scripteanna scons i %{dest} -Comment[gl]=Creouse unha aplicación TDE con scripts scons en %{dest} -Comment[hu]=Létrejött egy Scons-szkripteket használó TDE-alapú alkalmazás itt: %{dest} -Comment[it]=È stata creata un'applicazione TDE con gli script scons in %{dest} -Comment[ja]=Scons スクリプトを使った TDE アプリケーションを %{dest} に作成しました -Comment[nds]=In %{dest} wöör en TDE-Programm mit scons-Skripten opstellt -Comment[ne]=स्कोन स्क्रिप्टसँग केडीई अनुप्रयोग %{dest} मा सिर्जना गरियो -Comment[nl]=Een TDE applicatie inclusief Scons-scripts is aangemaakt in %{dest} -Comment[pl]=Program TDE ze skryptami scons utworzony w %{dest} -Comment[pt]=Foi criada uma aplicação do TDE com ficheiros do 'scons' em %{dest} -Comment[pt_BR]=Foi criada uma aplicação do TDE com ficheiros do 'scons' em %{dest} -Comment[ru]=Приложение TDE со скриптами Scons создано в %{dest} -Comment[sk]=TDE aplikácia so scons skriptom bola vytvorená v %{dest} -Comment[sr]=TDE програм са scons скриптама направљен је у %{dest} -Comment[sr@Latn]=TDE program sa scons skriptama napravljen je u %{dest} -Comment[sv]=Ett TDE-program med Scons-skript skapades i %{dest} -Comment[tr]=Scons betikleri olan bir TDE uygulaması %{dest} içinde yaratıldı. -Comment[zh_CN]=在 %{dest} 中创建了带 scons 脚本的 TDE 应用程序 -Comment[zh_TW]=一個內含 scons 文稿的 TDE 應用程式已建立於 %{dest} diff --git a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.png b/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.png deleted file mode 100644 index 72a347ee..00000000 Binary files a/languages/cpp/app_templates/kscons_kmdi/kscons_kmdi.png and /dev/null differ diff --git a/languages/cpp/app_templates/kscons_kmdi/main.cpp b/languages/cpp/app_templates/kscons_kmdi/main.cpp deleted file mode 100644 index dca1e7a6..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/main.cpp +++ /dev/null @@ -1,60 +0,0 @@ -%{CPP_TEMPLATE} - -#include -#include -#include -#include -#include - -#include "%{APPNAMELC}kmdi.h" - -static const char description[] = -I18N_NOOP("A simple kmdi app"); - -static const char version[] = "0.0.1"; - -static KCmdLineOptions options[] = -{ - { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, - KCmdLineLastOption -}; - -int main(int argc, char **argv) -{ - TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, - TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}" ); - about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); - - // warning, utf-8 char - //about.addCredit( "bksys authors", "Thomas Nagy, Julien Antille" ); - - TDECmdLineArgs::init(argc, argv, &about); - TDECmdLineArgs::addCmdLineOptions(options); - - TDEApplication app; - - // see if we are starting with session management - /*if (app.isRestored()) - { - RESTORE((%{APPNAME}); - } else */ - { - // no session.. just start up normally - TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - - %{APPNAMELC}kmdi *widget = new %{APPNAMELC}kmdi( KMdi::IDEAlMode ); - - if (args->count() != 0) - { - for (int i=0; i < args->count(); i++) - { - widget->openURL( args->url( i ) ); - } - } - widget->show(); - args->clear(); - } - - return app.exec(); -} - diff --git a/languages/cpp/app_templates/kscons_kmdi/messages.sh b/languages/cpp/app_templates/kscons_kmdi/messages.sh deleted file mode 100755 index a0ce678a..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/messages.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -# Inspired by Makefile.common from coolo -# this script is used to update the .po files - -# To update the translations, you will need a specific gettext -# patched for kde and a lot of patience, tenacity, luck, time .. - - -# I guess one should only update the .po files when all .cpp files -# are generated (after a make or scons) - -# If you have a better way to do this, do not keep that info -# for yourself and help me to improve this script, thanks -# (tnagyemail-mail tat yahoo d0tt fr) - -SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code -TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips - -TDEDIR=`tde-config --prefix` -EXTRACTRC=extractrc -TDEPOT=`tde-config --prefix`/include/kde.pot -XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $TDEPOT " - -## check that kde.pot is available -if ! test -e $TDEPOT; then - echo "$TDEPOT does not exist, there is something wrong with your installation!" - XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale " -fi - -> rc.cpp - -## extract the strings -echo "extracting the strings" - -# process the .ui and .rc files -$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp -$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp -echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp - -# process the tips - $SRCDIR is supposed to be where the tips are living -pushd $TIPSDIR; preparetips >tips.cpp; popd - -$XGETTEXT `find $SRCDIR -name "*.cpp"` -o kdissert.pot - -# remove the intermediate files -rm -f $TIPSDIR/tips.cpp -rm -f rc.cpp -rm -f $SRCDIR/_translatorinfo.cpp - -## now merge the .po files .. -echo "merging the .po files" - -for i in `ls *.po`; do - msgmerge $i kdissert.pot -o $i || exit 1 -done - -## finished -echo "Done" - diff --git a/languages/cpp/app_templates/kscons_kmdi/prefs.ui b/languages/cpp/app_templates/kscons_kmdi/prefs.ui deleted file mode 100644 index 7830280b..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/prefs.ui +++ /dev/null @@ -1,30 +0,0 @@ - -prefs - - -prefs - - - -0 -0 -241 -47 - - - - -unnamed - - - -kcfg_showCloseTabsButton - - -Show close buttons on the right of tabs - - - - - - diff --git a/languages/cpp/app_templates/kscons_kmdi/settings.kcfgc b/languages/cpp/app_templates/kscons_kmdi/settings.kcfgc deleted file mode 100644 index 384510cd..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/settings.kcfgc +++ /dev/null @@ -1,6 +0,0 @@ -# Code generation options for kconfig_compiler -File=%{APPNAMELC}.kcfg -ClassName=Settings -Singleton=true -Mutators=col_background,col_foreground -# will create the necessary code for setting those variables diff --git a/languages/cpp/app_templates/kscons_kmdi/tips b/languages/cpp/app_templates/kscons_kmdi/tips deleted file mode 100644 index b9618b42..00000000 --- a/languages/cpp/app_templates/kscons_kmdi/tips +++ /dev/null @@ -1,6 +0,0 @@ - - -

... that automake was not involved in building this kde application ?

-

The tdevelop template "kscons_kxt" was used instead.

- - diff --git a/languages/cpp/app_templates/kscons_kxt/README b/languages/cpp/app_templates/kscons_kxt/README index bf4edf71..e7aa2647 100644 --- a/languages/cpp/app_templates/kscons_kxt/README +++ b/languages/cpp/app_templates/kscons_kxt/README @@ -83,7 +83,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play in your app. For more details, consult : -http://www-106.ibm.com/developerworks/library/l-kparts/ +http://www-106.ibm.com/developerworks/library/l-tdeparts/ http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html diff --git a/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt new file mode 100644 index 00000000..c05f1bb1 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt @@ -0,0 +1,30 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_custom_target( kscons_tdemdi.tar.gz ALL + COMMAND tar zcf kscons_tdemdi.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + app.kcfg app.tdevelop apptdemdi.cpp apptdemdi.h apptdemdiView.cpp + apptdemdiView.h INSTALL tdemdikonsole.cpp tdemdikonsole.h + main.cpp messages.sh prefs.ui QUICKSTART README + SConscript-doc SConscript-src SConstruct settings.kcfgc + tips VERSION app_part.cpp app_part.h app_part.rc + app_shell.rc +) + + +install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/kscons_tdemdi.tar.gz kscons_tdemdi.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) + + +install( FILES + kscons_tdemdi.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kscons_tdemdi/INSTALL b/languages/cpp/app_templates/kscons_tdemdi/INSTALL new file mode 100644 index 00000000..e61a3acc --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/INSTALL @@ -0,0 +1,83 @@ +REQUIREMENTS +------------ + +* TDE headers & libraries for tdelibs +* A Python interpreter for the compilation + +scons v0.96.1 or newer is recommended, but it's not required since a +minimum scons distribution is included in the package. + +BUILDING AND INSTALLING +----------------------- + +For configuring, compiling and installing the application and +if you do have Scons 0.96.1 or newer installed, just run: + +$ scons +$ scons install (as root user) + +In case you don't have Scons installed, you can use +the accompanying minimum scons by running: + +$ tar xjvf admin/scons-mini.tar.bz2 +$ ./scons +$ ./scons install + +ADVANCED BUILD FEATURES & DEINSTALLING +-------------------------------------- + +In case you want to execute many compilation jobs in parallel (because you +want to make use of a SMP system or a compile cluster, for instance), +you can use ('N' is the number of jobs which should be run in parallel): + +$ scons -jN + +A debug build of the program can be created by running: + +$ scons configure debug=1 +$ scons + +Finally, the software can be removed from your system by running + +$ scons -c install + +CONFIGURATION NOTES +------------------- + +The installation scripts are relying on the tde-config program. +The programs tde-config, qmake, uic and moc must be accesssible +through your PATH. + +Qt and kde may not be installed as expected (in QTDIR and TDEDIR) +So until tde-config is able to give that information, you may +have to give those paths. You may also want to tune the build. + +In these cases, you must first run "scons configure" with some options +before running "scons" and "scons install" + +Here are some examples : +On Fedora/Redhat +$ scons configure kdeincludes=/usr/include/tde/ +On Debian +$ scons configure qtincludes=/usr/include/qt/ kdeinclude=/usr/include/tde/ +To install in some particular location with additional include paths +$ scons configure prefix=~/tmp extraincludes=/tmp/include:/usr/local/include +For AMD64 and platforms where folders are like /usr/lib64 +$ scons configure libsuffix=64 + +For more options, run +scons --help + +The build system is based on bksys, a build system that replaces +autoconf, automake and make in a row. Feel free to report your opinion +about it to the bksys authors. + +PACKAGE CREATION +---------------- + +RPM packagers can use the DESTDIR environment variable +$ DESTDIR=/tmp/build-rpm/ scons install + +To use checkinstall, pass the following option +$ checkinstall --fstrans=no --nodoc scons install + diff --git a/languages/cpp/app_templates/kscons_tdemdi/Makefile.am b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am new file mode 100644 index 00000000..191ea8ee --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am @@ -0,0 +1,21 @@ +dataFiles = app.kcfg app.tdevelop apptdemdi.cpp apptdemdi.h apptdemdiView.cpp \ +apptdemdiView.h INSTALL tdemdikonsole.cpp tdemdikonsole.h main.cpp \ +messages.sh prefs.ui QUICKSTART README SConscript-doc SConscript-src \ +SConstruct settings.kcfgc tips VERSION \ +app_part.cpp app_part.h app_part.rc app_shell.rc + +templateName= kscons_tdemdi + +### no need to change below: +template_DATA = $(templateName).kdevtemplate +templatedir = ${appwizarddatadir}/templates + +appwizarddatadir = ${kde_datadir}/kdevappwizard +$(templateName).tar.gz: ${dataFiles} ${dataFiles} + $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} + $(GZIP_COMMAND) -f9 $(templateName).tar + +archivedir = ${appwizarddatadir} +archive_DATA = $(templateName).tar.gz ${templateName}.png + +CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART new file mode 100644 index 00000000..a5fbba33 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART @@ -0,0 +1,164 @@ +------------------------------------------ +SUMMARY : + +scons +scons install + + +The online documentation of bksys can be found at: +http://freehackers.org/~tnagy/bksys_manual.html + + ... and now for the quickstart: + +CONFIGURING AND COMPILING THE PROJECT(S) +SCONS TIPS +MOC PROCESSING +SCONS MINIMUM DISTRIBUTION +MORE TIPS + +------------------------------------------ +CONFIGURING AND COMPILING THE PROJECT(S) + +The program scons is usually launched as "scons" +When it is not intalled globally, one can run +"./scons" instead of "scons" (ie : to use the local scons +that comes with bksys - see below SCONS MINIMUM DISTRIBUTION +if you do not have scons already) + +To compile the project, you will then only need to launch +scons on the top-level directory, the scripts find and +cache the environment detected *automatically* : +-> scons + +To clean the project -> scons -c + +To install the project -> scons install +To install as root user -> su -c 'scons install' +To uninstall the project -> scons -c install +To uninstall (as root) -> su -c 'scons -c install' +To consult the help -> scons -h + +To (re)configure the project and give particular arguments, use : + -> scons configure debug=1 + +The variables are saved automatically after the first run +in files named *.cache.py (look at kde.cache.py, ..) + +------------------------------------------ +SCONS TIPS + +In a subdirectory, it is necessary to launch scons with the -u flag : +scons -u + +This is annoying and you probably want to add this to your .bashrc +export SCONSFLAGS=-u +and forget about it :) + +To make .deb or .rpm packages of your program, use : +checkinstall --fstrans=no --nodoc scons install +(if you have checkinstall on your system of course) + +To make scons run (much) faster, consult ./addons/README in bksys + +------------------------------------------ +MOC PROCESSING + +In qt programs, when a header 'foo.h' contains a class that has +Q_SIGNALS and Q_SLOTS, then 'foo.h' must contain the macro Q_OBJECT +in order to compile. foo_moc.cpp is usually generated, and is +used to produce foo_moc.o which is linked with the +program or the library. + +In kde programs, 'foo.moc' is generated instead of foo_moc.cpp, +and it must be included at the very end of foo.cpp +(add #include "foo.moc" : this increases the speed of +compilation a *lot* and makes less object files. + +Both modes are provided though, see test6-mocfiesta/ + +------------------------------------------ +MINIMUM SCONS DISTRIBUTION + +A minimum scons distribution is included in the archive +for convenience to those who do not have scons packages +for their operating system or their linux +distribution. For a full and more recent version of scons, +please consult http://www.scons.org + +Including this scons distribution to your archive will add +about 63kb (compressed) , while including the necessary +kdescripts (admin/ directory, configure, autom4 cache stuff, +Makefile.in) can add easily 500kb (compressed). + +To compile with the scons distribution : +* unpack it with : + tar xjvf admin/scons-mini.tar.bz2 +* compile the program with : + ./scons (instead of just 'scons') +* install the program with : + ./scons install (instead of just 'scons install') + +More options : +* clean the object files with : + ./scons -c +* uninstall the program with with : + ./scons -c install +* create a package : + ./scons dist + +------------------------------------------ +MORE TIPS + +** static libraries ** +With Makefile.am, one had to make static libraries all the time +because it did not allow having source code in other directories. +This is not the case anymore with scons, so you can specify +sources in other directories relative to the sconscript file, ie: + test1_sources = ['mainfiles/main.cpp', 'otherfile/program.cpp'] + myenv.Program( target = "test1", source = test1_sources ) +To encourage you to switch to the new scheme, the static library +helper has been omitted (look at the end of kde.py if you need one) + +** libtool ** +The LaFile build tool is a cheat that allows klibloader to load +.so files without complaints. If you need real libtool support +you can have a look to the libtool directory : it can work but +remember that libtool is broken on many systems (invalid flags +among others), so when you can work without libtool +(small projects especially), just do it. + +** moc processing ** +As stated above, you should always add #include "foo.moc" +for your qt classes (Q_OBJECT) to save precious compilation time. + +** using a cache ** +It is a good idea to enable the cache feature in SConstruct, +especially if you are doing experiments (it saves your computer +from recompiling the same files over and over again ..). + +** threading ** +myenv.AppendUnique( CPPFLAGS = ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] ) + +** final notes *** +A medium-sized project containing several targets, libraries and data +files can be converted very quickly. +Also, remember that SConscript files are actually python scripts .. +you can use whatever python feature you want in them, ie: "for" loops, +this is how the kde helpers work (TDEprogram, TDEshlib ..). + +If you are stuck, you can also have a look at more complicated +bksys-based projects like kdissert or kshaderdesigner + +The scons man page and the wiki can be very useful, do not forget to +consult them when you encounter an issue + +------------------------------------------ + +I hope you will enjoy this alternative to the autotools +scripts for kde programming, at least as much as I do : +http://freehackers.org/~tnagy/kdissert/index.html + +Happy kde hacking, + +Thomas Nagy, 2004, 2005 + diff --git a/languages/cpp/app_templates/kscons_tdemdi/README b/languages/cpp/app_templates/kscons_tdemdi/README new file mode 100644 index 00000000..e7aa2647 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/README @@ -0,0 +1,111 @@ +----------------------------------------------- +Kde scons template quickstart +Author: Thomas Nagy +Date: 2005-04-04 +----------------------------------------------- + +This README file explains basic concepts necessary +for starting with this application template. + + +** Building and installing ** + +* To configure the application run "scons configure" + In some rare cases you may need to add flags: + scons configure qtincludes=/usr/include/qt3/include kdeincludes=/usr/lib/trinity/include + +* After building, launch the application and test the dcop + interface by using the command (search a bit) : + dcop + dcop appname-... + dcop appname-... instancenumber + dcop appname-... instancenumber switch_colors + dcop appname switch_colors + Or launch kdcop and search in the menus for your program + name and double-click on 'switch_colors()' + +* The usual targets call the following scons commands : + make -> scons + make clean -> scons -c + make install -> scons install + make uninstall -> scons -c install + make dist -> scons dist + +* To build apps, use TDEprogram, TDEshlib, etc. + these functions are documented at the bottom of kde.py + More information can be found in the QUICKSTART + +* The scons scripts for building kde applications originate + from the 'bksys' distribution. It contains several other examples + that detail the kpart building and the dcop interface + processing : + http://www.kde-apps.org/content/show.php?content=19243 + +* Extending the scons scripts for building the application : + The scons scripts are actually python scripts, so all the + usual tricks apply : 'for' and 'while' loops, 'if', 'else' .. + consult : + http://www.python.org for more information about python + http://www.scons.org for more informationabout scons + +* Simplify your life : install the project in your home directory for +testing purposes. +scons configure prefix=/home/user/dummyfolder/ +In the end when you finished the development you can +rm -rf /home/user/dummyfolder/ +without fear. + + +** Technologies ** + +* Build the menus of your application easily +kde applications now use an xml file (*ui.rc file) to build the menus. +This allow a great customization of the application. However, when +programming the menu is shown only after a "make install" + +For more details, consult : +http://devel-home.kde.org/~larrosa/tutorial/p9.html +http://developer.kde.org/documentation/tutorials/xmlui/preface.html + +* Use TDEConfig XT to create your configuration dialogs and make +them more maintainable. + +For that, you will need to write two simple configuration files +in the src directory : .kcfg and a .kcfgc +The configure.in.in will need to be modified : change the line #MIN_CONFIG(3.0.0) +into #MIN_CONFIG(3.2.0) + +Take an example on the many apps found in the tdegames source package and consult : +http://developer.kde.org/documentation/tutorials/kconfigxt/kconfigxt.html + +* With KParts, you can embed other kde components in your program, or make your program +embeddable in other apps. For example, the kmplayer kpart can be called to play videos +in your app. + +For more details, consult : +http://www-106.ibm.com/developerworks/library/l-tdeparts/ +http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html +http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html + +* With dcop, you can control your app from other applications +Make sure to include K_DCOP and a kdcop: section in your .h file +http://developer.kde.org/documentation/tutorials/dot/dcopiface/dcop-interface.html + + +** Documentation ** + +* For the translations : +refer to the file po/SConscript and po/messages.sh + +1. Download a patched gettext which can be found at: + http://public.kde.planetmirror.com/pub/kde/devel/gettext-kde/ +2. Install that gettext in ~/bin/ +3. cd ~/yourproject, export PATH=~/bin:$PATH, export +TDEDIR=/where_your_TDE3_is +4. make -f admin/Makefile.common package-messages +5. make package-messages +6. Translate the po files (not the pot!!) with kbabel or xemacs + +* Do not forget to write the documentation for your kde app +edit the documentation template index.docbook in doc/ + diff --git a/languages/cpp/app_templates/kscons_tdemdi/SConscript-doc b/languages/cpp/app_templates/kscons_tdemdi/SConscript-doc new file mode 100644 index 00000000..0c3e07e7 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/SConscript-doc @@ -0,0 +1,92 @@ +#! /usr/bin/env python +## This script demonstrates to build and install +## the documentation of a kde program with scons +## +## Thomas Nagy, 2005 + +## This file can be reused freely for any project (see COPYING) + +## First load the environment set in the top-level SConstruct file +Import( 'env' ) +myenv=env.Copy() + +## The following looks complicated but it is not +## We first define a function to install all files as documentation +## The documentation is of course lying in subfolders from here +## * normal files are installed under TDEDOC/destination +## * meinproc files are not installed, but processed into a single +## index.cache.bz2 which is installed afterwards + +## This is far more maintainable to have *one* file than +## having lots of almost empty SConscript in several folders + +################################################################### +# COMMON PART FOR PROCESSING DOCUMENTATION FOLDERS +################################################################### + +import os +import sys +import glob +import SCons.Util + +## Define this to 1 if you are writing documentation else to 0 :) +i_am_a_documentation_writer = 0 + +## This function uses env imported above +def processfolder(folder, lang, destination=""): + # folder is the folder to process + # lang is the language + # destination is the subdirectory in TDEDOC + + docfiles = glob.glob(folder+"/???*.*") # file files that are at least 4 chars wide :) + + # warn about errors + #if len(lang) != 2: + # print "error, lang must be a two-letter string, like 'en'" + + # when the destination is not given, use the folder + if len(destination) == 0: + destination=folder + + docbook_list = [] + for file in docfiles: + + # do not process folders + if not os.path.isfile(file): + continue + # do not process the cache file + if file == 'index.cache.bz2': + continue + # ignore invalid files (TODO??) + if len( SCons.Util.splitext( file ) ) <= 1 : + continue + + ext = SCons.Util.splitext( file )[1] + + # docbook files are processed by meinproc + if ext == '.docbook': + docbook_list.append( file ) + continue + + myenv.TDEinstall('TDEDOC', lang+'/'+destination, file) + + # Now process the index.docbook files .. + if len(docbook_list) == 0: + return + if not os.path.isfile( folder+'/index.docbook' ): + print "Error, index.docbook was not found in "+folder+'/index.docbook' + return + if i_am_a_documentation_writer: + for file in docbook_list: + myenv.Depends( folder+'index.cache.bz2', file ) + myenv.Meinproc( folder+'/index.cache.bz2', folder+'/index.docbook' ) + myenv.TDEinstall( 'TDEDOC', lang+'/'+destination, folder+'/index.cache.bz2' ) + +################################################################### +# TELL WHICH FOLDERS TO PROCESS +################################################################### + +## Use processfolder for each documentation directory +processfolder('en/', 'en', '%{APPNAMELC}') +processfolder('fr/', 'fr', '%{APPNAMELC}') + diff --git a/languages/cpp/app_templates/kscons_tdemdi/SConscript-src b/languages/cpp/app_templates/kscons_tdemdi/SConscript-src new file mode 100644 index 00000000..97f5140c --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/SConscript-src @@ -0,0 +1,60 @@ +#! /usr/bin/env python +## This script is a quick test to demonstrate (and test) +## the bksys moc handling '#include "file.moc"' can be added .. or not +## +## Thomas Nagy, 2005 +## This file can be reused freely for any project (see COPYING) + +Import('env') +myenv=env.Copy() + +## First build : the shell +## Each tab in it will hold an instance of the part .. + +%{APPNAMELC}_sources=""" +main.cpp +%{APPNAMELC}tdemdi.cpp +%{APPNAMELC}tdemdiView.cpp +tdemdikonsole.cpp +settings.kcfgc +prefs.ui +""" +# Now that we have our list of sources we can build the program +myenv.TDEprogram( '%{APPNAMELC}', %{APPNAMELC}_sources ) # main program +myenv.TDEaddpaths_includes( './ ../' ) # additional paths +myenv.TDEaddlibs( 'qt-mt tdecore kio tdeparts tdemdi' ) # additional libraries + +## Next, the kpart library +## using TDEshlib, the .so and .la are installed automatically when needed + +myenv2=env.Copy() +%{APPNAMELC}part_sources = '%{APPNAMELC}_part.cpp' +myenv2.TDEshlib( 'lib%{APPNAMELC}part', %{APPNAMELC}part_sources) +myenv2.TDEaddpaths_includes( './ #/' ) # the '#' means the top-level directory +myenv2.TDEaddlibs( 'qt-mt kio tdecore tdeprint tdeparts' ) +# myenv2.TDEaddflags_link( '-DQT_THREAD_SUPPORT' ) + +############################# +## Data files to install + +## NOTE: TDEinstall( resource_type, subdir, list of files ) + +## the .kcfg file +myenv.TDEinstall( 'TDEKCFG', '', '%{APPNAMELC}.kcfg' ) + +## the program .desktop file +myenv.TDEinstall( 'TDEMENU', '/Utilities', '%{APPNAMELC}.desktop' ) + +## the rc file - named *_shell.rc instead of *ui.rc for kpart apps +myenv.TDEinstall( 'TDEDATA', '/%{APPNAMELC}', '%{APPNAMELC}_shell.rc' ) + +## this servicetype desktop file goes in TDEXDG whether the other one goes in TDEMENU +myenv.TDEinstall( 'TDEXDG', '', '%{APPNAMELC}_part.desktop' ) + +## the kpart resource file +myenv.TDEinstall( 'TDEDATA', '/%{APPNAMELC}part', '%{APPNAMELC}_part.rc' ) + +## Installing icons is easy (hi-16-app-%{APPNAMELC}.png, hi-22-app-%{APPNAMELC}.png) +#myenv.TDEicon() + +## do not forget that this is a python script so even loops are allowed... :) diff --git a/languages/cpp/app_templates/kscons_tdemdi/SConstruct b/languages/cpp/app_templates/kscons_tdemdi/SConstruct new file mode 100644 index 00000000..3954247c --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/SConstruct @@ -0,0 +1,112 @@ +#! /usr/bin/env python + +""" +help -> scons -h +compile -> scons +clean -> scons -c +install -> scons install +uninstall -> scons -c install +configure -> scons configure prefix=/tmp/ita debug=full extraincludes=/usr/local/include:/tmp/include prefix=/usr/local + +Run from a subdirectory -> scons -u +The variables are saved automatically after the first run (look at cache/kde.cache.py, ..) +""" + +################################################################### +# LOAD THE ENVIRONMENT AND SET UP THE TOOLS +################################################################### + +## Load the builders in config +env = Environment( tools=['default', 'generic', 'kde'], toolpath=['./', './admin']) +#env = Environment( tools=['default', 'generic', 'kde', 'othertool'], toolpath=['./', './admin']) + +env.TDEuse("environ rpath") +#env.TDEuse("environ rpath lang_qt thread nohelp") + +################################################################### +# SCRIPTS FOR BUILDING THE TARGETS +################################################################### + +dirs=""" +src +doc +""" +env.subdirs(dirs) + +## Process the translations in the po/ directory +env.TDElang('po/', '%{APPNAMELC}') + +################################################################### +# CONVENIENCE FUNCTIONS TO EMULATE 'make dist' and 'make distclean' +################################################################### + +### To make a tarball of your masterpiece, use 'scons dist' +if 'dist' in COMMAND_LINE_TARGETS: + + ## The target scons dist requires the python module shutil which is in 2.3 + env.EnsurePythonVersion(2, 3) + + import os + APPNAME = 'bksys' + VERSION = os.popen("cat VERSION").read().rstrip() + FOLDER = APPNAME+'-'+VERSION + ARCHIVE = FOLDER+'.tar.bz2' + + ## If your app name and version number are defined in 'version.h', use this instead: + ## (contributed by Dennis Schridde devurandom@gmx@net) + #import re + #INFO = dict( re.findall( '(?m)^#define\s+(\w+)\s+(.*)(?<=\S)', open(r"version.h","rb").read() ) ) + #APPNAME = INFO['APPNAME'] + #VERSION = INFO['VERSION'] + + import shutil + import glob + + ## check if the temporary directory already exists + if os.path.isdir(FOLDER): + shutil.rmtree(FOLDER) + if os.path.isfile(ARCHIVE): + os.remove(ARCHIVE) + + ## create a temporary directory + startdir = os.getcwd() + shutil.copytree(startdir, FOLDER) + + ## remove our object files first + os.popen("find "+FOLDER+" -name \"*cache*\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \"*.pyc\" | xargs rm -f") + #os.popen("pushd %s && scons -c " % FOLDER) # TODO + + ## CVS cleanup + os.popen("find "+FOLDER+" -name \"CVS\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \".cvsignore\" | xargs rm -rf") + + ## Subversion cleanup + os.popen("find %s -name .svn -type d | xargs rm -rf" % FOLDER) + + ## GNU Arch cleanup + os.popen("find "+FOLDER+" -name \"{arch}\" | xargs rm -rf") + os.popen("find "+FOLDER+" -name \".arch-i*\" | xargs rm -rf") + + ## Create the tarball (coloured output) + print "\033[92m"+"Writing archive "+ARCHIVE+"\033[0m" + os.popen("tar cjf "+ARCHIVE+" "+FOLDER) + + ## Remove the temporary directory + if os.path.isdir(FOLDER): + shutil.rmtree(FOLDER) + + env.Default(None) + env.Exit(0) + +### Emulate "make distclean" +if 'distclean' in COMMAND_LINE_TARGETS: + ## Remove the cache directory + import os, shutil + if os.path.isdir(env['CACHEDIR']): + shutil.rmtree(env['CACHEDIR']) + os.popen("find . -name \"*.pyc\" | xargs rm -rf") + + env.Default(None) + env.Exit(0) + diff --git a/languages/cpp/app_templates/kscons_tdemdi/VERSION b/languages/cpp/app_templates/kscons_tdemdi/VERSION new file mode 100644 index 00000000..2e293c30 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/VERSION @@ -0,0 +1 @@ +%{VERSION} diff --git a/languages/cpp/app_templates/kscons_tdemdi/app.kcfg b/languages/cpp/app_templates/kscons_tdemdi/app.kcfg new file mode 100644 index 00000000..f2c46b64 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/app.kcfg @@ -0,0 +1,12 @@ + + + + + + true + + + diff --git a/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop b/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop new file mode 100644 index 00000000..317a4cbc --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop @@ -0,0 +1,169 @@ + + + + %{AUTHOR} + %{EMAIL} + %{VERSION} + KDevTDEAutoProject + C++ + + C++ + Code + Qt + TDE + + . + false + + + + + + 3 + true + 3 + EmbeddedKDevDesigner + + + + + + src/%{APPNAMELC} + debug + + + src/%{APPNAMELC} + false + + + + + + + false + 1 + false + + + + + optimized + kdevgccoptions + kdevgppoptions + kdevg77options + -O2 -g0 + + + --enable-debug=full + debug + kdevgccoptions + kdevgppoptions + kdevg77options + -O0 -g3 + + + + + + + + + + + + + false + *.o,*.lo,CVS + + + + + ada + ada_bugs_gcc + bash + bash_bugs + clanlib + w3c-dom-level2-html + fortran_bugs_gcc + gnome1 + gnustep + gtk + gtk_bugs + haskell + haskell_bugs_ghc + java_bugs_gcc + java_bugs_sun + pascal_bugs_fp + php + php_bugs + perl + perl_bugs + python + python_bugs + ruby + ruby_bugs + sdl + w3c-svg + sw + w3c-uaag10 + wxwidgets_bugs + + + qmake User Guide + + + + + libtool + + + true + false + false + true + + + false + true + + + + + + + + + + + + -f + + -dP + + -f + -u3 -p + + + + + + + false + + + .h + .cpp + true + + + + true + 2 + + + + Doxygen Documentation Collection + %{APPNAMELC}.tag + + + diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp new file mode 100644 index 00000000..2bdb725d --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp @@ -0,0 +1,159 @@ +%{CPP_TEMPLATE} + +#include "%{APPNAMELC}_part.h" + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory; +K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); + +%{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, const TQStringList & /*args*/) + : KParts::ReadWritePart(parent) +{ + // we need an instance + setInstance( %{APPNAMELC}PartFactory::instance() ); + + // this should be your custom internal widget + m_widget = new TQMultiLineEdit( parentWidget, widgetName ); + + // notify the part that this is our internal widget + setWidget(m_widget); + + // create our actions + KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + + // set our XML-UI resource file + setXMLFile("%{APPNAMELC}_part.rc"); + + // we are read-write by default + setReadWrite(true); + + // we are not modified since we haven't done anything yet + setModified(false); +} + +%{APPNAMELC}Part::~%{APPNAMELC}Part() +{ +} + +TDEAboutData *%{APPNAMELC}Part::createAboutData() +{ + // The non-i18n name here must be the same as the directory in + // which the part's rc file is installed + TDEAboutData *aboutData = new TDEAboutData("%{APPNAMELC}part", I18N_NOOP("%{APPNAMELC}Part"), "0.0.1"); + aboutData->addAuthor("%{AUTHOR}", 0, "%{EMAIL}"); + return aboutData; +} + +void %{APPNAMELC}Part::setReadWrite(bool rw) +{ + // notify your internal widget of the read-write state + m_widget->setReadOnly(!rw); + if (rw) + connect(m_widget, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(setModified())); + else + { + disconnect(m_widget, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(setModified())); + } + + ReadWritePart::setReadWrite(rw); +} + +void %{APPNAMELC}Part::setModified(bool modified) +{ + // get a handle on our Save action and make sure it is valid + KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); + if (!save) + return; + + // if so, we either enable or disable it based on the current + // state + if (modified) + save->setEnabled(true); + else + save->setEnabled(false); + + // in any event, we want our parent to do it's thing + ReadWritePart::setModified(modified); +} + +bool %{APPNAMELC}Part::openFile() +{ + // m_file is always local so we can use TQFile on it + TQFile file(m_file); + if (file.open(IO_ReadOnly) == false) + return false; + + // our example widget is text-based, so we use TQTextStream instead + // of a raw TQDataStream + TQTextStream stream(&file); + TQString str; + while (!stream.eof()) + str += stream.readLine() + "\n"; + + file.close(); + + // now that we have the entire file, display it + m_widget->setText(str); + + // just for fun, set the status bar + emit setStatusBarText( m_url.prettyURL() ); + + return true; +} + +bool %{APPNAMELC}Part::saveFile() +{ + // if we aren't read-write, return immediately + if (isReadWrite() == false) + return false; + + // m_file is always local, so we use TQFile + TQFile file(m_file); + if (file.open(IO_WriteOnly) == false) + return false; + + // use TQTextStream to dump the text to the file + TQTextStream stream(&file); + stream << m_widget->text(); + + file.close(); + + return true; +} + +void %{APPNAMELC}Part::fileOpen() +{ + // this slot is called whenever the File->Open menu is selected, + // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar + // button is clicked + TQString file_name = KFileDialog::getOpenFileName(); + + if (file_name.isEmpty() == false) + openURL(file_name); +} + +void %{APPNAMELC}Part::fileSaveAs() +{ + // this slot is called whenever the File->Save As menu is selected, + TQString file_name = KFileDialog::getSaveFileName(); + if (file_name.isEmpty() == false) + saveAs(file_name); +} + +#include "%{APPNAMELC}_part.moc" diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.h b/languages/cpp/app_templates/kscons_tdemdi/app_part.h new file mode 100644 index 00000000..13f773a1 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.h @@ -0,0 +1,75 @@ +%{H_TEMPLATE} + +#ifndef _%{APPNAMEUC}PART_H_ +#define _%{APPNAMEUC}PART_H_ + +#include +#include + +class TQMultiLineEdit; +class TQWidget; +class TQPainter; +class KURL; +class TDEAboutData; + +/** + * This is a "Part". It that does all the real work in a KPart + * application. + * + * @short Main Part + * @author %{AUTHOR} + * @version %{VERSION} + */ +class %{APPNAMELC}Part : public KParts::ReadWritePart +{ + Q_OBJECT + +public: + /** + * Default constructor + */ + %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName, + TQObject *parent, const char *name, const TQStringList & /*args*/); + + /** + * Destructor + */ + virtual ~%{APPNAMELC}Part(); + + /** + * This is a virtual function inherited from KParts::ReadWritePart. + * A shell will use this to inform this Part if it should act + * read-only + */ + virtual void setReadWrite(bool rw); + + /** + * Reimplemented to disable and enable Save action + */ + virtual void setModified(bool modified); + + /** + * About data for the part + */ + static TDEAboutData *createAboutData(); + +protected: + /** + * This must be implemented by each part + */ + virtual bool openFile(); + + /** + * This must be implemented by each read-write part + */ + virtual bool saveFile(); + +protected slots: + void fileOpen(); + void fileSaveAs(); + +private: + TQMultiLineEdit *m_widget; +}; + +#endif // _%{APPNAMEUC}PART_H_ diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.rc b/languages/cpp/app_templates/kscons_tdemdi/app_part.rc new file mode 100644 index 00000000..cec8ec5c --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.rc @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_shell.rc b/languages/cpp/app_templates/kscons_tdemdi/app_shell.rc new file mode 100644 index 00000000..c8b2bb98 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/app_shell.rc @@ -0,0 +1,33 @@ + + + + &File + + + + + + + + &View + + &Settings + + + + + + + + + + + + +Main Toolbar + + + + + + diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp new file mode 100644 index 00000000..0ef16672 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp @@ -0,0 +1,394 @@ +%{CPP_TEMPLATE} + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "settings.h" +#include "prefs.h" +#include "%{APPNAMELC}tdemdiView.h" +#include "tdemdikonsole.h" +#include "%{APPNAMELC}tdemdi.h" + +%{APPNAMELC}tdemdi::%{APPNAMELC}tdemdi(KMdi::MdiMode mode) + : KMdiMainFrm( 0, "%{APPNAMELC}", mode ) +{ + resize( 800, 600 ); // start at 800x600 the first time + + setManagedDockPositionModeEnabled(true); + setStandardMDIMenuEnabled(false); + + m_manager = new KParts::PartManager(this); + connect(m_manager, TQT_SIGNAL(activePartChanged(KParts::Part*)), + this, TQT_SLOT(createGUI(KParts::Part*)) ); + +#if KDE_IS_VERSION(3, 3, 0) + setToolviewStyle( KMdi::TextAndIcon ); + tabWidget()->setHoverCloseButton( false ); +#endif + + setMenuForSDIModeSysButtons( menuBar() ); + setManagedDockPositionModeEnabled(true); + + m_console = NULL; + + // accept dnd + setAcceptDrops(true); + + // then, setup our actions + setupActions(); + + //createShellGUI( true ); + + // and a status bar + statusBar()->show(); + + connect( this, TQT_SIGNAL( viewActivated( KMdiChildView * ) ), this, TQT_SLOT( currentChanged( KMdiChildView * ) ) ); + + m_console = new tdemdikonsole(this, "konsole"); + m_console->setIcon( SmallIcon("konsole") ); + m_console->setCaption( i18n("Terminal") ); + addToolWindow( m_console, KDockWidget::DockBottom, getMainDockWidget(), 20 ); + + +#if KDE_IS_VERSION(3, 3, 0) + if (Settings::showCloseTabsButton()) + { + TQToolButton *but = new TQToolButton(tabWidget()); + but->setIconSet(SmallIcon("tab_remove")); + but->adjustSize(); + but->hide(); + connect(but, TQT_SIGNAL(clicked()), actionCollection()->action( "file_close" ), TQT_SIGNAL(activated())); + tabWidget()->setCornerWidget(but, TopRight); + } +#endif + + // apply the saved mainwindow settings, if any, and ask the mainwindow + // to automatically save settings if changed: window size, toolbar + // position, icon size, etc. + setAutoSaveSettings(); + + // Read the dock config only if the app was started at least only once - tdemdi is tricky + TDEConfig *cfg = new TDEConfig("%{APPNAMELC}_dockposrc"); + if (cfg->readNumEntry("%{APPNAMELC}_main_dock_settings", 0) == 1) manager()->readConfig(cfg); + cfg->writeEntry("%{APPNAMELC}_main_dock_settings", 1); + delete cfg; + + showTipOnStart(); +} + +%{APPNAMELC}tdemdi::~%{APPNAMELC}tdemdi() +{ + // Write the dock config on exit + TDEConfig *cfg = new TDEConfig("%{APPNAMELC}_dockposrc"); + manager()->writeConfig(cfg); + delete cfg; + delete m_console; +} + +void %{APPNAMELC}tdemdi::setupActions() +{ + setXMLFile("%{APPNAMELC}_shell.rc"); + + KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); + + KStdAction::tipOfDay( this, TQT_SLOT( showTip() ), actionCollection() + )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); + + KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); + KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + + m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + + KAction* action = KStdAction::configureToolbars(this, + TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + + createGUI( NULL ); +} + +void %{APPNAMELC}tdemdi::showTip() +{ + KTipDialog::showTip(this,TQString(),true); +} + +void %{APPNAMELC}tdemdi::showTipOnStart() +{ + KTipDialog::showTip(this); +} + +void %{APPNAMELC}tdemdi::slotFileNew() +{ + %{APPNAMELC}tdemdiView *view = new %{APPNAMELC}tdemdiView(this); + m_manager->addPart( view->part() ); + + addWindow( view ); + + // add the tree view to the widget stack + m_views += view; + + currentChanged( view ); +} + +void %{APPNAMELC}tdemdi::openURL(const KURL & url) +{ + // check if the url is not already opened first + TQValueList<%{APPNAMELC}tdemdiView*>::iterator it = m_views.begin(); + TQValueList<%{APPNAMELC}tdemdiView*>::iterator end = m_views.end(); + for (; it != end; ++it) + { + %{APPNAMELC}tdemdiView *view = *it; + if (view->part()->url() == url) + { + activateView(view); + return; + } + } + + %{APPNAMELC}tdemdiView *view = new %{APPNAMELC}tdemdiView(this); + m_manager->addPart( view->part() ); + + addWindow( view ); + + m_views += view; + + view->part()->openURL(url); + currentChanged( view ); +} + +void %{APPNAMELC}tdemdi::currentChanged( KMdiChildView *current ) +{ + //kdWarning()<<"current view changed"<setActivePart(NULL); + //setCaption("()"); + return; + } + + // switch to the corresponding document + if ( m_views.contains( (%{APPNAMELC}tdemdiView*) current ) ) + { + %{APPNAMELC}tdemdiView *view = (%{APPNAMELC}tdemdiView*) current; + //view->updateCaption(); + m_manager->setActivePart( view->part() ); + } +} + +void %{APPNAMELC}tdemdi::slotFileClose() +{ + requestClose( activeWindow() ); +} + +bool %{APPNAMELC}tdemdi::requestClose(KMdiChildView* v) +{ + // kdWarning()<<"closing view"<part()->queryClose()) + { + m_manager->removePart( view->part() ); + + closeWindow( view ); + m_views.clear(); + setCaption("kdissert"); + return true; + } + return false; + } + return true; + } + + %{APPNAMELC}tdemdiView *view = (%{APPNAMELC}tdemdiView*) v; + if ( m_views.contains( view ) ) + { + m_views.remove( view ); + if ( view->part()->queryClose() ) + { + m_manager->removePart( view->part() ); + + closeWindow( view ); + return true; + } + return false; + } + return true; +} + +void %{APPNAMELC}tdemdi::slotFileQuit() +{ + close(); +} + +void %{APPNAMELC}tdemdi::optionsShowToolbar() +{ + if (m_toolbarAction->isChecked()) + toolBar()->show(); + else + toolBar()->hide(); +} + +void %{APPNAMELC}tdemdi::optionsShowStatusbar() +{ + if (m_statusbarAction->isChecked()) + statusBar()->show(); + else + statusBar()->hide(); +} + +void %{APPNAMELC}tdemdi::optionsConfigureKeys() +{ + //KKeyDialog::configure(actionCollection()); + KKeyDialog dlg( false, this ); + TQPtrList clients = guiFactory()->clients(); + + for( TQPtrListIterator it( clients ); it.current(); ++it ) + dlg.insert ( (*it)->actionCollection(), (*it)->instance()->aboutData()->programName() ); + + dlg.configure(); + + for (int i=0; ipart()->reloadXML(); + } +} + +void %{APPNAMELC}tdemdi::optionsConfigureToolbars() +{ + //saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); +} + +void %{APPNAMELC}tdemdi::newToolbarConfig() +{ + // This slot is called when user clicks "Ok" or "Apply" in the toolbar editor. + // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.) + //createGUI(); + //applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); +} + +void %{APPNAMELC}tdemdi::optionsPreferences() +{ + // The preference dialog is derived from prefs-base.ui which is subclassed into Prefs + // + // compare the names of the widgets in the .ui file + // to the names of the variables in the .kcfg file + if (TDEConfigDialog::showDialog("settings")) + return; + + TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self(), KDialogBase::Swallow); + dialog->addPage(new prefs(), i18n("General"), "package_settings"); + connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChanged())); + dialog->show(); +} + +void %{APPNAMELC}tdemdi::settingsChanged() +{ + // propagate the changes to our views + /*TQValueList<%{APPNAMELC}tdemdiView*>::iterator it = m_views.begin(); + TQValueList<%{APPNAMELC}tdemdiView*>::iterator end = m_views.end(); + for (; it != end; ++it) + { + %{APPNAMELC}tdemdiView *view = *it; + view->settingsChanged(); + }*/ +} + +void %{APPNAMELC}tdemdi::changeStatusbar(const TQString& text) +{ + // display the text on the statusbar + statusBar()->message(text, 2000); +} + +void %{APPNAMELC}tdemdi::dragEnterEvent(TQDragEnterEvent *event) +{ + // accept uri drops only + event->accept(KURLDrag::canDecode(event)); +} + +void %{APPNAMELC}tdemdi::dropEvent(TQDropEvent *event) +{ + KURL::List urls; + + // see if we can decode a URI.. if not, just ignore it + if (KURLDrag::decode(event, urls) && !urls.isEmpty()) + { + // okay, we have a URI.. process it + const KURL &url = urls.first(); + + // load in the file + openURL(url); + } +} + +bool %{APPNAMELC}tdemdi::queryClose() +{ + TQValueList<%{APPNAMELC}tdemdiView*>::iterator it; + + // check if we can close all documents + for (it = m_views.begin(); it != m_views.end(); ++it) + { + // kdWarning()<<"searching for the part"<part()->queryClose()) + { + return false; + } + } + + // and now close the documents + for (it = m_views.begin(); it != m_views.end(); ++it) + { + // now close all views + %{APPNAMELC}tdemdiView *view = *it; + + m_manager->removePart( view->part() ); + closeWindow( view ); + } + + return true; +} + +#include "%{APPNAMELC}tdemdi.moc" diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h new file mode 100644 index 00000000..02d26d0c --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h @@ -0,0 +1,83 @@ +%{H_TEMPLATE} + +#ifndef _%{APPNAMEUC}KMDI_H +#define _%{APPNAMEUC}KMDI_H + +#include + +#include +#include +#include + +class KToggleAction; +class KRecentFilesAction; + +class tdemdikonsole; +class KMdiChildView; +class TQWidgetStack; +class %{APPNAMELC}tdemdiView; +class TextProperties; +class MiscProperties; + +/** + * This class serves as the main window for %{APPNAMELC}tdemdi. It handles the + * menus, toolbars, and status bars. + * + * @short Main window class + */ +class %{APPNAMELC}tdemdi : public KMdiMainFrm +{ + Q_OBJECT + + public: + %{APPNAMELC}tdemdi( KMdi::MdiMode mode ); + virtual ~%{APPNAMELC}tdemdi(); + void showTipOnStart(); + + public slots: + void openURL( const KURL& ); + + protected: + virtual void dragEnterEvent(TQDragEnterEvent *event); + virtual void dropEvent(TQDropEvent *event); + virtual bool queryClose(); + + private slots: + void slotFileNew(); + void slotFileClose(); + void slotFileQuit(); + + /// this is called when a new file is saved + void showTip(); + + void optionsShowToolbar(); + void optionsShowStatusbar(); + void optionsConfigureKeys(); + void optionsConfigureToolbars(); + void optionsPreferences(); + void newToolbarConfig(); + + + void changeStatusbar(const TQString& text); + + void currentChanged( KMdiChildView *current ); + bool requestClose(KMdiChildView* view); + + void settingsChanged(); + + private: + void setupAccel(); + void setupActions(); + + TQValueList<%{APPNAMELC}tdemdiView*> m_views; + + KToggleAction *m_toolbarAction; + KToggleAction *m_statusbarAction; + + KParts::PartManager *m_manager; + + tdemdikonsole *m_console; +}; + +#endif // _%{APPNAMEUC}KMDI_H + diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp new file mode 100644 index 00000000..a9b9845e --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp @@ -0,0 +1,63 @@ +%{CPP_TEMPLATE} + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "%{APPNAMELC}tdemdiView.h" + + + %{APPNAMELC}tdemdiView::%{APPNAMELC}tdemdiView( TQWidget *parentWidget, const char *name ) +: KMdiChildView( parentWidget, name ) +{ + m_part = NULL; + + // this routine will find and load our Part. it finds the Part by + // name which is a bad idea usually.. but it's alright in this + // case since our Part is made for this Shell + KLibFactory *factory = KLibLoader::self()->factory("lib%{APPNAMELC}part"); + //KLibFactory *factory = KLibLoader::self()->factory("libkatepart"); + if (factory) + { + // now that the Part is loaded, we cast it to a Part to get + // our hands on it + m_part = static_cast(factory->create( + this, "katepart", "KParts::ReadWritePart" )); + + if (m_part) + { + part()->widget()->setFocus(); + setFocusProxy(part()->widget()); + + TQBoxLayout* layout = new TQHBoxLayout(this, 0, -1, "kdissertviewlayout" ); + part()->widget()->reparent( this, TQPoint(0, 0) ); + layout->addWidget( part()->widget() ); + + // connect( m_part, TQT_SIGNAL(stateChanged()), this, TQT_SLOT(updateCaption()) ); + } + else + { + KMessageBox::error(this, i18n("Could not find our part.")); + } + } + else + { + // if we couldn't find our Part, we exit since the Shell by + // itself can't do anything useful + KMessageBox::error(this, i18n("Could not find our part.")); + return; + } +} + +%{APPNAMELC}tdemdiView::~%{APPNAMELC}tdemdiView() +{ + delete m_part->widget(); +} + +#include "%{APPNAMELC}tdemdiView.moc" diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h new file mode 100644 index 00000000..00109fdb --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.h @@ -0,0 +1,30 @@ +%{H_TEMPLATE} + +#ifndef _%{APPNAMEUC}KMDIVIEW_H +#define _%{APPNAMEUC}KMDIVIEW_H + +#include +#include +#include + +/** + * This class serves as the %{APPNAMELC}tdemdi view. + * + * @short main view class + */ +class %{APPNAMELC}tdemdiView : public KMdiChildView +{ + Q_OBJECT + + public: + %{APPNAMELC}tdemdiView( TQWidget *parentWidget=0L, const char *name=0L ); + virtual ~%{APPNAMELC}tdemdiView(); + + KParts::ReadWritePart *part() { return m_part; } + + private: + KParts::ReadWritePart *m_part; +}; + +#endif // _%{APPNAMEUC}KMDIVIEW_H + diff --git a/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate new file mode 100644 index 00000000..635d40d8 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate @@ -0,0 +1,271 @@ +# TDE Config File +[General] +Name=Scons-based KMDI application +Name[ca]=Aplicació per a KMDI basada en Scons +Name[da]=Scons-baseret KMDI-program +Name[de]=Auf Scons basierende KMDI-Anwendung +Name[el]=Μια εφαρμογή KMDI βασισμένης στο Scons +Name[es]=Aplicación KMDI basada en Scons +Name[et]=KMDI rakendus Sconsi põhjal +Name[eu]=Scons-en oinarritutako KMDI aplikazioa +Name[fa]=کاربرد KMDI بر مبنای Scons +Name[fr]=Application KMDI basée sur Scons +Name[ga]=Feidhmchlár KMDI bunaithe ar Scons +Name[gl]=Aplicación KMDI baseada en Scons +Name[hu]=Scons-alapú KMDI-alkalmazás +Name[it]=Applicazione KMDI basata su scons +Name[ja]=Scons ベースの KMDI アプリケーション +Name[nds]=Op "scons" opbuut KMDI-Programm +Name[ne]=स्कोन-आधारित KMDI अनुप्रयोग +Name[nl]=Scons gebaseerde KMDI-toepassing +Name[pl]=Program KMDI wykorzystujący Scons +Name[pt]=Aplicação KMDI usando Scons +Name[pt_BR]=Aplicação KMDI usando Scons +Name[ru]=Многооконное приложение TDE на базе Scons +Name[sk]=KMDI aplikácia založená na Scons +Name[sr]=KMDI програм на основу Scons-а +Name[sr@Latn]=KMDI program na osnovu Scons-a +Name[sv]=Scons-baserat KMDI-program +Name[tr]=Scons tabanlı KMDI uygulaması +Name[zh_CN]=基于 Scons 的 KMDI 应用程序 +Name[zh_TW]=Scons 為基礎的 KMDI 應用程式 +Category=C++/TDE +Icon=kscons_tdemdi.png +Comment=Generates a complex KMDI application. Scons scripts are provided for compiling and installing the application. +Comment[ca]=Genera una complexa aplicació per a KMDI. Els scripts en Scons són proveïts per a compilar i instal·lar l'aplicació. +Comment[da]=Genererer et komplekst TDE-program. Der sørges for scons-scripter til at kompilere og installere programmet. +Comment[de]=Erstellt eine aufwändige KMDI-Anwendung. Scons-Skripte zum Kompilieren und Installieren der Anwendung werden zur Verfügung gestellt. +Comment[el]=Δημιουργεί μια πολύπλοκη εφαρμογή KMDI. Προσφέρονται σενάρια Scons για τη μεταγλώττιση και εγκατάσταση της εφαρμογής. +Comment[es]=Genera una aplicación KMDI compleja. Se proporcionan guiones en Scons para compilar e instalar la aplicación. +Comment[et]=Keerulise KMDI rakenduse loomine. Luuakse ka Sconsi skriptid rakenduse kompileerimiseks ja paigaldamiseks. +Comment[eu]=KMDI aplikazio konplexu bat sortzen du. Aplikazioak konpilatu eta aplikazioa instalatzeko Scons script-ak sortzen ditu. +Comment[fa]=یک کاربرد پیچیدۀ KMDI تولید می‌کند. دست‌نوشته‌های Scons برای ترجمه و نصب کاربرد فراهم می‌شوند. +Comment[fr]=Génère une application KMDI évoluée. Des scripts Scons sont fournis pour compiler et installer l'application. +Comment[gl]=Xera unha aplicación complexa KMDI. Os scripts Scons proporciónanse para compilar e instalar a aplicación. +Comment[hu]=Létrehoz egy komplex KMDI alkalmazást. Az alkalmazás lefordításához és telepítéséhez Scons-szkriptek állnak rendelkezésre. +Comment[it]=Genera una applicazione KMDI complessa. Gli script scons sono forniti per compilare e istallare l'applicazione. +Comment[nds]=Stellt en vigeliensch KMDI-Programm op. Stellt Scons-Skripten för't Kompileren un Installeren vun't Programm praat. +Comment[ne]=जटिल KMDI अनुप्रयोग उत्पन्न गर्दछ । स्कोन स्क्रिप्टहरू अनुप्रयोग स्थापना र कम्पाइल गर्नका लागि प्रदान गरिन्छ । +Comment[nl]=Genereert een complexe KMDI-applicatie. Scons-scripts worden gebruikt voor compilatie en installatie. +Comment[pl]=Generuje złożony program z powłoką KMDI. Do kompilacji i instalacji wykorzystywany jest skrypt Scons. +Comment[pt]=Gera uma aplicação complexa com KMDI. Os ficheiros do Scons são fornecidos para compilar e instalar a aplicação. +Comment[pt_BR]=Gera uma aplicação complexa com KMDI. Os ficheiros do Scons são fornecidos para compilar e instalar a aplicação. +Comment[ru]=Создание полноценного многооконного приложения TDE. Для сборки и установки этого приложения будут использованы скрипты Scons. +Comment[sk]=Vygeneruje komplexnú KMDI aplikáciu. K dispozícii je Scons skriptna kompiláciu a inštaláciu aplikácie. +Comment[sr]=Прави сложени KMDI програм. Дате су Scons скрипте за превођење и инсталирање програма. +Comment[sr@Latn]=Pravi složeni KMDI program. Date su Scons skripte za prevođenje i instaliranje programa. +Comment[sv]=Skapar ett komplext KMDI-program. Scons-skript tillhandahålls för att kompilera och installera programmet. +Comment[tr]=Karmaşık bir KMDI uygulaması yaratır. Uygulamayı derlemek ve kurmak için scons betikleri sağlanmıştır. +Comment[zh_CN]=生成一个复杂的 KMDI 应用程序。此时会提供 Scons 脚本以供编译并安装应用程序。 +Comment[zh_TW]=產生一個複雜的 KMDI 應用程式。Scons 文稿是用於編譯與安裝應用程式。 +FileTemplates=h,CStyle,cpp,CStyle +ShowFilesAfterGeneration=%{dest}/QUICKSTART +Archive=kscons_tdemdi.tar.gz + +[SCONS] +Type=include +File=%{tdevelop}/template-common/scons.kdevtemplate + +[MKDIR_DOCBOOK1] +Type=mkdir +Dir=%{dest}/doc + +[MKDIR_DOCBOOK2] +Type=mkdir +Dir=%{dest}/doc/en + +[FILE1] +Type=install +Source=%{src}/SConscript-doc +Dest=%{dest}/doc/SConscript + +[FILE2] +Type=install +EscapeXML=true +Source=%{tdevelop}/template-common/kde-index.docbook +Dest=%{dest}/doc/en/index.docbook + +[FILE3] +Type=install +EscapeXML=true +Source=%{src}/app.tdevelop +Dest=%{dest}/%{APPNAMELC}.tdevelop + +[FILE4] +Type=install +Source=%{src}/SConstruct +Dest=%{dest}/SConstruct + +[MkDir3] +Type=mkdir +Dir=%{dest}/src + +[FILE6] +Type=install +Source=%{tdevelop}/template-common/tde-app.desktop +Dest=%{dest}/src/%{APPNAMELC}.desktop + +[FILE7] +Type=install +Source=%{tdevelop}/template-common/hi16-app-app.png +Dest=%{dest}/src/hi16-app-%{APPNAMELC}.png +Process=false + +[FILE8] +Type=install +Source=%{tdevelop}/template-common/hi32-app-app.png +Dest=%{dest}/src/hi32-app-%{APPNAMELC}.png +Process=false + +[MkDir4] +Type=mkdir +Dir=%{dest}/po + +[FILE10] +Type=install +Source=%{src}/SConscript-src +Dest=%{dest}/src/SConscript + +[FILE11] +Type=install +Source=%{src}/apptdemdi.cpp +Dest=%{dest}/src/%{APPNAMELC}tdemdi.cpp + +[FILE12] +Type=install +Source=%{src}/apptdemdi.h +Dest=%{dest}/src/%{APPNAMELC}tdemdi.h + +[FILE13] +Type=install +EscapeXML=true +Source=%{src}/prefs.ui +Dest=%{dest}/src/prefs.ui + +[FILE14] +Type=install +Source=%{src}/apptdemdiView.cpp +Dest=%{dest}/src/%{APPNAMELC}tdemdiView.cpp + +[FILE15] +Type=install +Source=%{src}/apptdemdiView.h +Dest=%{dest}/src/%{APPNAMELC}tdemdiView.h + +[FILE19] +Type=install +Source=%{src}/main.cpp +Dest=%{dest}/src/main.cpp + +[FILE20] +Type=install +EscapeXML=true +Source=%{src}/app_shell.rc +Dest=%{dest}/src/%{APPNAMELC}_shell.rc + +[FILE21] +Type=install +Source=%{src}/README +Dest=%{dest}/src/README + +[FILE22] +Type=install +Source=%{src}/app.kcfg +Dest=%{dest}/src/%{APPNAMELC}.kcfg + +[FILE23] +Type=install +Source=%{src}/settings.kcfgc +Dest=%{dest}/src/settings.kcfgc + +[FILE25] +Type=install +Source=%{src}/tips +Dest=%{dest}/src/tips + +[FILE27] +Type=install +Source=%{src}/VERSION +Dest=%{dest}/VERSION + +[FILE28] +Type=install +Source=%{src}/INSTALL +Dest=%{dest}/INSTALL + +[FILE29] +Type=install +Source=%{src}/QUICKSTART +Dest=%{dest}/QUICKSTART + +[FILE30] +Type=install +Source=%{src}/messages.sh +Dest=%{dest}/po/messages.sh + +[FILE31] +Type=install +Source=%{src}/tdemdikonsole.cpp +Dest=%{dest}/src/tdemdikonsole.cpp + +[FILE32] +Type=install +Source=%{src}/tdemdikonsole.h +Dest=%{dest}/src/tdemdikonsole.h + +[FILE34] +Type=install +Source=%{src}/app_part.cpp +Dest=%{dest}/src/%{APPNAMELC}_part.cpp + +[FILE35] +Type=install +Source=%{src}/app_part.h +Dest=%{dest}/src/%{APPNAMELC}_part.h + +[FILE36] +Type=install +Source=%{tdevelop}/template-common/tde-app.desktop +Dest=%{dest}/src/%{APPNAMELC}.desktop + +[FILE37] +Type=install +Source=%{tdevelop}/template-common/tde-part.desktop +Dest=%{dest}/src/%{APPNAMELC}_part.desktop + +[FILE38] +Type=install +Source=%{src}/app_part.rc +Dest=%{dest}/src/%{APPNAMELC}_part.rc + +[MSG] +Type=message +Comment=A TDE application with scons scripts was created in %{dest} +Comment[ca]=Una aplicació per al TDE amb scripts en Scons ha estat creada e n %{dest} +Comment[da]=Et TDE program med scons-scripter blev oprette i %{dest} +Comment[de]=Eine TDE-Anwendung mit Scons-Skripten wurde in %{dest} erstellt. +Comment[el]=Μια εφαρμογή TDE με σενάρια scons δημιουργήθηκε στο %{dest} +Comment[es]=Una aplicación para TDE con guiones de Scons ha sido creada en %{dest} +Comment[et]=TDE rakendus Sconsi skriptidega loodi asukohta %{dest} +Comment[eu]=Scons script-dun TDE aplikazio bat sortu da hemen: %{dest} +Comment[fa]=یک کاربرد TDE با دست‌نوشته‌های scons در %{dest} ایجاد شد +Comment[fr]=Une application TDE comprenant des scripts Scons a été créée dans %{dest} +Comment[ga]=Cruthaíodh feidhmchlár TDE le scripteanna scons i %{dest} +Comment[gl]=Creouse unha aplicación TDE con scripts scons en %{dest} +Comment[hu]=Létrejött egy Scons-szkripteket használó TDE-alapú alkalmazás itt: %{dest} +Comment[it]=È stata creata un'applicazione TDE con gli script scons in %{dest} +Comment[ja]=Scons スクリプトを使った TDE アプリケーションを %{dest} に作成しました +Comment[nds]=In %{dest} wöör en TDE-Programm mit scons-Skripten opstellt +Comment[ne]=स्कोन स्क्रिप्टसँग केडीई अनुप्रयोग %{dest} मा सिर्जना गरियो +Comment[nl]=Een TDE applicatie inclusief Scons-scripts is aangemaakt in %{dest} +Comment[pl]=Program TDE ze skryptami scons utworzony w %{dest} +Comment[pt]=Foi criada uma aplicação do TDE com ficheiros do 'scons' em %{dest} +Comment[pt_BR]=Foi criada uma aplicação do TDE com ficheiros do 'scons' em %{dest} +Comment[ru]=Приложение TDE со скриптами Scons создано в %{dest} +Comment[sk]=TDE aplikácia so scons skriptom bola vytvorená v %{dest} +Comment[sr]=TDE програм са scons скриптама направљен је у %{dest} +Comment[sr@Latn]=TDE program sa scons skriptama napravljen je u %{dest} +Comment[sv]=Ett TDE-program med Scons-skript skapades i %{dest} +Comment[tr]=Scons betikleri olan bir TDE uygulaması %{dest} içinde yaratıldı. +Comment[zh_CN]=在 %{dest} 中创建了带 scons 脚本的 TDE 应用程序 +Comment[zh_TW]=一個內含 scons 文稿的 TDE 應用程式已建立於 %{dest} diff --git a/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.png b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.png new file mode 100644 index 00000000..72a347ee Binary files /dev/null and b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.png differ diff --git a/languages/cpp/app_templates/kscons_tdemdi/main.cpp b/languages/cpp/app_templates/kscons_tdemdi/main.cpp new file mode 100644 index 00000000..ccfc4fac --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/main.cpp @@ -0,0 +1,60 @@ +%{CPP_TEMPLATE} + +#include +#include +#include +#include +#include + +#include "%{APPNAMELC}tdemdi.h" + +static const char description[] = +I18N_NOOP("A simple tdemdi app"); + +static const char version[] = "0.0.1"; + +static KCmdLineOptions options[] = +{ + { "+[URL]", I18N_NOOP( "Document to open" ), 0 }, + KCmdLineLastOption +}; + +int main(int argc, char **argv) +{ + TDEAboutData about("%{APPNAMELC}", I18N_NOOP("%{APPNAME}"), version, description, + TDEAboutData::License_%{LICENSE}, "(C) %{YEAR} %{AUTHOR}", 0, 0, "%{EMAIL}" ); + about.addAuthor( "%{AUTHOR}", 0, "%{EMAIL}" ); + + // warning, utf-8 char + //about.addCredit( "bksys authors", "Thomas Nagy, Julien Antille" ); + + TDECmdLineArgs::init(argc, argv, &about); + TDECmdLineArgs::addCmdLineOptions(options); + + TDEApplication app; + + // see if we are starting with session management + /*if (app.isRestored()) + { + RESTORE((%{APPNAME}); + } else */ + { + // no session.. just start up normally + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); + + %{APPNAMELC}tdemdi *widget = new %{APPNAMELC}tdemdi( KMdi::IDEAlMode ); + + if (args->count() != 0) + { + for (int i=0; i < args->count(); i++) + { + widget->openURL( args->url( i ) ); + } + } + widget->show(); + args->clear(); + } + + return app.exec(); +} + diff --git a/languages/cpp/app_templates/kscons_tdemdi/messages.sh b/languages/cpp/app_templates/kscons_tdemdi/messages.sh new file mode 100755 index 00000000..a0ce678a --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/messages.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# Inspired by Makefile.common from coolo +# this script is used to update the .po files + +# To update the translations, you will need a specific gettext +# patched for kde and a lot of patience, tenacity, luck, time .. + + +# I guess one should only update the .po files when all .cpp files +# are generated (after a make or scons) + +# If you have a better way to do this, do not keep that info +# for yourself and help me to improve this script, thanks +# (tnagyemail-mail tat yahoo d0tt fr) + +SRCDIR=../test1-kconfigxt # srcdir is the directory containing the source code +TIPSDIR=$SRCDIR # tipsdir is the directory containing the tips + +TDEDIR=`tde-config --prefix` +EXTRACTRC=extractrc +TDEPOT=`tde-config --prefix`/include/kde.pot +XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x $TDEPOT " + +## check that kde.pot is available +if ! test -e $TDEPOT; then + echo "$TDEPOT does not exist, there is something wrong with your installation!" + XGETTEXT="xgettext -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale " +fi + +> rc.cpp + +## extract the strings +echo "extracting the strings" + +# process the .ui and .rc files +$EXTRACTRC `find $SRCDIR -iname *.rc` >> rc.cpp +$EXTRACTRC `find $SRCDIR -iname *.ui` >> rc.cpp +echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > $SRCDIR/_translatorinfo.cpp + +# process the tips - $SRCDIR is supposed to be where the tips are living +pushd $TIPSDIR; preparetips >tips.cpp; popd + +$XGETTEXT `find $SRCDIR -name "*.cpp"` -o kdissert.pot + +# remove the intermediate files +rm -f $TIPSDIR/tips.cpp +rm -f rc.cpp +rm -f $SRCDIR/_translatorinfo.cpp + +## now merge the .po files .. +echo "merging the .po files" + +for i in `ls *.po`; do + msgmerge $i kdissert.pot -o $i || exit 1 +done + +## finished +echo "Done" + diff --git a/languages/cpp/app_templates/kscons_tdemdi/prefs.ui b/languages/cpp/app_templates/kscons_tdemdi/prefs.ui new file mode 100644 index 00000000..7830280b --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/prefs.ui @@ -0,0 +1,30 @@ + +prefs + + +prefs + + + +0 +0 +241 +47 + + + + +unnamed + + + +kcfg_showCloseTabsButton + + +Show close buttons on the right of tabs + + + + + + diff --git a/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc b/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc new file mode 100644 index 00000000..384510cd --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/settings.kcfgc @@ -0,0 +1,6 @@ +# Code generation options for kconfig_compiler +File=%{APPNAMELC}.kcfg +ClassName=Settings +Singleton=true +Mutators=col_background,col_foreground +# will create the necessary code for setting those variables diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp new file mode 100644 index 00000000..0eab6525 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.cpp @@ -0,0 +1,76 @@ +%{CPP_TEMPLATE} + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include "tdemdikonsole.h" + +tdemdikonsole::tdemdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name) +{ + m_haskonsole = false; + respawn(); +} + +tdemdikonsole::~tdemdikonsole() +{ +} + +void tdemdikonsole::respawn() +{ + KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart"); + + if (!factory) return; + m_part = (KParts::ReadOnlyPart *) factory->create(this); + + if (!m_part) return; + + if (m_part->widget()->inherits(TQFRAME_OBJECT_NAME_STRING)) + ((TQFrame*)m_part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); + + m_haskonsole=true; + connect( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + + m_part->widget()->show(); + show(); +} + +void tdemdikonsole::setDirectory(const TQString &dirname) +{ + if (m_haskonsole) + { + KURL url(dirname); + if (m_part->url() != url) + m_part->openURL(url); + } +} + +void tdemdikonsole::showEvent(TQShowEvent *ev) +{ + TQWidget::showEvent(ev); + activate(); +} + +void tdemdikonsole::activate() +{ + if (m_haskonsole) + { + m_part->widget()->show(); + setFocusProxy(m_part->widget()); + m_part->widget()->setFocus(); + } +} + +void tdemdikonsole::slotDestroyed() +{ + m_haskonsole=false; + respawn(); +} + +#include "tdemdikonsole.moc" diff --git a/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h new file mode 100644 index 00000000..db4a4323 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/tdemdikonsole.h @@ -0,0 +1,33 @@ +%{H_TEMPLATE} + +#ifndef KMDIKONSOLE_H +#define KMDIKONSOLE_H + +#include + +class tdemdikonsole : public TQVBox +{ + Q_OBJECT + + + public: + tdemdikonsole( TQWidget* parent, const char* name=0); + ~tdemdikonsole(); + + public slots: + void setDirectory(const TQString & dir); + void activate(); + + private slots: + void slotDestroyed(); + void respawn(); + + protected: + void showEvent(TQShowEvent *ev); + + private: + KParts::ReadOnlyPart *m_part; + bool m_haskonsole; +}; + +#endif // KMDIKONSOLE_H diff --git a/languages/cpp/app_templates/kscons_tdemdi/tips b/languages/cpp/app_templates/kscons_tdemdi/tips new file mode 100644 index 00000000..b9618b42 --- /dev/null +++ b/languages/cpp/app_templates/kscons_tdemdi/tips @@ -0,0 +1,6 @@ + + +

... that automake was not involved in building this kde application ?

+

The tdevelop template "kscons_kxt" was used instead.

+ + diff --git a/languages/cpp/app_templates/kscreensaver/.kdev_ignore b/languages/cpp/app_templates/kscreensaver/.kdev_ignore deleted file mode 100644 index e69de29b..00000000 diff --git a/languages/cpp/app_templates/kscreensaver/CMakeLists.txt b/languages/cpp/app_templates/kscreensaver/CMakeLists.txt deleted file mode 100644 index a74c003c..00000000 --- a/languages/cpp/app_templates/kscreensaver/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_custom_target( kscreensaver.tar.gz ALL - COMMAND tar zcf kscreensaver.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - kscreensaver.desktop kscreensaver.png kscreensaver.h - kscreensaverui.ui src-Makefile.am kscreensaver.cpp - kscreensaver.tdevelop subdirs -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/kscreensaver.tar.gz kscreensaver.png - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) - - -install( FILES - kscreensaver.kdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kscreensaver/Makefile.am b/languages/cpp/app_templates/kscreensaver/Makefile.am deleted file mode 100644 index a304c27a..00000000 --- a/languages/cpp/app_templates/kscreensaver/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -dataFiles = kscreensaver.desktop kscreensaver.png kscreensaver.h \ - kscreensaverui.ui src-Makefile.am kscreensaver.cpp \ - kscreensaver.tdevelop subdirs - -templateName= kscreensaver - -### no need to change below: -template_DATA = $(templateName).kdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/kdevappwizard -$(templateName).tar.gz: ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - $(GZIP_COMMAND) -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz $(templateName).png - -CLEANFILES = *.tar.gz \ No newline at end of file diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp deleted file mode 100644 index 12699c32..00000000 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp +++ /dev/null @@ -1,107 +0,0 @@ -%{CPP_TEMPLATE} - -#include -#include -#include -#include -#include -#include -#include -#include -#include "%{APPNAMELC}.h" -#include "%{APPNAMELC}ui.h" - -//! libkscreensaver interface -extern "C" -{ - const char *kss_applicationName = "%{APPNAMELC}.kss"; - const char *kss_description = I18N_NOOP( "%{APPNAME}" ); - const char *kss_version = "2.2.0"; - - %{APPNAME} *kss_create( WId id ) - { - TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); - return new %{APPNAME}( id ); - } - - TQDialog *kss_setup() - { - TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); - return new %{APPNAME}Setup(); - } -} - -//----------------------------------------------------------------------------- -//! dialog to setup screen saver parameters -%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name ) - : %{APPNAME}UI( parent, name, TRUE ) -{ - /// @todo - //Connect your signals and slots here to configure the screen saver. - connect( OkayPushButton, TQT_SIGNAL( released() ), - TQT_SLOT( slotOkPressed() ) ); - connect( CancelPushButton, TQT_SIGNAL( released() ), - TQT_SLOT( slotCancelPressed() ) ); -} - - -//! read settings from config file -void %{APPNAME}Setup::readSettings() -{ - TDEConfig *config = TDEGlobal::config(); - config->setGroup( "Settings" ); - /// @todo - // Add your config options here... - CheckBox1->setChecked(config->readBoolEntry( "somesetting", false )); -} - - -//! Ok pressed - save settings and exit -void %{APPNAME}Setup::slotOkPressed() -{ - TDEConfig *config = TDEGlobal::config(); - config->setGroup( "Settings" ); - /// @todo - // Add your config options here. - config->writeEntry( "somesetting", CheckBox1->isChecked() ); - config->sync(); - - accept(); -} - -void %{APPNAME}Setup::slotCancelPressed() -{ - reject(); -} -//----------------------------------------------------------------------------- - - -%{APPNAME}::%{APPNAME}( WId id ) : KScreenSaver( id ) -{ - readSettings(); - blank(); -} - -%{APPNAME}::~%{APPNAME}() -{} - - -//! read configuration settings from config file -void %{APPNAME}::readSettings() -{ - TDEConfig *config = TDEGlobal::config(); - config->setGroup( "Settings" ); - /// @todo - // Add your config options here... - bool somesetting = config->readBoolEntry( "somesetting", false ); -} - - -void %{APPNAME}::blank() -{ - /// @todo - //Add your code to render the screen. - setBackgroundColor( TQColor(black) ); - // - erase(); -} diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.desktop b/languages/cpp/app_templates/kscreensaver/kscreensaver.desktop deleted file mode 100644 index 046eb9a2..00000000 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.desktop +++ /dev/null @@ -1,124 +0,0 @@ -[Desktop Entry] -Exec=%{APPNAMELC}.kss -Icon=kscreensaver -Type=Application -Actions=Setup;InWindow;Root; -X-TDE-Category=Miscellaneous -Name=%{APPNAME} - -[Desktop Action Setup] -Exec=%{APPNAMELC}.kss -setup -Name=Setup... -Name[br]=Kefluniadur ... -Name[ca]=Configuració... -Name[cy]=Gosod ... -Name[da]=Opsætning... -Name[de]=Einrichtung ... -Name[el]=Ρύθμιση... -Name[es]=Configuración... -Name[et]=Häälestus... -Name[eu]=Konfiguratu... -Name[fa]=برپایی... -Name[fr]=Configuration... -Name[ga]=Cumraigh... -Name[gl]=Configuración... -Name[hu]=Beállítások... -Name[it]=Imposta... -Name[ja]=設定... -Name[lt]=Nustatymas... -Name[ms]=Tetapan... -Name[nds]=Instellen... -Name[ne]=सेटअप... -Name[nl]=Instellen... -Name[pl]=Ustawienia... -Name[pt]=Configurar... -Name[pt_BR]=Configurar... -Name[ru]=Настроить... -Name[rw]=Iboneza... -Name[sk]=Nastavenie... -Name[sl]=Nastavi ... -Name[sr]=Постављање... -Name[sr@Latn]=Postavljanje... -Name[sv]=Inställning... -Name[tr]=Kurulum... -Name[zh_CN]=设置... -Name[zh_TW]=設定... -Icon=kscreensaver - -[Desktop Action InWindow] -Exec=%{APPNAMELC}.kss -window-id %w -Name=Display in Specified Window -Name[br]=Diskwel er prenestr spisaet -Name[ca]=Mostra a la finestra especificada -Name[cy]=Dangos mewn Ffenestr Benodol -Name[da]=Vis i specificeret vindue -Name[de]=Im angegebenen Fenster anzeigen -Name[el]=Προβολή στο ορισμένο παράθυρο -Name[es]=Mostrar en la ventana especificada -Name[et]=Kuva määratud aknas -Name[eu]=Bistaratu zehaztutako lehioan -Name[fa]=نمایش در پنجرۀ مشخص‌شده -Name[fr]=Afficher dans la fenêtre spécifiée -Name[ga]=Taispeáin san Fhuinneog Sonraithe -Name[gl]=Mostrar na xanela especificada -Name[hu]=Megjelenítés egy adott ablakban -Name[it]=Mostra in una finestra specificata -Name[ja]=指定したウィンドウに表示 -Name[lt]=Rodyti nurodytame lange -Name[ms]=Papar dalam Tetingkap Yang Dinyatakan -Name[nds]=Binnen angeven Finster wiesen -Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रर्दशन -Name[nl]=Weergave in aangegeven venster -Name[pl]=Pokazywanie w podanym oknie -Name[pt]=Mostrar na Janela Indicada -Name[pt_BR]=Exibir na Janela Especificada -Name[ru]=Показать в указанном окне -Name[rw]=Kwerekana mu Idirishya Ryihariye -Name[sk]=Zobraziť v špecifickom okne -Name[sl]=Prikaži v določenem oknu -Name[sr]=Прикажи у наведеном прозору -Name[sr@Latn]=Prikaži u navedenom prozoru -Name[sv]=Visa i angivet fönster -Name[tr]=Belirtilen Pencerede Göster -Name[zh_CN]=在指定窗口中显示 -Name[zh_TW]=顯示在指定視窗 -NoDisplay=true - -[Desktop Action Root] -Exec=%{APPNAMELC}.kss -root -Name=Display in Root Window -Name[br]=Diskwel er prenestr gwrizienn -Name[ca]=Mostra a la finestra arrel -Name[cy]=Dangos mewn Ffenestr Wraidd -Name[da]=Vis i rod-vindue -Name[de]=Im Root-Fenster anzeigen -Name[el]=Προβολή στο βασικό παράθυρο -Name[es]=Mostrar en la ventana raíz -Name[et]=Kuva juuraknas -Name[eu]=Bistaratu erro-lehioan -Name[fa]=نمایش در پنجرۀ ریشه -Name[fr]=Afficher dans la fenêtre racine -Name[ga]=Taispeáin sa bhFréamhfhuinneog -Name[gl]=Mostrar na xanela raíz -Name[hu]=Megjelenítés a gyökérablakban -Name[it]=Mostra nella finestra radice -Name[ja]=ルートウィンドウに表示 -Name[lt]=Rodyti root lange -Name[ms]=Papar dalam Tetingkap Root -Name[nds]=Binnen Wörtelfinster wiesen -Name[ne]=रूट सञ्झ्यालमा प्रर्दशन -Name[nl]=Weergave in hoofdvenster -Name[pl]=Pokazywanie w głównym oknie -Name[pt]=Mostrar na Janela de Fundo -Name[pt_BR]=Exibir na Janela Raiz -Name[ru]=Показать в главном окне -Name[rw]=Kwerekana mu Idirishya Umuzi -Name[sk]=Zobraziť v koreňovom okne -Name[sl]=Prikaži v korenskem oknu -Name[sr]=Прикажи у кореном прозору -Name[sr@Latn]=Prikaži u korenom prozoru -Name[sv]=Visa i rotfönster -Name[tr]=Kök Pencerede Göster -Name[zh_CN]=在根窗口中显示 -Name[zh_TW]=顯示在根視窗 -NoDisplay=true diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.h b/languages/cpp/app_templates/kscreensaver/kscreensaver.h deleted file mode 100644 index 881137c5..00000000 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.h +++ /dev/null @@ -1,37 +0,0 @@ -%{CPP_TEMPLATE} - -#ifndef %{APPNAME}_H__ -#define %{APPNAME}_H__ - -#include "kscreensaver.h" -#include "%{APPNAMELC}ui.h" - -class %{APPNAME} : public KScreenSaver -{ - Q_OBJECT - -public: - %{APPNAME}( WId drawable ); - virtual ~%{APPNAME}(); -private: - void readSettings(); - void blank(); -}; - -class %{APPNAME}Setup : public %{APPNAME}UI -{ - Q_OBJECT - -public: - %{APPNAME}Setup( TQWidget *parent = NULL, const char *name = NULL ); - -private slots: - void slotOkPressed(); - void slotCancelPressed(); - -private: - void readSettings(); - %{APPNAME} *saver; -}; - -#endif diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate b/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate deleted file mode 100644 index 24b96770..00000000 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.kdevtemplate +++ /dev/null @@ -1,203 +0,0 @@ -# TDE Config File -[General] -Name=TDE Screen Saver -Name[br]=Damanter skramm TDE -Name[ca]=Salvapantalles per al TDE -Name[da]=TDE pauseskærm -Name[de]=TDE-Bildschirmschoner -Name[el]=Προφύλαξη οθόνης του TDE -Name[es]=Salvapantallas para TDE -Name[et]=TDE ekraanisäästja -Name[eu]=TDE pantaila-babeslea -Name[fa]=محافظ صفحۀ TDE -Name[fr]=Écran de veille TDE -Name[ga]=Spárálaí Scáileáin TDE -Name[gl]=Salvapantallas TDE -Name[hu]=TDE-s képernyővédő -Name[it]=Salva schermo di TDE -Name[ja]=TDE スクリーンセーバー -Name[nds]=TDE-Pausschirm -Name[ne]=केडीई स्क्रिन सर्भर -Name[nl]=TDE-schermbeveiliging -Name[pl]=Wygaszacz ekranu TDE -Name[pt]=Protector de Ecrã do TDE -Name[pt_BR]=Protetor de tela do TDE -Name[ru]=Хранитель экрана для TDE -Name[sk]=TDE šetrič obrazovky -Name[sl]=Ohranjevalnik zaslona za TDE -Name[sr]=TDE чувар екрана -Name[sr@Latn]=TDE čuvar ekrana -Name[sv]=TDE-skärmsläckare -Name[tr]=TDE Ekran Koruyucusu -Name[zh_CN]= TDE 屏幕保护程序 -Name[zh_TW]=TDE 螢幕保護程式 -Icon=kscreensaver.png -Category=C++/TDE -Comment=Generates a framework for a TDE screensaver. -Comment[ca]=Genera una infraestructura per a un salvapantalles de TDE. -Comment[da]=Genererer et skelet for en TDE-pauseskærm. -Comment[de]=Erstellt das Gerüst für einen TDE-Bildschirmschoner. -Comment[el]=Δημιουργεί ένα πλαίσιο για μια προφύλαξη οθόνης του TDE. -Comment[es]=Genera una infraestructura para un salvapantallas de TDE -Comment[et]=TDE ekraanisäästja raamistiku loomine. -Comment[eu]=TDE-ren pantaila-babesle baten lan-marko bat sortzen du. -Comment[fa]=چارچوبی برای محافظ صفحۀ TDE تولید می‌کند. -Comment[fr]=Génère une infrastructure pour un écran de veille TDE. -Comment[gl]=Xera un contorno de traballo para un salvapantallas TDE. -Comment[hu]=Létrehoz egy alap TDE-s képernyővédőt. -Comment[it]=Genera l'infrastruttura per un salvaschermo di TDE. -Comment[ja]=TDE スクリーンセーバーのフレームワークを作成します -Comment[nds]=Stellt dat Rahmenwark för en TDE-Pausschirm op. -Comment[ne]=केडीई स्क्रिनसेभरका लागि फ्रेमवर्क उत्पन्न गर्दछ -Comment[nl]=Genereert een framework voor een TDE-schermbeveiliging. -Comment[pl]=Generuje szablon wygaszacza ekranu dla TDE. -Comment[pt]=Gera a plataforma para um protector de ecrã do TDE. -Comment[pt_BR]=Gera a plataforma para um protector de ecrã do TDE. -Comment[ru]=Создание инфраструктуры хранителя экрана для TDE. -Comment[sk]=Vygeneruje framework pre TDE šetrič obrazovky. -Comment[sl]=Ustvari ogrodje ohranjevalnika zaslona za TDE. -Comment[sr]=Прави радни оквир за TDE чувар екрана. -Comment[sr@Latn]=Pravi radni okvir za TDE čuvar ekrana. -Comment[sv]=Skapar ett ramverk för en TDE-skärmsläckare -Comment[tr]=Bir TDE ekran koruyucusu için bir çatı oluşturulur. -Comment[zh_CN]=生成 TDE 屏幕保护程序框架。 -Comment[zh_TW]=產生一個 TDE 螢幕保護程式的框架 -FileTemplates=h,CStyle,cpp,CStyle -ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp -Archive=kscreensaver.tar.gz - -[ADMIN] -Type=include -File=%{tdevelop}/template-common/admin.kdevtemplate - -[GNU] -Type=include -File=%{tdevelop}/template-common/gnu.kdevtemplate - -[MKDIR_DOCBOOK1] -Type=mkdir -Dir=%{dest}/doc - -[MKDIR_DOCBOOK2] -Type=mkdir -Dir=%{dest}/doc/en - -[FILE1] -Type=install -EscapeXML=true -Source=%{tdevelop}/template-common/kde-doc-Makefile.am -Dest=%{dest}/doc/Makefile.am - -[FILE2] -Type=install -Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am -Dest=%{dest}/doc/en/Makefile.am - -[FILE3] -Type=install -EscapeXML=true -Source=%{tdevelop}/template-common/kde-index.docbook -Dest=%{dest}/doc/en/index.docbook - -[FILE4] -Type=install -EscapeXML=true -Source=%{src}/kscreensaver.tdevelop -Dest=%{dest}/%{APPNAMELC}.tdevelop - -[MkDir3] -Type=mkdir -Dir=%{dest}/src - -[FILE5] -Type=install -Source=%{tdevelop}/template-common/kde-app.lsm -Dest=%{dest}/src/%{APPNAMELC}.lsm - -[MkDir4] -Type=mkdir -Dir=%{dest}/po - -[FILE6] -Type=install -Source=%{tdevelop}/template-common/kde-po-Makefile.am -Dest=%{dest}/po/Makefile.am - -[FILE7] -Type=install -Source=%{tdevelop}/template-common/kde-Makefile.am -Dest=%{dest}/Makefile.am - -[FILE8] -Type=install -Source=%{tdevelop}/template-common/kde-Makefile.cvs -Dest=%{dest}/Makefile.cvs - -[FILE9] -Type=install -Source=%{tdevelop}/template-common/tde-configure.in.in -Dest=%{dest}/configure.in.in - -[FILE10] -Type=install -Source=%{src}/subdirs -Dest=%{dest}/subdirs - -[FILE11] -Type=install -Source=%{src}/src-Makefile.am -Dest=%{dest}/src/Makefile.am - -[FILE12] -Type=install -Source=%{src}/kscreensaver.cpp -Dest=%{dest}/src/%{APPNAMELC}.cpp - -[FILE13] -Type=install -Source=%{src}/kscreensaver.h -Dest=%{dest}/src/%{APPNAMELC}.h - -[FILE14] -Type=install -Source=%{src}/kscreensaver.desktop -Dest=%{dest}/src/%{APPNAMELC}.desktop - -[FILE15] -Type=install -EscapeXML=true -Source=%{src}/kscreensaverui.ui -Dest=%{dest}/src/%{APPNAMELC}ui.ui - -[MSG] -Type=message -Comment=A screensaver application was created in %{dest} -Comment[ca]=Una aplicació de salvapantalles ha estat creada en %{dest} -Comment[da]=Et pauseskærmsprogram blev oprettet i %{dest} -Comment[de]=Ein Bildschirmschoner wurde in %{dest} erstellt. -Comment[el]=Μια εφαρμογή προφύλαξης οθόνης δημιουργήθηκε στο %{dest} -Comment[es]=Una aplicación salvapantallas ha sido creada en %{dest} -Comment[et]=Ekraanisäästja rakendus loodi asukohta %{dest} -Comment[eu]=Pantaila-babesle baten aplikazioa sortu da hemen: %{dest} -Comment[fa]=یک کاربرد محافظ صفحه در %{dest} ایجاد شد -Comment[fr]=Une application écran de veille a été créé dans %{dest} -Comment[ga]=Cruthaíodh spárálaí scáileáin i %{dest} -Comment[gl]=Creouse unha aplicación salvapantallas en %{dest} -Comment[hu]=Létrejött egy alap képernyővédő program itt: %{dest} -Comment[it]=È stata creata un'applicazione salvaschermo in %{dest} -Comment[ja]=スクリーンセーバーアプリケーションを %{dest} に作成しました -Comment[nds]=In %{dest} wöör en Pausschirm opstellt -Comment[ne]=स्क्रिनसेभर अनुप्रयोग %{dest} मा सिर्जना गरियो -Comment[nl]=Een schermbeveiligingstoepassing is aangemaakt in %{dest} -Comment[pl]=Program wygaszacza ekranu został utworzony w %{dest} -Comment[pt]=Foi criada uma aplicação protectora do ecrã em %{dest} -Comment[pt_BR]=Foi criada uma aplicação protectora do ecrã em %{dest} -Comment[ru]=Приложение хранителя экрана создано в %{dest} -Comment[sk]=Aplikácia šetriča obrazovky bola vytvorená v %{dest} -Comment[sl]=Program ohranjevalnika zaslona je bil ustvarjen v %{dest} -Comment[sr]=Програм чувара екрана направљен је у %{dest} -Comment[sr@Latn]=Program čuvara ekrana napravljen je u %{dest} -Comment[sv]=Ett skärmsläckarprogram skapades i %{dest} -Comment[tr]=Bir ekran koruyucusu uygulaması %{dest} içinde yaratıldı. -Comment[zh_CN]=在 %{dest} 中创建了屏幕保护应用程序 -Comment[zh_TW]=一個螢幕保護程式已建立於 %{dest} diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.png b/languages/cpp/app_templates/kscreensaver/kscreensaver.png deleted file mode 100644 index e91ec2e2..00000000 Binary files a/languages/cpp/app_templates/kscreensaver/kscreensaver.png and /dev/null differ diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.tdevelop b/languages/cpp/app_templates/kscreensaver/kscreensaver.tdevelop deleted file mode 100644 index 38429f89..00000000 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.tdevelop +++ /dev/null @@ -1,113 +0,0 @@ - - - - %{AUTHOR} - %{EMAIL} - %{VERSION} - KDevTDEAutoProject - C++ - - C++ - Code - Qt - TDE - kioslave - - - - - 3 - true - 3 - EmbeddedKDevDesigner - - - - - - src/lib%{APPNAMELC}.la - debug - - - - optimized - kdevgccoptions - kdevgppoptions - kdevg77options - -O2 -g0 - - - --enable-debug=full - debug - kdevgccoptions - kdevgppoptions - kdevg77options - -O0 -g3 - - - - - - - - - - - - - ada - ada_bugs_gcc - bash - bash_bugs - clanlib - fortran_bugs_gcc - gnome1 - gnustep - gtk - gtk_bugs - haskell - haskell_bugs_ghc - java_bugs_gcc - java_bugs_sun - opengl - pascal_bugs_fp - php - php_bugs - perl - perl_bugs - python - python_bugs - ruby - ruby_bugs - sdl - stl - sw - w3c-dom-level2-html - w3c-svg - w3c-uaag10 - wxwidgets_bugs - - - qmake User Guide - - - - - libtool - - - - - - - - - - - - - Doxygen Documentation Collection - %{APPNAMELC}.tag - - - diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui b/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui deleted file mode 100644 index e83bcda9..00000000 --- a/languages/cpp/app_templates/kscreensaver/kscreensaverui.ui +++ /dev/null @@ -1,79 +0,0 @@ - -%{APPNAME}UI -This is the main UI for setting up your screen saver. -Ian Reinhart Geiser - - - %{APPNAMELC}cfg - - - - 0 - 0 - 257 - 58 - - - - Screen Saver Config - - - - Layout2 - - - - 5 - 0 - 255 - 57 - - - - - unnamed - - - - CheckBox1 - - - Set some setting - - - - - Layout1 - - - - unnamed - - - - - OkayPushButton - - - &OK - - - - - CancelPushButton - - - &Cancel - - - - - - - - - kdialog.h - - - - diff --git a/languages/cpp/app_templates/kscreensaver/src-Makefile.am b/languages/cpp/app_templates/kscreensaver/src-Makefile.am deleted file mode 100644 index 83c32868..00000000 --- a/languages/cpp/app_templates/kscreensaver/src-Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# Makefile.am for %{APPNAMELC}. -# - -AM_CPPFLAGS = -UQT_NO_ASCII_CAST -METASOURCES = AUTO - -INCLUDES = $(all_includes) -LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) -LDADD = $(LIB_TDEUI) -lkscreensaver -lm -bin_PROGRAMS = %{APPNAMELC}.kss - -%{APPNAMELC}_kss_SOURCES = %{APPNAMELC}ui.ui %{APPNAMELC}.cpp -%{APPNAMELC}_kss_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LDADD) $(LIB_KSYCOCA) - -#datadir = $(kde_datadir)/%{APPNAMELC} - -desktop_DATA = %{APPNAMELC}.desktop -desktopdir = $(kde_appsdir)/System/ScreenSavers - -EXTRA_DIST = $(desktop_DATA) - -messages: rc.cpp - $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/kscreensaver/subdirs b/languages/cpp/app_templates/kscreensaver/subdirs deleted file mode 100644 index 0e678106..00000000 --- a/languages/cpp/app_templates/kscreensaver/subdirs +++ /dev/null @@ -1,3 +0,0 @@ -doc -po -src diff --git a/languages/cpp/app_templates/kxt/README b/languages/cpp/app_templates/kxt/README index a7775d6a..a24ad60a 100644 --- a/languages/cpp/app_templates/kxt/README +++ b/languages/cpp/app_templates/kxt/README @@ -58,7 +58,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play in your app. For more details, consult : -http://www-106.ibm.com/developerworks/library/l-kparts/ +http://www-106.ibm.com/developerworks/library/l-tdeparts/ http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html diff --git a/languages/cpp/app_templates/tdecmodule/module.cpp b/languages/cpp/app_templates/tdecmodule/module.cpp index 2c8d9271..52203d1a 100644 --- a/languages/cpp/app_templates/tdecmodule/module.cpp +++ b/languages/cpp/app_templates/tdecmodule/module.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "%{APPNAMELC}.h" diff --git a/languages/cpp/app_templates/tdescreensaver/.kdev_ignore b/languages/cpp/app_templates/tdescreensaver/.kdev_ignore new file mode 100644 index 00000000..e69de29b diff --git a/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt new file mode 100644 index 00000000..b1149d88 --- /dev/null +++ b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt @@ -0,0 +1,27 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_custom_target( tdescreensaver.tar.gz ALL + COMMAND tar zcf tdescreensaver.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + tdescreensaver.desktop tdescreensaver.png tdescreensaver.h + tdescreensaverui.ui src-Makefile.am tdescreensaver.cpp + tdescreensaver.tdevelop subdirs +) + + +install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/tdescreensaver.tar.gz tdescreensaver.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) + + +install( FILES + tdescreensaver.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdescreensaver/Makefile.am b/languages/cpp/app_templates/tdescreensaver/Makefile.am new file mode 100644 index 00000000..bee93bbc --- /dev/null +++ b/languages/cpp/app_templates/tdescreensaver/Makefile.am @@ -0,0 +1,19 @@ +dataFiles = tdescreensaver.desktop tdescreensaver.png tdescreensaver.h \ + tdescreensaverui.ui src-Makefile.am tdescreensaver.cpp \ + tdescreensaver.tdevelop subdirs + +templateName= tdescreensaver + +### no need to change below: +template_DATA = $(templateName).kdevtemplate +templatedir = ${appwizarddatadir}/templates + +appwizarddatadir = ${kde_datadir}/kdevappwizard +$(templateName).tar.gz: ${dataFiles} + $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} + $(GZIP_COMMAND) -f9 $(templateName).tar + +archivedir = ${appwizarddatadir} +archive_DATA = $(templateName).tar.gz $(templateName).png + +CLEANFILES = *.tar.gz \ No newline at end of file diff --git a/languages/cpp/app_templates/tdescreensaver/src-Makefile.am b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am new file mode 100644 index 00000000..5e2caf20 --- /dev/null +++ b/languages/cpp/app_templates/tdescreensaver/src-Makefile.am @@ -0,0 +1,24 @@ +# Makefile.am for %{APPNAMELC}. +# + +AM_CPPFLAGS = -UQT_NO_ASCII_CAST +METASOURCES = AUTO + +INCLUDES = $(all_includes) +LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) +LDADD = $(LIB_TDEUI) -ltdescreensaver -lm +bin_PROGRAMS = %{APPNAMELC}.kss + +%{APPNAMELC}_kss_SOURCES = %{APPNAMELC}ui.ui %{APPNAMELC}.cpp +%{APPNAMELC}_kss_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LDADD) $(LIB_KSYCOCA) + +#datadir = $(kde_datadir)/%{APPNAMELC} + +desktop_DATA = %{APPNAMELC}.desktop +desktopdir = $(kde_appsdir)/System/ScreenSavers + +EXTRA_DIST = $(desktop_DATA) + +messages: rc.cpp + $(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp + $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot diff --git a/languages/cpp/app_templates/tdescreensaver/subdirs b/languages/cpp/app_templates/tdescreensaver/subdirs new file mode 100644 index 00000000..0e678106 --- /dev/null +++ b/languages/cpp/app_templates/tdescreensaver/subdirs @@ -0,0 +1,3 @@ +doc +po +src diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp new file mode 100644 index 00000000..f8e88db8 --- /dev/null +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp @@ -0,0 +1,107 @@ +%{CPP_TEMPLATE} + +#include +#include +#include +#include +#include +#include +#include +#include +#include "%{APPNAMELC}.h" +#include "%{APPNAMELC}ui.h" + +//! libtdescreensaver interface +extern "C" +{ + const char *kss_applicationName = "%{APPNAMELC}.kss"; + const char *kss_description = I18N_NOOP( "%{APPNAME}" ); + const char *kss_version = "2.2.0"; + + %{APPNAME} *kss_create( WId id ) + { + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + return new %{APPNAME}( id ); + } + + TQDialog *kss_setup() + { + TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}"); + return new %{APPNAME}Setup(); + } +} + +//----------------------------------------------------------------------------- +//! dialog to setup screen saver parameters +%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name ) + : %{APPNAME}UI( parent, name, TRUE ) +{ + /// @todo + //Connect your signals and slots here to configure the screen saver. + connect( OkayPushButton, TQT_SIGNAL( released() ), + TQT_SLOT( slotOkPressed() ) ); + connect( CancelPushButton, TQT_SIGNAL( released() ), + TQT_SLOT( slotCancelPressed() ) ); +} + + +//! read settings from config file +void %{APPNAME}Setup::readSettings() +{ + TDEConfig *config = TDEGlobal::config(); + config->setGroup( "Settings" ); + /// @todo + // Add your config options here... + CheckBox1->setChecked(config->readBoolEntry( "somesetting", false )); +} + + +//! Ok pressed - save settings and exit +void %{APPNAME}Setup::slotOkPressed() +{ + TDEConfig *config = TDEGlobal::config(); + config->setGroup( "Settings" ); + /// @todo + // Add your config options here. + config->writeEntry( "somesetting", CheckBox1->isChecked() ); + config->sync(); + + accept(); +} + +void %{APPNAME}Setup::slotCancelPressed() +{ + reject(); +} +//----------------------------------------------------------------------------- + + +%{APPNAME}::%{APPNAME}( WId id ) : KScreenSaver( id ) +{ + readSettings(); + blank(); +} + +%{APPNAME}::~%{APPNAME}() +{} + + +//! read configuration settings from config file +void %{APPNAME}::readSettings() +{ + TDEConfig *config = TDEGlobal::config(); + config->setGroup( "Settings" ); + /// @todo + // Add your config options here... + bool somesetting = config->readBoolEntry( "somesetting", false ); +} + + +void %{APPNAME}::blank() +{ + /// @todo + //Add your code to render the screen. + setBackgroundColor( TQColor(black) ); + // + erase(); +} diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop new file mode 100644 index 00000000..b4ec0186 --- /dev/null +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.desktop @@ -0,0 +1,124 @@ +[Desktop Entry] +Exec=%{APPNAMELC}.kss +Icon=tdescreensaver +Type=Application +Actions=Setup;InWindow;Root; +X-TDE-Category=Miscellaneous +Name=%{APPNAME} + +[Desktop Action Setup] +Exec=%{APPNAMELC}.kss -setup +Name=Setup... +Name[br]=Kefluniadur ... +Name[ca]=Configuració... +Name[cy]=Gosod ... +Name[da]=Opsætning... +Name[de]=Einrichtung ... +Name[el]=Ρύθμιση... +Name[es]=Configuración... +Name[et]=Häälestus... +Name[eu]=Konfiguratu... +Name[fa]=برپایی... +Name[fr]=Configuration... +Name[ga]=Cumraigh... +Name[gl]=Configuración... +Name[hu]=Beállítások... +Name[it]=Imposta... +Name[ja]=設定... +Name[lt]=Nustatymas... +Name[ms]=Tetapan... +Name[nds]=Instellen... +Name[ne]=सेटअप... +Name[nl]=Instellen... +Name[pl]=Ustawienia... +Name[pt]=Configurar... +Name[pt_BR]=Configurar... +Name[ru]=Настроить... +Name[rw]=Iboneza... +Name[sk]=Nastavenie... +Name[sl]=Nastavi ... +Name[sr]=Постављање... +Name[sr@Latn]=Postavljanje... +Name[sv]=Inställning... +Name[tr]=Kurulum... +Name[zh_CN]=设置... +Name[zh_TW]=設定... +Icon=tdescreensaver + +[Desktop Action InWindow] +Exec=%{APPNAMELC}.kss -window-id %w +Name=Display in Specified Window +Name[br]=Diskwel er prenestr spisaet +Name[ca]=Mostra a la finestra especificada +Name[cy]=Dangos mewn Ffenestr Benodol +Name[da]=Vis i specificeret vindue +Name[de]=Im angegebenen Fenster anzeigen +Name[el]=Προβολή στο ορισμένο παράθυρο +Name[es]=Mostrar en la ventana especificada +Name[et]=Kuva määratud aknas +Name[eu]=Bistaratu zehaztutako lehioan +Name[fa]=نمایش در پنجرۀ مشخص‌شده +Name[fr]=Afficher dans la fenêtre spécifiée +Name[ga]=Taispeáin san Fhuinneog Sonraithe +Name[gl]=Mostrar na xanela especificada +Name[hu]=Megjelenítés egy adott ablakban +Name[it]=Mostra in una finestra specificata +Name[ja]=指定したウィンドウに表示 +Name[lt]=Rodyti nurodytame lange +Name[ms]=Papar dalam Tetingkap Yang Dinyatakan +Name[nds]=Binnen angeven Finster wiesen +Name[ne]=निर्दिष्ट सञ्झ्यालमा प्रर्दशन +Name[nl]=Weergave in aangegeven venster +Name[pl]=Pokazywanie w podanym oknie +Name[pt]=Mostrar na Janela Indicada +Name[pt_BR]=Exibir na Janela Especificada +Name[ru]=Показать в указанном окне +Name[rw]=Kwerekana mu Idirishya Ryihariye +Name[sk]=Zobraziť v špecifickom okne +Name[sl]=Prikaži v določenem oknu +Name[sr]=Прикажи у наведеном прозору +Name[sr@Latn]=Prikaži u navedenom prozoru +Name[sv]=Visa i angivet fönster +Name[tr]=Belirtilen Pencerede Göster +Name[zh_CN]=在指定窗口中显示 +Name[zh_TW]=顯示在指定視窗 +NoDisplay=true + +[Desktop Action Root] +Exec=%{APPNAMELC}.kss -root +Name=Display in Root Window +Name[br]=Diskwel er prenestr gwrizienn +Name[ca]=Mostra a la finestra arrel +Name[cy]=Dangos mewn Ffenestr Wraidd +Name[da]=Vis i rod-vindue +Name[de]=Im Root-Fenster anzeigen +Name[el]=Προβολή στο βασικό παράθυρο +Name[es]=Mostrar en la ventana raíz +Name[et]=Kuva juuraknas +Name[eu]=Bistaratu erro-lehioan +Name[fa]=نمایش در پنجرۀ ریشه +Name[fr]=Afficher dans la fenêtre racine +Name[ga]=Taispeáin sa bhFréamhfhuinneog +Name[gl]=Mostrar na xanela raíz +Name[hu]=Megjelenítés a gyökérablakban +Name[it]=Mostra nella finestra radice +Name[ja]=ルートウィンドウに表示 +Name[lt]=Rodyti root lange +Name[ms]=Papar dalam Tetingkap Root +Name[nds]=Binnen Wörtelfinster wiesen +Name[ne]=रूट सञ्झ्यालमा प्रर्दशन +Name[nl]=Weergave in hoofdvenster +Name[pl]=Pokazywanie w głównym oknie +Name[pt]=Mostrar na Janela de Fundo +Name[pt_BR]=Exibir na Janela Raiz +Name[ru]=Показать в главном окне +Name[rw]=Kwerekana mu Idirishya Umuzi +Name[sk]=Zobraziť v koreňovom okne +Name[sl]=Prikaži v korenskem oknu +Name[sr]=Прикажи у кореном прозору +Name[sr@Latn]=Prikaži u korenom prozoru +Name[sv]=Visa i rotfönster +Name[tr]=Kök Pencerede Göster +Name[zh_CN]=在根窗口中显示 +Name[zh_TW]=顯示在根視窗 +NoDisplay=true diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h new file mode 100644 index 00000000..e066852a --- /dev/null +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.h @@ -0,0 +1,37 @@ +%{CPP_TEMPLATE} + +#ifndef %{APPNAME}_H__ +#define %{APPNAME}_H__ + +#include "tdescreensaver.h" +#include "%{APPNAMELC}ui.h" + +class %{APPNAME} : public KScreenSaver +{ + Q_OBJECT + +public: + %{APPNAME}( WId drawable ); + virtual ~%{APPNAME}(); +private: + void readSettings(); + void blank(); +}; + +class %{APPNAME}Setup : public %{APPNAME}UI +{ + Q_OBJECT + +public: + %{APPNAME}Setup( TQWidget *parent = NULL, const char *name = NULL ); + +private slots: + void slotOkPressed(); + void slotCancelPressed(); + +private: + void readSettings(); + %{APPNAME} *saver; +}; + +#endif diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate new file mode 100644 index 00000000..df27d577 --- /dev/null +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate @@ -0,0 +1,203 @@ +# TDE Config File +[General] +Name=TDE Screen Saver +Name[br]=Damanter skramm TDE +Name[ca]=Salvapantalles per al TDE +Name[da]=TDE pauseskærm +Name[de]=TDE-Bildschirmschoner +Name[el]=Προφύλαξη οθόνης του TDE +Name[es]=Salvapantallas para TDE +Name[et]=TDE ekraanisäästja +Name[eu]=TDE pantaila-babeslea +Name[fa]=محافظ صفحۀ TDE +Name[fr]=Écran de veille TDE +Name[ga]=Spárálaí Scáileáin TDE +Name[gl]=Salvapantallas TDE +Name[hu]=TDE-s képernyővédő +Name[it]=Salva schermo di TDE +Name[ja]=TDE スクリーンセーバー +Name[nds]=TDE-Pausschirm +Name[ne]=केडीई स्क्रिन सर्भर +Name[nl]=TDE-schermbeveiliging +Name[pl]=Wygaszacz ekranu TDE +Name[pt]=Protector de Ecrã do TDE +Name[pt_BR]=Protetor de tela do TDE +Name[ru]=Хранитель экрана для TDE +Name[sk]=TDE šetrič obrazovky +Name[sl]=Ohranjevalnik zaslona za TDE +Name[sr]=TDE чувар екрана +Name[sr@Latn]=TDE čuvar ekrana +Name[sv]=TDE-skärmsläckare +Name[tr]=TDE Ekran Koruyucusu +Name[zh_CN]= TDE 屏幕保护程序 +Name[zh_TW]=TDE 螢幕保護程式 +Icon=tdescreensaver.png +Category=C++/TDE +Comment=Generates a framework for a TDE screensaver. +Comment[ca]=Genera una infraestructura per a un salvapantalles de TDE. +Comment[da]=Genererer et skelet for en TDE-pauseskærm. +Comment[de]=Erstellt das Gerüst für einen TDE-Bildschirmschoner. +Comment[el]=Δημιουργεί ένα πλαίσιο για μια προφύλαξη οθόνης του TDE. +Comment[es]=Genera una infraestructura para un salvapantallas de TDE +Comment[et]=TDE ekraanisäästja raamistiku loomine. +Comment[eu]=TDE-ren pantaila-babesle baten lan-marko bat sortzen du. +Comment[fa]=چارچوبی برای محافظ صفحۀ TDE تولید می‌کند. +Comment[fr]=Génère une infrastructure pour un écran de veille TDE. +Comment[gl]=Xera un contorno de traballo para un salvapantallas TDE. +Comment[hu]=Létrehoz egy alap TDE-s képernyővédőt. +Comment[it]=Genera l'infrastruttura per un salvaschermo di TDE. +Comment[ja]=TDE スクリーンセーバーのフレームワークを作成します +Comment[nds]=Stellt dat Rahmenwark för en TDE-Pausschirm op. +Comment[ne]=केडीई स्क्रिनसेभरका लागि फ्रेमवर्क उत्पन्न गर्दछ +Comment[nl]=Genereert een framework voor een TDE-schermbeveiliging. +Comment[pl]=Generuje szablon wygaszacza ekranu dla TDE. +Comment[pt]=Gera a plataforma para um protector de ecrã do TDE. +Comment[pt_BR]=Gera a plataforma para um protector de ecrã do TDE. +Comment[ru]=Создание инфраструктуры хранителя экрана для TDE. +Comment[sk]=Vygeneruje framework pre TDE šetrič obrazovky. +Comment[sl]=Ustvari ogrodje ohranjevalnika zaslona za TDE. +Comment[sr]=Прави радни оквир за TDE чувар екрана. +Comment[sr@Latn]=Pravi radni okvir za TDE čuvar ekrana. +Comment[sv]=Skapar ett ramverk för en TDE-skärmsläckare +Comment[tr]=Bir TDE ekran koruyucusu için bir çatı oluşturulur. +Comment[zh_CN]=生成 TDE 屏幕保护程序框架。 +Comment[zh_TW]=產生一個 TDE 螢幕保護程式的框架 +FileTemplates=h,CStyle,cpp,CStyle +ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.cpp +Archive=tdescreensaver.tar.gz + +[ADMIN] +Type=include +File=%{tdevelop}/template-common/admin.kdevtemplate + +[GNU] +Type=include +File=%{tdevelop}/template-common/gnu.kdevtemplate + +[MKDIR_DOCBOOK1] +Type=mkdir +Dir=%{dest}/doc + +[MKDIR_DOCBOOK2] +Type=mkdir +Dir=%{dest}/doc/en + +[FILE1] +Type=install +EscapeXML=true +Source=%{tdevelop}/template-common/kde-doc-Makefile.am +Dest=%{dest}/doc/Makefile.am + +[FILE2] +Type=install +Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am +Dest=%{dest}/doc/en/Makefile.am + +[FILE3] +Type=install +EscapeXML=true +Source=%{tdevelop}/template-common/kde-index.docbook +Dest=%{dest}/doc/en/index.docbook + +[FILE4] +Type=install +EscapeXML=true +Source=%{src}/tdescreensaver.tdevelop +Dest=%{dest}/%{APPNAMELC}.tdevelop + +[MkDir3] +Type=mkdir +Dir=%{dest}/src + +[FILE5] +Type=install +Source=%{tdevelop}/template-common/kde-app.lsm +Dest=%{dest}/src/%{APPNAMELC}.lsm + +[MkDir4] +Type=mkdir +Dir=%{dest}/po + +[FILE6] +Type=install +Source=%{tdevelop}/template-common/kde-po-Makefile.am +Dest=%{dest}/po/Makefile.am + +[FILE7] +Type=install +Source=%{tdevelop}/template-common/kde-Makefile.am +Dest=%{dest}/Makefile.am + +[FILE8] +Type=install +Source=%{tdevelop}/template-common/kde-Makefile.cvs +Dest=%{dest}/Makefile.cvs + +[FILE9] +Type=install +Source=%{tdevelop}/template-common/tde-configure.in.in +Dest=%{dest}/configure.in.in + +[FILE10] +Type=install +Source=%{src}/subdirs +Dest=%{dest}/subdirs + +[FILE11] +Type=install +Source=%{src}/src-Makefile.am +Dest=%{dest}/src/Makefile.am + +[FILE12] +Type=install +Source=%{src}/tdescreensaver.cpp +Dest=%{dest}/src/%{APPNAMELC}.cpp + +[FILE13] +Type=install +Source=%{src}/tdescreensaver.h +Dest=%{dest}/src/%{APPNAMELC}.h + +[FILE14] +Type=install +Source=%{src}/tdescreensaver.desktop +Dest=%{dest}/src/%{APPNAMELC}.desktop + +[FILE15] +Type=install +EscapeXML=true +Source=%{src}/tdescreensaverui.ui +Dest=%{dest}/src/%{APPNAMELC}ui.ui + +[MSG] +Type=message +Comment=A screensaver application was created in %{dest} +Comment[ca]=Una aplicació de salvapantalles ha estat creada en %{dest} +Comment[da]=Et pauseskærmsprogram blev oprettet i %{dest} +Comment[de]=Ein Bildschirmschoner wurde in %{dest} erstellt. +Comment[el]=Μια εφαρμογή προφύλαξης οθόνης δημιουργήθηκε στο %{dest} +Comment[es]=Una aplicación salvapantallas ha sido creada en %{dest} +Comment[et]=Ekraanisäästja rakendus loodi asukohta %{dest} +Comment[eu]=Pantaila-babesle baten aplikazioa sortu da hemen: %{dest} +Comment[fa]=یک کاربرد محافظ صفحه در %{dest} ایجاد شد +Comment[fr]=Une application écran de veille a été créé dans %{dest} +Comment[ga]=Cruthaíodh spárálaí scáileáin i %{dest} +Comment[gl]=Creouse unha aplicación salvapantallas en %{dest} +Comment[hu]=Létrejött egy alap képernyővédő program itt: %{dest} +Comment[it]=È stata creata un'applicazione salvaschermo in %{dest} +Comment[ja]=スクリーンセーバーアプリケーションを %{dest} に作成しました +Comment[nds]=In %{dest} wöör en Pausschirm opstellt +Comment[ne]=स्क्रिनसेभर अनुप्रयोग %{dest} मा सिर्जना गरियो +Comment[nl]=Een schermbeveiligingstoepassing is aangemaakt in %{dest} +Comment[pl]=Program wygaszacza ekranu został utworzony w %{dest} +Comment[pt]=Foi criada uma aplicação protectora do ecrã em %{dest} +Comment[pt_BR]=Foi criada uma aplicação protectora do ecrã em %{dest} +Comment[ru]=Приложение хранителя экрана создано в %{dest} +Comment[sk]=Aplikácia šetriča obrazovky bola vytvorená v %{dest} +Comment[sl]=Program ohranjevalnika zaslona je bil ustvarjen v %{dest} +Comment[sr]=Програм чувара екрана направљен је у %{dest} +Comment[sr@Latn]=Program čuvara ekrana napravljen je u %{dest} +Comment[sv]=Ett skärmsläckarprogram skapades i %{dest} +Comment[tr]=Bir ekran koruyucusu uygulaması %{dest} içinde yaratıldı. +Comment[zh_CN]=在 %{dest} 中创建了屏幕保护应用程序 +Comment[zh_TW]=一個螢幕保護程式已建立於 %{dest} diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.png b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.png new file mode 100644 index 00000000..e91ec2e2 Binary files /dev/null and b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.png differ diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop new file mode 100644 index 00000000..38429f89 --- /dev/null +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop @@ -0,0 +1,113 @@ + + + + %{AUTHOR} + %{EMAIL} + %{VERSION} + KDevTDEAutoProject + C++ + + C++ + Code + Qt + TDE + kioslave + + + + + 3 + true + 3 + EmbeddedKDevDesigner + + + + + + src/lib%{APPNAMELC}.la + debug + + + + optimized + kdevgccoptions + kdevgppoptions + kdevg77options + -O2 -g0 + + + --enable-debug=full + debug + kdevgccoptions + kdevgppoptions + kdevg77options + -O0 -g3 + + + + + + + + + + + + + ada + ada_bugs_gcc + bash + bash_bugs + clanlib + fortran_bugs_gcc + gnome1 + gnustep + gtk + gtk_bugs + haskell + haskell_bugs_ghc + java_bugs_gcc + java_bugs_sun + opengl + pascal_bugs_fp + php + php_bugs + perl + perl_bugs + python + python_bugs + ruby + ruby_bugs + sdl + stl + sw + w3c-dom-level2-html + w3c-svg + w3c-uaag10 + wxwidgets_bugs + + + qmake User Guide + + + + + libtool + + + + + + + + + + + + + Doxygen Documentation Collection + %{APPNAMELC}.tag + + + diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui b/languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui new file mode 100644 index 00000000..e83bcda9 --- /dev/null +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui @@ -0,0 +1,79 @@ + +%{APPNAME}UI +This is the main UI for setting up your screen saver. +Ian Reinhart Geiser + + + %{APPNAMELC}cfg + + + + 0 + 0 + 257 + 58 + + + + Screen Saver Config + + + + Layout2 + + + + 5 + 0 + 255 + 57 + + + + + unnamed + + + + CheckBox1 + + + Set some setting + + + + + Layout1 + + + + unnamed + + + + + OkayPushButton + + + &OK + + + + + CancelPushButton + + + &Cancel + + + + + + + + + kdialog.h + + + + diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp index f6d19c2a..48eb7bb9 100644 --- a/languages/cpp/ast_utils.cpp +++ b/languages/cpp/ast_utils.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include "cppsupport_utils.h" diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index ab89713f..a19d3289 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -20,10 +20,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/languages/cpp/codecompletionentry.h b/languages/cpp/codecompletionentry.h index e510b765..a219fe7a 100644 --- a/languages/cpp/codecompletionentry.h +++ b/languages/cpp/codecompletionentry.h @@ -24,7 +24,7 @@ #ifndef __CODECOMPLETIONENTRY_H__ #define __CODECOMPLETIONENTRY_H__ -#include +#include //this is just a little helper-class to allow custom sorting, it must stay binary compatible with KTextEditor::CompletionEntry!! class CodeCompletionEntry : public KTextEditor::CompletionEntry diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h index 961af5ef..07655dac 100644 --- a/languages/cpp/codeinformationrepository.h +++ b/languages/cpp/codeinformationrepository.h @@ -16,7 +16,7 @@ #include "cppcodecompletion.h" #include -#include +#include struct TypeProcessor { virtual TQString processType( const TQString& type ) = 0; diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index 56e8a644..7ef40424 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -44,9 +44,9 @@ email : david.nolden.tdevelop@art-master.de #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h index 297f2692..24877215 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -27,12 +27,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index 94eab619..f0ec6fa9 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -41,7 +41,7 @@ #include "kdevcreatefile.h" #include "qtbuildconfig.h" #include "kdeveditorutil.h" -#include +#include #include // wizards #include "cppnewclassdlg.h" @@ -85,13 +85,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index 35331654..5c747144 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 699b28dd..9c2ade95 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc index e0b4db61..1156df06 100644 --- a/languages/cpp/doc/kde2book.toc +++ b/languages/cpp/doc/kde2book.toc @@ -1534,10 +1534,10 @@ - - - - + + + + @@ -1725,8 +1725,8 @@ - - + + diff --git a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp index c3e7ca0c..174219a3 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp @@ -62,8 +62,8 @@ TQStringList KDevKDELibsImporter::fileList() files += fileList( m_settings->kdeDir() + "/tdesu" ); files += fileList( m_settings->kdeDir() + "/kio" ); files += fileList( m_settings->kdeDir() + "/kjs" ); - files += fileList( m_settings->kdeDir() + "/kparts" ); - files += fileList( m_settings->kdeDir() + "/ktexteditor" ); + files += fileList( m_settings->kdeDir() + "/tdeparts" ); + files += fileList( m_settings->kdeDir() + "/tdetexteditor" ); } else if ( scope == 1 ) { diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index 27b139f0..6f87771f 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -26,13 +26,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp index 32d407a4..c87d0266 100644 --- a/languages/cpp/qtdesignercppintegration.cpp +++ b/languages/cpp/qtdesignercppintegration.cpp @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/languages/cpp/typedesc.h b/languages/cpp/typedesc.h index de2417a1..0229c781 100644 --- a/languages/cpp/typedesc.h +++ b/languages/cpp/typedesc.h @@ -15,7 +15,7 @@ #ifndef __TYPEDESC_H__ #define __TYPEDESC_H__ -#include +#include #include #include "includefiles.h" diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index 86b193c8..29173e45 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -18,10 +18,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index c1e45273..4ab43d38 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -54,14 +54,14 @@ #include #include -#include -#include -#include -#include -#include -#include - -#include +#include +#include +#include +#include +#include +#include + +#include #include #include diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index 43aefed0..5dffdecd 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -25,13 +25,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp index 24eeda70..032d861b 100644 --- a/languages/kjssupport/jscodecompletion.cpp +++ b/languages/kjssupport/jscodecompletion.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include diff --git a/languages/kjssupport/jscodecompletion.h b/languages/kjssupport/jscodecompletion.h index 5aa14198..f1d18a70 100644 --- a/languages/kjssupport/jscodecompletion.h +++ b/languages/kjssupport/jscodecompletion.h @@ -17,9 +17,9 @@ #include #include -#include -#include -#include +#include +#include +#include /** The code completion engine for Javascript. diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp index 44a3659b..c73d51bb 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include diff --git a/languages/lib/debugger/CMakeLists.txt b/languages/lib/debugger/CMakeLists.txt index 0f980a45..c159528b 100644 --- a/languages/lib/debugger/CMakeLists.txt +++ b/languages/lib/debugger/CMakeLists.txt @@ -33,6 +33,6 @@ install( FILES tde_add_library( lang_debugger SHARED AUTOMOC SOURCES kdevdebugger.cpp debugger.cpp VERSION 0.0.0 - LINK ktexteditor-shared + LINK tdetexteditor-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/languages/lib/debugger/Makefile.am b/languages/lib/debugger/Makefile.am index 70484a34..1a6b7d2e 100644 --- a/languages/lib/debugger/Makefile.am +++ b/languages/lib/debugger/Makefile.am @@ -2,12 +2,12 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO lib_LTLIBRARIES = liblang_debugger.la liblang_debugger_la_LDFLAGS = $(all_libraries) -liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) -lktexteditor +liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_KPARTS) -ltdetexteditor liblang_debugger_la_SOURCES = kdevdebugger.cpp debugger.cpp langincludedirdir = $(includedir)/tdevelop/languages/debugger langincludedir_HEADERS = debugger.h kdevdebugger.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces kdevutil +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil DOXYGEN_PROJECTNAME = KDevelop Debugger Support Library DOXYGEN_DOCDIRPREFIX = kdevlang include ../../../Doxyfile.am diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp index 5d33ee8c..69b7a128 100644 --- a/languages/lib/debugger/debugger.cpp +++ b/languages/lib/debugger/debugger.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include // #include "editorproxy.h" #include diff --git a/languages/lib/debugger/debugger.h b/languages/lib/debugger/debugger.h index b7c48964..d4112490 100644 --- a/languages/lib/debugger/debugger.h +++ b/languages/lib/debugger/debugger.h @@ -5,11 +5,11 @@ #include "kdevdebugger.h" -#include -#include +#include +#include #include -#include +#include class KDevPartController; diff --git a/languages/lib/designer_integration/Makefile.am b/languages/lib/designer_integration/Makefile.am index 3ba9afb5..250b8be6 100644 --- a/languages/lib/designer_integration/Makefile.am +++ b/languages/lib/designer_integration/Makefile.am @@ -11,6 +11,6 @@ libdesignerintegration_la_SOURCES = implementationwidgetbase.ui \ langincludedirdir = $(includedir)/tdevelop/languages/designer_integration langincludedir_HEADERS = qtdesignerintegration.h implementationwidget.h implementationwidgetbase.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces kdevutil +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil DOXYGEN_PROJECTNAME = KDevelop Designer Integration Support Library include ../../../Doxyfile.am diff --git a/languages/lib/interfaces/Makefile.am b/languages/lib/interfaces/Makefile.am index d469eaa6..3edd1097 100644 --- a/languages/lib/interfaces/Makefile.am +++ b/languages/lib/interfaces/Makefile.am @@ -10,7 +10,7 @@ INCLUDES = $(all_includes) servicetypedir = $(kde_servicetypesdir) servicetype_DATA = tdeveloppcsimporter.desktop -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces kdevutil +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces kdevutil DOXYGEN_PROJECTNAME = KDevelop Language Support Interfaces Library DOXYGEN_DOCDIRPREFIX = kdevlang include ../../../Doxyfile.am diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index 1618ba11..3b2ffbc4 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -24,12 +24,12 @@ #include "backgroundparser.h" #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include #include diff --git a/languages/php/phpcodecompletion.h b/languages/php/phpcodecompletion.h index f922b09b..0874430e 100644 --- a/languages/php/phpcodecompletion.h +++ b/languages/php/phpcodecompletion.h @@ -25,15 +25,15 @@ #include #include -#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include class KDevCore; diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index efc63d70..47d869b7 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -25,13 +25,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h index 470e7159..3cc571fa 100644 --- a/languages/php/phpfile.h +++ b/languages/php/phpfile.h @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include #include "phpsupportpart.h" #include "phperrorview.h" diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 9435c274..f7bde3d0 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -35,13 +35,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h index f7d13122..572be8c8 100644 --- a/languages/php/phpsupportpart.h +++ b/languages/php/phpsupportpart.h @@ -29,7 +29,7 @@ #include #include -#include +#include class TQStringList; class PHPHTMLView; diff --git a/languages/python/qtdesignerpythonintegration.cpp b/languages/python/qtdesignerpythonintegration.cpp index d9503339..4d7b28a5 100644 --- a/languages/python/qtdesignerpythonintegration.cpp +++ b/languages/python/qtdesignerpythonintegration.cpp @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/languages/ruby/app_templates/kapp/README b/languages/ruby/app_templates/kapp/README index 69e9ac5f..f7d35069 100644 --- a/languages/ruby/app_templates/kapp/README +++ b/languages/ruby/app_templates/kapp/README @@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play in your app. For more details, consult : -http://www-106.ibm.com/developerworks/library/l-kparts/ +http://www-106.ibm.com/developerworks/library/l-tdeparts/ http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index 4da31204..091649e1 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/languages/ruby/qtdesignerrubyintegration.cpp b/languages/ruby/qtdesignerrubyintegration.cpp index 1b4da06d..f2412739 100644 --- a/languages/ruby/qtdesignerrubyintegration.cpp +++ b/languages/ruby/qtdesignerrubyintegration.cpp @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index 9de81db4..7111ffca 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -28,12 +28,12 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index 78c1c1f2..580d99c5 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -11,9 +11,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include "kdevcore.h" diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 025e1819..0398ddf0 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -34,6 +34,6 @@ tde_add_library( tdevelop SHARED EMBED kdevutil-static kdevinterfaces-static LINK kdevpropertyeditor-shared - kscript-shared kparts-shared ktexteditor-shared + tdescript-shared tdeparts-shared tdetexteditor-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/lib/Makefile.am b/lib/Makefile.am index 4e722350..2314d6e7 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -11,7 +11,7 @@ libtdevelop_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \ # $(top_builddir)/lib/util/libkdevutil.la $(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la \ # $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la \ -# -lktexteditor $(LIB_KPARTS) $(LIB_KIO) -lkscript +# -ltdetexteditor $(LIB_KPARTS) $(LIB_KIO) -ltdescript libtdevelop_la_SOURCES = dummy.cpp diff --git a/lib/catalog/Makefile.am b/lib/catalog/Makefile.am index f9c81448..1aaa40ef 100644 --- a/lib/catalog/Makefile.am +++ b/lib/catalog/Makefile.am @@ -7,7 +7,7 @@ libkdevcatalog_la_LIBADD = -l$(DB3LIB) $(LIB_TDECORE) $(LIB_QT) kdevcatalogincludedir = $(includedir)/tdevelop/catalog kdevcataloginclude_HEADERS = catalog.h tag.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils DOXYGEN_PROJECTNAME = TDevelop Catalog Library DOXYGEN_DOCDIRPREFIX = kdev include ../../Doxyfile.am diff --git a/lib/cppparser/Makefile.am b/lib/cppparser/Makefile.am index a40c5518..414fea6f 100644 --- a/lib/cppparser/Makefile.am +++ b/lib/cppparser/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes) AM_CXXFLAGS = -DKDEVELOP_BGPARSER lib_LTLIBRARIES = libkdevcppparser.la libkdevcppparser_la_LDFLAGS = $(all_libraries) -libkdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_KPARTS) -lktexteditor $(LIB_KIO) -lkscript +libkdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_KPARTS) -ltdetexteditor $(LIB_KIO) -ltdescript libkdevcppparser_la_SOURCES = ast.cpp cachemanager.cpp driver.cpp errors.cpp \ lexer.cpp lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp diff --git a/lib/interfaces/Makefile.am b/lib/interfaces/Makefile.am index 3e8cbc7c..21deec16 100644 --- a/lib/interfaces/Makefile.am +++ b/lib/interfaces/Makefile.am @@ -14,7 +14,7 @@ libkdevinterfaces_la_SOURCES = kdevcore.cpp kdevproject.cpp \ libkdevinterfaces_la_LDFLAGS = -no-undefined $(all_libraries) libkdevinterfaces_la_LIBADD = $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la \ $(top_builddir)/lib/util/libkdevutil.la \ - $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) -lktexteditor -lkscript -lDCOP + $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS) -ltdetexteditor -ltdescript -lDCOP tdevelopincludedir = $(includedir)/tdevelop/interfaces tdevelopinclude_HEADERS = kdevlanguagesupport.h kdevmainwindow.h \ @@ -33,7 +33,7 @@ METASOURCES = AUTO SUBDIRS = extensions external extras -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions DOXYGEN_PROJECTNAME = TDevelop Interfaces Library DOXYGEN_DOCDIRPREFIX = kdev include ../../Doxyfile.am diff --git a/lib/interfaces/extensions/Makefile.am b/lib/interfaces/extensions/Makefile.am index 29ab44e4..211439b0 100644 --- a/lib/interfaces/extensions/Makefile.am +++ b/lib/interfaces/extensions/Makefile.am @@ -16,7 +16,7 @@ libkdevextensions_la_SOURCES = kdevappfrontend.cpp kdevmakefrontend.cpp INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces DOXYGEN_PROJECTNAME = KDevelop Extension Interfaces Library DOXYGEN_DOCDIRPREFIX = kdev include ../../../Doxyfile.am diff --git a/lib/interfaces/external/CMakeLists.txt b/lib/interfaces/external/CMakeLists.txt index cee645d0..353721fd 100644 --- a/lib/interfaces/external/CMakeLists.txt +++ b/lib/interfaces/external/CMakeLists.txt @@ -27,7 +27,7 @@ install( FILES tde_add_library( kinterfacedesigner SHARED AUTOMOC SOURCES designer.cpp - LINK kparts-shared tdeui-shared + LINK tdeparts-shared tdeui-shared VERSION 0.0.0 DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/lib/interfaces/external/Makefile.am b/lib/interfaces/external/Makefile.am index 63e15465..8d022993 100644 --- a/lib/interfaces/external/Makefile.am +++ b/lib/interfaces/external/Makefile.am @@ -10,6 +10,6 @@ libkinterfacedesigner_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDEUI) libkinterfacedesigner_la_LDFLAGS = $(all_libraries) libkinterfacedesigner_la_SOURCES = designer.cpp -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils DOXYGEN_PROJECTNAME = KInterfaceDesigner Library include ../../../Doxyfile.am diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h index 4396c1ab..b84e2268 100644 --- a/lib/interfaces/external/designer.h +++ b/lib/interfaces/external/designer.h @@ -19,7 +19,7 @@ #ifndef KINTERFACEDESIGNER_FORMEDITOR_H #define KINTERFACEDESIGNER_FORMEDITOR_H -#include +#include /**Contains KInterfaceDesigner classes.*/ namespace KInterfaceDesigner{ diff --git a/lib/interfaces/extras/Makefile.am b/lib/interfaces/extras/Makefile.am index 49107f8f..a554ad30 100644 --- a/lib/interfaces/extras/Makefile.am +++ b/lib/interfaces/extras/Makefile.am @@ -12,7 +12,7 @@ libkdevextras_la_SOURCES = kdevcompileroptions.cpp kdevvcsintegrator.cpp servicetype_DATA = tdevelopcompileroptions.desktop \ tdevelopvcsintegrator.desktop -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevinterfaces +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevinterfaces DOXYGEN_PROJECTNAME = TDevelop Extra Interfaces Library DOXYGEN_DOCDIRPREFIX = kdev include ../../../Doxyfile.am diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h index 8c237bf3..0e24c8fc 100644 --- a/lib/interfaces/kdevpartcontroller.h +++ b/lib/interfaces/kdevpartcontroller.h @@ -26,7 +26,7 @@ #define KDEV_PARTCONTROLLER_H #include -#include +#include #include /** diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt index 378c4dca..1eb17f35 100644 --- a/lib/util/CMakeLists.txt +++ b/lib/util/CMakeLists.txt @@ -22,7 +22,7 @@ include_directories( install( FILES domutil.h execcommand.h filetemplate.h urlutil.h - configwidgetproxy.h rurl.h kscriptactionmanager.h + configwidgetproxy.h rurl.h tdescriptactionmanager.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/util ) @@ -33,6 +33,6 @@ tde_add_library( kdevutil STATIC_PIC AUTOMOC blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp execcommand.cpp filetemplate.cpp kdeveditorutil.cpp kdevjobtimer.cpp - kdevshellwidget.cpp kscriptactionmanager.cpp + kdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp ) diff --git a/lib/util/Makefile.am b/lib/util/Makefile.am index 3a31f258..4dbaa33b 100644 --- a/lib/util/Makefile.am +++ b/lib/util/Makefile.am @@ -4,15 +4,15 @@ noinst_LTLIBRARIES = libkdevutil.la libkdevutil_la_SOURCES = blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp \ execcommand.cpp filetemplate.cpp kdeveditorutil.cpp kdevjobtimer.cpp \ - kdevshellwidget.cpp kscriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp + kdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp METASOURCES = AUTO tdevelopincludedir = $(includedir)/tdevelop/util tdevelopinclude_HEADERS = domutil.h execcommand.h filetemplate.h urlutil.h \ - configwidgetproxy.h rurl.h kscriptactionmanager.h + configwidgetproxy.h rurl.h tdescriptactionmanager.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevextensions kdevinterfaces +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevextensions kdevinterfaces DOXYGEN_PROJECTNAME = KDevelop Utility Library DOXYGEN_DOCDIRPREFIX = kdev include ../../Doxyfile.am diff --git a/lib/util/kdeveditorutil.cpp b/lib/util/kdeveditorutil.cpp index 3c01f780..198e9a42 100644 --- a/lib/util/kdeveditorutil.cpp +++ b/lib/util/kdeveditorutil.cpp @@ -11,11 +11,11 @@ #include "kdeveditorutil.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include bool KDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * col, KTextEditor::Document * doc, KTextEditor::View * view ) { diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp index b85bea80..b9220250 100644 --- a/lib/util/kdevshellwidget.cpp +++ b/lib/util/kdevshellwidget.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp deleted file mode 100644 index 28756841..00000000 --- a/lib/util/kscriptactionmanager.cpp +++ /dev/null @@ -1,177 +0,0 @@ -/*************************************************************************** -* Copyright (C) 2004 by ian geiser * -* geiseri@sourcextreme.com * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU 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 General Public License for more details. * -* * -* You should have received a copy of the GNU 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 "kscriptactionmanager.h" -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac ) - : TQObject(interface), KScriptClientInterface( ) -{ - m_interface = 0L; - m_action = 0L; - m_isValid = false; - m_refs = 0; - // Read the desktop file - if(KDesktopFile::isDesktopFile(scriptDesktopFile)) - { - KDesktopFile desktop(scriptDesktopFile, true); - TQFileInfo scriptPath(scriptDesktopFile); - - m_scriptFile = scriptPath.dirPath(true) + "/" + desktop.readEntry("X-TDE-ScriptName", ""); - m_scriptName = desktop.readName(); - m_scriptType = desktop.readType(); - TQString scriptTypeQuery = "([X-TDE-Script-Runner] == '" + m_scriptType + "')"; - KTrader::OfferList offers = KTrader::self()->query( "KScriptRunner/KScriptRunner", scriptTypeQuery ); - if ( !offers.isEmpty() ) - { - m_action = new KAction(m_scriptName, KShortcut(), this, TQT_SLOT(activate()), ac, "script"); - m_isValid = true; - m_timeout = new TQTimer(this); - TQString icon = desktop.readIcon(); - m_action->setStatusText(desktop.readComment()); - if( !icon.isEmpty() ) - m_action->setIcon(icon); - m_action->setShortcutConfigurable(true); - connect( m_timeout, TQT_SIGNAL(timeout()), TQT_SLOT(cleanup()) ); - } - } -} - -KScriptAction::~KScriptAction() -{ - if( m_interface ) delete m_interface; - if( m_action ) delete m_action; -} - - - -KAction * KScriptAction::action( ) -{ - return m_action; -} - -void KScriptAction::activate( ) -{ - if( m_interface == 0L) - { - TQString scriptTypeQuery = "([X-TDE-Script-Runner] == '" + m_scriptType + "')"; - m_interface= KParts::ComponentFactory::createInstanceFromQuery( "KScriptRunner/KScriptRunner", scriptTypeQuery, this ); - if ( m_interface != 0L) - { - m_interface->ScriptClientInterface= this; - if( m_scriptMethod.isEmpty() ) - m_interface->setScript(m_scriptFile); - else - m_interface->setScript(m_scriptFile, m_scriptMethod); - connect(this, TQT_SIGNAL(done(KScriptClientInterface::Result, const TQVariant &)), this, TQT_SLOT(scriptFinished())); - } - else - { - KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").arg(m_scriptType), i18n("KScript Error")); - kdDebug() << "Query string: " << scriptTypeQuery << endl; - return; - } - } - m_interface->run(parent(), TQVariant()); - m_timeout->start(60000,FALSE); // after 1 minute unload - m_refs++; -} - -void KScriptAction::cleanup() -{ - if( m_interface && m_refs == 0) - { - delete m_interface; - m_interface = 0L; - } -} - -void KScriptAction::scriptFinished() -{ - m_refs--; -} - -KScriptActionManager::KScriptActionManager( TQObject *parent, KActionCollection * ac ) : TQObject(parent), m_ac(ac) -{ - m_actions.setAutoDelete(true); -} - -KScriptActionManager::~ KScriptActionManager( ) -{ - m_actions.clear(); -} - -TQPtrList< KAction > KScriptActionManager::scripts( TQObject * interface , const TQStringList &dirs) const -{ - m_actions.clear(); - TQPtrList actions; - TQStringList scripts; - - scripts += TDEGlobal::dirs()->findAllResources("data", - TQString(kapp->name())+"/scripts/*.desktop", false, true ); - - for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) - { - scripts += TDEGlobal::dirs()->findAllResources("data", - (*it)+"/*.desktop", false, true ); - } - - for (TQStringList::Iterator it = scripts.begin(); it != scripts.end(); ++it ) - { - kdDebug() << "Loading " << *it << endl; - KScriptAction *script = new KScriptAction(*it, interface, m_ac); - if( script->isValid()) - { - actions.append(script->action()); - m_actions.append(script); - connect(script, TQT_SIGNAL(error( const TQString&)), this, - TQT_SIGNAL(scriptError( const TQString&))); - connect(script, TQT_SIGNAL(warning( const TQString&)), this, - TQT_SIGNAL(scriptWarning( const TQString&))); - connect(script, TQT_SIGNAL(output( const TQString&)), this, - TQT_SIGNAL(scriptOutput( const TQString&))); - connect(script, TQT_SIGNAL(progress( int )), this, - TQT_SIGNAL(scriptProgress(int))); - connect(script, TQT_SIGNAL(done( KScriptClientInterface::Result, const TQVariant &)),this, - TQT_SIGNAL(scriptDone( KScriptClientInterface::Result, const TQVariant &))); - } - else - delete script; - } - return actions; -} - -bool KScriptAction::isValid( ) const -{ - return m_isValid; -} - -#include "kscriptactionmanager.moc" diff --git a/lib/util/kscriptactionmanager.h b/lib/util/kscriptactionmanager.h deleted file mode 100644 index c2e43238..00000000 --- a/lib/util/kscriptactionmanager.h +++ /dev/null @@ -1,141 +0,0 @@ -/*************************************************************************** -* Copyright (C) 2004 by ian geiser * -* geiseri@sourcextreme.com * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU 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 General Public License for more details. * -* * -* You should have received a copy of the GNU 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 KScriptAction_H -#define KScriptAction_H - -#include -#include -#include - -class KAction; -class KActionCollection; -class KScriptInterface; -class KScriptActionManager; -class TQTimer; - -/** -* Connects a KAction to a script runner. -* -* @author ian geiser geiseri@sourcextreme.com -*/ -class KScriptAction : public TQObject, public KScriptClientInterface { - Q_OBJECT - -public: - - KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac ); - - virtual ~KScriptAction(); - - /** - * KAction for the current script - */ - KAction *action(); - - /** - * Returns the validity of the current script. - */ - bool isValid() const; - -signals: - // Reimplemented from KScript - void error ( const TQString &msg ); - void warning ( const TQString &msg ); - void output ( const TQString &msg ); - void progress ( int percent ); - void done ( KScriptClientInterface::Result result, const TQVariant &returned ); - -signals: - void scriptError ( const TQString &msg ); - void scriptWarning ( const TQString &msg ); - void scriptOutput ( const TQString &msg ); - void scriptProgress ( int percent ); - void scriptDone ( KScriptClientInterface::Result result, const TQVariant &returned ); - -private slots: - void activate(); - void cleanup(); - void scriptFinished(); - -private: - KAction *m_action; - TQString m_scriptName; - TQString m_scriptType; - TQString m_scriptFile; - TQString m_scriptMethod; - KScriptInterface *m_interface; - bool m_isValid; - TQTimer *m_timeout; - uint m_refs; -}; - -/** - * Provides an actionlist of scripts that are currently available. - * Scripts are not actually loaded until they are actually executed. - * @author ian geiser - */ -class KScriptActionManager : public TQObject { -Q_OBJECT - - -public: - /** - * Create a script manager that is attached to an action collection. - */ - KScriptActionManager( TQObject *parent, KActionCollection *ac ); - ~KScriptActionManager(); - - /** - * Return all currently loaded scripts in a direcotry and attaches them - * to a TQObject interface. If the dirs are empty the current applications - * scripts directory is used. The dirs are actual directories to search - * in the $KDEPATH/data/ direcories. So if you add "coolapp/data" then - * the manager will search in $KDEPATH/data/coolapp/data for all desktop - * files that are scripts. - */ - TQPtrList scripts( TQObject *interface, const TQStringList &dirs = TQStringList() ) const; - -signals: - /** - * Returns an error message from a script. - */ - void scriptError ( const TQString &msg ); - /** - * Returns a warning message from a script. - */ - void scriptWarning ( const TQString &msg ); - /** - * Returns a standard out message from a script. - */ - void scriptOutput ( const TQString &msg ); - /** - * Returns the percentage complete of an operation in the script. - */ - void scriptProgress ( int percent ); - /** - * Notifies that the script has finished. - */ - void scriptDone( KScriptClientInterface::Result result, const TQVariant &returned ); - -private: - mutable TQPtrList m_actions; - KActionCollection *m_ac; -}; -#endif diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp new file mode 100644 index 00000000..3b0aa8ac --- /dev/null +++ b/lib/util/tdescriptactionmanager.cpp @@ -0,0 +1,177 @@ +/*************************************************************************** +* Copyright (C) 2004 by ian geiser * +* geiseri@sourcextreme.com * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU 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 General Public License for more details. * +* * +* You should have received a copy of the GNU 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 "tdescriptactionmanager.h" +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac ) + : TQObject(interface), KScriptClientInterface( ) +{ + m_interface = 0L; + m_action = 0L; + m_isValid = false; + m_refs = 0; + // Read the desktop file + if(KDesktopFile::isDesktopFile(scriptDesktopFile)) + { + KDesktopFile desktop(scriptDesktopFile, true); + TQFileInfo scriptPath(scriptDesktopFile); + + m_scriptFile = scriptPath.dirPath(true) + "/" + desktop.readEntry("X-TDE-ScriptName", ""); + m_scriptName = desktop.readName(); + m_scriptType = desktop.readType(); + TQString scriptTypeQuery = "([X-TDE-Script-Runner] == '" + m_scriptType + "')"; + KTrader::OfferList offers = KTrader::self()->query( "KScriptRunner/KScriptRunner", scriptTypeQuery ); + if ( !offers.isEmpty() ) + { + m_action = new KAction(m_scriptName, KShortcut(), this, TQT_SLOT(activate()), ac, "script"); + m_isValid = true; + m_timeout = new TQTimer(this); + TQString icon = desktop.readIcon(); + m_action->setStatusText(desktop.readComment()); + if( !icon.isEmpty() ) + m_action->setIcon(icon); + m_action->setShortcutConfigurable(true); + connect( m_timeout, TQT_SIGNAL(timeout()), TQT_SLOT(cleanup()) ); + } + } +} + +KScriptAction::~KScriptAction() +{ + if( m_interface ) delete m_interface; + if( m_action ) delete m_action; +} + + + +KAction * KScriptAction::action( ) +{ + return m_action; +} + +void KScriptAction::activate( ) +{ + if( m_interface == 0L) + { + TQString scriptTypeQuery = "([X-TDE-Script-Runner] == '" + m_scriptType + "')"; + m_interface= KParts::ComponentFactory::createInstanceFromQuery( "KScriptRunner/KScriptRunner", scriptTypeQuery, this ); + if ( m_interface != 0L) + { + m_interface->ScriptClientInterface= this; + if( m_scriptMethod.isEmpty() ) + m_interface->setScript(m_scriptFile); + else + m_interface->setScript(m_scriptFile, m_scriptMethod); + connect(this, TQT_SIGNAL(done(KScriptClientInterface::Result, const TQVariant &)), this, TQT_SLOT(scriptFinished())); + } + else + { + KMessageBox::sorry(0, i18n("Unable to get KScript Runner for type \"%1\".").arg(m_scriptType), i18n("KScript Error")); + kdDebug() << "Query string: " << scriptTypeQuery << endl; + return; + } + } + m_interface->run(parent(), TQVariant()); + m_timeout->start(60000,FALSE); // after 1 minute unload + m_refs++; +} + +void KScriptAction::cleanup() +{ + if( m_interface && m_refs == 0) + { + delete m_interface; + m_interface = 0L; + } +} + +void KScriptAction::scriptFinished() +{ + m_refs--; +} + +KScriptActionManager::KScriptActionManager( TQObject *parent, KActionCollection * ac ) : TQObject(parent), m_ac(ac) +{ + m_actions.setAutoDelete(true); +} + +KScriptActionManager::~ KScriptActionManager( ) +{ + m_actions.clear(); +} + +TQPtrList< KAction > KScriptActionManager::scripts( TQObject * interface , const TQStringList &dirs) const +{ + m_actions.clear(); + TQPtrList actions; + TQStringList scripts; + + scripts += TDEGlobal::dirs()->findAllResources("data", + TQString(kapp->name())+"/scripts/*.desktop", false, true ); + + for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it) + { + scripts += TDEGlobal::dirs()->findAllResources("data", + (*it)+"/*.desktop", false, true ); + } + + for (TQStringList::Iterator it = scripts.begin(); it != scripts.end(); ++it ) + { + kdDebug() << "Loading " << *it << endl; + KScriptAction *script = new KScriptAction(*it, interface, m_ac); + if( script->isValid()) + { + actions.append(script->action()); + m_actions.append(script); + connect(script, TQT_SIGNAL(error( const TQString&)), this, + TQT_SIGNAL(scriptError( const TQString&))); + connect(script, TQT_SIGNAL(warning( const TQString&)), this, + TQT_SIGNAL(scriptWarning( const TQString&))); + connect(script, TQT_SIGNAL(output( const TQString&)), this, + TQT_SIGNAL(scriptOutput( const TQString&))); + connect(script, TQT_SIGNAL(progress( int )), this, + TQT_SIGNAL(scriptProgress(int))); + connect(script, TQT_SIGNAL(done( KScriptClientInterface::Result, const TQVariant &)),this, + TQT_SIGNAL(scriptDone( KScriptClientInterface::Result, const TQVariant &))); + } + else + delete script; + } + return actions; +} + +bool KScriptAction::isValid( ) const +{ + return m_isValid; +} + +#include "tdescriptactionmanager.moc" diff --git a/lib/util/tdescriptactionmanager.h b/lib/util/tdescriptactionmanager.h new file mode 100644 index 00000000..c2e43238 --- /dev/null +++ b/lib/util/tdescriptactionmanager.h @@ -0,0 +1,141 @@ +/*************************************************************************** +* Copyright (C) 2004 by ian geiser * +* geiseri@sourcextreme.com * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU 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 General Public License for more details. * +* * +* You should have received a copy of the GNU 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 KScriptAction_H +#define KScriptAction_H + +#include +#include +#include + +class KAction; +class KActionCollection; +class KScriptInterface; +class KScriptActionManager; +class TQTimer; + +/** +* Connects a KAction to a script runner. +* +* @author ian geiser geiseri@sourcextreme.com +*/ +class KScriptAction : public TQObject, public KScriptClientInterface { + Q_OBJECT + +public: + + KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac ); + + virtual ~KScriptAction(); + + /** + * KAction for the current script + */ + KAction *action(); + + /** + * Returns the validity of the current script. + */ + bool isValid() const; + +signals: + // Reimplemented from KScript + void error ( const TQString &msg ); + void warning ( const TQString &msg ); + void output ( const TQString &msg ); + void progress ( int percent ); + void done ( KScriptClientInterface::Result result, const TQVariant &returned ); + +signals: + void scriptError ( const TQString &msg ); + void scriptWarning ( const TQString &msg ); + void scriptOutput ( const TQString &msg ); + void scriptProgress ( int percent ); + void scriptDone ( KScriptClientInterface::Result result, const TQVariant &returned ); + +private slots: + void activate(); + void cleanup(); + void scriptFinished(); + +private: + KAction *m_action; + TQString m_scriptName; + TQString m_scriptType; + TQString m_scriptFile; + TQString m_scriptMethod; + KScriptInterface *m_interface; + bool m_isValid; + TQTimer *m_timeout; + uint m_refs; +}; + +/** + * Provides an actionlist of scripts that are currently available. + * Scripts are not actually loaded until they are actually executed. + * @author ian geiser + */ +class KScriptActionManager : public TQObject { +Q_OBJECT + + +public: + /** + * Create a script manager that is attached to an action collection. + */ + KScriptActionManager( TQObject *parent, KActionCollection *ac ); + ~KScriptActionManager(); + + /** + * Return all currently loaded scripts in a direcotry and attaches them + * to a TQObject interface. If the dirs are empty the current applications + * scripts directory is used. The dirs are actual directories to search + * in the $KDEPATH/data/ direcories. So if you add "coolapp/data" then + * the manager will search in $KDEPATH/data/coolapp/data for all desktop + * files that are scripts. + */ + TQPtrList scripts( TQObject *interface, const TQStringList &dirs = TQStringList() ) const; + +signals: + /** + * Returns an error message from a script. + */ + void scriptError ( const TQString &msg ); + /** + * Returns a warning message from a script. + */ + void scriptWarning ( const TQString &msg ); + /** + * Returns a standard out message from a script. + */ + void scriptOutput ( const TQString &msg ); + /** + * Returns the percentage complete of an operation in the script. + */ + void scriptProgress ( int percent ); + /** + * Notifies that the script has finished. + */ + void scriptDone( KScriptClientInterface::Result result, const TQVariant &returned ); + +private: + mutable TQPtrList m_actions; + KActionCollection *m_ac; +}; +#endif diff --git a/lib/widgets/CMakeLists.txt b/lib/widgets/CMakeLists.txt index b819bc91..d7e92092 100644 --- a/lib/widgets/CMakeLists.txt +++ b/lib/widgets/CMakeLists.txt @@ -47,6 +47,6 @@ tde_add_library( kdevwidgets SHARED AUTOMOC processlinemaker.cpp processwidget.cpp ksavealldialog.cpp fancylistviewitem.cpp VERSION 0.0.0 - LINK kio-shared khtml-shared + LINK kio-shared tdehtml-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am index f42447e7..ecf57f7f 100644 --- a/lib/widgets/Makefile.am +++ b/lib/widgets/Makefile.am @@ -24,7 +24,7 @@ rcdir = $(kde_datadir)/tdevelop rc_DATA = kdevhtml_partui.rc -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces DOXYGEN_PROJECTNAME = KDevelop Widgets Library DOXYGEN_DOCDIRPREFIX = kdev include ../../Doxyfile.am diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index abbeebbc..85990989 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h index 805134a0..13f155a5 100644 --- a/lib/widgets/kdevhtmlpart.h +++ b/lib/widgets/kdevhtmlpart.h @@ -5,7 +5,7 @@ #include -#include +#include /** @file kdevhtmlpart.h diff --git a/lib/widgets/propeditor/Makefile.am b/lib/widgets/propeditor/Makefile.am index 00bc07ca..0c037873 100644 --- a/lib/widgets/propeditor/Makefile.am +++ b/lib/widgets/propeditor/Makefile.am @@ -13,6 +13,6 @@ pcolorcombo.cpp pdoublenuminput.cpp ppixmapedit.cpp propertylist.cpp ps kdevpropeditorincludedir = $(includedir)/tdevelop/propeditor kdevpropeditorinclude_HEADERS = childproperty.h pcombobox.h pdummywidget.h ppointedit.h propertymachinefactory.h pcursoredit.h pfontbutton.h prectedit.h propertywidget.h pdateedit.h pfontcombo.h property.h psizeedit.h pdatetimeedit.h plineedit.h propertyeditor.h psizepolicyedit.h pdoublenuminput.h ppixmapedit.h propertylist.h pspinbox.h propertywidgetproxy.h multiproperty.h pyesnobutton.h purledit.h psymbolcombo.h pstringlistedit.h pcolorcombo.h pcolorbutton.h pcheckbox.h plinestyleedit.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils DOXYGEN_PROJECTNAME = KDevelop Property Editing Library include ../../../Doxyfile.am diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index 5aeeb62c..3abe3b09 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -31,10 +31,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "kdevcore.h" #include "kdevpartcontroller.h" diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h index db2833fc..5fb37e97 100644 --- a/parts/abbrev/abbrevpart.h +++ b/parts/abbrev/abbrevpart.h @@ -20,7 +20,7 @@ #include #include "kdevplugin.h" -#include +#include class KDialogBase; diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index d9725ba4..11552b27 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include diff --git a/parts/appwizard/common/incadmin/ltmain.sh b/parts/appwizard/common/incadmin/ltmain.sh index 3506ead3..f5fb19b4 100644 --- a/parts/appwizard/common/incadmin/ltmain.sh +++ b/parts/appwizard/common/incadmin/ltmain.sh @@ -7148,7 +7148,7 @@ EOF k=1 if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + output=${output_objdir}/${output_la}.lntdescript func_verbose "creating GNU ld script: $output" $ECHO 'INPUT (' > $output for obj in $save_libobjs diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index c0d05a77..34b5422c 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include "kdevcore.h" diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 620315d3..18675ad5 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -10,12 +10,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h index 3bc36ff2..eed15022 100644 --- a/parts/astyle/astyle_part.h +++ b/parts/astyle/astyle_part.h @@ -9,7 +9,7 @@ class KDialogBase; #include #include -#include +#include #include #include #include diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index 965b359b..733d2010 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -19,9 +19,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h index 311f66f8..f51603d7 100644 --- a/parts/bookmarks/bookmarks_part.h +++ b/parts/bookmarks/bookmarks_part.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index e4fb531c..a5eec6a3 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include #include diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index 649db134..a30f6158 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -50,12 +50,12 @@ #include "klistviewaction.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include class FunctionCompletion : public CustomCompleter { diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index 5379119c..b24917df 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 3b9d2768..fef1372e 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -19,10 +19,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index 97adaf4f..2f899828 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index 681c09d1..539108e1 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index 90f66120..40d482b5 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "distpart_widget.h" -#include +#include #include #include #include diff --git a/parts/documentation/CMakeLists.txt b/parts/documentation/CMakeLists.txt index 0fa6cdca..accc3401 100644 --- a/parts/documentation/CMakeLists.txt +++ b/parts/documentation/CMakeLists.txt @@ -53,6 +53,6 @@ tde_add_kpart( libkdevdocumentation AUTOMOC docprojectconfigwidget.cpp KDevDocumentationIface.cpp KDevDocumentationIface.skel addcatalogdlgbase.ui addcatalogdlg.cpp - LINK documentation_interfaces-shared tdevelop-shared khtml-shared + LINK documentation_interfaces-shared tdevelop-shared tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index 6ee782ee..0ca74f43 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 0b04548d..21fc1b5b 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include #include "kdevdocumentationplugin.h" #include "kdevpartcontroller.h" diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 32b08323..77b4e6b2 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include "kdevplugininfo.h" #include "kdevcore.h" diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index 84d8eada..567237e2 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/parts/documentation/interfaces/Makefile.am b/parts/documentation/interfaces/Makefile.am index 93f5e7a0..6e66b46c 100644 --- a/parts/documentation/interfaces/Makefile.am +++ b/parts/documentation/interfaces/Makefile.am @@ -10,7 +10,7 @@ partincludedir_HEADERS = kdevdocumentationplugin.h servicetypedir = $(kde_servicetypesdir) servicetype_DATA = tdevelopdocumentationplugins.desktop -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces DOXYGEN_PROJECTNAME = KDevelop Documentation Part Interfaces Library DOXYGEN_DOCDIRPREFIX = kdevdoc include ../../../Doxyfile.am diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am index eba29efd..d68f20bd 100644 --- a/parts/documentation/protocols/chm/Makefile.am +++ b/parts/documentation/protocols/chm/Makefile.am @@ -9,7 +9,7 @@ kio_chm_la_LIBADD = $(LIB_KIO) kio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) libkchmpart_la_SOURCES = kchmpart.cpp -libkchmpart_la_LIBADD = -lkhtml $(LIB_KPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la +libkchmpart_la_LIBADD = -ltdehtml $(LIB_KPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la libkchmpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) noinst_HEADERS = chm.h chmfile.h decompress.h kchmpart.h diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index 1ec2eaf8..f8779d75 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -17,10 +17,10 @@ #ifndef __kchmpart_h__ #define __kchmpart_h__ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/parts/documentation/tools/htdig/Makefile.am b/parts/documentation/tools/htdig/Makefile.am index b46c07e7..303ff645 100644 --- a/parts/documentation/tools/htdig/Makefile.am +++ b/parts/documentation/tools/htdig/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) METASOURCES = AUTO bin_PROGRAMS = tdevelop-htdig -tdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor tdevelop_htdig_SOURCES = htdigindex.cpp noinst_HEADERS = htdigindex.h diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index f267fec9..50c916f2 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -31,10 +31,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp index f2d67f25..59ec1a33 100644 --- a/parts/filecreate/filecreate_widget2.cpp +++ b/parts/filecreate/filecreate_widget2.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp index 5d307bff..2bc308b6 100644 --- a/parts/filecreate/filecreate_widget3.cpp +++ b/parts/filecreate/filecreate_widget3.cpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp index 4898440d..93769573 100644 --- a/parts/filelist/filelist_widget.cpp +++ b/parts/filelist/filelist_widget.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 45d186ae..62cae2b0 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -43,9 +43,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index d2d8ffff..cfa72b6c 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp index 496dc197..aa10c559 100644 --- a/parts/filter/filterpart.cpp +++ b/parts/filter/filterpart.cpp @@ -14,10 +14,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "kdevcore.h" #include "kdevpartcontroller.h" diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp index bc6948fd..e792b04b 100644 --- a/parts/grepview/grepdlg.cpp +++ b/parts/grepview/grepdlg.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp index 11ffbd77..7b2822ec 100644 --- a/parts/grepview/grepviewpart.cpp +++ b/parts/grepview/grepviewpart.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "kdevcore.h" #include "kdevpartcontroller.h" diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp index 43981f6d..65ddf9e3 100644 --- a/parts/grepview/grepviewwidget.cpp +++ b/parts/grepview/grepviewwidget.cpp @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index 8c9e517b..a9f84bb6 100644 --- a/parts/konsole/konsoleviewwidget.cpp +++ b/parts/konsole/konsoleviewwidget.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include #include diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 5bdb2cd9..5e1e92bc 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index 5c8e7c6c..a1b1cb70 100644 --- a/parts/outputviews/makeactionfilter.cpp +++ b/parts/outputviews/makeactionfilter.cpp @@ -234,7 +234,7 @@ void MakeActionFilter::test() "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.la.closure libkfilereplacepart_la_closure.lo " "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo " "kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo " - "klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml", + "klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml", "linking", "libtool", "libkfilereplacepart.la.closure") << TestItem( //libtool, linking 3 "/bin/sh ../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic " @@ -242,7 +242,7 @@ void MakeActionFilter::test() "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.la -rpath /opt/trinity/lib/trinity " "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib -version-info 1:0:0 kfilereplacepart.lo " "kfilereplacedoc.lo kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo " - "kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml", + "kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml", "linking", "libtool", "libkfilereplacepart.la") << TestItem( //automake, builddir!=srcdir, libtool=no, compiling " g++ -DHAVE_CONFIG_H -I. -I/home/andris/cvs-developement/head/quanta/quanta/project " diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp index e6ae4609..e9d53ab1 100644 --- a/parts/outputviews/makeitem.cpp +++ b/parts/outputviews/makeitem.cpp @@ -16,7 +16,7 @@ #include #include -#include "ktexteditor/cursorinterface.h" +#include "tdetexteditor/cursorinterface.h" MakeItem::MakeItem() { diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index ad106ef0..07204c8c 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -17,9 +17,9 @@ #include "processlinemaker.h" #include "makeviewpart.h" #include "makeitem.h" -#include "ktexteditor/document.h" -#include "ktexteditor/cursorinterface.h" -#include "ktexteditor/editinterface.h" +#include "tdetexteditor/document.h" +#include "tdetexteditor/cursorinterface.h" +#include "tdetexteditor/editinterface.h" #include "urlutil.h" #include diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index 04f19c8d..cd95f64a 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -32,8 +32,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp index ecc201b4..95988bde 100644 --- a/parts/regexptest/regexptestdlg.cpp +++ b/parts/regexptest/regexptestdlg.cpp @@ -26,10 +26,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "kdevplugin.h" diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index b24949ab..a677b292 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -13,19 +13,19 @@ #include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h index 227f8775..c9063928 100644 --- a/parts/replace/replace_widget.h +++ b/parts/replace/replace_widget.h @@ -12,7 +12,7 @@ #ifndef __REPLACE_WIDGET_H__ #define __REPLACE_WIDGET_H__ -#include +#include #include #include diff --git a/parts/replace/replacedlgimpl.cpp b/parts/replace/replacedlgimpl.cpp index 0ee78577..87432791 100644 --- a/parts/replace/replacedlgimpl.cpp +++ b/parts/replace/replacedlgimpl.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index f12625f8..35b0f9b0 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -38,7 +38,7 @@ #include #include #include "scriptingglobalconfig.h" -#include "kscriptactionmanager.h" +#include "tdescriptactionmanager.h" typedef KDevGenericFactory scriptingFactory; KDevPluginInfo data("kdevscripting"); diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 1cf8a398..8e54fd75 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -6,7 +6,7 @@ * Copyright: See COPYING file that comes with this distribution */ -#include +#include #include #include #include @@ -19,10 +19,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h index 1a0ef8c1..29bb1dc9 100644 --- a/parts/snippet/snippet_widget.h +++ b/parts/snippet/snippet_widget.h @@ -15,8 +15,8 @@ #include #include -#include -#include +#include +#include #include "snippetconfig.h" class KDevProject; diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp index deb88ff3..0450782f 100644 --- a/parts/texttools/texttoolspart.cpp +++ b/parts/texttools/texttoolspart.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include "kdevpartcontroller.h" #include "kdevmainwindow.h" diff --git a/parts/texttools/texttoolspart.h b/parts/texttools/texttoolspart.h index 46f9b7cc..5ebee704 100644 --- a/parts/texttools/texttoolspart.h +++ b/parts/texttools/texttoolspart.h @@ -13,7 +13,7 @@ #define _TEXTTOOLSPART_H_ #include -#include +#include #include "kdevplugin.h" class TextToolsWidget; diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index a358fb07..f655511f 100644 --- a/parts/texttools/texttoolswidget.cpp +++ b/parts/texttools/texttoolswidget.cpp @@ -16,11 +16,11 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include "kdevmainwindow.h" #include "kdevpartcontroller.h" diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index edf89043..287e5b40 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include "kapplicationtree.h" diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index b414fbbb..b35ac551 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -15,9 +15,9 @@ #include #include #include -#include +#include #include -#include +#include #include "kdevcore.h" #include "kdevproject.h" diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp index 074a2c38..e3d36291 100644 --- a/parts/valgrind/valgrind_widget.cpp +++ b/parts/valgrind/valgrind_widget.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/Makefile.am b/src/Makefile.am index 701fcbb1..4cf58098 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,7 +11,7 @@ libkdevshell_la_LDFLAGS = $(all_libraries) -ltdevelop -L../lib/.libs -L../lib/in libkdevshell_la_LIBADD = \ $(top_builddir)/src/profileengine/lib/libprofileengine.la $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la \ - $(top_builddir)/src/newui/libd.la $(LIB_KHTML) -lktexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner + $(top_builddir)/src/newui/libd.la $(LIB_KHTML) -ltdetexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner libkdevshell_la_SOURCES = api.cpp core.cpp documentationpart.cpp \ editorproxy.cpp generalinfowidget.cpp generalinfowidgetbase.ui languageselectwidget.cpp \ mainwindowshare.cpp mimewarningdialog.ui multibuffer.cpp partcontroller.cpp \ @@ -24,7 +24,7 @@ bin_PROGRAMS = tdevelop kdevassistant tdevelop_SOURCES = main.cpp kdevideextension.cpp settingswidget.ui tdevelop_METASOURCES = AUTO -tdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner +tdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner tdevelop_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner rcdir = $(kde_datadir)/tdevelop @@ -35,7 +35,7 @@ tdevelopdatadir = $(kde_confdir) tdevelopdata_DATA = tdeveloprc kdevassistantrc SUBDIRS = profiles profileengine newui kconf_update -kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner +kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner kdevassistant_SOURCES = main_assistant.cpp kdevassistantextension.cpp kdevassistant_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner @@ -48,7 +48,7 @@ shellinclude_HEADERS = api.h core.h documentationpart.h editorproxy.h \ statusbar.h toplevel.h generalinfowidgetbase.h mimewarningdialog.h settingswidget.h \ simplemainwindow.h multibuffer.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevextensions +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions DOXYGEN_PROJECTNAME = KDevelop Generic Shell DOXYGEN_DOCDIRPREFIX = kdevshell include ../Doxyfile.am diff --git a/src/core.h b/src/core.h index 2588e232..b30549ca 100644 --- a/src/core.h +++ b/src/core.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include "kdevcore.h" diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index 34860c26..55861014 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -7,15 +7,15 @@ #include #include -#include - -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -115,7 +115,7 @@ void EditorProxy::installPopup( KParts::Part * part ) { KTextEditor::View * view = static_cast( part->widget() ); - TQPopupMenu * popup = static_cast( part->factory()->container("ktexteditor_popup", view ) ); + TQPopupMenu * popup = static_cast( part->factory()->container("tdetexteditor_popup", view ) ); if (!popup) { @@ -225,7 +225,7 @@ void EditorProxy::showPopup( ) if ( iface ) { KTextEditor::View * view = static_cast( part->widget() ); - TQPopupMenu * popup = static_cast( view->factory()->container("ktexteditor_popup", view ) ); + TQPopupMenu * popup = static_cast( view->factory()->container("tdetexteditor_popup", view ) ); if ( popup ) { diff --git a/src/editorproxy.h b/src/editorproxy.h index d71d4cda..7cbd9ec9 100644 --- a/src/editorproxy.h +++ b/src/editorproxy.h @@ -10,10 +10,10 @@ class TQPopupMenu; class MultiBuffer; class TQTimer; -#include -#include +#include +#include #include -# include +# include class EditorProxy : public TQObject { diff --git a/src/kconf_update/Makefile.am b/src/kconf_update/Makefile.am index 7b072c71..e7317f2b 100644 --- a/src/kconf_update/Makefile.am +++ b/src/kconf_update/Makefile.am @@ -11,7 +11,7 @@ kconf_PROGRAMS = kdev-gen-settings-kconf_update kconfdir = $(libdir)/kconf_update_bin kdev_gen_settings_kconf_update_SOURCES = kdev-gen-settings-kconf_update.cpp -kdev_gen_settings_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdev_gen_settings_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kdev_gen_settings_kconf_update_LDADD = $(LIB_QT) # vim: set noet: diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 1d67217b..d03fffed 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -40,10 +40,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp index 87707e84..403eee1a 100644 --- a/src/multibuffer.cpp +++ b/src/multibuffer.cpp @@ -23,7 +23,7 @@ // doesn't need to be rearchitected for multiple views before the lazy view // creation can go in #define protected public -#include +#include #undef protected #include "multibuffer.h" @@ -39,11 +39,11 @@ #include #include -#include +#include -#include -#include -#include +#include +#include +#include MultiBuffer::MultiBuffer( TQWidget *parent ) : TQSplitter( parent, "MultiBuffer" ), diff --git a/src/newui/CMakeLists.txt b/src/newui/CMakeLists.txt index 046c2c7f..b1f89a56 100644 --- a/src/newui/CMakeLists.txt +++ b/src/newui/CMakeLists.txt @@ -22,7 +22,7 @@ tde_add_library( d SHARED AUTOMOC SOURCES dmainwindow.cpp buttonbar.cpp button.cpp ddockwindow.cpp docksplitter.cpp dtabwidget.cpp - LINK kparts-shared tdecore-shared tdeui-shared + LINK tdeparts-shared tdecore-shared tdeui-shared VERSION 0.0.0 DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/src/newui/dmainwindow.h b/src/newui/dmainwindow.h index 2f1c2ed5..37caa50d 100644 --- a/src/newui/dmainwindow.h +++ b/src/newui/dmainwindow.h @@ -21,7 +21,7 @@ #define DMAINWINDOW_H #include -#include +#include #include "ddockwindow.h" diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 0bd2e404..ab13eff5 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -19,16 +19,16 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -42,10 +42,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "toplevel.h" #include "api.h" diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index e598b456..18440daa 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/profileengine/lib/Makefile.am b/src/profileengine/lib/Makefile.am index 4bbdbbf5..5a37fdf5 100644 --- a/src/profileengine/lib/Makefile.am +++ b/src/profileengine/lib/Makefile.am @@ -10,7 +10,7 @@ libprofileengine_la_SOURCES = profileengine.cpp profile.cpp profileincludedir = $(includedir)/tdevelop/shell/profileengine profileinclude_HEADERS = profileengine.h profile.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces DOXYGEN_PROJECTNAME = KDevelop Shell Profiles Library DOXYGEN_DOCDIRPREFIX = kdevprofiles include ../../../Doxyfile.am diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index bd4ee23e..dffe9b92 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -17,7 +17,7 @@ class TQDomDocument; #include #include #include -#include +#include #include #include #include diff --git a/src/projectsession.cpp b/src/projectsession.cpp index 84626536..0448521c 100644 --- a/src/projectsession.cpp +++ b/src/projectsession.cpp @@ -20,14 +20,14 @@ #include #include -#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include "api.h" #include "partcontroller.h" diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index 6c733c5e..3f685c3c 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -23,15 +23,15 @@ #include #include -#include +#include #include #include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/statusbar.cpp b/src/statusbar.cpp index ff1502bc..08a5cab2 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -18,11 +18,11 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include "statusbar.h" #include "partcontroller.h" diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt index b02db663..dc50d646 100644 --- a/vcs/cvsservice/CMakeLists.txt +++ b/vcs/cvsservice/CMakeLists.txt @@ -53,6 +53,6 @@ tde_add_kpart( libkdevcvsservice AUTOMOC annotatepage.cpp annotateview.cpp LINK kdevextensions-static kdevwidgets-shared tdevelop-shared - cvsservice khtml-shared + cvsservice tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index 9df91a9b..89854b1b 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index d4a2dc55..fae85d9d 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index 06d55ec9..45ea039b 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "kdevpartcontroller.h" #include "kdevcore.h" diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index 4a647b34..9f517c07 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include "subversion_part.h" diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index af58f7c8..7c41c29b 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -42,7 +42,7 @@ #include "urlutil.h" #include #include -#include +#include #include #include #include diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index 0f66a844..e635d600 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include -- cgit v1.2.3