From dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:16:20 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- CMakeLists.txt | 4 +- Makefile.am.in | 2 +- README | 2 +- README.pam | 10 +- applnk/compat/konqhtml.desktop | 4 +- applnk/tde-system-screensavers.directory | 2 +- config.h.cmake | 2 +- configure.in.in | 2 +- doc/faq/webbrowse.docbook | 2 +- doc/glossary/index.docbook | 6 +- doc/glossary/tdeprintingglossary.docbook | 2 +- doc/kcontrol/filemanager/index.docbook | 2 +- doc/kcontrol/kcmcss/index.docbook | 2 +- doc/kcontrol/khtml/CMakeLists.txt | 12 - doc/kcontrol/khtml/Makefile.am | 2 - doc/kcontrol/khtml/index.docbook | 352 -------- doc/kcontrol/khtml/nsplugin.docbook | 91 --- doc/kcontrol/spellchecking/index.docbook | 4 +- doc/kcontrol/tdehtml/CMakeLists.txt | 12 + doc/kcontrol/tdehtml/Makefile.am | 2 + doc/kcontrol/tdehtml/index.docbook | 352 ++++++++ doc/kcontrol/tdehtml/nsplugin.docbook | 91 +++ doc/konqueror/config.docbook | 2 +- doc/userguide/groupware-kontact.docbook | 4 +- doc/userguide/tde-for-admins.docbook | 12 +- doc/userguide/tde-office.docbook | 2 +- drkonqi/Makefile.am | 2 +- kappfinder/Makefile.am | 4 +- kate/AUTHORS | 2 +- kate/ChangeLog | 10 +- kate/app/CMakeLists.txt | 2 +- kate/app/kateconfigdialog.h | 2 +- kate/app/kateconsole.cpp | 2 +- kate/app/katedocmanager.cpp | 4 +- kate/app/katemainwindow.cpp | 4 +- kate/app/katemainwindow.h | 2 +- kate/app/katemdi.h | 4 +- kate/app/katesavemodifieddialog.cpp | 2 +- kate/app/kateviewmanager.cpp | 2 +- kate/app/kateviewspacecontainer.cpp | 4 +- kate/app/kwritemain.cpp | 18 +- kate/app/kwritemain.h | 6 +- kate/data/kateui.rc | 2 +- kate/data/kwriteui.rc | 2 +- kate/interfaces/Makefile.am | 2 +- kate/interfaces/plugin.cpp | 2 +- kate/interfaces/plugin.h | 2 +- kcheckpass/README | 2 +- kcheckpass/kcheckpass.c | 2 +- kcheckpass/kcheckpass.h | 2 +- kcminit/CMakeLists.txt | 4 +- kcontrol/arts/CMakeLists.txt | 2 +- kcontrol/arts/Makefile.am | 2 +- kcontrol/arts/arts.cpp | 4 +- kcontrol/background/bgrender.cpp | 4 +- .../componentchooser/componentservices/Makefile.am | 4 +- kcontrol/display/CMakeLists.txt | 2 +- kcontrol/display/display.desktop | 2 +- kcontrol/displayconfig/CMakeLists.txt | 2 +- kcontrol/displayconfig/Makefile.am | 2 +- kcontrol/displayconfig/displayconfig.h | 2 +- kcontrol/dnssd/CMakeLists.txt | 8 +- kcontrol/dnssd/Makefile.am | 12 +- kcontrol/dnssd/kcm_kdnssd.desktop | 155 ---- kcontrol/dnssd/kcm_tdednssd.desktop | 155 ++++ kcontrol/dnssd/kcmdnssd.cpp | 8 +- kcontrol/filetypes/Makefile.am | 2 +- kcontrol/filetypes/filetypedetails.cpp | 2 +- kcontrol/filetypes/filetypesview.cpp | 4 +- kcontrol/filetypes/keditfiletype.cpp | 2 +- kcontrol/filetypes/typeslistitem.h | 2 +- kcontrol/iccconfig/CMakeLists.txt | 2 +- kcontrol/iccconfig/Makefile.am | 2 +- kcontrol/iccconfig/iccconfig.h | 2 +- kcontrol/kcontrol/CMakeLists.txt | 2 +- kcontrol/kcontrol/aboutwidget.cpp | 2 +- kcontrol/kfontinst/kcmfontinst/KCmFontInst.h | 2 +- kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp | 2 +- kcontrol/kfontinst/viewpart/CMakeLists.txt | 4 +- kcontrol/kfontinst/viewpart/FontViewPart.h | 2 +- kcontrol/kfontinst/viewpart/FontViewerApp.h | 4 +- kcontrol/kfontinst/viewpart/Makefile.am | 2 +- kcontrol/kicker/CMakeLists.txt | 2 +- kcontrol/kio/CMakeLists.txt | 2 +- kcontrol/knotify/knotify.cpp | 2 +- kcontrol/konq/CMakeLists.txt | 2 +- kcontrol/konqhtml/CMakeLists.txt | 8 +- kcontrol/konqhtml/Makefile.am | 6 +- kcontrol/konqhtml/appearance.cpp | 16 +- kcontrol/konqhtml/htmlopts.cpp | 10 +- kcontrol/konqhtml/javaopts.cpp | 2 +- kcontrol/konqhtml/jspolicies.h | 2 +- kcontrol/konqhtml/khtml_behavior.desktop | 231 ------ kcontrol/konqhtml/khtml_filter.desktop | 145 ---- kcontrol/konqhtml/khtml_fonts.desktop | 230 ------ kcontrol/konqhtml/khtml_java_js.desktop | 211 ----- kcontrol/konqhtml/main.cpp | 12 +- kcontrol/konqhtml/tdehtml_behavior.desktop | 231 ++++++ kcontrol/konqhtml/tdehtml_filter.desktop | 145 ++++ kcontrol/konqhtml/tdehtml_fonts.desktop | 230 ++++++ kcontrol/konqhtml/tdehtml_java_js.desktop | 211 +++++ kcontrol/kthememanager/kthememanager.cpp | 2 +- kcontrol/pics/cr128-app-kscreensaver.png | Bin 7140 -> 0 bytes kcontrol/pics/cr128-app-tdescreensaver.png | Bin 0 -> 7140 bytes kcontrol/pics/cr16-app-kscreensaver.png | Bin 707 -> 0 bytes kcontrol/pics/cr16-app-tdescreensaver.png | Bin 0 -> 707 bytes kcontrol/pics/cr22-app-kscreensaver.png | Bin 1058 -> 0 bytes kcontrol/pics/cr22-app-tdescreensaver.png | Bin 0 -> 1058 bytes kcontrol/pics/cr32-app-kscreensaver.png | Bin 1663 -> 0 bytes kcontrol/pics/cr32-app-tdescreensaver.png | Bin 0 -> 1663 bytes kcontrol/pics/cr48-app-kscreensaver.png | Bin 2777 -> 0 bytes kcontrol/pics/cr48-app-tdescreensaver.png | Bin 0 -> 2777 bytes kcontrol/pics/cr64-app-kscreensaver.png | Bin 3703 -> 0 bytes kcontrol/pics/cr64-app-tdescreensaver.png | Bin 0 -> 3703 bytes kcontrol/privacy/kprivacymanager.cpp | 2 +- kcontrol/randr/CMakeLists.txt | 18 +- kcontrol/randr/Makefile.am | 26 +- kcontrol/randr/configdialog.cpp | 4 +- kcontrol/randr/krandrapp.cpp | 47 -- kcontrol/randr/krandrapp.h | 44 - kcontrol/randr/krandrbindings.cpp | 34 - kcontrol/randr/krandrinithack.cpp | 0 kcontrol/randr/krandrmodule.cpp | 365 --------- kcontrol/randr/krandrmodule.h | 68 -- kcontrol/randr/krandrpassivepopup.cpp | 118 --- kcontrol/randr/krandrpassivepopup.h | 47 -- kcontrol/randr/krandrtray-autostart.desktop | 144 ---- kcontrol/randr/krandrtray.cpp | 884 --------------------- kcontrol/randr/krandrtray.desktop | 141 ---- kcontrol/randr/krandrtray.h | 94 --- kcontrol/randr/main.cpp | 10 +- kcontrol/randr/tderandrapp.cpp | 47 ++ kcontrol/randr/tderandrapp.h | 44 + kcontrol/randr/tderandrbindings.cpp | 34 + kcontrol/randr/tderandrinithack.cpp | 0 kcontrol/randr/tderandrmodule.cpp | 365 +++++++++ kcontrol/randr/tderandrmodule.h | 68 ++ kcontrol/randr/tderandrpassivepopup.cpp | 118 +++ kcontrol/randr/tderandrpassivepopup.h | 47 ++ kcontrol/randr/tderandrtray-autostart.desktop | 144 ++++ kcontrol/randr/tderandrtray.cpp | 884 +++++++++++++++++++++ kcontrol/randr/tderandrtray.desktop | 141 ++++ kcontrol/randr/tderandrtray.h | 94 +++ kcontrol/screensaver/screensaver.desktop | 2 +- kcontrol/screensaver/scrnsave.cpp | 4 +- kcontrol/spellchecking/spellchecking.cpp | 2 +- kdepasswd/Makefile.am | 2 +- kdesktop/CMakeLists.txt | 4 +- kdesktop/ConfigureChecks.cmake | 2 +- kdesktop/desktop.cc | 2 +- kdesktop/kwebdesktop/CMakeLists.txt | 2 +- kdesktop/kwebdesktop/Makefile.am | 2 +- kdesktop/kwebdesktop/kwebdesktop.cpp | 4 +- kdesktop/kwebdesktop/kwebdesktop.h | 4 +- kdesktop/lock/Makefile.am | 2 +- kdialog/Makefile.am | 2 +- kfind/CMakeLists.txt | 2 +- kfind/Makefile.am | 2 +- kfind/kfindpart.cpp | 2 +- kfind/kfindpart.h | 4 +- kfind/kftabdlg.cpp | 2 +- khelpcenter/CMakeLists.txt | 2 +- khelpcenter/Makefile.am | 4 +- khelpcenter/fontdialog.cpp | 2 +- khelpcenter/htmlsearch/Makefile.am | 8 +- khelpcenter/htmlsearch/index.cpp | 2 +- khelpcenter/htmlsearch/kcmhtmlsearch.cpp | 2 +- khelpcenter/mainwindow.cpp | 4 +- khelpcenter/mainwindow.h | 2 +- khelpcenter/view.cpp | 4 +- khelpcenter/view.h | 2 +- kicker/applets/launcher/CMakeLists.txt | 2 +- kicker/applets/launcher/quickaddappsmenu.cpp | 2 +- kicker/extensions/kasbar/Makefile.am | 2 +- kicker/extensions/sidebar/sidebarextension.cpp | 4 +- kicker/extensions/sidebar/sidebarextension.h | 2 +- kicker/kicker/CMakeLists.txt | 2 +- kicker/kicker/core/container_button.cpp | 2 +- kicker/kicker/ui/addbutton_mnu.cpp | 2 +- kicker/kicker/ui/itemview.cpp | 2 +- kicker/kicker/ui/k_new_mnu.cpp | 2 +- kicker/kicker/ui/service_mnu.cpp | 4 +- kicker/kicker/ui/service_mnu.h | 2 +- kicker/libkicker/menuinfo.cpp | 2 +- kicker/menuext/prefmenu/prefmenu.cpp | 2 +- kicker/menuext/prefmenu/prefmenu.h | 2 +- kicker/menuext/tom/tom.cc | 2 +- kicker/proxy/Makefile.am | 2 +- kioslave/about/Makefile.am | 2 +- kioslave/finger/Makefile.am | 2 +- kioslave/fish/Makefile.am | 2 +- kioslave/mac/Makefile.am | 2 +- kioslave/man/CMakeLists.txt | 2 +- kioslave/man/Makefile.am | 8 +- kioslave/man/kmanpart.h | 8 +- kioslave/media/mounthelper/Makefile.am | 2 +- kioslave/nfs/Makefile.am | 2 +- kioslave/sftp/Makefile.am | 2 +- kioslave/tar/Makefile.am | 2 +- kioslave/thumbnail/CMakeLists.txt | 2 +- kioslave/thumbnail/Makefile.am | 2 +- kioslave/thumbnail/htmlcreator.cpp | 2 +- kioslave/trash/Makefile.am | 2 +- klipper/configdialog.cpp | 2 +- klipper/historyurlitem.cpp | 2 +- kmenuedit/treeview.cpp | 2 +- knetattach/Makefile.am | 2 +- knetattach/TODO | 2 +- konqueror/CMakeLists.txt | 2 +- konqueror/DESIGN | 8 +- konqueror/DESIGN_config | 2 +- konqueror/Makefile.am | 2 +- konqueror/about/CMakeLists.txt | 2 +- konqueror/about/konq_aboutpage.cc | 6 +- konqueror/about/konq_aboutpage.h | 4 +- konqueror/client/kfmclient_3_2_update.sh | 2 +- konqueror/iconview/konq_iconview.cc | 2 +- konqueror/iconview/konq_iconview.h | 2 +- konqueror/keditbookmarks/DESIGN | 2 +- konqueror/keditbookmarks/Makefile.am | 2 +- konqueror/keditbookmarks/actionsimpl.cpp | 4 +- konqueror/keditbookmarks/favicons.h | 4 +- konqueror/keditbookmarks/updater.cpp | 8 +- konqueror/keditbookmarks/updater.h | 4 +- konqueror/konq_browseriface.h | 2 +- konqueror/konq_combo.cc | 2 +- konqueror/konq_extensionmanager.cc | 6 +- konqueror/konq_factory.cc | 2 +- konqueror/konq_factory.h | 2 +- konqueror/konq_mainwindow.cc | 10 +- konqueror/konq_mainwindow.h | 2 +- konqueror/konq_misc.h | 2 +- konqueror/konq_openurlrequest.h | 2 +- konqueror/konq_run.h | 2 +- konqueror/konq_view.cc | 4 +- konqueror/konq_viewmgr.h | 2 +- konqueror/konqueror.kcfg | 8 +- konqueror/kttsplugin/CMakeLists.txt | 12 +- konqueror/kttsplugin/Makefile.am | 14 +- konqueror/kttsplugin/khtmlkttsd.cpp | 138 ---- konqueror/kttsplugin/khtmlkttsd.desktop | 75 -- konqueror/kttsplugin/khtmlkttsd.h | 46 -- konqueror/kttsplugin/khtmlkttsd.rc | 13 - konqueror/kttsplugin/tdehtmlkttsd.cpp | 138 ++++ konqueror/kttsplugin/tdehtmlkttsd.desktop | 75 ++ konqueror/kttsplugin/tdehtmlkttsd.h | 46 ++ konqueror/kttsplugin/tdehtmlkttsd.rc | 13 + konqueror/listview/konq_listview.h | 4 +- konqueror/listview/konq_listviewwidget.cc | 2 +- konqueror/listview/konq_listviewwidget.h | 2 +- konqueror/profile_kde_devel.desktop | 10 +- konqueror/profile_tabbedbrowsing.desktop | 8 +- konqueror/quickprint/TODO | 2 +- .../remoteencodingplugin/kremoteencodingplugin.cpp | 2 +- .../remoteencodingplugin/kremoteencodingplugin.h | 2 +- konqueror/shellcmdplugin/kshellcmdplugin.h | 2 +- konqueror/sidebar/CMakeLists.txt | 4 +- konqueror/sidebar/konqsidebar.h | 8 +- konqueror/sidebar/konqsidebarplugin.h | 4 +- konqueror/sidebar/sidebar_widget.h | 4 +- konqueror/sidebar/trees/konqsidebar_tree.h | 6 +- konqueror/sidebar/web_module/CMakeLists.txt | 2 +- konqueror/sidebar/web_module/web_module.cpp | 2 +- konqueror/sidebar/web_module/web_module.h | 2 +- konsole/konsole/CMakeLists.txt | 2 +- konsole/konsole/Makefile.am | 2 +- konsole/konsole/konsole.cpp | 2 +- konsole/konsole/konsole_part.h | 4 +- kpager/Makefile.am | 2 +- kpersonalizer/Makefile.am | 2 +- kpersonalizer/kcountrypage.cpp | 2 +- kreadconfig/Makefile.am | 2 +- kscreensaver.pamd | 4 - kscreensaver/AUTHORS | 23 - kscreensaver/CMakeLists.txt | 44 - kscreensaver/ChangeLog | 93 --- kscreensaver/KBlankscreen.desktop | 323 -------- kscreensaver/KRandom.desktop | 321 -------- kscreensaver/Makefile.am | 27 - kscreensaver/blankscrn.cpp | 135 ---- kscreensaver/blankscrn.h | 56 -- kscreensaver/random.cpp | 292 ------- kscreensaver/random.h | 38 - ksmserver/CMakeLists.txt | 2 +- ksmserver/Makefile.am | 2 +- ksmserver/shutdown.cpp | 2 +- ksplashml/CMakeLists.txt | 2 +- ksplashml/Makefile.am | 2 +- ksplashml/themeengine/default/Makefile.am | 2 +- ksplashml/themeengine/simple/Makefile.am | 2 +- ksplashml/themeengine/standard/Makefile.am | 2 +- ksplashml/themeengine/unified/Makefile.am | 2 +- kstart/Makefile.am | 2 +- ksysguard/gui/CMakeLists.txt | 2 +- ksysguard/gui/Makefile.am | 2 +- ksystraycmd/Makefile.am | 2 +- ktip/Makefile.am | 2 +- ktip/tips | 2 +- libkonq/CMakeLists.txt | 2 +- libkonq/kivdirectoryoverlay.cc | 2 +- libkonq/konq_dirpart.cc | 2 +- libkonq/konq_dirpart.h | 4 +- libkonq/konq_events.h | 2 +- libkonq/konq_historymgr.h | 4 +- libkonq/konq_iconviewwidget.h | 2 +- libkonq/konq_popupmenu.cc | 12 +- libkonq/konq_popupmenu.h | 2 +- migratekde3 | 6 +- nsplugins/CMakeLists.txt | 4 +- nsplugins/Makefile.am | 4 +- nsplugins/khtml_plugins.desktop | 233 ------ nsplugins/nspluginloader.cpp | 2 +- nsplugins/plugin_part.cpp | 8 +- nsplugins/plugin_part.h | 6 +- nsplugins/tdehtml_plugins.desktop | 233 ++++++ nsplugins/test/Makefile.am | 2 +- nsplugins/viewer/CMakeLists.txt | 2 +- nsplugins/viewer/nsplugin.h | 2 +- r14-xdg-update | 4 +- tdeinit/CMakeLists.txt | 2 +- tdeinit/displayconfig.cpp | 2 +- tdeprint/tdeprint_part/CMakeLists.txt | 2 +- tdeprint/tdeprint_part/printpart.cpp | 2 +- tdeprint/tdeprint_part/printpart.h | 4 +- tdeprint/tdeprintfax/Makefile.am | 2 +- tdescreensaver.pamd | 4 + tdescreensaver/AUTHORS | 23 + tdescreensaver/CMakeLists.txt | 44 + tdescreensaver/ChangeLog | 93 +++ tdescreensaver/KBlankscreen.desktop | 323 ++++++++ tdescreensaver/KRandom.desktop | 321 ++++++++ tdescreensaver/Makefile.am | 27 + tdescreensaver/blankscrn.cpp | 135 ++++ tdescreensaver/blankscrn.h | 56 ++ tdescreensaver/random.cpp | 292 +++++++ tdescreensaver/random.h | 38 + tdesu/tdesu/Makefile.am | 2 +- tdesu/tdesu/tdesu.cpp | 4 +- tdm/kfrontend/CMakeLists.txt | 2 +- tdm/kfrontend/Makefile.am | 4 +- tdm/kfrontend/kgapp.cpp | 2 +- tqt3integration/README | 2 +- twin/clients/keramik/Makefile.am | 2 +- twin/clients/kwmtheme/cli_installer/Makefile.am | 2 +- twin/killer/Makefile.am | 2 +- twin/tools/Makefile.am | 2 +- 346 files changed, 5723 insertions(+), 5723 deletions(-) delete mode 100644 doc/kcontrol/khtml/CMakeLists.txt delete mode 100644 doc/kcontrol/khtml/Makefile.am delete mode 100644 doc/kcontrol/khtml/index.docbook delete mode 100644 doc/kcontrol/khtml/nsplugin.docbook create mode 100644 doc/kcontrol/tdehtml/CMakeLists.txt create mode 100644 doc/kcontrol/tdehtml/Makefile.am create mode 100644 doc/kcontrol/tdehtml/index.docbook create mode 100644 doc/kcontrol/tdehtml/nsplugin.docbook delete mode 100644 kcontrol/dnssd/kcm_kdnssd.desktop create mode 100644 kcontrol/dnssd/kcm_tdednssd.desktop delete mode 100644 kcontrol/konqhtml/khtml_behavior.desktop delete mode 100644 kcontrol/konqhtml/khtml_filter.desktop delete mode 100644 kcontrol/konqhtml/khtml_fonts.desktop delete mode 100644 kcontrol/konqhtml/khtml_java_js.desktop create mode 100644 kcontrol/konqhtml/tdehtml_behavior.desktop create mode 100644 kcontrol/konqhtml/tdehtml_filter.desktop create mode 100644 kcontrol/konqhtml/tdehtml_fonts.desktop create mode 100644 kcontrol/konqhtml/tdehtml_java_js.desktop delete mode 100644 kcontrol/pics/cr128-app-kscreensaver.png create mode 100644 kcontrol/pics/cr128-app-tdescreensaver.png delete mode 100644 kcontrol/pics/cr16-app-kscreensaver.png create mode 100644 kcontrol/pics/cr16-app-tdescreensaver.png delete mode 100644 kcontrol/pics/cr22-app-kscreensaver.png create mode 100644 kcontrol/pics/cr22-app-tdescreensaver.png delete mode 100644 kcontrol/pics/cr32-app-kscreensaver.png create mode 100644 kcontrol/pics/cr32-app-tdescreensaver.png delete mode 100644 kcontrol/pics/cr48-app-kscreensaver.png create mode 100644 kcontrol/pics/cr48-app-tdescreensaver.png delete mode 100644 kcontrol/pics/cr64-app-kscreensaver.png create mode 100644 kcontrol/pics/cr64-app-tdescreensaver.png delete mode 100644 kcontrol/randr/krandrapp.cpp delete mode 100644 kcontrol/randr/krandrapp.h delete mode 100644 kcontrol/randr/krandrbindings.cpp delete mode 100644 kcontrol/randr/krandrinithack.cpp delete mode 100644 kcontrol/randr/krandrmodule.cpp delete mode 100644 kcontrol/randr/krandrmodule.h delete mode 100644 kcontrol/randr/krandrpassivepopup.cpp delete mode 100644 kcontrol/randr/krandrpassivepopup.h delete mode 100644 kcontrol/randr/krandrtray-autostart.desktop delete mode 100644 kcontrol/randr/krandrtray.cpp delete mode 100644 kcontrol/randr/krandrtray.desktop delete mode 100644 kcontrol/randr/krandrtray.h create mode 100644 kcontrol/randr/tderandrapp.cpp create mode 100644 kcontrol/randr/tderandrapp.h create mode 100644 kcontrol/randr/tderandrbindings.cpp create mode 100644 kcontrol/randr/tderandrinithack.cpp create mode 100644 kcontrol/randr/tderandrmodule.cpp create mode 100644 kcontrol/randr/tderandrmodule.h create mode 100644 kcontrol/randr/tderandrpassivepopup.cpp create mode 100644 kcontrol/randr/tderandrpassivepopup.h create mode 100644 kcontrol/randr/tderandrtray-autostart.desktop create mode 100644 kcontrol/randr/tderandrtray.cpp create mode 100644 kcontrol/randr/tderandrtray.desktop create mode 100644 kcontrol/randr/tderandrtray.h delete mode 100644 konqueror/kttsplugin/khtmlkttsd.cpp delete mode 100644 konqueror/kttsplugin/khtmlkttsd.desktop delete mode 100644 konqueror/kttsplugin/khtmlkttsd.h delete mode 100644 konqueror/kttsplugin/khtmlkttsd.rc create mode 100644 konqueror/kttsplugin/tdehtmlkttsd.cpp create mode 100644 konqueror/kttsplugin/tdehtmlkttsd.desktop create mode 100644 konqueror/kttsplugin/tdehtmlkttsd.h create mode 100644 konqueror/kttsplugin/tdehtmlkttsd.rc delete mode 100644 kscreensaver.pamd delete mode 100644 kscreensaver/AUTHORS delete mode 100644 kscreensaver/CMakeLists.txt delete mode 100644 kscreensaver/ChangeLog delete mode 100644 kscreensaver/KBlankscreen.desktop delete mode 100644 kscreensaver/KRandom.desktop delete mode 100644 kscreensaver/Makefile.am delete mode 100644 kscreensaver/blankscrn.cpp delete mode 100644 kscreensaver/blankscrn.h delete mode 100644 kscreensaver/random.cpp delete mode 100644 kscreensaver/random.h delete mode 100644 nsplugins/khtml_plugins.desktop create mode 100644 nsplugins/tdehtml_plugins.desktop create mode 100644 tdescreensaver.pamd create mode 100644 tdescreensaver/AUTHORS create mode 100644 tdescreensaver/CMakeLists.txt create mode 100644 tdescreensaver/ChangeLog create mode 100644 tdescreensaver/KBlankscreen.desktop create mode 100644 tdescreensaver/KRandom.desktop create mode 100644 tdescreensaver/Makefile.am create mode 100644 tdescreensaver/blankscrn.cpp create mode 100644 tdescreensaver/blankscrn.h create mode 100644 tdescreensaver/random.cpp create mode 100644 tdescreensaver/random.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 473c37c6e..4ef4a9e86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,7 +171,7 @@ option( BUILD_KAPPFINDER "Build kappfinder" ${BUILD_ALL} ) option( BUILD_KCHECKPASS "Build kcheckpass" ${BUILD_ALL} ) option( BUILD_KHELPCENTER "Build khelpcenter" ${BUILD_ALL} ) option( BUILD_KHOTKEYS "Build khotkeys" ${BUILD_ALL} ) -option( BUILD_KSCREENSAVER "Build kscreensaver" ${BUILD_ALL} ) +option( BUILD_KSCREENSAVER "Build tdescreensaver" ${BUILD_ALL} ) option( BUILD_KSTART "Build kstart" ${BUILD_ALL} ) option( BUILD_KSYSTRAYCMD "Build ksystraycmd" ${BUILD_ALL} ) option( BUILD_NSPLUGINS "Build nsplugins" ${BUILD_ALL} ) @@ -248,7 +248,7 @@ tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder ) tde_conditional_add_subdirectory( BUILD_KCHECKPASS kcheckpass ) tde_conditional_add_subdirectory( BUILD_KHELPCENTER khelpcenter ) tde_conditional_add_subdirectory( BUILD_KHOTKEYS khotkeys ) -tde_conditional_add_subdirectory( BUILD_KSCREENSAVER kscreensaver ) +tde_conditional_add_subdirectory( BUILD_KSCREENSAVER tdescreensaver ) tde_conditional_add_subdirectory( BUILD_KSTART kstart ) tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd ) tde_conditional_add_subdirectory( BUILD_NSPLUGINS nsplugins ) diff --git a/Makefile.am.in b/Makefile.am.in index 15164399a..b6b018f2d 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -11,7 +11,7 @@ AUTOMAKE_OPTIONS = foreign 1.6.1 bin_SCRIPTS = starttde trinity migratekde3 r14-xdg-update -EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd kscreensaver.pamd mkpamserv +EXTRA_DIST = admin bsd-port debian tdebase.spec.in README.pam kde.pamd tdescreensaver.pamd mkpamserv dist-hook: cd $(top_distdir) && perl $(top_srcdir)/admin/am_edit -padmin diff --git a/README b/README index f6557fffb..8e5b89c7e 100644 --- a/README +++ b/README @@ -106,7 +106,7 @@ libraries. Here is an overview of the directories: * krichtexteditor A embeddable rich text editor and a wrapper application for it. -* kscreensaver +* tdescreensaver The KDE screensaver environment and some basic screensavers. More of them are in the tdeartwork package. diff --git a/README.pam b/README.pam index c7db9908a..38831e0cf 100644 --- a/README.pam +++ b/README.pam @@ -1,6 +1,6 @@ KDE can be configured to support the PAM ("Pluggable Authentication Modules") system for password checking by the display manager tdm and -by the screen saver kscreensaver (for unlocking the display). +by the screen saver tdescreensaver (for unlocking the display). PAM is a flexible application-transparent configurable user-authentication system found on FreeBSD, Solaris, and Linux (and maybe other unixes). @@ -27,26 +27,26 @@ By default, PAM is automatically used, if it is found. Use If PAM is found, KDE usually uses the PAM service "kde". You may override it for all KDE programs by using --with-pam= and/or individually by using --with--pam=, where is -one of tdm, kcp and kss (for tdm, kcheckpass and kscreensaver). +one of tdm, kcp and kss (for tdm, kcheckpass and tdescreensaver). "make install" will attempt to create suitable service definitions; either by putting files into /etc/pam.d/ or by adding text to /etc/pam.conf. The services are just copies of the "login" service. You may want to edit these definitions to meet your needs. There are also two example service definitions in this directory - -kde.pamd and kscreensaver.pamd - but don't just copy them! +kde.pamd and tdescreensaver.pamd - but don't just copy them! If the services are misconfigured, you will NOT be able to login via TDM and/or unlock a locked screen! If there is ever any doubt about which PAM service a program was compiled with, it can be determined by examining the PAM-generated -entries in the system log associated with tdm logins or kscreensaver +entries in the system log associated with tdm logins or tdescreensaver authentication failures. PAM configuration files have four types of entries for each service: -type used by tdm used by kscreensaver +type used by tdm used by tdescreensaver ---- ----------- -------------------- auth x x account x diff --git a/applnk/compat/konqhtml.desktop b/applnk/compat/konqhtml.desktop index affe9e6a1..9556740b2 100644 --- a/applnk/compat/konqhtml.desktop +++ b/applnk/compat/konqhtml.desktop @@ -77,7 +77,7 @@ Name[zh_CN]=Konqueror 浏览器 Name[zh_TW]=Konqueror 網頁瀏覽器 Type=Application Icon=fonts -Exec=kcmshell khtml_fonts +Exec=kcmshell tdehtml_fonts X-TDE-ModuleType=Library X-TDE-Library=konqhtml -X-TDE-FactoryName=khtml_fonts +X-TDE-FactoryName=tdehtml_fonts diff --git a/applnk/tde-system-screensavers.directory b/applnk/tde-system-screensavers.directory index f4c47d881..b6e23a727 100644 --- a/applnk/tde-system-screensavers.directory +++ b/applnk/tde-system-screensavers.directory @@ -82,7 +82,7 @@ Name[xh]=Abagcini Bekhusi Name[zh_CN]=屏幕保护程序 Name[zh_TW]=螢幕保護程式 Name[zu]=Abagcini Besikrini -Icon=kscreensaver +Icon=tdescreensaver X-TDE-BaseGroup=screensavers Comment=Screen saver demos diff --git a/config.h.cmake b/config.h.cmake index b5433283c..f45626f48 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -88,7 +88,7 @@ // kcontrol/energy #cmakedefine HAVE_DPMS 1 -// kdesktop, kcontrol/screensaver, kscreensaver +// kdesktop, kcontrol/screensaver, tdescreensaver #cmakedefine HAVE_GLXCHOOSEVISUAL 1 // kcontrol/crypto diff --git a/configure.in.in b/configure.in.in index bdad1ca08..f15f4ad4b 100644 --- a/configure.in.in +++ b/configure.in.in @@ -7,7 +7,7 @@ KDE_PASSWDLIBS DEF_PAM_SERVICE(tdm, tdm, TDM) DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS) -DEF_PAM_SERVICE(kss, kscreensaver, KSCREENSAVER) +DEF_PAM_SERVICE(kss, tdescreensaver, KSCREENSAVER) dnl Checks for header files. AC_HEADER_DIRENT diff --git a/doc/faq/webbrowse.docbook b/doc/faq/webbrowse.docbook index d1ee69240..bfa9b59cd 100644 --- a/doc/faq/webbrowse.docbook +++ b/doc/faq/webbrowse.docbook @@ -206,7 +206,7 @@ text->html in the tree view. Click on the Embedding tab. Make sure that Left Click Action is set to Show file in embedded -viewer, and that KHTML (khtml) is at the top +viewer, and that KHTML (tdehtml) is at the top of Services Preference Order. diff --git a/doc/glossary/index.docbook b/doc/glossary/index.docbook index 7032e511d..f8b7d46c2 100644 --- a/doc/glossary/index.docbook +++ b/doc/glossary/index.docbook @@ -33,7 +33,7 @@ Slave &tde; - + KParts KParts is an embedding technology which allows &tde; applications to embed other &tde; applications. For example, the text @@ -41,7 +41,7 @@ Slave &konqueror; - + KSycoca KSycoca (&tde; System Configuration Cache) is a @@ -88,7 +88,7 @@ program and regenerates the or all modules in &kcontrol; are missing. KSycoca +otherterm="gloss-tdesycoca">KSycoca &kcontrol; diff --git a/doc/glossary/tdeprintingglossary.docbook b/doc/glossary/tdeprintingglossary.docbook index ac33e1943..2cc77e57f 100644 --- a/doc/glossary/tdeprintingglossary.docbook +++ b/doc/glossary/tdeprintingglossary.docbook @@ -1134,7 +1134,7 @@ now. address gives administrative access to TDEPrint. Konqueror uses &tde;'s famous "KParts" technology to achieve that. IO Slave - KParts + KParts diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol/filemanager/index.docbook index a9aa9ab5a..26cc11ac5 100644 --- a/doc/kcontrol/filemanager/index.docbook +++ b/doc/kcontrol/filemanager/index.docbook @@ -29,7 +29,7 @@ &konqueror;'s file manager functionality. &konqueror;'s web browser functionality has its own configuration +url="help:/kcontrol/tdehtml/index.html">own configuration modules. diff --git a/doc/kcontrol/kcmcss/index.docbook b/doc/kcontrol/kcmcss/index.docbook index 113c2fe19..8560fa8a7 100644 --- a/doc/kcontrol/kcmcss/index.docbook +++ b/doc/kcontrol/kcmcss/index.docbook @@ -45,7 +45,7 @@ tuned for accessibility purposes, especially for people with reduced vision. Your choices here affect every &tde; application that renders HTML -with &tde;'s own renderer, which is called khtml. These include +with &tde;'s own renderer, which is called tdehtml. These include &kmail;, &khelpcenter; and of course &konqueror;. Choices here do not affect other browsers such as &Netscape;. diff --git a/doc/kcontrol/khtml/CMakeLists.txt b/doc/kcontrol/khtml/CMakeLists.txt deleted file mode 100644 index dda61f78d..000000000 --- a/doc/kcontrol/khtml/CMakeLists.txt +++ /dev/null @@ -1,12 +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 -# -################################################# - -tde_create_handbook( DESTINATION kcontrol/khtml ) diff --git a/doc/kcontrol/khtml/Makefile.am b/doc/kcontrol/khtml/Makefile.am deleted file mode 100644 index c54c99e96..000000000 --- a/doc/kcontrol/khtml/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -KDE_LANG = en -KDE_DOCS = kcontrol/khtml diff --git a/doc/kcontrol/khtml/index.docbook b/doc/kcontrol/khtml/index.docbook deleted file mode 100644 index 386df55fd..000000000 --- a/doc/kcontrol/khtml/index.docbook +++ /dev/null @@ -1,352 +0,0 @@ - - - - -]> - -
- - - -&Krishna.Tateneni; &Krishna.Tateneni.mail; - - - -2003-10-12 -3.2 - - -KDE -KControl -konqueror -browsing - - - - -Browsing With &konqueror; - -The &konqueror; Browser module of &kcontrol; allows you to select -various options for the appearance and behavior of &konqueror;, the -integrated web browser of &tde;. - - - -Behavior - -The first option you can enable on this page is Enable -completion of forms. If you check this box, &konqueror; will -try to remember what you answer to form questions, and will try to fill -in forms for you with the answers you previously used. - -You can configure the number of form items &konqueror; remembers -with the slider below labelled Maximum -completions - -Of course, anything &konqueror; fills in a form with, you -can still edit before submitting the form! - -The next option is Change cursor over -links. If this option is selected, the shape of the cursor -will change (usually to a hand) whenever it moves over a -hyperlink. This makes it easy to identify links, especially when they -are in the form of images. - -&konqueror; defaults to a single window per page, but has the -capability to open multiple tabs inside a -single window. &konqueror; also, by default, has a &MMB; shortcut to -open any link in a new window. If you enable Open links in -new tab instead of in new window you can &MMB; click on a -link to have it open in a new tab. - -If you are using tabbed browsing, you can choose if a newly -opened tab becomes the active (front) tab, or goes to -the back. On a slow internet connection, or while browsing a page -that has a list of headlines or other links in a list, you may like to -have the new tabs load in the background while you continue reading. -In this case, leave this setting disabled. If you prefer to go -straight to the new page, leaving the old one in the background to -return to later, enable it. - -If you close a window in &konqueror; that has multiple tabs -open, &konqueror; will ask you if you're sure that you meant to close -it. You can toggle on and off this behavior with the -Confirm when closing windows with multiple tabs -checkbox. - -As a convenience feature, if you enable Right click -goes back in history, then clicking an empty area (&ie; not -a link) in the &konqueror; window will act as if you pressed the -Back button on the toolbar. - -The checkbox labeled Automatically load -images, allows you to control whether images on web pages are -loaded by default. Unless you have a very slow connection, you will -probably want to leave this option selected, as there are many web pages -that are difficult to use without images. If you don't select the option -to automatically load images, you can still view the text on the page, -and then load the images if you need them. - -Enabling Allow automatic delayed -reloading/redirecting allows websites to send you to -another page without your interaction. In many cases, this is a -convenience. For example, the website has moved to a new -URL. Many webmasters in this situation will put up -a page on the old site, telling you that it has moved and you may like -to change your bookmark, and then automatically move you along to the -new website. However, such features can be confusing, or annoying, -when misused, and so you may wish to disable it. - -The next setting is Underline links:. You can -choose to underline links Always. If this option -is selected, any text on web pages that acts as a link will be shown in -an underlined font. While many web pages do use color to distinguish -text that acts as a link, underlining makes it very easy to spot -links. - -If you don't like underlined links, you can choose -Never, so that no links are underlined. Or you -can choose a middle ground, Hover, so that links -are underlined when the mouse cursor is resting over them, and not -underlined the rest of the time. - -Many web pages use animated gif images, and these can be very -annoying, and in some cases, quite a drain on your system resources. -The Animations option lets you choose when -animations are enabled. The default is enabled, but you can set this -to disabled, or to run the animation only once, even if the file -itself contains instructions that the animation should run more times, -or continuously. - - - - - -Fonts - -Under this tab, you can select various options related to the use -of fonts. Although the shapes and sizes of fonts are often part of the -design of a web page, you can select some default settings for -&konqueror; to use. - -The first thing you can set here is the font size. There are two -settings which work together to allow you a comfortable browsing -experience. - -Firstly, you can set a Minimum Font Size. -This means, even if the font size is set specifically in the page you -are viewing, &konqueror; will ignore that instruction and never show -smaller fonts than you set here. - -Next you can set a Medium Font Size. This is -not only the default size of text, used when the page doesn't specify -sizes, but it is also used as the base size that relative font sizes are -calculated against. That is, the HTML instruction -smaller, it means smaller than the size you set for this -option. - -For either option, you can select the exact font size in points by -using the up/down spin control (or just typing) next to the option -label. - -These options are independent of each other. Pages that do not -set a font size, or ask for the default, will display with the size -you set from Medium Font Size, while any pages -that ask for a size smaller than your Minimum Font -Size setting will instead show that size. The one does not -affect the other. - -The remaining options are for the fonts to be associated with -different types of markup used in HTML pages. Note -that many web pages may override these settings. If you click anywhere -on a control which shows a font name, a list of font names appears, and -you can select a different font if you like. (If there are a lot of -fonts, a vertical scrollbar appears in the list to allow you to scroll -through all of the fonts.) - -Below this, you can set a Font size adjustment for this -encoding. Sometimes the fonts you want to use for a -particular encoding or language are much larger or smaller than average, -so you can use this setting to bring them into line. - -You can set a default encoding that &konqueror; should assume -pages are when rendering them. The default setting is Use -language encoding, but you can change it to any encoding -available in the list. - - - - -&Java; and JavaScript - -&Java; allows applications to be downloaded and run by a web -browser, provided you have the necessary software installed on your -machine. Many web sites make use of &Java; (for example, online -banking services or interactive gaming sites). You should be aware -that running programs from unknown sources could pose a threat to the -security of your computer, even if the potential extent of the damage -is not great. - -The checkboxes under Global Settings allows -you to turn &Java; support on for all web sites by default. You can -also select to turn &Java; on or off for specific hosts. To add a -policy for a specific host, click the Add... -button to bring up a dialog in which you can type the host name and -then choose to accept or reject &Java; code from that particular host, -which will add the domain to the list on the left of the page. - -You can select a host in the list, and click the -Change... button to choose a different policy for -that host. Clicking the Delete button removes the -policy for the selected host; after deletion, the global settings will -then apply to that host. You can import policies from a file by clicking -the Import... button. To save the current list to a -compressed archive file, click the Export... -button. - -Finally, the group of controls labeled Java Runtime -Settings allows you to set some options for the way in -which &Java; should run. These options are useful for diagnosing -problems, or if you are a &Java; developer, and should not normally -need adjusting. - -If you select the Show Java -Console option, &konqueror; will open a console window from -which &Java; applications can read and write text. While most &Java; -applications will not require such a console, it could be helpful in -diagnosing problems with &Java; applications. - -Use KIO will cause the -JVMto use &tde;'s own KIO -transports for network connections. - -Use security -manager is normally enabled by default. This setting will -cause the JVM to run with a Security Manager in place. This will keep -applets from being able to read and write to your file system, creating -arbitrary sockets, and other actions which could be used to compromise -your system. Disable this option at your own risk. You can modify your $HOME/.java.policy file with the -&Java; policytool utility to give code downloaded from certain sites -more permissions. - -The Shutdown Applet Server when inactive -checkbox allows you to save resources by closing the &Java; Applet -Server when it is not in use, rather than leaving it running in the -background. Leaving this disabled may make &Java; applets start up -faster, but it will use system resources when you are not using a -&Java; applet. If you enable this, you can set a timeout. - -You can either opt to have &konqueror; automatically detect the -&Java; installation on your system, or specify the path to the -installation yourself by selecting Use user-specified -Java. You may want to choose the latter method, for -instance, if you have multiple &Java; installations on your system, -and want to specify which one to use. If the &Java; Virtual Machine -you are using requires any special startup options, you can type them -in the text box labeled Additional Java -Arguments. - - - - -JavaScript - -Despite the name, JavaScript is not related at all to -&Java;. - -The first part of this page works the same as the &Java; page -settings. - -The checkboxes under Global Settings allow -you to turn JavaScript support on for all web sites by default. You -can also select to turn JavaScript on or off for specific hosts. To -add a policy for a specific host, click the -Add... button to bring up a dialog in which you -can type the host name and then choose to accept or reject JavaScript -code from that particular host, which will add the domain to the list -on the left of the page. - -You can select a host in the list, and click the -Change... button to choose a different policy for -that host. Clicking the Delete button removes the -policy for the selected host; after deletion, the global settings will -then apply to that host. You can import policies from a file by -clicking the Import... button. To save the -current list to a compressed archive file, click the -Export... button. - -The final set of options on this page determine what happens -when a page uses JavaScript for specific actions. - -You can individually enable or disable the ability of JavaScript -to manipulate your windows by moving, resizing or changing focus. You -can also disable JavaScript from changing the status bar text, so that -for instance, you can always see where links will take you when -clicked.The choices for these options are Allow and -Ignore. - -For opening a new window, there is even more control. You can -set &konqueror; to Allow all such requests, -Ask each time a request is made, or -Deny all popup requests. - -The Smart setting will only allow -JavaScript popup windows when you have explicitly chosen a link that -creates one. - - - - -AdBlocK - -&konqueror; AdBlocK can be configured to replace or remove -images or frames from web pages that match a series of filters. - -The setting Enable filters enables or -disables the use of list of URL filters. -If Hide filtered images is enabled then -blocked images are completely removed from the page and the space they -occupied is reclaimed. If the option is disabled then a placeholder -image is used in place of filtered images. - -URL expressions to filter is a list of -URLs that will be compared against image and frame names to decide -on fitlering actions. The wildcards can be given as filename style -regular expressions. - -Each filter can either be expressed as a file style wildcard -string (e.g. http://www.site.com/ads/*) or as a full regular expression -by enclosing the filter with forward slashes (e.g. //(ads|dclk)\./). - -Import and export will save or read the current filter list to a -plain text file. Lines prefixed with an exclamation mark (!) are treated -as comments and can be used to clarify or label a set of filters. - - - -Plugins - -The first setting here is Enable Plugins -globally. If you disable this checkbox, then &konqueror; -will not use any plugins. If you enable it, then any installed and -configured plugins that it can find will be used by &konqueror; - -You can also restrict &konqueror; to Only allow HTTP -and HTTPS URLs for plugins by checking the box. - - - -&nsplugins-kcontrol; - - - -
diff --git a/doc/kcontrol/khtml/nsplugin.docbook b/doc/kcontrol/khtml/nsplugin.docbook deleted file mode 100644 index 958a8f1a1..000000000 --- a/doc/kcontrol/khtml/nsplugin.docbook +++ /dev/null @@ -1,91 +0,0 @@ - -&Netscape; Plugins - - -Introduction - -As &Netscape;'s Navigator has been a -web browsing standard for many years, so-called &Netscape; plugins have -appeared that allow rich web content. Using those plugins, web sites -can contain PDF files, flash animations, video, &etc; -With &konqueror;, you can still use these plugins to take advantage of -rich web content. - -&Netscape; plugins should not be confused with &konqueror; -plugins. The latter ones specifically extend &konqueror;'s -functionality; they are normally not used to display rich web -content. - - - - -Scan - -&konqueror; has to know where your &Netscape; plugins are -installed. This can be in several places, &ie; you might have -system-wide plugins in /opt/netscape/plugins and your personal -plugins in $HOME/.netscape/plugins. -However, &konqueror; will not automatically use the installed plugins: -it first has to scan a list of folders. You can initiate the scan -by clicking Scan for new plugins. Alternatively, -you can enable Scan for new plugins at &tde; startup -so &konqueror; will scan the appropriate folders every time &tde; -starts up, to see whether new plugins have been installed. - -Enabling Scan for new plugins at &tde; -startup can considerably slow down the startup procedure, -and is known to give difficulty on certain installations. Turn this -option off if you experience problems. - -To find plugins, &konqueror; will look in the folders -specified in the Scan Folders frame. When you -use this control module for the first time, this list will already be -filled with reasonable paths that should work on most operating systems. -If you need to provide a new path, click the New -button; then you can either enter the new path in the text edit box to -the left, or choose a folder using the file dialog by clicking the -New... button. As scanning the folders can take -a little time, you might want to remove folders from the list where -you know that no plugins are installed: do this by selecting a folder -and clicking Remove. Using the -Up and Down buttons you -can change the order in which folders will be scanned by moving the -selected folder up or down. - -As usual, click Apply to save your changes -permanently. - - - - -Plugins - -In this tab, you can see a list of the &Netscape; plugins found by -&konqueror;, displayed as a tree. Double click on a plugin to fold it -out and you'll see that the different mime types this plugin can handle -will be displayed as branches. Fold out a mime type to see its -info. - -This tab is mostly for informational purposes. The only -configurable option is Use artsdsp to pipe plugin sound -through aRts, which is enabled by default. Disable this if -you wish plugins to use their own method for sounds, and you have -configured &arts; in such a way that third-party applications can do -so (for example, by having it exit when idle, or by having it use a -custom sound device on modern soundcards which allow this.) - - - - -Section Author - -This section written by: Jost Schenck -jost@schenck.de - - - - - - diff --git a/doc/kcontrol/spellchecking/index.docbook b/doc/kcontrol/spellchecking/index.docbook index 813aba96a..2893d750b 100644 --- a/doc/kcontrol/spellchecking/index.docbook +++ b/doc/kcontrol/spellchecking/index.docbook @@ -30,7 +30,7 @@ Spell Checker The configuration options available here are used by all &tde; -applications that use &kspell;, which is a front end to +applications that use &tdespell;, which is a front end to ispell or aspell. @@ -57,7 +57,7 @@ error. Dictionary: Choose from the available dictionaries, which one to use for -&kspell;. +&tdespell;. diff --git a/doc/kcontrol/tdehtml/CMakeLists.txt b/doc/kcontrol/tdehtml/CMakeLists.txt new file mode 100644 index 000000000..b7e6bb6b7 --- /dev/null +++ b/doc/kcontrol/tdehtml/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kcontrol/tdehtml ) diff --git a/doc/kcontrol/tdehtml/Makefile.am b/doc/kcontrol/tdehtml/Makefile.am new file mode 100644 index 000000000..07d632f49 --- /dev/null +++ b/doc/kcontrol/tdehtml/Makefile.am @@ -0,0 +1,2 @@ +KDE_LANG = en +KDE_DOCS = kcontrol/tdehtml diff --git a/doc/kcontrol/tdehtml/index.docbook b/doc/kcontrol/tdehtml/index.docbook new file mode 100644 index 000000000..b8df24598 --- /dev/null +++ b/doc/kcontrol/tdehtml/index.docbook @@ -0,0 +1,352 @@ + + + + +]> + +
+ + + +&Krishna.Tateneni; &Krishna.Tateneni.mail; + + + +2003-10-12 +3.2 + + +KDE +KControl +konqueror +browsing + + + + +Browsing With &konqueror; + +The &konqueror; Browser module of &kcontrol; allows you to select +various options for the appearance and behavior of &konqueror;, the +integrated web browser of &tde;. + + + +Behavior + +The first option you can enable on this page is Enable +completion of forms. If you check this box, &konqueror; will +try to remember what you answer to form questions, and will try to fill +in forms for you with the answers you previously used. + +You can configure the number of form items &konqueror; remembers +with the slider below labelled Maximum +completions + +Of course, anything &konqueror; fills in a form with, you +can still edit before submitting the form! + +The next option is Change cursor over +links. If this option is selected, the shape of the cursor +will change (usually to a hand) whenever it moves over a +hyperlink. This makes it easy to identify links, especially when they +are in the form of images. + +&konqueror; defaults to a single window per page, but has the +capability to open multiple tabs inside a +single window. &konqueror; also, by default, has a &MMB; shortcut to +open any link in a new window. If you enable Open links in +new tab instead of in new window you can &MMB; click on a +link to have it open in a new tab. + +If you are using tabbed browsing, you can choose if a newly +opened tab becomes the active (front) tab, or goes to +the back. On a slow internet connection, or while browsing a page +that has a list of headlines or other links in a list, you may like to +have the new tabs load in the background while you continue reading. +In this case, leave this setting disabled. If you prefer to go +straight to the new page, leaving the old one in the background to +return to later, enable it. + +If you close a window in &konqueror; that has multiple tabs +open, &konqueror; will ask you if you're sure that you meant to close +it. You can toggle on and off this behavior with the +Confirm when closing windows with multiple tabs +checkbox. + +As a convenience feature, if you enable Right click +goes back in history, then clicking an empty area (&ie; not +a link) in the &konqueror; window will act as if you pressed the +Back button on the toolbar. + +The checkbox labeled Automatically load +images, allows you to control whether images on web pages are +loaded by default. Unless you have a very slow connection, you will +probably want to leave this option selected, as there are many web pages +that are difficult to use without images. If you don't select the option +to automatically load images, you can still view the text on the page, +and then load the images if you need them. + +Enabling Allow automatic delayed +reloading/redirecting allows websites to send you to +another page without your interaction. In many cases, this is a +convenience. For example, the website has moved to a new +URL. Many webmasters in this situation will put up +a page on the old site, telling you that it has moved and you may like +to change your bookmark, and then automatically move you along to the +new website. However, such features can be confusing, or annoying, +when misused, and so you may wish to disable it. + +The next setting is Underline links:. You can +choose to underline links Always. If this option +is selected, any text on web pages that acts as a link will be shown in +an underlined font. While many web pages do use color to distinguish +text that acts as a link, underlining makes it very easy to spot +links. + +If you don't like underlined links, you can choose +Never, so that no links are underlined. Or you +can choose a middle ground, Hover, so that links +are underlined when the mouse cursor is resting over them, and not +underlined the rest of the time. + +Many web pages use animated gif images, and these can be very +annoying, and in some cases, quite a drain on your system resources. +The Animations option lets you choose when +animations are enabled. The default is enabled, but you can set this +to disabled, or to run the animation only once, even if the file +itself contains instructions that the animation should run more times, +or continuously. + + + + + +Fonts + +Under this tab, you can select various options related to the use +of fonts. Although the shapes and sizes of fonts are often part of the +design of a web page, you can select some default settings for +&konqueror; to use. + +The first thing you can set here is the font size. There are two +settings which work together to allow you a comfortable browsing +experience. + +Firstly, you can set a Minimum Font Size. +This means, even if the font size is set specifically in the page you +are viewing, &konqueror; will ignore that instruction and never show +smaller fonts than you set here. + +Next you can set a Medium Font Size. This is +not only the default size of text, used when the page doesn't specify +sizes, but it is also used as the base size that relative font sizes are +calculated against. That is, the HTML instruction +smaller, it means smaller than the size you set for this +option. + +For either option, you can select the exact font size in points by +using the up/down spin control (or just typing) next to the option +label. + +These options are independent of each other. Pages that do not +set a font size, or ask for the default, will display with the size +you set from Medium Font Size, while any pages +that ask for a size smaller than your Minimum Font +Size setting will instead show that size. The one does not +affect the other. + +The remaining options are for the fonts to be associated with +different types of markup used in HTML pages. Note +that many web pages may override these settings. If you click anywhere +on a control which shows a font name, a list of font names appears, and +you can select a different font if you like. (If there are a lot of +fonts, a vertical scrollbar appears in the list to allow you to scroll +through all of the fonts.) + +Below this, you can set a Font size adjustment for this +encoding. Sometimes the fonts you want to use for a +particular encoding or language are much larger or smaller than average, +so you can use this setting to bring them into line. + +You can set a default encoding that &konqueror; should assume +pages are when rendering them. The default setting is Use +language encoding, but you can change it to any encoding +available in the list. + + + + +&Java; and JavaScript + +&Java; allows applications to be downloaded and run by a web +browser, provided you have the necessary software installed on your +machine. Many web sites make use of &Java; (for example, online +banking services or interactive gaming sites). You should be aware +that running programs from unknown sources could pose a threat to the +security of your computer, even if the potential extent of the damage +is not great. + +The checkboxes under Global Settings allows +you to turn &Java; support on for all web sites by default. You can +also select to turn &Java; on or off for specific hosts. To add a +policy for a specific host, click the Add... +button to bring up a dialog in which you can type the host name and +then choose to accept or reject &Java; code from that particular host, +which will add the domain to the list on the left of the page. + +You can select a host in the list, and click the +Change... button to choose a different policy for +that host. Clicking the Delete button removes the +policy for the selected host; after deletion, the global settings will +then apply to that host. You can import policies from a file by clicking +the Import... button. To save the current list to a +compressed archive file, click the Export... +button. + +Finally, the group of controls labeled Java Runtime +Settings allows you to set some options for the way in +which &Java; should run. These options are useful for diagnosing +problems, or if you are a &Java; developer, and should not normally +need adjusting. + +If you select the Show Java +Console option, &konqueror; will open a console window from +which &Java; applications can read and write text. While most &Java; +applications will not require such a console, it could be helpful in +diagnosing problems with &Java; applications. + +Use KIO will cause the +JVMto use &tde;'s own KIO +transports for network connections. + +Use security +manager is normally enabled by default. This setting will +cause the JVM to run with a Security Manager in place. This will keep +applets from being able to read and write to your file system, creating +arbitrary sockets, and other actions which could be used to compromise +your system. Disable this option at your own risk. You can modify your $HOME/.java.policy file with the +&Java; policytool utility to give code downloaded from certain sites +more permissions. + +The Shutdown Applet Server when inactive +checkbox allows you to save resources by closing the &Java; Applet +Server when it is not in use, rather than leaving it running in the +background. Leaving this disabled may make &Java; applets start up +faster, but it will use system resources when you are not using a +&Java; applet. If you enable this, you can set a timeout. + +You can either opt to have &konqueror; automatically detect the +&Java; installation on your system, or specify the path to the +installation yourself by selecting Use user-specified +Java. You may want to choose the latter method, for +instance, if you have multiple &Java; installations on your system, +and want to specify which one to use. If the &Java; Virtual Machine +you are using requires any special startup options, you can type them +in the text box labeled Additional Java +Arguments. + + + + +JavaScript + +Despite the name, JavaScript is not related at all to +&Java;. + +The first part of this page works the same as the &Java; page +settings. + +The checkboxes under Global Settings allow +you to turn JavaScript support on for all web sites by default. You +can also select to turn JavaScript on or off for specific hosts. To +add a policy for a specific host, click the +Add... button to bring up a dialog in which you +can type the host name and then choose to accept or reject JavaScript +code from that particular host, which will add the domain to the list +on the left of the page. + +You can select a host in the list, and click the +Change... button to choose a different policy for +that host. Clicking the Delete button removes the +policy for the selected host; after deletion, the global settings will +then apply to that host. You can import policies from a file by +clicking the Import... button. To save the +current list to a compressed archive file, click the +Export... button. + +The final set of options on this page determine what happens +when a page uses JavaScript for specific actions. + +You can individually enable or disable the ability of JavaScript +to manipulate your windows by moving, resizing or changing focus. You +can also disable JavaScript from changing the status bar text, so that +for instance, you can always see where links will take you when +clicked.The choices for these options are Allow and +Ignore. + +For opening a new window, there is even more control. You can +set &konqueror; to Allow all such requests, +Ask each time a request is made, or +Deny all popup requests. + +The Smart setting will only allow +JavaScript popup windows when you have explicitly chosen a link that +creates one. + + + + +AdBlocK + +&konqueror; AdBlocK can be configured to replace or remove +images or frames from web pages that match a series of filters. + +The setting Enable filters enables or +disables the use of list of URL filters. +If Hide filtered images is enabled then +blocked images are completely removed from the page and the space they +occupied is reclaimed. If the option is disabled then a placeholder +image is used in place of filtered images. + +URL expressions to filter is a list of +URLs that will be compared against image and frame names to decide +on fitlering actions. The wildcards can be given as filename style +regular expressions. + +Each filter can either be expressed as a file style wildcard +string (e.g. http://www.site.com/ads/*) or as a full regular expression +by enclosing the filter with forward slashes (e.g. //(ads|dclk)\./). + +Import and export will save or read the current filter list to a +plain text file. Lines prefixed with an exclamation mark (!) are treated +as comments and can be used to clarify or label a set of filters. + + + +Plugins + +The first setting here is Enable Plugins +globally. If you disable this checkbox, then &konqueror; +will not use any plugins. If you enable it, then any installed and +configured plugins that it can find will be used by &konqueror; + +You can also restrict &konqueror; to Only allow HTTP +and HTTPS URLs for plugins by checking the box. + + + +&nsplugins-kcontrol; + + + +
diff --git a/doc/kcontrol/tdehtml/nsplugin.docbook b/doc/kcontrol/tdehtml/nsplugin.docbook new file mode 100644 index 000000000..958a8f1a1 --- /dev/null +++ b/doc/kcontrol/tdehtml/nsplugin.docbook @@ -0,0 +1,91 @@ + +&Netscape; Plugins + + +Introduction + +As &Netscape;'s Navigator has been a +web browsing standard for many years, so-called &Netscape; plugins have +appeared that allow rich web content. Using those plugins, web sites +can contain PDF files, flash animations, video, &etc; +With &konqueror;, you can still use these plugins to take advantage of +rich web content. + +&Netscape; plugins should not be confused with &konqueror; +plugins. The latter ones specifically extend &konqueror;'s +functionality; they are normally not used to display rich web +content. + + + + +Scan + +&konqueror; has to know where your &Netscape; plugins are +installed. This can be in several places, &ie; you might have +system-wide plugins in /opt/netscape/plugins and your personal +plugins in $HOME/.netscape/plugins. +However, &konqueror; will not automatically use the installed plugins: +it first has to scan a list of folders. You can initiate the scan +by clicking Scan for new plugins. Alternatively, +you can enable Scan for new plugins at &tde; startup +so &konqueror; will scan the appropriate folders every time &tde; +starts up, to see whether new plugins have been installed. + +Enabling Scan for new plugins at &tde; +startup can considerably slow down the startup procedure, +and is known to give difficulty on certain installations. Turn this +option off if you experience problems. + +To find plugins, &konqueror; will look in the folders +specified in the Scan Folders frame. When you +use this control module for the first time, this list will already be +filled with reasonable paths that should work on most operating systems. +If you need to provide a new path, click the New +button; then you can either enter the new path in the text edit box to +the left, or choose a folder using the file dialog by clicking the +New... button. As scanning the folders can take +a little time, you might want to remove folders from the list where +you know that no plugins are installed: do this by selecting a folder +and clicking Remove. Using the +Up and Down buttons you +can change the order in which folders will be scanned by moving the +selected folder up or down. + +As usual, click Apply to save your changes +permanently. + + + + +Plugins + +In this tab, you can see a list of the &Netscape; plugins found by +&konqueror;, displayed as a tree. Double click on a plugin to fold it +out and you'll see that the different mime types this plugin can handle +will be displayed as branches. Fold out a mime type to see its +info. + +This tab is mostly for informational purposes. The only +configurable option is Use artsdsp to pipe plugin sound +through aRts, which is enabled by default. Disable this if +you wish plugins to use their own method for sounds, and you have +configured &arts; in such a way that third-party applications can do +so (for example, by having it exit when idle, or by having it use a +custom sound device on modern soundcards which allow this.) + + + + +Section Author + +This section written by: Jost Schenck +jost@schenck.de + + + + + + diff --git a/doc/konqueror/config.docbook b/doc/konqueror/config.docbook index a8958166d..90a1a5212 100644 --- a/doc/konqueror/config.docbook +++ b/doc/konqueror/config.docbook @@ -48,7 +48,7 @@ position and icon size Toolbars... option, which brings up the Configure Toolbars dialog box. The Main and Extra Toolbars are divided into sections, such as Main Toolbar <&konqueror;>, Main -Toolbar <khtmlpart> and Extra Toolbar <khtmlsettingsplugin>. The +Toolbar <tdehtmlpart> and Extra Toolbar <tdehtmlsettingsplugin>. The number and type of these sections will depend on whether &konqueror; is in Web Browser or File Manager mode and whether you have &konqueror; plugins installed. diff --git a/doc/userguide/groupware-kontact.docbook b/doc/userguide/groupware-kontact.docbook index 445a26da5..8a1b81c00 100644 --- a/doc/userguide/groupware-kontact.docbook +++ b/doc/userguide/groupware-kontact.docbook @@ -242,7 +242,7 @@ class="username">groupware user (already previously done!) Create/configure an IMAP account in &kmail; -for login as that user Use kresources to make +for login as that user Use tderesources to make &kontact; components work with data taken from IMAP source @@ -336,7 +336,7 @@ slow data updates. Now we have to tell &kontact; to use IMAP as the data source for it's various components. From the &kmenu;, choose Run command, run kcmshell -kresources. In the combo box select +tderesources. In the combo box select Contacts, then press the Add... button, and choose Addressbook on IMAP Server via KMail. Then select that new line and press Use as Standard button. Do the same for diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook index 6a49a129a..872191714 100644 --- a/doc/userguide/tde-for-admins.docbook +++ b/doc/userguide/tde-for-admins.docbook @@ -858,7 +858,7 @@ also unique per X-server display. The processes are: kded Generic service daemon. -Triggers Sycoca database updates when +Triggers Sycoca database updates when needed @@ -1819,14 +1819,14 @@ class="directory">$HOME/.trinity/share/applnk (user specific). This is observed unless the .desktop file has a Categories= line. In that case the categories determine the location in the menu. - + <application>KSycoca</application> KSycoca caches menu structure and information about all available applications. You can rebuild the database with kbuildsycoca. The database which is built lives in /var/tmp/tdecache-${USER}/ksycoca. +class="directory">/var/tmp/tdecache-${USER}/tdesycoca. It is automatically updated by KDED, checked during &tde; login, and KDED watches for changes while logged in. @@ -1839,7 +1839,7 @@ CheckSycoca=false -To force regeneration, run touch $TDEDIR/share/services/update_ksycoca. +To force regeneration, run touch $TDEDIR/share/services/update_tdesycoca. @@ -2031,7 +2031,7 @@ shell_access=false Since this affects the &tde; menu and the available applications, we must force an update of the sycoca database: -touch $TDEDIR/share/services/update_ksycoca +touch $TDEDIR/share/services/update_tdesycoca Now re-login to &tde; and check the following points: @@ -2488,7 +2488,7 @@ KDebug MainApplication-Interface konsole (default) konsole-mainwindow#1 -ksycoca +tdesycoca session-1 session-2 session-3 diff --git a/doc/userguide/tde-office.docbook b/doc/userguide/tde-office.docbook index 73e4cc313..28e089b3d 100644 --- a/doc/userguide/tde-office.docbook +++ b/doc/userguide/tde-office.docbook @@ -128,7 +128,7 @@ actually use the OASIS OpenDocument file format. - + - + - + diff --git a/konqueror/kttsplugin/CMakeLists.txt b/konqueror/kttsplugin/CMakeLists.txt index 80180aa8e..fc3f409fe 100644 --- a/konqueror/kttsplugin/CMakeLists.txt +++ b/konqueror/kttsplugin/CMakeLists.txt @@ -24,16 +24,16 @@ link_directories( ##### other data ################################ install( FILES - khtmlkttsd.rc khtmlkttsd.desktop - DESTINATION ${DATA_INSTALL_DIR}/khtml/kpartplugins ) + tdehtmlkttsd.rc tdehtmlkttsd.desktop + DESTINATION ${DATA_INSTALL_DIR}/tdehtml/kpartplugins ) -##### libkhtmlkttsdplugin (module) ############## +##### libtdehtmlkttsdplugin (module) ############## -set( target libkhtmlkttsdplugin ) +set( target libtdehtmlkttsdplugin ) tde_add_kpart( ${target} AUTOMOC - SOURCES khtmlkttsd.cpp - LINK khtml-shared + SOURCES tdehtmlkttsd.cpp + LINK tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/kttsplugin/Makefile.am b/konqueror/kttsplugin/Makefile.am index 580a18dcd..d82a56fc2 100644 --- a/konqueror/kttsplugin/Makefile.am +++ b/konqueror/kttsplugin/Makefile.am @@ -2,15 +2,15 @@ INCLUDES = $(all_includes) METASOURCES = AUTO # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = libkhtmlkttsdplugin.la +kde_module_LTLIBRARIES = libtdehtmlkttsdplugin.la -libkhtmlkttsdplugin_la_SOURCES = khtmlkttsd.cpp -libkhtmlkttsdplugin_la_LIBADD = $(LIB_KHTML) -libkhtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +libtdehtmlkttsdplugin_la_SOURCES = tdehtmlkttsd.cpp +libtdehtmlkttsdplugin_la_LIBADD = $(LIB_KHTML) +libtdehtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -pluginsdir = $(kde_datadir)/khtml/kpartplugins -plugins_DATA = khtmlkttsd.rc khtmlkttsd.desktop +pluginsdir = $(kde_datadir)/tdehtml/kpartplugins +plugins_DATA = tdehtmlkttsd.rc tdehtmlkttsd.desktop messages: rc.cpp $(EXTRACTRC) *.rc > rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/khtmlkttsd.pot + $(XGETTEXT) *.cpp -o $(podir)/tdehtmlkttsd.pot diff --git a/konqueror/kttsplugin/khtmlkttsd.cpp b/konqueror/kttsplugin/khtmlkttsd.cpp deleted file mode 100644 index e832bd27a..000000000 --- a/konqueror/kttsplugin/khtmlkttsd.cpp +++ /dev/null @@ -1,138 +0,0 @@ -/*************************************************************************** - Copyright: - (C) 2002 by George Russell - (C) 2003-2004 by Olaf Schmidt - ***************************************************************************/ - -/*************************************************************************** - * * - * 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. * - * * - ***************************************************************************/ - -#include // this plugin applies to a khtml part -#include -#include -#include -#include -#include "khtmlkttsd.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -KHTMLPluginKTTSD::KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& ) - : Plugin( parent, name ) -{ - // If KTTSD is not installed, hide action. - KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'"); - if (offers.count() > 0) - { - (void) new KAction( i18n("&Speak Text"), - "kttsd", 0, - this, TQT_SLOT(slotReadOut()), - actionCollection(), "tools_kttsd" ); - } - else - kdDebug() << "KHTMLPLuginKTTSD::KHTMLPluginKTTSD: KTrader did not find KTTSD." << endl; -} - -KHTMLPluginKTTSD::~KHTMLPluginKTTSD() -{ -} - -void KHTMLPluginKTTSD::slotReadOut() -{ - // The parent is assumed to be a KHTMLPart - if ( !parent()->inherits("KHTMLPart") ) - TQMessageBox::warning( 0, i18n( "Cannot Read source" ), - i18n( "You cannot read anything except web pages with\n" - "this plugin, sorry." )); - else - { - // If KTTSD not running, start it. - DCOPClient *client = kapp->dcopClient(); - if (!client->isApplicationRegistered("kttsd")) - { - TQString error; - if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error)) - TQMessageBox::warning(0, i18n( "Starting KTTSD Failed"), error ); - } - - // Find out if KTTSD supports xhtml (rich speak). - TQByteArray data; - TQBuffer dataBuf(data); - TQDataStream arg; - dataBuf.open(IO_WriteOnly); - arg.setDevice(&dataBuf); - arg << "" << KSpeech::mtHtml; - TQCString replyType; - TQByteArray replyData; - bool supportsXhtml = false; - if ( !client->call("kttsd", "KSpeech", "supportsMarkup(TQString,uint)", - data, replyType, replyData, true) ) - TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ), - i18n( "The DCOP call supportsMarkup failed." )); - else - { - TQDataStream reply(replyData, IO_ReadOnly); - reply >> supportsXhtml; - } - - KHTMLPart *part = (KHTMLPart *) parent(); - - TQString query; - if (supportsXhtml) - { - kdDebug() << "KTTS claims to support rich speak (XHTML to SSML)." << endl; - if (part->hasSelection()) - query = part->selectedTextAsHTML(); - else - { - // TODO: Fooling around with the selection probably has unwanted - // side effects, but until a method is supplied to get valid xhtml - // from entire document.. - // query = part->document().toString().string(); - part->selectAll(); - query = part->selectedTextAsHTML(); - // Restore no selection. - part->setSelection(part->document().createRange()); - } - } else { - if (part->hasSelection()) - query = part->selectedText(); - else - query = part->htmlDocument().body().innerText().string(); - } - // kdDebug() << "KHTMLPluginKTTSD::slotReadOut: query = " << query << endl; - - dataBuf.at(0); // reset data - arg << query << ""; - if ( !client->call("kttsd", "KSpeech", "setText(TQString,TQString)", - data, replyType, replyData, true) ) - TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ), - i18n( "The DCOP call setText failed." )); - dataBuf.at(0); - arg << 0; - if ( !client->call("kttsd", "KSpeech", "startText(uint)", - data, replyType, replyData, true) ) - TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ), - i18n( "The DCOP call startText failed." )); - } -} - -K_EXPORT_COMPONENT_FACTORY( libkhtmlkttsdplugin, KGenericFactory("khtmlkttsd") ) - -#include "khtmlkttsd.moc" diff --git a/konqueror/kttsplugin/khtmlkttsd.desktop b/konqueror/kttsplugin/khtmlkttsd.desktop deleted file mode 100644 index 5e8519eb3..000000000 --- a/konqueror/kttsplugin/khtmlkttsd.desktop +++ /dev/null @@ -1,75 +0,0 @@ -[Desktop Entry] -X-TDE-Library=libkhtmlkttsdplugin -X-TDE-PluginInfo-Author=Olaf Schmidt -X-TDE-PluginInfo-Email=ojschmidt@kde.org -X-TDE-PluginInfo-Name=khtmlkttsdplugin -X-TDE-PluginInfo-Version=3.4 -X-TDE-PluginInfo-Website= -X-TDE-PluginInfo-Category=Tools -X-TDE-PluginInfo-Depends= -X-TDE-PluginInfo-License=GPL -X-TDE-PluginInfo-EnabledByDefault=true -X-TDE-ParentApp=konqueror -Name=Text-to-Speech Plugin -Name[ar]=برنامج مساعد تحويل لفظ النص -Name[be]=Утулка галасавога ўзнаўлення тэксту -Name[bg]=Приставка за синтез на глас -Name[bn]=লেখা-থেকে-বলা প্লাগ-ইন -Name[bs]=Dodatak za izgovaranje teksta -Name[ca]=Endollable de text a veu -Name[cs]=Modul text-na-řeč -Name[csb]=Plugins czëtôrza tekstu -Name[da]=Tekst-til-tale plugin -Name[de]=Sprachausgabe-Plugin -Name[el]=Πρόσθετο κείμενο σε ομιλία -Name[eo]=Teksto-Paroligilo Kromaĵo -Name[es]=Complemento de Texto-a-Voz -Name[et]=Teksti kõneks muutmise plugin -Name[eu]=Testu-ahotserako plugina -Name[fa]=وصلۀ متن به سخن -Name[fi]=Teksti puheeksi -liitännäinen -Name[fr]=Module de synthèse vocale -Name[fy]=Tekst-ta-spraak-plugin -Name[ga]=Breiseán Téacs-go-Caint -Name[gl]=Plugin de Texto-a-Fala -Name[he]=תוסף טקסט אל דיבור -Name[hr]=Pretvaranje teksta u govor -Name[hu]=Szövegfelolvasó modul -Name[is]=Texti-í-tal íforrit -Name[it]=Plugin lettura del testo (text-to-speech) -Name[ja]=テキスト読み上げプラグイン -Name[ka]=ტექსტის გახმოვანების მოდული -Name[kk]=Дыбыстап оқу модулі -Name[km]=កម្មវិធី​ជំនួយ​ខាង​ក្នុង អត្ថបទ-ទៅ​ជា-សម្ដី -Name[ko]=Text-to-Speech -Name[lt]=Teksto vertimo kalba priedas -Name[mk]=Приклучок за текст-во-говор -Name[ms]=Plugin Teks-ke-Tutur -Name[nb]=Programtillegg for tekst-til-tale -Name[nds]=Vörleser-Plugin -Name[ne]=पाठलाई वाक्यमा प्लगइन -Name[nl]=Tekst-tot-spraak-plugin -Name[nn]=Programtillegg for tekst-til-tale -Name[pa]=ਪਾਠ ਤੋਂ ਬੋਲੀ ਪਲੱਗਇਨ -Name[pl]=Wtyczka odczytywania tekstu -Name[pt]='Plugin' de Texto-para-Fala -Name[pt_BR]=Plug-in de Conversão de Fala -Name[ro]=Modul vorbire text -Name[ru]=Зачитывание текста -Name[rw]=Icomeka Umwandiko-ku-Imvugo -Name[sk]=Modul text-na-reč -Name[sl]=Vstavek za pretvorbo besedila v govor -Name[sr]=Прикључак за текст-у-говор -Name[sr@Latn]=Priključak za tekst-u-govor -Name[sv]=Text till tal-insticksprogram -Name[ta]=உரையில் இருந்து பேச்சு சொருகுப்பொருள் -Name[th]=ปลั๊กอิน เปลี่ยนตัวหนังสือเป็นเสียง -Name[tr]=Metinden-Sese Eklentisi -Name[tt]=Yazma-Uquçı Östämä -Name[uk]=Втулок синтезу мовлення з тексту -Name[vi]=Trình bổ sung Chuyển Văn bản thành Tiếng nói -Name[wa]=Tchôke-divins tecse viè parole -Name[zh_CN]=文本到语音插件 -Name[zh_TW]=文字轉換語音外掛程式 -Icon=kttsd - diff --git a/konqueror/kttsplugin/khtmlkttsd.h b/konqueror/kttsplugin/khtmlkttsd.h deleted file mode 100644 index cfe1e7d38..000000000 --- a/konqueror/kttsplugin/khtmlkttsd.h +++ /dev/null @@ -1,46 +0,0 @@ -/*************************************************************************** - Copyright: - (C) 2002 by George Russell - (C) 2003-2004 by Olaf Schmidt - ***************************************************************************/ - -/*************************************************************************** - * * - * 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. * - * * - ***************************************************************************/ - - -#ifndef KHTMLKTTSD_H -#define KHTMLKTTSD_H - -#include - -class KURL; -class TDEInstance; - -/** - * KHTML KParts Plugin - */ -class KHTMLPluginKTTSD : public KParts::Plugin -{ - Q_OBJECT -public: - - /** - * Construct a new KParts plugin. - */ - KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& ); - - /** - * Destructor. - */ - virtual ~KHTMLPluginKTTSD(); -public slots: - void slotReadOut(); -}; - -#endif diff --git a/konqueror/kttsplugin/khtmlkttsd.rc b/konqueror/kttsplugin/khtmlkttsd.rc deleted file mode 100644 index 388aec9e7..000000000 --- a/konqueror/kttsplugin/khtmlkttsd.rc +++ /dev/null @@ -1,13 +0,0 @@ - - - - - &Tools - - - - - - diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp new file mode 100644 index 000000000..80b756a8b --- /dev/null +++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp @@ -0,0 +1,138 @@ +/*************************************************************************** + Copyright: + (C) 2002 by George Russell + (C) 2003-2004 by Olaf Schmidt + ***************************************************************************/ + +/*************************************************************************** + * * + * 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. * + * * + ***************************************************************************/ + +#include // this plugin applies to a tdehtml part +#include +#include +#include +#include +#include "tdehtmlkttsd.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +KHTMLPluginKTTSD::KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& ) + : Plugin( parent, name ) +{ + // If KTTSD is not installed, hide action. + KTrader::OfferList offers = KTrader::self()->query("DCOP/Text-to-Speech", "Name == 'KTTSD'"); + if (offers.count() > 0) + { + (void) new KAction( i18n("&Speak Text"), + "kttsd", 0, + this, TQT_SLOT(slotReadOut()), + actionCollection(), "tools_kttsd" ); + } + else + kdDebug() << "KHTMLPLuginKTTSD::KHTMLPluginKTTSD: KTrader did not find KTTSD." << endl; +} + +KHTMLPluginKTTSD::~KHTMLPluginKTTSD() +{ +} + +void KHTMLPluginKTTSD::slotReadOut() +{ + // The parent is assumed to be a KHTMLPart + if ( !parent()->inherits("KHTMLPart") ) + TQMessageBox::warning( 0, i18n( "Cannot Read source" ), + i18n( "You cannot read anything except web pages with\n" + "this plugin, sorry." )); + else + { + // If KTTSD not running, start it. + DCOPClient *client = kapp->dcopClient(); + if (!client->isApplicationRegistered("kttsd")) + { + TQString error; + if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error)) + TQMessageBox::warning(0, i18n( "Starting KTTSD Failed"), error ); + } + + // Find out if KTTSD supports xhtml (rich speak). + TQByteArray data; + TQBuffer dataBuf(data); + TQDataStream arg; + dataBuf.open(IO_WriteOnly); + arg.setDevice(&dataBuf); + arg << "" << KSpeech::mtHtml; + TQCString replyType; + TQByteArray replyData; + bool supportsXhtml = false; + if ( !client->call("kttsd", "KSpeech", "supportsMarkup(TQString,uint)", + data, replyType, replyData, true) ) + TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ), + i18n( "The DCOP call supportsMarkup failed." )); + else + { + TQDataStream reply(replyData, IO_ReadOnly); + reply >> supportsXhtml; + } + + KHTMLPart *part = (KHTMLPart *) parent(); + + TQString query; + if (supportsXhtml) + { + kdDebug() << "KTTS claims to support rich speak (XHTML to SSML)." << endl; + if (part->hasSelection()) + query = part->selectedTextAsHTML(); + else + { + // TODO: Fooling around with the selection probably has unwanted + // side effects, but until a method is supplied to get valid xhtml + // from entire document.. + // query = part->document().toString().string(); + part->selectAll(); + query = part->selectedTextAsHTML(); + // Restore no selection. + part->setSelection(part->document().createRange()); + } + } else { + if (part->hasSelection()) + query = part->selectedText(); + else + query = part->htmlDocument().body().innerText().string(); + } + // kdDebug() << "KHTMLPluginKTTSD::slotReadOut: query = " << query << endl; + + dataBuf.at(0); // reset data + arg << query << ""; + if ( !client->call("kttsd", "KSpeech", "setText(TQString,TQString)", + data, replyType, replyData, true) ) + TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ), + i18n( "The DCOP call setText failed." )); + dataBuf.at(0); + arg << 0; + if ( !client->call("kttsd", "KSpeech", "startText(uint)", + data, replyType, replyData, true) ) + TQMessageBox::warning( 0, i18n( "DCOP Call Failed" ), + i18n( "The DCOP call startText failed." )); + } +} + +K_EXPORT_COMPONENT_FACTORY( libtdehtmlkttsdplugin, KGenericFactory("tdehtmlkttsd") ) + +#include "tdehtmlkttsd.moc" diff --git a/konqueror/kttsplugin/tdehtmlkttsd.desktop b/konqueror/kttsplugin/tdehtmlkttsd.desktop new file mode 100644 index 000000000..35db3445c --- /dev/null +++ b/konqueror/kttsplugin/tdehtmlkttsd.desktop @@ -0,0 +1,75 @@ +[Desktop Entry] +X-TDE-Library=libtdehtmlkttsdplugin +X-TDE-PluginInfo-Author=Olaf Schmidt +X-TDE-PluginInfo-Email=ojschmidt@kde.org +X-TDE-PluginInfo-Name=tdehtmlkttsdplugin +X-TDE-PluginInfo-Version=3.4 +X-TDE-PluginInfo-Website= +X-TDE-PluginInfo-Category=Tools +X-TDE-PluginInfo-Depends= +X-TDE-PluginInfo-License=GPL +X-TDE-PluginInfo-EnabledByDefault=true +X-TDE-ParentApp=konqueror +Name=Text-to-Speech Plugin +Name[ar]=برنامج مساعد تحويل لفظ النص +Name[be]=Утулка галасавога ўзнаўлення тэксту +Name[bg]=Приставка за синтез на глас +Name[bn]=লেখা-থেকে-বলা প্লাগ-ইন +Name[bs]=Dodatak za izgovaranje teksta +Name[ca]=Endollable de text a veu +Name[cs]=Modul text-na-řeč +Name[csb]=Plugins czëtôrza tekstu +Name[da]=Tekst-til-tale plugin +Name[de]=Sprachausgabe-Plugin +Name[el]=Πρόσθετο κείμενο σε ομιλία +Name[eo]=Teksto-Paroligilo Kromaĵo +Name[es]=Complemento de Texto-a-Voz +Name[et]=Teksti kõneks muutmise plugin +Name[eu]=Testu-ahotserako plugina +Name[fa]=وصلۀ متن به سخن +Name[fi]=Teksti puheeksi -liitännäinen +Name[fr]=Module de synthèse vocale +Name[fy]=Tekst-ta-spraak-plugin +Name[ga]=Breiseán Téacs-go-Caint +Name[gl]=Plugin de Texto-a-Fala +Name[he]=תוסף טקסט אל דיבור +Name[hr]=Pretvaranje teksta u govor +Name[hu]=Szövegfelolvasó modul +Name[is]=Texti-í-tal íforrit +Name[it]=Plugin lettura del testo (text-to-speech) +Name[ja]=テキスト読み上げプラグイン +Name[ka]=ტექსტის გახმოვანების მოდული +Name[kk]=Дыбыстап оқу модулі +Name[km]=កម្មវិធី​ជំនួយ​ខាង​ក្នុង អត្ថបទ-ទៅ​ជា-សម្ដី +Name[ko]=Text-to-Speech +Name[lt]=Teksto vertimo kalba priedas +Name[mk]=Приклучок за текст-во-говор +Name[ms]=Plugin Teks-ke-Tutur +Name[nb]=Programtillegg for tekst-til-tale +Name[nds]=Vörleser-Plugin +Name[ne]=पाठलाई वाक्यमा प्लगइन +Name[nl]=Tekst-tot-spraak-plugin +Name[nn]=Programtillegg for tekst-til-tale +Name[pa]=ਪਾਠ ਤੋਂ ਬੋਲੀ ਪਲੱਗਇਨ +Name[pl]=Wtyczka odczytywania tekstu +Name[pt]='Plugin' de Texto-para-Fala +Name[pt_BR]=Plug-in de Conversão de Fala +Name[ro]=Modul vorbire text +Name[ru]=Зачитывание текста +Name[rw]=Icomeka Umwandiko-ku-Imvugo +Name[sk]=Modul text-na-reč +Name[sl]=Vstavek za pretvorbo besedila v govor +Name[sr]=Прикључак за текст-у-говор +Name[sr@Latn]=Priključak za tekst-u-govor +Name[sv]=Text till tal-insticksprogram +Name[ta]=உரையில் இருந்து பேச்சு சொருகுப்பொருள் +Name[th]=ปลั๊กอิน เปลี่ยนตัวหนังสือเป็นเสียง +Name[tr]=Metinden-Sese Eklentisi +Name[tt]=Yazma-Uquçı Östämä +Name[uk]=Втулок синтезу мовлення з тексту +Name[vi]=Trình bổ sung Chuyển Văn bản thành Tiếng nói +Name[wa]=Tchôke-divins tecse viè parole +Name[zh_CN]=文本到语音插件 +Name[zh_TW]=文字轉換語音外掛程式 +Icon=kttsd + diff --git a/konqueror/kttsplugin/tdehtmlkttsd.h b/konqueror/kttsplugin/tdehtmlkttsd.h new file mode 100644 index 000000000..f42c9b03e --- /dev/null +++ b/konqueror/kttsplugin/tdehtmlkttsd.h @@ -0,0 +1,46 @@ +/*************************************************************************** + Copyright: + (C) 2002 by George Russell + (C) 2003-2004 by Olaf Schmidt + ***************************************************************************/ + +/*************************************************************************** + * * + * 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. * + * * + ***************************************************************************/ + + +#ifndef KHTMLKTTSD_H +#define KHTMLKTTSD_H + +#include + +class KURL; +class TDEInstance; + +/** + * KHTML KParts Plugin + */ +class KHTMLPluginKTTSD : public KParts::Plugin +{ + Q_OBJECT +public: + + /** + * Construct a new KParts plugin. + */ + KHTMLPluginKTTSD( TQObject* parent, const char* name, const TQStringList& ); + + /** + * Destructor. + */ + virtual ~KHTMLPluginKTTSD(); +public slots: + void slotReadOut(); +}; + +#endif diff --git a/konqueror/kttsplugin/tdehtmlkttsd.rc b/konqueror/kttsplugin/tdehtmlkttsd.rc new file mode 100644 index 000000000..a06a29742 --- /dev/null +++ b/konqueror/kttsplugin/tdehtmlkttsd.rc @@ -0,0 +1,13 @@ + + + + + &Tools + + + + + + diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index 40f8b2269..127ecc3b2 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -20,10 +20,10 @@ #ifndef __konq_listview_h__ #define __konq_listview_h__ -#include +#include #include #include -#include +#include #include #include diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 1dd7a25ad..bd26db191 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -840,7 +840,7 @@ void KonqBaseListViewWidget::startDrag() { int iconSize = m_pBrowserView->m_pProps->iconSize(); iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small - pixmap2 = DesktopIcon( "kmultiple", iconSize ); + pixmap2 = DesktopIcon( "tdemultiple", iconSize ); if ( pixmap2.isNull() ) kdWarning(1202) << "Could not find multiple pixmap" << endl; } diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index 5dd6aca11..9bdc60e3d 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include "konq_listviewitems.h" diff --git a/konqueror/profile_kde_devel.desktop b/konqueror/profile_kde_devel.desktop index afb7d36e8..6c30b886f 100644 --- a/konqueror/profile_kde_devel.desktop +++ b/konqueror/profile_kde_devel.desktop @@ -76,35 +76,35 @@ Tabs0_activeChildIndex=0 ViewT0_LinkedView=false ViewT0_LockedLocation=false ViewT0_PassiveMode=false -ViewT0_ServiceName=khtml +ViewT0_ServiceName=tdehtml ViewT0_ServiceType=text/html ViewT0_ToggleView=false ViewT0_URL=http://www.trinitydesktop.org/docs/trinity/current/kdelibs/html/main.html ViewT1_LinkedView=false ViewT1_LockedLocation=false ViewT1_PassiveMode=false -ViewT1_ServiceName=khtml +ViewT1_ServiceName=tdehtml ViewT1_ServiceType=text/html ViewT1_ToggleView=false ViewT1_URL=http://www.trinitydesktop.org/docs/qt3/index-2.html ViewT2_LinkedView=false ViewT2_LockedLocation=false ViewT2_PassiveMode=false -ViewT2_ServiceName=khtml +ViewT2_ServiceName=tdehtml ViewT2_ServiceType=text/html ViewT2_ToggleView=false ViewT2_URL=http://bugs.trinitydesktop.org/ ViewT3_LinkedView=false ViewT3_LockedLocation=false ViewT3_PassiveMode=false -ViewT3_ServiceName=khtml +ViewT3_ServiceName=tdehtml ViewT3_ServiceType=text/html ViewT3_ToggleView=false ViewT3_URL=man:/gcc ViewT4_LinkedView=false ViewT4_LockedLocation=false ViewT4_PassiveMode=false -ViewT4_ServiceName=khtml +ViewT4_ServiceName=tdehtml ViewT4_ServiceType=text/html ViewT4_ToggleView=false ViewT4_URL=info:/dir diff --git a/konqueror/profile_tabbedbrowsing.desktop b/konqueror/profile_tabbedbrowsing.desktop index 38cc09e3c..c910cbac1 100644 --- a/konqueror/profile_tabbedbrowsing.desktop +++ b/konqueror/profile_tabbedbrowsing.desktop @@ -77,28 +77,28 @@ Tabs0_activeChildIndex=0 ViewT0_LinkedView=false ViewT0_LockedLocation=false ViewT0_PassiveMode=false -ViewT0_ServiceName=khtml +ViewT0_ServiceName=tdehtml ViewT0_ServiceType=text/html ViewT0_ToggleView=false ViewT0_URL=http://www.kde.org/ ViewT1_LinkedView=false ViewT1_LockedLocation=false ViewT1_PassiveMode=false -ViewT1_ServiceName=khtml +ViewT1_ServiceName=tdehtml ViewT1_ServiceType=text/html ViewT1_ToggleView=false ViewT1_URL=http://dot.kde.org/ ViewT2_LinkedView=false ViewT2_LockedLocation=false ViewT2_PassiveMode=false -ViewT2_ServiceName=khtml +ViewT2_ServiceName=tdehtml ViewT2_ServiceType=text/html ViewT2_ToggleView=false ViewT2_URL=http://themes.kde.org/ ViewT3_LinkedView=false ViewT3_LockedLocation=false ViewT3_PassiveMode=false -ViewT3_ServiceName=khtml +ViewT3_ServiceName=tdehtml ViewT3_ServiceType=text/html ViewT3_ToggleView=false ViewT3_URL=http://www.kde-apps.org/ diff --git a/konqueror/quickprint/TODO b/konqueror/quickprint/TODO index d858e8db6..5001bfaf7 100644 --- a/konqueror/quickprint/TODO +++ b/konqueror/quickprint/TODO @@ -5,7 +5,7 @@ - set the position of the picture on the site and something like that - printing html (homepges) - print the html code like for the textprinting - - print the html file like it was parsed with khtml + - print the html file like it was parsed with tdehtml - printing TeX documents with a action on the TeX source - I don't know at the moment options for that - ... diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index 9ae297285..838f2aad7 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include "kremoteencodingplugin.h" diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h index d663baf6c..9b80888a5 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include class KActionMenu; class TDEConfig; diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.h b/konqueror/shellcmdplugin/kshellcmdplugin.h index f942c82bf..16874adc0 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.h +++ b/konqueror/shellcmdplugin/kshellcmdplugin.h @@ -19,7 +19,7 @@ #ifndef kshellcmdplugin_h #define kshellcmdplugin_h -#include +#include #include class KShellCmdPlugin : public KParts::Plugin diff --git a/konqueror/sidebar/CMakeLists.txt b/konqueror/sidebar/CMakeLists.txt index ba9f677ce..fa9c3cbd5 100644 --- a/konqueror/sidebar/CMakeLists.txt +++ b/konqueror/sidebar/CMakeLists.txt @@ -51,7 +51,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.2.0 - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${LIB_INSTALL_DIR} ) @@ -66,6 +66,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK konqsidebarplugin-shared konq-shared kio-shared kutils-shared + LINK konqsidebarplugin-shared konq-shared kio-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h index 660fda9df..dfdd2e2e0 100644 --- a/konqueror/sidebar/konqsidebar.h +++ b/konqueror/sidebar/konqsidebar.h @@ -17,10 +17,10 @@ #ifndef KONQSIDEBARPART_H #define KONQSIDEBARPART_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include "sidebar_widget.h" #include "konqsidebariface_p.h" diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h index b9225edfa..0433261c7 100644 --- a/konqueror/sidebar/konqsidebarplugin.h +++ b/konqueror/sidebar/konqsidebarplugin.h @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index da5b0888b..c5ee75a8a 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include "konqsidebarplugin.h" #include "konqsidebariface_p.h" diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h index b70230b9e..5a198eeca 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.h +++ b/konqueror/sidebar/trees/konqsidebar_tree.h @@ -3,9 +3,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/konqueror/sidebar/web_module/CMakeLists.txt b/konqueror/sidebar/web_module/CMakeLists.txt index a925474b4..a15866ebd 100644 --- a/konqueror/sidebar/web_module/CMakeLists.txt +++ b/konqueror/sidebar/web_module/CMakeLists.txt @@ -35,6 +35,6 @@ set( target konqsidebar_web ) tde_add_kpart( ${target} AUTOMOC SOURCES web_module.cpp - LINK konqsidebarplugin-shared konq-shared khtml-shared + LINK konqsidebarplugin-shared konq-shared tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index a337c65c6..1386ee0a7 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index 4e0c3d6d7..b7538bff3 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -20,7 +20,7 @@ #define web_module_h #include -#include +#include #include #include #include diff --git a/konsole/konsole/CMakeLists.txt b/konsole/konsole/CMakeLists.txt index 222583500..4992cdc43 100644 --- a/konsole/konsole/CMakeLists.txt +++ b/konsole/konsole/CMakeLists.txt @@ -39,7 +39,7 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konsole/konsole/Makefile.am b/konsole/konsole/Makefile.am index 6139fdfe4..4f9a03d55 100644 --- a/konsole/konsole/Makefile.am +++ b/konsole/konsole/Makefile.am @@ -46,7 +46,7 @@ konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) $(LIBUTIL) $(XTESTLI # kcmkonsole_SOURCES = kcmkonsole.cpp schema.cpp # kcmkonsole_LDADD = $(LIB_TDEUI) -# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +# kcmkonsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noinst_HEADERS = TEWidget.h TEPty.h TEmulation.h TEmuVt102.h \ TECommon.h TEScreen.h konsole.h schema.h session.h konsole_wcwidth.h \ diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index b9940e697..0e6265321 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -135,7 +135,7 @@ Time to start a requirement list. #include #include #include -#include +#include #include #include #include diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h index 981c4d6c9..fc76b565b 100644 --- a/konsole/konsole/konsole_part.h +++ b/konsole/konsole/konsole_part.h @@ -21,8 +21,8 @@ #ifndef KONSOLE_PART_H #define KONSOLE_PART_H -#include -#include +#include +#include #include diff --git a/kpager/Makefile.am b/kpager/Makefile.am index 5cfbf0910..672dec243 100644 --- a/kpager/Makefile.am +++ b/kpager/Makefile.am @@ -6,7 +6,7 @@ kpager_SOURCES = desktop.cpp kpager.cpp config.cpp windowdrag.cpp \ kpagerIface.skel main.cpp kpager_METASOURCES = AUTO -kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kpager_LDADD = $(LIB_TDEUI) diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am index 76b1a4ff8..66b957804 100644 --- a/kpersonalizer/Makefile.am +++ b/kpersonalizer/Makefile.am @@ -38,7 +38,7 @@ METASOURCES = AUTO KDE_ICON= AUTO # the library search path. -kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDEs XML GUI builing diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index e3efd2f85..818fd02e3 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -165,7 +165,7 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan stream << comboLang->current(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - // ksycoca needs to be rebuilt + // tdesycoca needs to be rebuilt TDEProcess proc; proc << TQString::fromLatin1("kbuildsycoca"); proc.start(TDEProcess::DontCare); diff --git a/kreadconfig/Makefile.am b/kreadconfig/Makefile.am index aaffa73af..79670d29a 100644 --- a/kreadconfig/Makefile.am +++ b/kreadconfig/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII INCLUDES = $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor LDADD = $(LIB_TDECORE) bin_PROGRAMS = kreadconfig kwriteconfig diff --git a/kscreensaver.pamd b/kscreensaver.pamd deleted file mode 100644 index aae5d16b8..000000000 --- a/kscreensaver.pamd +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth sufficient /lib/security/pam_linux_afs.so ignore_root -#auth sufficient /lib/security/pam_linux_afs.so no_unlog ignore_root -auth required /lib/security/pam_pwdb.so shadow nullok diff --git a/kscreensaver/AUTHORS b/kscreensaver/AUTHORS deleted file mode 100644 index fda66bb39..000000000 --- a/kscreensaver/AUTHORS +++ /dev/null @@ -1,23 +0,0 @@ - blank - Copyright (c) 1997 Martin Jones - banner - Copyright (c) 1997 Martin Jones - polygon - Copyright (c) 1997 Martin Jones - lines - Copyright (c) 1997 Dirk Staneker - blob - Copyright (c) 1997 Tiaan Wessels - -Ported from xlockmore: (but blame Martin if they don't work) - rock - Copyright (c) 1992 Jamie Zawinski - flame - Copyright (c) 1991 Scott Draves - pyro - Copyright (c) 1991 Patrick J. Naughton - laser - Copyright (c) 1995 Pascal Pensa - -Ported from xlockmore by Emanuel Pirker : - bat - Copyright (c) 1988 Sun Microsystems - forest - Copyright (c) 1995 Pascal Pensa - hop - Copyright (c) 1991 Patrick J. Naughton - lissie - Copyright (c) Alexander Jolk - slip - Copyright (c) 1992 Scott Draves - swarm - Copyright (c) 1991 Patrick J. Naughton - morph3d - Copyright (c) 1997 by Marcelo F. Vianna - -Ported from xscreensaver by Alex Zepeda - bsod - Copyright (c) 1998 Jamie Zawinski diff --git a/kscreensaver/CMakeLists.txt b/kscreensaver/CMakeLists.txt deleted file mode 100644 index 7aee6728d..000000000 --- a/kscreensaver/CMakeLists.txt +++ /dev/null @@ -1,44 +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 -# -################################################# - -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### other data ################################ - -install( FILES KRandom.desktop KBlankscreen.desktop DESTINATION ${APPS_INSTALL_DIR}/System/ScreenSavers ) - - -##### krandom (executable) ###################### - -tde_add_executable( krandom.kss AUTOMOC - SOURCES random.cpp - LINK tdeui-shared ${GL_LIBRARY} - DESTINATION ${BIN_INSTALL_DIR} -) - - -##### kblankscrn (executable) ################### - -tde_add_executable( kblankscrn.kss AUTOMOC - SOURCES blankscrn.cpp - LINK kscreensaver-shared tdeui-shared - DESTINATION ${BIN_INSTALL_DIR} -) diff --git a/kscreensaver/ChangeLog b/kscreensaver/ChangeLog deleted file mode 100644 index 0711aef0a..000000000 --- a/kscreensaver/ChangeLog +++ /dev/null @@ -1,93 +0,0 @@ -2001-03-10 Martin R. Jones - * added libkscreensaver and ported KDE savers to it. - * big cleanup. - -2000-01-10 Alexander Neundorf - * banner.h, banner.cpp: - -added cycling color option - -added "show current time" option - -replaced the readEntry()'s with the appropriate read*Entry()'s - * replaced the glocale->translate with i18n in - attraction.cpp, banner.cpp, bat.cpp, blankscrn.cpp, blob.cpp, - bouboule.cpp, flame.cpp, forest.cpp, hop.cpp, laser.cpp, lines.cpp, - lissie.cpp, main.cpp, morph3d.cpp, pipes.cpp, polygon.cpp, pyro.cpp, rock.cpp, - slidescreen.cpp, slideshow.cpp, slip.cpp, space.cpp, swarm.cpp - -1999-04-28 Christophe Prud'homme - - * bouboule.cpp: the global variable initialized in bouboule is - used also in qt2. I just renamed the variable to - bouboule_initialized. However it is just a hack, and I think that - such global variables are C pratice and not C++ - -1998-12-13 Christian Esken - - * Calling kcheckpass (only on Shadow systems). This checks if the password - database can be acessed. This uses the new return code (#2) by kcheckpass. - -1998-10-24 Alex Zepeda - - * bsod.cpp (BSODSaver::BSODSaver): Use srandomdev where available. - -1998-10-23 Alex Zepeda - - * bsod.cpp (BSODSaver::BSODSaver): initialize the random seed correctly. - - * amiga.xpm, atari.xbm, bsod.cpp, bsod.h, mac.xbm, AUTHORS, Makefile.am: - New screensaver: BSOD. Yay! Still needs some final polishing however (such as a - configuration dialog box). - - * saver.h: Add correct C style prototypes for startScreenSaver and friends. - - * main.cpp: Make startScreenSaver and friends use C style name mangling. - -Version 0.3.7 - -added geometry management to all screensaver setups except kmorph3d (Mario -Weilguni ) - -Version 0.3.6 - -added "blob" saver from Tiaan Wessels - -Version 0.3.5 - -fixes from Emanuel Pirker for ported xlock savers. - -Version 0.3.4 - -More xlock ports from Emanuel Pirker - -Version 0.3.3 - -Fix small window problem under kwm (hopefully) -Fixes for Qt-1.2 - - -Version 0.3.2 - -Updated lines -added About dialogs for all savers -Shadow password support added by Martin Hartig -Use libtdeui for colour dialog - - -Version 0.3.1 - -Ported some xlock savers. Basic interface code done, but will need more work - for some savers yet to be ported. -Included "lines" (contributed by Dirk Staneker - ) -locking bug fix - -Version 0.3 - -fixes to password stuff - -Version 0.2 - -kscreensaver.h/cpp external control files -SIGUSR1 causes the screen saver to lock immediately -hopefully StaysOnTop and windows opening after ss invoked will not display - over saver window anymore -minor bug fixes diff --git a/kscreensaver/KBlankscreen.desktop b/kscreensaver/KBlankscreen.desktop deleted file mode 100644 index 778da2ce0..000000000 --- a/kscreensaver/KBlankscreen.desktop +++ /dev/null @@ -1,323 +0,0 @@ -[Desktop Entry] -Exec=kblankscrn.kss -Icon=kscreensaver -Type=Application -Actions=Setup;InWindow;Root; -OnlyShowIn=TDE; -Name=Blank Screen -Name[af]=Leë Skerm -Name[ar]=شاشة فارغة -Name[az]=Boş Ekran -Name[be]=Чысты экран -Name[bg]=Празен екран -Name[bn]=ফাঁকা স্ক্রীণ -Name[br]=Skramm goullo -Name[bs]=Prazan ekran -Name[ca]=Pantalla en blanc -Name[cs]=Prázdná obrazovka -Name[csb]=Czôrny ekran -Name[cy]=Sgrîn Gwag -Name[da]=Blank skærm -Name[de]=Leerer Bildschirm -Name[el]=Κενή οθόνη -Name[eo]=Nigra ekrano -Name[es]=Pantalla negra -Name[et]=Tühi ekraan -Name[eu]=Leiho beltza -Name[fa]=پردۀ خالی -Name[fi]=Tyhjä ruutu -Name[fr]=Écran vide -Name[fy]=Leech skerm -Name[ga]=Scáileán Glan -Name[gl]=Pantalla baleira -Name[he]=מסך ריק -Name[hi]=स्क्रीन शून्य करें -Name[hr]=Prazan zaslon -Name[hu]=Üres képernyő -Name[id]=Layar Kosong -Name[is]=Svartur skjár -Name[it]=Schermo nero -Name[ja]=なし -Name[ka]=ცარიელი ეკრანი -Name[kk]=Бос экран -Name[km]=អេក្រង់​ទទេ -Name[ko]=빈 화면 -Name[lo]=ຈໍວ່າງ -Name[lt]=Tuščias ekranas -Name[lv]=Tukšs Ekrāns -Name[mk]=Празен екран -Name[mn]=Хоосон дэлгэц -Name[ms]=Skrin Kosong -Name[mt]=Skrin Vojt -Name[nb]=Tom skjerm -Name[nds]=Leddig Schirm -Name[ne]=खाली पर्दा -Name[nl]=Leeg scherm -Name[nn]=Tom skjerm -Name[nso]=Pontsho yeo Esenago Selo -Name[oc]=Ecran blanc -Name[pa]=ਖਾਲੀ ਸਕਰੀਨ -Name[pl]=Czarny ekran -Name[pt]=Ecrã Vazio -Name[pt_BR]=Limpar Tela -Name[ro]=Ecran gol -Name[ru]=Пустой экран -Name[rw]=Mugaragaza Itanditseho -Name[se]=Guorus šearbma -Name[sk]=Prázdna obrazovka -Name[sl]=Prazen zaslon -Name[sr]=Празан екран -Name[sr@Latn]=Prazan ekran -Name[ss]=Skrini lesingenalutfo -Name[sv]=Tom skärm -Name[ta]=வெற்று திரை -Name[te]=ఖాళి తెర -Name[tg]=Пардаи сафед -Name[th]=หน้าจอว่าง -Name[tr]=Boş Ekran -Name[tt]=Buş Küräk -Name[uk]=Порожній екран -Name[uz]=Boʻsh ekran -Name[uz@cyrillic]=Бўш экран -Name[ven]=Tshikirini tshi sina tshithu -Name[vi]=Màn hình Trống -Name[wa]=Noere waitroûle -Name[xh]=Ikhusi Elingenanto -Name[zh_CN]=空屏幕 -Name[zh_TW]=空白螢幕 -Name[zu]=Iskrini Esingenalutho - -[Desktop Action Setup] -Exec=kblankscrn.kss -setup -Name=Setup... -Name[af]=Opstelling... -Name[ar]=إعداد... -Name[az]=Qurğular... -Name[be]=Настаўленні... -Name[bg]=Настройване... -Name[bn]=সেট-আপ... -Name[br]=Kefluniadur ... -Name[bs]=Postavke... -Name[ca]=Configuració... -Name[cs]=Nastavení... -Name[csb]=Ùstôw... -Name[cy]=Gosod... -Name[da]=Opsætning... -Name[de]=Einrichtung ... -Name[el]=Ρύθμιση... -Name[eo]=Agordo... -Name[es]=Configuración... -Name[et]=Seadistused... -Name[eu]=Konfigurazioa... -Name[fa]=برپایی... -Name[fi]=Asetukset... -Name[fr]=Configuration... -Name[fy]=Opset... -Name[ga]=Cumraigh... -Name[gl]=Configuración... -Name[he]=הגדרות... -Name[hi]=सेटअप... -Name[hr]=Postavke... -Name[hu]=Beállítás... -Name[id]=Aturan... -Name[is]=Stillingar... -Name[it]=Impostazioni... -Name[ja]=セットアップ... -Name[ka]=კონფიგურაცია... -Name[kk]=Баптау... -Name[km]=ដំឡើង... -Name[ko]=설정... -Name[lo]=ຕິດຕັ້ງ.. -Name[lt]=Nustatymas... -Name[lv]=Uzstādīšana... -Name[mk]=Постави... -Name[mn]=Тохируулга... -Name[ms]=Tetapan... -Name[nb]=Oppsett … -Name[nds]=Instellen... -Name[ne]=सेटअप... -Name[nl]=Instellingen... -Name[nn]=Oppsett … -Name[nso]=Beakanya... -Name[oc]=Configuracion... -Name[pa]=ਸੈੱਟਅੱਪ... -Name[pl]=Ustawienia... -Name[pt]=Configurar... -Name[pt_BR]=Configurar... -Name[ro]=Opțiuni... -Name[ru]=Настройка... -Name[rw]=Iboneza... -Name[se]=Heiveheapmi … -Name[sk]=Nastavenie... -Name[sl]=Nastavitve ... -Name[sr]=Подеси... -Name[sr@Latn]=Podesi... -Name[ss]=Lungiselela... -Name[sv]=Inställningar... -Name[ta]=அமைப்பு... -Name[te]=సెటప్... -Name[tg]=Танзимот... -Name[th]=ตั้งค่า... -Name[tr]=Kurulum... -Name[tt]=Caylaw... -Name[uk]=Встановити... -Name[uz]=Oʻrnatish -Name[uz@cyrillic]=Ўрнатиш -Name[ven]=Vhekanya... -Name[vi]=Cài đặt... -Name[wa]=Apontyî... -Name[xh]=Iyacwangciswa... -Name[zh_CN]=设置... -Name[zh_TW]=設定... -Name[zu]=Iyalungiselela... -Icon=kscreensaver - -[Desktop Action InWindow] -Exec=kblankscrn.kss -window-id %w -Name=Display in Specified Window -Name[af]=Vertoon in gespesifiseerde venster -Name[ar]=أعرض في النافذة المحددة -Name[az]=Bildirilən Pəncərədə Göstər -Name[be]=Паказваць у вызначаным акне -Name[bg]=Стартиране в избран прозорец -Name[bn]=নির্দিষ্ট উইণ্ডোয় দেখাও -Name[br]=Diskwel er prenestr spisaet -Name[bs]=Prikaži u navedenom prozoru -Name[ca]=Mostra a la finestra especificada -Name[cs]=Zobrazit v určeném okně -Name[csb]=Wëskrzëni w pòdónym òknie -Name[cy]=Dangos mewn Ffenestr Benodol -Name[da]=Visning i angivet vindue -Name[de]=In angegebenem Fenster anzeigen -Name[el]=Προβολή στο καθορισμένο παράθυρο -Name[eo]=Montru en indikita fenestro -Name[es]=Mostrar en la ventana especificada -Name[et]=Määratud aknas näitamine -Name[eu]=Erakutsi adierazitako leihoan -Name[fa]=نمایش در پنجرۀ مشخص‌شده -Name[fi]=Näytä määrätyssä ikkunassa -Name[fr]=Affichage dans la fenêtre spécifiée -Name[fy]=Werjefte yn in definiëare finster -Name[ga]=Taispeáin san Fhuinneog Sonraithe -Name[gl]=Mostrar na fiestra especificada -Name[he]=הצג בחלון המצוין -Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें -Name[hr]=Prikaži u odabranom prozoru -Name[hu]=Megjelenítés egy megadott ablakban -Name[is]=Birta í völdum glugga -Name[it]=Mostra nella finestra specificata -Name[ja]=特定のウィンドウで表示 -Name[ka]=მოცემულ ფანჯარაში ასახვა -Name[kk]=Келтірілген терезеде көрсету -Name[km]=បង្ហាញ​ក្នុង​បង្អួច​ដែល​បាន​បញ្ជាក់​លម្អិត -Name[ko]=지정한 창에 보이기 -Name[lt]=Rodyti nurodytame lange -Name[lv]=Rādīt norādītajā logā -Name[mk]=Прикажи во наведениот прозорец -Name[ms]=Paparan dalam Tetingkap Yang Dinyatakan -Name[mt]=Uri f'window speċifika -Name[nb]=Vis i det valgte vinduet -Name[nds]=In't utsöchte Finster wiesen -Name[ne]=निर्दिष्ट गरिएको सञ्झ्यालमा प्रदर्शन गर्नुहोस् -Name[nl]=In een gedefinieerd venster weergeven -Name[nn]=Vis i vald vindauge -Name[pa]=ਦਿੱਤੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ -Name[pl]=Wyświetl w podanym oknie -Name[pt]=Mostrar na Janela Indicada -Name[pt_BR]=Mostrar em janela especificada -Name[ro]=Afișează în fereastra specificată -Name[ru]=Показать в указанном окне -Name[rw]=Kwerekana mu Idirishya Ryihariye -Name[se]=Čájet meroštuvvon láses -Name[sk]=Zobraziť v zadanom okne -Name[sl]=Prikaz v določenemu oknu -Name[sr]=Прикажи у задатом прозору -Name[sr@Latn]=Prikaži u zadatom prozoru -Name[sv]=Visa i angivet fönster -Name[ta]=குறிப்பிடப்பட்ட சாளரத்தில் காட்டு -Name[th]=แสดงในหน้าต่างที่กำหนด -Name[tr]=Belirtilen Pencerede Göster -Name[tt]=Äytelgän Täräzädä Kürsät -Name[uk]=Відобразити у вказаному вікні -Name[uz]=Koʻrsatilgan oynada koʻrsatish -Name[uz@cyrillic]=Кўрсатилган ойнада кўрсатиш -Name[vi]=Hiển thị trong một Cửa sổ Đặc biệt -Name[wa]=Håyner dins l' purnea specifyî -Name[zh_CN]=在指定窗口中显示 -Name[zh_TW]=在指定的視窗中顯示 -NoDisplay=true - -[Desktop Action Root] -Exec=kblankscrn.kss -root -Name=Display in Root Window -Name[af]=Vertoon in root venster -Name[ar]=أعرض في النافذة الجذرية -Name[az]=Kök Pəncərədə Göstər -Name[be]=Паказваць у галоўным акне -Name[bg]=Стартиране в главния прозорец -Name[bn]=রুট উইণ্ডোয় দেখাও -Name[br]=Diskwel er prenestr gwrizienn -Name[bs]=Prikaži u korijenskom prozoru -Name[ca]=Mostra a la finestra root -Name[cs]=Zobrazit na pozadí plochy -Name[csb]=Wëskrzëni w przédnym òknie -Name[cy]=Dangos mewn Ffenestr Wraidd -Name[da]=Visning i root-vindue -Name[de]=Im Basisfenster (Root Window) anzeigen -Name[el]=Προβολή στο βασικό παράθυρο -Name[eo]=Montru en radika fenestro -Name[es]=Mostrar en la ventana raíz -Name[et]=Juuraknas näitamine -Name[eu]=Erakutsi leiho nagusian -Name[fa]=نمایش در پنجرۀ ریشه -Name[fi]=Näytä juuri-ikkunassa -Name[fr]=Affichage dans la fenêtre racine -Name[fy]=Werjefte yn haadfinster -Name[ga]=Taispeáin sa bhFréamhfhuinneog -Name[gl]=Mostrar na fiestra raiz -Name[he]=הצג בחלון השורש -Name[hi]=रूट विंडो में प्रदर्शित करें -Name[hr]=Prikaži u korijenskom prozoru -Name[hu]=Megjelenítés a gyökérablakban -Name[is]=Birta í bakgrunni skjáborðs -Name[it]=Mostra sulla finestra di sfondo -Name[ja]=ルートウィンドウで表示 -Name[ka]=ძირეულ ფანჯარაში ასახვა -Name[kk]=Root терезесінде көрсету -Name[km]=បង្ហាញ​ក្នុង​បង្អួច Root -Name[ko]=전체 화면에 보이기 -Name[lt]=Rodyti root lange -Name[lv]=Rādīt saknes logā -Name[mk]=Прикажи во кореновиот прозорец -Name[ms]=Papar dalam Tetingkap Root -Name[mt]=Uri fil-window ewlenija -Name[nb]=Vis i rotvinduet -Name[nds]=In't Hööftfinster wiesen -Name[ne]=रुट सञ्झ्यालमा प्रदर्शन गर्नुहोस् -Name[nl]=In hoofdvenster weergeven -Name[nn]=Vis i rotvindauget -Name[pa]=ਰੂਟ(Root) ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ -Name[pl]=Wyświetl w oknie głównym -Name[pt]=Mostrar na Janela de Fundo -Name[pt_BR]=Mostrar na janela-raiz -Name[ro]=Afișează în fereastra rădăcină -Name[ru]=Показать в корневом окне -Name[rw]=Kwerekana mu Idirishya Umuzi -Name[se]=Čájet ruohtasláses -Name[sk]=Zobraziť v koreňovom okne -Name[sl]=Prikaz v korenskem oknu -Name[sr]=Прикажи у кореном прозору -Name[sr@Latn]=Prikaži u korenom prozoru -Name[sv]=Visa i rotfönstret -Name[ta]=மூல சாளரத்தில் காட்டு -Name[th]=แสดงในหน้าต่างหลัก -Name[tr]=Kök Pencerede Göster -Name[tt]=Root Täräzäsendä Kürsät -Name[uk]=Відобразити на тлі екрана -Name[uz]=Tub oynada koʻrsatish -Name[uz@cyrillic]=Туб ойнада кўрсатиш -Name[vi]=Hiển thị trong Cửa sổ của Gốc -Name[wa]=Håyner e purnea raecene (li fond do scribanne) -Name[zh_CN]=在 Root 窗口中显示 -Name[zh_TW]=在 Root 視窗中顯示 -NoDisplay=true diff --git a/kscreensaver/KRandom.desktop b/kscreensaver/KRandom.desktop deleted file mode 100644 index 072901172..000000000 --- a/kscreensaver/KRandom.desktop +++ /dev/null @@ -1,321 +0,0 @@ -[Desktop Entry] -Exec=krandom.kss -Icon=kscreensaver -Type=Application -Actions=Setup;InWindow;Root; -OnlyShowIn=TDE; -Name=Random -Name[af]=Lukrake -Name[ar]=عشوائي -Name[az]=Təsadüfi -Name[be]=Выпадковы -Name[bg]=Произволен -Name[bn]=এলোমেলোভাবে -Name[br]=Dre zegouezh -Name[bs]=Bilo koji -Name[ca]=Aleatori -Name[cs]=Náhodný -Name[csb]=Przëtrôfkòwi -Name[cy]=Ar Hap -Name[da]=Tilfældig -Name[de]=Zufällig -Name[el]=Τυχαία -Name[eo]=Hazardo -Name[es]=Aleatorio -Name[et]=Juhuslik -Name[eu]=Ausazkoa -Name[fa]=تصادفی -Name[fi]=Satunnainen -Name[fr]=Aléatoire -Name[fy]=Samar in -Name[ga]=Fánach -Name[gl]=Aleatório -Name[he]=אקראי -Name[hi]=बेतरतीब -Name[hr]=Nasumice -Name[hu]=Véletlenszerű -Name[id]=Acak -Name[is]=Slembið -Name[it]=Casuale -Name[ja]=ランダム -Name[ka]=შემთხვევითი -Name[kk]=Кездейсоқ -Name[km]=ចៃដន្យ -Name[ko]=아무거나 -Name[lo]=ສຸ່ມ -Name[lt]=Atsitiktinis -Name[lv]=Gadījuma -Name[mk]=Случаен -Name[mn]=Дурын -Name[ms]=Rawak -Name[mt]=Imtella' bil-Polza -Name[nb]=Tilfeldig -Name[nds]=Tofall -Name[ne]=अनियमित -Name[nl]=Willekeurig -Name[nn]=Tilfeldig -Name[nso]=Kago Rarela -Name[oc]=Aleatori -Name[pa]=ਰਲਵਾਂ -Name[pl]=Losowy -Name[pt]=Aleatório -Name[pt_BR]=Aleatório -Name[ro]=Aleator -Name[ru]=Случайный -Name[rw]=Bibonetse -Name[se]=Sáhtodohko -Name[sk]=Náhodný -Name[sl]=Naključno -Name[sr]=Случајно -Name[sr@Latn]=Slučajno -Name[sv]=Slumpmässig -Name[ta]=ஒழுங்கற்ற -Name[tg]=Тассодуфӣ -Name[th]=สุ่ม -Name[tr]=Rastgele -Name[tt]=Oçraqlı -Name[uk]=Випадковий -Name[uz]=Tasodifiy -Name[uz@cyrillic]=Тасодифий -Name[ven]=Zwothe -Name[vi]=Ngẫu nhiên -Name[wa]=A l' astcheyance -Name[xh]=Ngaphandle kwenjongo -Name[zh_CN]=随机 -Name[zh_TW]=隨機 -Name[zu]=Okungenaphethini - -[Desktop Action Setup] -Exec=krandom.kss -setup -Name=Setup... -Name[af]=Opstelling... -Name[ar]=إعداد... -Name[az]=Qurğular... -Name[be]=Настаўленні... -Name[bg]=Настройване... -Name[bn]=সেট-আপ... -Name[br]=Kefluniadur ... -Name[bs]=Postavke... -Name[ca]=Configuració... -Name[cs]=Nastavení... -Name[csb]=Ùstôw... -Name[cy]=Gosod... -Name[da]=Opsætning... -Name[de]=Einrichtung ... -Name[el]=Ρύθμιση... -Name[eo]=Agordo... -Name[es]=Configuración... -Name[et]=Seadistused... -Name[eu]=Konfigurazioa... -Name[fa]=برپایی... -Name[fi]=Asetukset... -Name[fr]=Configuration... -Name[fy]=Opset... -Name[ga]=Cumraigh... -Name[gl]=Configuración... -Name[he]=הגדרות... -Name[hi]=सेटअप... -Name[hr]=Postavke... -Name[hu]=Beállítás... -Name[id]=Aturan... -Name[is]=Stillingar... -Name[it]=Impostazioni... -Name[ja]=セットアップ... -Name[ka]=კონფიგურაცია... -Name[kk]=Баптау... -Name[km]=ដំឡើង... -Name[ko]=설정... -Name[lo]=ຕິດຕັ້ງ.. -Name[lt]=Nustatymas... -Name[lv]=Uzstādīšana... -Name[mk]=Постави... -Name[mn]=Тохируулга... -Name[ms]=Tetapan... -Name[nb]=Oppsett … -Name[nds]=Instellen... -Name[ne]=सेटअप... -Name[nl]=Instellingen... -Name[nn]=Oppsett … -Name[nso]=Beakanya... -Name[oc]=Configuracion... -Name[pa]=ਸੈੱਟਅੱਪ... -Name[pl]=Ustawienia... -Name[pt]=Configurar... -Name[pt_BR]=Configurar... -Name[ro]=Opțiuni... -Name[ru]=Настройка... -Name[rw]=Iboneza... -Name[se]=Heiveheapmi … -Name[sk]=Nastavenie... -Name[sl]=Nastavitve ... -Name[sr]=Подеси... -Name[sr@Latn]=Podesi... -Name[ss]=Lungiselela... -Name[sv]=Inställningar... -Name[ta]=அமைப்பு... -Name[te]=సెటప్... -Name[tg]=Танзимот... -Name[th]=ตั้งค่า... -Name[tr]=Kurulum... -Name[tt]=Caylaw... -Name[uk]=Встановити... -Name[uz]=Oʻrnatish -Name[uz@cyrillic]=Ўрнатиш -Name[ven]=Vhekanya... -Name[vi]=Cài đặt... -Name[wa]=Apontyî... -Name[xh]=Iyacwangciswa... -Name[zh_CN]=设置... -Name[zh_TW]=設定... -Name[zu]=Iyalungiselela... -Icon=kscreensaver - -[Desktop Action InWindow] -Exec=krandom.kss -window-id %w -Name=Display in Specified Window -Name[af]=Vertoon in gespesifiseerde venster -Name[ar]=أعرض في النافذة المحددة -Name[az]=Bildirilən Pəncərədə Göstər -Name[be]=Паказваць у вызначаным акне -Name[bg]=Стартиране в избран прозорец -Name[bn]=নির্দিষ্ট উইণ্ডোয় দেখাও -Name[br]=Diskwel er prenestr spisaet -Name[bs]=Prikaži u navedenom prozoru -Name[ca]=Mostra a la finestra especificada -Name[cs]=Zobrazit v určeném okně -Name[csb]=Wëskrzëni w pòdónym òknie -Name[cy]=Dangos mewn Ffenestr Benodol -Name[da]=Visning i angivet vindue -Name[de]=In angegebenem Fenster anzeigen -Name[el]=Προβολή στο καθορισμένο παράθυρο -Name[eo]=Montru en indikita fenestro -Name[es]=Mostrar en la ventana especificada -Name[et]=Määratud aknas näitamine -Name[eu]=Erakutsi adierazitako leihoan -Name[fa]=نمایش در پنجرۀ مشخص‌شده -Name[fi]=Näytä määrätyssä ikkunassa -Name[fr]=Affichage dans la fenêtre spécifiée -Name[fy]=Werjefte yn in definiëare finster -Name[ga]=Taispeáin san Fhuinneog Sonraithe -Name[gl]=Mostrar na fiestra especificada -Name[he]=הצג בחלון המצוין -Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें -Name[hr]=Prikaži u odabranom prozoru -Name[hu]=Megjelenítés egy megadott ablakban -Name[is]=Birta í völdum glugga -Name[it]=Mostra nella finestra specificata -Name[ja]=特定のウィンドウで表示 -Name[ka]=მოცემულ ფანჯარაში ასახვა -Name[kk]=Келтірілген терезеде көрсету -Name[km]=បង្ហាញ​ក្នុង​បង្អួច​ដែល​បាន​បញ្ជាក់​លម្អិត -Name[ko]=지정한 창에 보이기 -Name[lt]=Rodyti nurodytame lange -Name[lv]=Rādīt norādītajā logā -Name[mk]=Прикажи во наведениот прозорец -Name[ms]=Paparan dalam Tetingkap Yang Dinyatakan -Name[mt]=Uri f'window speċifika -Name[nb]=Vis i det valgte vinduet -Name[nds]=In't utsöchte Finster wiesen -Name[ne]=निर्दिष्ट गरिएको सञ्झ्यालमा प्रदर्शन गर्नुहोस् -Name[nl]=In een gedefinieerd venster weergeven -Name[nn]=Vis i vald vindauge -Name[pa]=ਦਿੱਤੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ -Name[pl]=Wyświetl w podanym oknie -Name[pt]=Mostrar na Janela Indicada -Name[pt_BR]=Mostrar em janela especificada -Name[ro]=Afișează în fereastra specificată -Name[ru]=Показать в указанном окне -Name[rw]=Kwerekana mu Idirishya Ryihariye -Name[se]=Čájet meroštuvvon láses -Name[sk]=Zobraziť v zadanom okne -Name[sl]=Prikaz v določenemu oknu -Name[sr]=Прикажи у задатом прозору -Name[sr@Latn]=Prikaži u zadatom prozoru -Name[sv]=Visa i angivet fönster -Name[ta]=குறிப்பிடப்பட்ட சாளரத்தில் காட்டு -Name[th]=แสดงในหน้าต่างที่กำหนด -Name[tr]=Belirtilen Pencerede Göster -Name[tt]=Äytelgän Täräzädä Kürsät -Name[uk]=Відобразити у вказаному вікні -Name[uz]=Koʻrsatilgan oynada koʻrsatish -Name[uz@cyrillic]=Кўрсатилган ойнада кўрсатиш -Name[vi]=Hiển thị trong một Cửa sổ Đặc biệt -Name[wa]=Håyner dins l' purnea specifyî -Name[zh_CN]=在指定窗口中显示 -Name[zh_TW]=在指定的視窗中顯示 -NoDisplay=true - -[Desktop Action Root] -Exec=krandom.kss -root -Name=Display in Root Window -Name[af]=Vertoon in root venster -Name[ar]=أعرض في النافذة الجذرية -Name[az]=Kök Pəncərədə Göstər -Name[be]=Паказваць у галоўным акне -Name[bg]=Стартиране в главния прозорец -Name[bn]=রুট উইণ্ডোয় দেখাও -Name[br]=Diskwel er prenestr gwrizienn -Name[bs]=Prikaži u korijenskom prozoru -Name[ca]=Mostra a la finestra root -Name[cs]=Zobrazit na pozadí plochy -Name[csb]=Wëskrzëni w przédnym òknie -Name[cy]=Dangos mewn Ffenestr Wraidd -Name[da]=Visning i root-vindue -Name[de]=Im Basisfenster (Root Window) anzeigen -Name[el]=Προβολή στο βασικό παράθυρο -Name[eo]=Montru en radika fenestro -Name[es]=Mostrar en la ventana raíz -Name[et]=Juuraknas näitamine -Name[eu]=Erakutsi leiho nagusian -Name[fa]=نمایش در پنجرۀ ریشه -Name[fi]=Näytä juuri-ikkunassa -Name[fr]=Affichage dans la fenêtre racine -Name[fy]=Werjefte yn haadfinster -Name[ga]=Taispeáin sa bhFréamhfhuinneog -Name[gl]=Mostrar na fiestra raiz -Name[he]=הצג בחלון השורש -Name[hi]=रूट विंडो में प्रदर्शित करें -Name[hr]=Prikaži u korijenskom prozoru -Name[hu]=Megjelenítés a gyökérablakban -Name[is]=Birta í bakgrunni skjáborðs -Name[it]=Mostra sulla finestra di sfondo -Name[ja]=ルートウィンドウで表示 -Name[ka]=ძირეულ ფანჯარაში ასახვა -Name[kk]=Root терезесінде көрсету -Name[km]=បង្ហាញ​ក្នុង​បង្អួច Root -Name[ko]=전체 화면에 보이기 -Name[lt]=Rodyti root lange -Name[lv]=Rādīt saknes logā -Name[mk]=Прикажи во кореновиот прозорец -Name[ms]=Papar dalam Tetingkap Root -Name[mt]=Uri fil-window ewlenija -Name[nb]=Vis i rotvinduet -Name[nds]=In't Hööftfinster wiesen -Name[ne]=रुट सञ्झ्यालमा प्रदर्शन गर्नुहोस् -Name[nl]=In hoofdvenster weergeven -Name[nn]=Vis i rotvindauget -Name[pa]=ਰੂਟ(Root) ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ -Name[pl]=Wyświetl w oknie głównym -Name[pt]=Mostrar na Janela de Fundo -Name[pt_BR]=Mostrar na janela-raiz -Name[ro]=Afișează în fereastra rădăcină -Name[ru]=Показать в корневом окне -Name[rw]=Kwerekana mu Idirishya Umuzi -Name[se]=Čájet ruohtasláses -Name[sk]=Zobraziť v koreňovom okne -Name[sl]=Prikaz v korenskem oknu -Name[sr]=Прикажи у кореном прозору -Name[sr@Latn]=Prikaži u korenom prozoru -Name[sv]=Visa i rotfönstret -Name[ta]=மூல சாளரத்தில் காட்டு -Name[th]=แสดงในหน้าต่างหลัก -Name[tr]=Kök Pencerede Göster -Name[tt]=Root Täräzäsendä Kürsät -Name[uk]=Відобразити на тлі екрана -Name[uz]=Tub oynada koʻrsatish -Name[uz@cyrillic]=Туб ойнада кўрсатиш -Name[vi]=Hiển thị trong Cửa sổ của Gốc -Name[wa]=Håyner e purnea raecene (li fond do scribanne) -Name[zh_CN]=在 Root 窗口中显示 -Name[zh_TW]=在 Root 視窗中顯示 -NoDisplay=true diff --git a/kscreensaver/Makefile.am b/kscreensaver/Makefile.am deleted file mode 100644 index ff00a42b1..000000000 --- a/kscreensaver/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# Makefile.am for kscreensaver. -# - -AM_CPPFLAGS = -UQT_NO_ASCII_CAST - -INCLUDES = $(GLINC) $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor - -bin_PROGRAMS = krandom.kss kblankscrn.kss - -krandom_kss_SOURCES = random.cpp -krandom_kss_LDADD = $(LIB_TDEUI) $(GLLIB) -lm - -kblankscrn_kss_SOURCES = blankscrn.cpp -kblankscrn_kss_LDADD = $(LIB_TDEUI) -lkscreensaver -lm - -METASOURCES = AUTO - -messages: - $(XGETTEXT) *.cpp *.h -o $(podir)/kscreensaver.pot - -########## Meta objects ########## - -desktop_DATA = KRandom.desktop KBlankscreen.desktop -desktopdir = $(kde_appsdir)/System/ScreenSavers - -EXTRA_DIST = $(desktop_DATA) diff --git a/kscreensaver/blankscrn.cpp b/kscreensaver/blankscrn.cpp deleted file mode 100644 index 3691e98af..000000000 --- a/kscreensaver/blankscrn.cpp +++ /dev/null @@ -1,135 +0,0 @@ -//----------------------------------------------------------------------------- -// -// kblankscrn - Basic screen saver for KDE -// -// Copyright (c) Martin R. Jones 1996 -// -// 1998/04/19 Layout management added by Mario Weilguni -// 2001/03/04 Converted to use libkscreensaver by Martin R. Jones - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "blankscrn.h" -#include "blankscrn.moc" - -// libkscreensaver interface -extern "C" -{ - KDE_EXPORT const char *kss_applicationName = "kblankscrn.kss"; - KDE_EXPORT const char *kss_description = I18N_NOOP( "KBlankScreen" ); - KDE_EXPORT const char *kss_version = "2.2.0"; - - KDE_EXPORT KScreenSaver* kss_create( WId id ) - { - return new KBlankSaver( id ); - } - - KDE_EXPORT TQDialog* kss_setup() - { - return new KBlankSetup(); - } -} - -//----------------------------------------------------------------------------- -// dialog to setup screen saver parameters -// -KBlankSetup::KBlankSetup( TQWidget *parent, const char *name ) - : KDialogBase( parent, name, true, i18n( "Setup Blank Screen Saver" ), - Ok|Cancel, Ok, true ) -{ - readSettings(); - - TQFrame *main = makeMainWidget(); - TQGridLayout *grid = new TQGridLayout(main, 4, 2, 0, spacingHint() ); - - TQLabel *label = new TQLabel( i18n("Color:"), main ); - grid->addWidget(label, 0, 0); - - KColorButton *colorPush = new KColorButton( color, main ); - colorPush->setMinimumWidth(80); - connect( colorPush, TQT_SIGNAL( changed(const TQColor &) ), - TQT_SLOT( slotColor(const TQColor &) ) ); - grid->addWidget(colorPush, 1, 0); - - preview = new TQWidget( main ); - preview->setFixedSize( 220, 165 ); - preview->setBackgroundColor( black ); - preview->show(); // otherwise saver does not get correct size - saver = new KBlankSaver( preview->winId() ); - grid->addMultiCellWidget(preview, 0, 2, 1, 1); - - grid->setRowStretch( 2, 10 ); - grid->setRowStretch( 3, 20 ); - - setMinimumSize( sizeHint() ); -} - -// read settings from config file -void KBlankSetup::readSettings() -{ - TDEConfig *config = TDEGlobal::config(); - config->setGroup( "Settings" ); - - color = config->readColorEntry( "Color", &black ); -} - -void KBlankSetup::slotColor( const TQColor &col ) -{ - color = col; - saver->setColor( color ); -} - -// Ok pressed - save settings and exit -void KBlankSetup::slotOk() -{ - TDEConfig *config = TDEGlobal::config(); - config->setGroup( "Settings" ); - config->writeEntry( "Color", color ); - config->sync(); - - accept(); -} - -//----------------------------------------------------------------------------- - - -KBlankSaver::KBlankSaver( WId id ) : KScreenSaver( id ) -{ - readSettings(); - blank(); -} - -KBlankSaver::~KBlankSaver() -{ -} - -// set the color -void KBlankSaver::setColor( const TQColor &col ) -{ - color = col; - blank(); -} - -// read configuration settings from config file -void KBlankSaver::readSettings() -{ - TDEConfig *config = TDEGlobal::config(); - config->setGroup( "Settings" ); - - color = config->readColorEntry( "Color", &black ); -} - -void KBlankSaver::blank() -{ - setBackgroundColor( color ); - erase(); -} - diff --git a/kscreensaver/blankscrn.h b/kscreensaver/blankscrn.h deleted file mode 100644 index ce9e129b4..000000000 --- a/kscreensaver/blankscrn.h +++ /dev/null @@ -1,56 +0,0 @@ -//----------------------------------------------------------------------------- -// -// kblankscrn - Basic screen saver for KDE -// -// Copyright (c) Martin R. Jones 1996 -// - -#ifndef __BLANKSCRN_H__ -#define __BLANKSCRN_H__ - -#include -#include -#include - -class KColorButton; - - -class KBlankSaver : public KScreenSaver -{ - Q_OBJECT -public: - KBlankSaver( WId drawable ); - virtual ~KBlankSaver(); - - void setColor( const TQColor &col ); - -private: - void readSettings(); - void blank(); - -private: - TQColor color; -}; - -class KBlankSetup : public KDialogBase -{ - Q_OBJECT -public: - KBlankSetup( TQWidget *parent = NULL, const char *name = NULL ); - -protected: - void readSettings(); - -private slots: - void slotColor( const TQColor & ); - void slotOk(); - -private: - TQWidget *preview; - KBlankSaver *saver; - - TQColor color; -}; - -#endif - diff --git a/kscreensaver/random.cpp b/kscreensaver/random.cpp deleted file mode 100644 index f7421ae7d..000000000 --- a/kscreensaver/random.cpp +++ /dev/null @@ -1,292 +0,0 @@ - //----------------------------------------------------------------------------- -// -// Screen savers for KDE -// -// Copyright (c) Martin R. Jones 1999 -// -// This is an extremely simple program that starts a random screensaver. -// - -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "kscreensaver_vroot.h" -#include "random.h" - -#define MAX_ARGS 20 - -static void usage(char *name) -{ - puts(i18n("Usage: %1 [-setup] [args]\n" - "Starts a random screen saver.\n" - "Any arguments (except -setup) are passed on to the screen saver.").arg( name ).local8Bit().data()); -} - -static const char appName[] = "random"; - -static const char description[] = I18N_NOOP("Start a random TDE screen saver"); - -static const char version[] = "2.0.0"; - -static const KCmdLineOptions options[] = -{ - { "setup", I18N_NOOP("Setup screen saver"), 0 }, - { "window-id wid", I18N_NOOP("Run in the specified XWindow"), 0 }, - { "root", I18N_NOOP("Run in the root XWindow"), 0 }, - // { "+-- [options]", I18N_NOOP("Options to pass to the screen saver"), 0 } - KCmdLineLastOption -}; - -//---------------------------------------------------------------------------- - -#ifdef HAVE_GLXCHOOSEVISUAL -#include -#endif - -//------------------------------------- -bool hasDirectRendering () { - Display *dpy = TQApplication::desktop()->x11Display(); - -#ifdef HAVE_GLXCHOOSEVISUAL - int attribSingle[] = { - GLX_RGBA, - GLX_RED_SIZE, 1, - GLX_GREEN_SIZE, 1, - GLX_BLUE_SIZE, 1, - None - }; - XVisualInfo* visinfo = glXChooseVisual ( - dpy, TQApplication::desktop()->primaryScreen(), attribSingle - ); - if (visinfo) { - GLXContext ctx = glXCreateContext ( dpy, visinfo, NULL, True ); - if (glXIsDirect(dpy, ctx)) { - glXDestroyContext (dpy,ctx); - return true; - } - glXDestroyContext (dpy,ctx); - return false; - } else { - return false; - } -#else -#error no GL? - return false; -#endif - -} - -int main(int argc, char *argv[]) -{ - KLocale::setMainCatalogue("kscreensaver"); - TDECmdLineArgs::init(argc, argv, appName, I18N_NOOP("Random screen saver"), description, version); - - TDECmdLineArgs::addCmdLineOptions(options); - - TDEApplication app; - - Window windowId = 0; - - TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - - if (args->isSet("setup")) - { - KRandomSetup setup; - setup.exec(); - exit(0); - } - - if (args->isSet("window-id")) - { - windowId = atol(args->getOption("window-id")); - } - - if (args->isSet("root")) - { - windowId = RootWindow(tqt_xdisplay(), tqt_xscreen()); - } - - TDEGlobal::dirs()->addResourceType("scrsav", - TDEGlobal::dirs()->kde_default("apps") + - "apps/ScreenSavers/"); - TDEGlobal::dirs()->addResourceType("scrsav", - TDEGlobal::dirs()->kde_default("apps") + - "System/ScreenSavers/"); - TQStringList tempSaverFileList = TDEGlobal::dirs()->findAllResources("scrsav", - "*.desktop", false, true); - - TQStringList saverFileList; - - TDEConfig type("krandom.kssrc"); - type.setGroup("Settings"); - bool opengl = type.readBoolEntry("OpenGL", hasDirectRendering()); - kdDebug() << "hasOPEN " << opengl << endl; - bool manipulatescreen = type.readBoolEntry("ManipulateScreen"); - bool fortune = !KStandardDirs::findExe("fortune").isEmpty(); - TQStringList defaults = type.readListEntry( "Defaults" ); - TQMap def_numbers; - for ( TQStringList::ConstIterator it = defaults.begin(); it != defaults.end(); ++it ) { - int index = ( *it ).find( ':' ); - if ( index == -1 ) - def_numbers[*it] = 1; - else - def_numbers[( *it ).left( index )] = ( *it ).mid( index + 1 ).toInt(); - } - - for (uint i = 0; i < tempSaverFileList.count(); i++) - { - int howoften = 1; - if ( defaults.count() != 0 ) { - TQFileInfo fi( tempSaverFileList[i] ); - if ( def_numbers.contains( fi.fileName() ) ) - howoften = def_numbers[fi.fileName()]; - else - howoften = 0; - } - - KDesktopFile saver(tempSaverFileList[i], true); - if (!saver.tryExec()) - continue; - TQString saverType = saver.readEntry("X-TDE-Type"); - if (!saverType.isEmpty()) // no X-TDE-Type defined so must be OK - { - TQStringList saverTypes = TQStringList::split(";", saverType); - for (TQStringList::ConstIterator it = saverTypes.begin(); it != saverTypes.end(); ++it ) - { - if (*it == "ManipulateScreen") - { - if (!manipulatescreen) - howoften = 0; - } - else - if (*it == "OpenGL") - { - if (!opengl) - howoften = 0; - } - if (*it == "Fortune") - { - if (!fortune) - howoften = 0; - } - - } - } - for ( int j = 0; j < howoften; ++j ) - saverFileList.append(tempSaverFileList[i]); - } - kdDebug() << "final " << saverFileList << endl; - - KRandomSequence rnd; - int indx = rnd.getLong(saverFileList.count()); - TQString filename = *(saverFileList.at(indx)); - - KDesktopFile config(filename, true); - - TQString cmd; - if (windowId && config.hasActionGroup("InWindow")) - { - config.setActionGroup("InWindow"); - } - else if ((windowId == 0) && config.hasActionGroup("Root")) - { - config.setActionGroup("Root"); - } - cmd = config.readPathEntry("Exec"); - - TQTextStream ts(&cmd, IO_ReadOnly); - TQString word; - ts >> word; - TQString exeFile = KStandardDirs::findExe(word); - - if (!exeFile.isEmpty()) - { - char *sargs[MAX_ARGS]; - sargs[0] = new char [strlen(word.ascii())+1]; - strcpy(sargs[0], word.ascii()); - - int i = 1; - while (!ts.atEnd() && i < MAX_ARGS-1) - { - ts >> word; - if (word == "%w") - { - word = word.setNum(windowId); - } - - sargs[i] = new char [strlen(word.ascii())+1]; - strcpy(sargs[i], word.ascii()); - kdDebug() << "word is " << word.ascii() << endl; - - i++; - } - - sargs[i] = 0; - - execv(exeFile.ascii(), sargs); - } - - // If we end up here then we couldn't start a saver. - // If we have been supplied a window id or root window then blank it. - Window win = windowId ? windowId : RootWindow(tqt_xdisplay(), tqt_xscreen()); - XSetWindowBackground(tqt_xdisplay(), win, - BlackPixel(tqt_xdisplay(), tqt_xscreen())); - XClearWindow(tqt_xdisplay(), win); -} - - -KRandomSetup::KRandomSetup( TQWidget *parent, const char *name ) - : KDialogBase( parent, name, true, i18n( "Setup Random Screen Saver" ), - Ok|Cancel, Ok, true ) -{ - - TQFrame *main = makeMainWidget(); - TQGridLayout *grid = new TQGridLayout(main, 4, 2, 0, spacingHint() ); - - openGL = new TQCheckBox( i18n("Use OpenGL screen savers"), main ); - grid->addWidget(openGL, 0, 0); - - manipulateScreen = new TQCheckBox(i18n("Use screen savers that manipulate the screen"), main); - grid->addWidget(manipulateScreen, 1, 0); - - setMinimumSize( sizeHint() ); - - TDEConfig config("krandom.kssrc"); - config.setGroup("Settings"); - openGL->setChecked(config.readBoolEntry("OpenGL", hasDirectRendering())); - manipulateScreen->setChecked(config.readBoolEntry("ManipulateScreen", true)); -} - -void KRandomSetup::slotOk() -{ - TDEConfig config("krandom.kssrc"); - config.setGroup("Settings"); - config.writeEntry("OpenGL", openGL->isChecked()); - config.writeEntry("ManipulateScreen", manipulateScreen->isChecked()); - - accept(); -} - -#include "random.moc" diff --git a/kscreensaver/random.h b/kscreensaver/random.h deleted file mode 100644 index e34556662..000000000 --- a/kscreensaver/random.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - Copyright (c) 2003 Chris Howells - - ************************************************************************* - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; version * - * 2 of the License. * - * * - ************************************************************************* -*/ - -#ifndef RANDOM_H -#define RANDOM_H - -class TQWidget; -class TQCheckBox; - -class KRandomSetup : public KDialogBase -{ - Q_OBJECT - public: - KRandomSetup( TQWidget *parent = NULL, const char *name = NULL ); - - private: - - TQWidget *preview; - TQCheckBox *openGL; - TQCheckBox *manipulateScreen; - - private slots: - - void slotOk(); - -}; - -#endif diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index bd46dadcd..6f09a8f33 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -49,5 +49,5 @@ tde_add_tdeinit_executable( ksmserver AUTOMOC main.cpp server.cpp shutdowndlg.cpp startupdlg.cpp legacy.cpp startup.cpp shutdown.cpp client.cpp KSMServerInterface.skel server.skel timed.ui - LINK dmctl-static tdeui-shared krsync-shared ${HAL_LIBRARIES} ${DBUS_1_TQT_LIBRARIES} ${DBUS_TQT_LIBRARIES} + LINK dmctl-static tdeui-shared tdersync-shared ${HAL_LIBRARIES} ${DBUS_1_TQT_LIBRARIES} ${DBUS_TQT_LIBRARIES} ) diff --git a/ksmserver/Makefile.am b/ksmserver/Makefile.am index 66a51e762..502ffb8e9 100644 --- a/ksmserver/Makefile.am +++ b/ksmserver/Makefile.am @@ -43,7 +43,7 @@ updatedir = $(kde_datadir)/kconf_update EXTRA_PROGRAMS = testsh testsh_SOURCES = test.cpp timed.ui -testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testsh_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testsh_LDADD = $(LIB_TDEUI) shutdowndlg.lo ../tdmlib/libdmctl.la $(HAL_LIBS) $(DBUS_LIBS) messages: diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index 08d934069..2d9ce713a 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -81,7 +81,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include +#include #ifdef WITH_UPOWER #include diff --git a/ksplashml/CMakeLists.txt b/ksplashml/CMakeLists.txt index 2ab57be05..6cfe72836 100644 --- a/ksplashml/CMakeLists.txt +++ b/ksplashml/CMakeLists.txt @@ -36,6 +36,6 @@ install( FILES ksplash.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_executable( ksplash AUTOMOC SOURCES wndmain.cpp ksplashiface.skel main.cpp - LINK themedefault-static kparts-shared + LINK themedefault-static tdeparts-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ksplashml/Makefile.am b/ksplashml/Makefile.am index 30639589b..f7f7b70ab 100644 --- a/ksplashml/Makefile.am +++ b/ksplashml/Makefile.am @@ -6,7 +6,7 @@ METASOURCES=AUTO bin_PROGRAMS = ksplash ksplash_SOURCES = wndmain.cpp ksplashiface.skel main.cpp -ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksplash_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ksplash_LDADD = $(LIB_TDEUI) themeengine/default/libthemedefault.la themeengine/libksplashthemes.la $(LIB_KIO) noinst_HEADERS = ksplashiface.h wndmain.h diff --git a/ksplashml/themeengine/default/Makefile.am b/ksplashml/themeengine/default/Makefile.am index b6f14e29b..2e78de52a 100644 --- a/ksplashml/themeengine/default/Makefile.am +++ b/ksplashml/themeengine/default/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) noinst_LTLIBRARIES = libthemedefault.la libthemedefault_la_SOURCES = themelegacy.cpp -libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libthemedefault_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la kde_module_LTLIBRARIES = ksplashdefault.la diff --git a/ksplashml/themeengine/simple/Makefile.am b/ksplashml/themeengine/simple/Makefile.am index 029e31944..200b96b83 100644 --- a/ksplashml/themeengine/simple/Makefile.am +++ b/ksplashml/themeengine/simple/Makefile.am @@ -3,5 +3,5 @@ INCLUDES = $(all_includes) bin_PROGRAMS = ksplashsimple ksplashsimple_SOURCES = main.cpp -ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksplashsimple_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor ksplashsimple_LDADD = $(LIB_XINERAMA) $(LIB_X11) $(LIB_QT) diff --git a/ksplashml/themeengine/standard/Makefile.am b/ksplashml/themeengine/standard/Makefile.am index 9d275066b..6db469162 100644 --- a/ksplashml/themeengine/standard/Makefile.am +++ b/ksplashml/themeengine/standard/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/ksplashml/themeengine $(all_includes) noinst_LTLIBRARIES = libthemestandard.la libthemestandard_la_SOURCES = themestandard.cpp wndicon.cpp wndstatus.cpp -libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libthemestandard_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libthemestandard_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la kde_module_LTLIBRARIES = ksplashstandard.la diff --git a/ksplashml/themeengine/unified/Makefile.am b/ksplashml/themeengine/unified/Makefile.am index b6f14e29b..2e78de52a 100644 --- a/ksplashml/themeengine/unified/Makefile.am +++ b/ksplashml/themeengine/unified/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) noinst_LTLIBRARIES = libthemedefault.la libthemedefault_la_SOURCES = themelegacy.cpp -libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libthemedefault_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libthemedefault_la_LIBADD = $(LIB_TDEUI) ../libksplashthemes.la kde_module_LTLIBRARIES = ksplashdefault.la diff --git a/kstart/Makefile.am b/kstart/Makefile.am index 718687b50..d9e493a9d 100644 --- a/kstart/Makefile.am +++ b/kstart/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = $(all_includes) bin_PROGRAMS = kstart kstart_SOURCES = kstart.cpp -kstart_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kstart_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kstart_LDADD = $(LIB_TDECORE) METASOURCES = kstart.moc diff --git a/ksysguard/gui/CMakeLists.txt b/ksysguard/gui/CMakeLists.txt index e6d7357bf..7313b6b5d 100644 --- a/ksysguard/gui/CMakeLists.txt +++ b/ksysguard/gui/CMakeLists.txt @@ -51,7 +51,7 @@ tde_add_executable( ksysguard AUTOMOC SOURCES SensorBrowser.cc WorkSheet.cc WorkSheetSettings.cc Workspace.cc ksysguard.cc ksysguard.skel - LINK sensordisplays-static ksgrd-shared kdnssd-shared + LINK sensordisplays-static ksgrd-shared tdednssd-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am index 4479b1c38..3d849af15 100644 --- a/ksysguard/gui/Makefile.am +++ b/ksysguard/gui/Makefile.am @@ -32,7 +32,7 @@ ksysguard_LDADD = \ ksgrd/libksgrd.la \ SensorDisplayLib/libsensordisplays.la \ $(LIB_TDEUI) $(LIB_KIO) $(LIB_KDNSSD) -ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksysguard_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kpm_SOURCES = kpm.c diff --git a/ksystraycmd/Makefile.am b/ksystraycmd/Makefile.am index 21f340bf7..f8f98402e 100644 --- a/ksystraycmd/Makefile.am +++ b/ksystraycmd/Makefile.am @@ -10,7 +10,7 @@ METASOURCES = ksystraycmd.moc noinst_HEADERS = ksystraycmd.h ksystraycmd_SOURCES = ksystraycmd.cpp main.cpp -ksystraycmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ksystraycmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor messages: $(XGETTEXT) $(ksystraycmd_SOURCES) -o $(podir)/ksystraycmd.pot diff --git a/ktip/Makefile.am b/ktip/Makefile.am index d1ae5d172..1e6f48144 100644 --- a/ktip/Makefile.am +++ b/ktip/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = pics bin_PROGRAMS = ktip ktip_SOURCES = ktipwindow.cpp ktip_LDADD = $(LIB_TDEUI) -ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +ktip_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO KDE_ICON = AUTO diff --git a/ktip/tips b/ktip/tips index b93468221..2d54819a4 100644 --- a/ktip/tips +++ b/ktip/tips @@ -1076,7 +1076,7 @@ password.

KWallet can be accessed from kcontrol, TDE's Control Center; from there, simply go to Security & Privacy->TDE Wallet. For more information on KWallet and on how to use it, check the handbook.

+href="help:/tdewallet" title="tdewallet">the handbook.

diff --git a/libkonq/CMakeLists.txt b/libkonq/CMakeLists.txt index 4ced51f33..b1b9b4a47 100644 --- a/libkonq/CMakeLists.txt +++ b/libkonq/CMakeLists.txt @@ -60,7 +60,7 @@ tde_add_library( konq SHARED AUTOMOC konq_pixmapprovider.cc kivdirectoryoverlay.cc konq_faviconmgr.cc konq_faviconmgr.skel konq_filetip.cc VERSION 4.2.0 - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc index 2b32129c2..cfc2a05e2 100644 --- a/libkonq/kivdirectoryoverlay.cc +++ b/libkonq/kivdirectoryoverlay.cc @@ -97,7 +97,7 @@ void KIVDirectoryOverlay::slotCompleted() } if ( best * 2 < total ) { - m_bestIcon = "kmultiple"; + m_bestIcon = "tdemultiple"; } if (!m_bestIcon.isNull()) { diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index 86f945742..59fc097b8 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/libkonq/konq_dirpart.h b/libkonq/konq_dirpart.h index 9c5d0735e..ffe176224 100644 --- a/libkonq/konq_dirpart.h +++ b/libkonq/konq_dirpart.h @@ -21,8 +21,8 @@ #define __konqdirpart_h #include -#include -#include +#include +#include #include #include #include diff --git a/libkonq/konq_events.h b/libkonq/konq_events.h index c047d904e..dab0f3fa1 100644 --- a/libkonq/konq_events.h +++ b/libkonq/konq_events.h @@ -1,7 +1,7 @@ #ifndef __konq_events_h__ #define __konq_events_h__ -#include +#include #include #include diff --git a/libkonq/konq_historymgr.h b/libkonq/konq_historymgr.h index 9545c5674..bd22331fd 100644 --- a/libkonq/konq_historymgr.h +++ b/libkonq/konq_historymgr.h @@ -31,7 +31,7 @@ #include #include -#include +#include #include "konq_historycomm.h" @@ -327,7 +327,7 @@ protected: private slots: /** * Called by the updateTimer to emit the KParts::HistoryProvider::updated() - * signal so that khtml can repaint the updated links. + * signal so that tdehtml can repaint the updated links. */ void slotEmitUpdated(); diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h index 2625055d8..1a4884db7 100644 --- a/libkonq/konq_iconviewwidget.h +++ b/libkonq/konq_iconviewwidget.h @@ -260,7 +260,7 @@ public slots: signals: /** - * For cut/copy/paste/move/delete (see kparts/browserextension.h) + * For cut/copy/paste/move/delete (see tdeparts/browserextension.h) */ void enableAction( const char * name, bool enabled ); diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 8d2503c30..294e43337 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include @@ -56,11 +56,11 @@ iconview trash:/ sidebar directory tree sidebar Devices / Hard Disc - khtml background - khtml link - khtml image (www.kde.org RMB on K logo) - khtmlimage (same as above, then choose View image, then RMB) - selected text in khtml + tdehtml background + tdehtml link + tdehtml image (www.kde.org RMB on K logo) + tdehtmlimage (same as above, then choose View image, then RMB) + selected text in tdehtml embedded katepart kdesktop folder trash link on desktop diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h index 744d67c4d..aaa7f6f07 100644 --- a/libkonq/konq_popupmenu.h +++ b/libkonq/konq_popupmenu.h @@ -33,7 +33,7 @@ #include // for KDEDesktopMimeType #include -#include +#include #include "konq_xmlguiclient.h" diff --git a/migratekde3 b/migratekde3 index be8fa49df..4b7d48e30 100755 --- a/migratekde3 +++ b/migratekde3 @@ -253,10 +253,10 @@ if [ -n "$KDE3_PROFILE" ] && [ -d "$KDE3_PROFILE" ]; then if [ "$TMP_DIR" != "" ]; then rm -fr $TMP_DIR 2>/dev/null fi - # Remove the ksycoca files from the cache directory. The KDE3 and Trinity + # Remove the tdesycoca files from the cache directory. The KDE3 and Trinity # cache directories will be linked to the same location, but deleting the - # ksycoca files is non-destructive. - rm -f $HOME/.trinity/cache-`uname -n`/ksycoca* 2>/dev/null + # tdesycoca files is non-destructive. + rm -f $HOME/.trinity/cache-`uname -n`/tdesycoca* 2>/dev/null # Fix config files. # Exclude KMail mail files --- we don't want to touch those files. diff --git a/nsplugins/CMakeLists.txt b/nsplugins/CMakeLists.txt index 09731c2a9..9ed66c7bb 100644 --- a/nsplugins/CMakeLists.txt +++ b/nsplugins/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( ##### other data ################################ -install( FILES khtml_plugins.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES tdehtml_plugins.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES nspluginpart.rc DESTINATION ${DATA_INSTALL_DIR}/plugin ) @@ -36,7 +36,7 @@ tde_add_kpart( libnsplugin AUTOMOC viewer/NSPluginClassIface.stub NSPluginCallbackIface.skel plugin_part.cpp nspluginloader.cpp - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/nsplugins/Makefile.am b/nsplugins/Makefile.am index 7a01b759a..d23881b6f 100644 --- a/nsplugins/Makefile.am +++ b/nsplugins/Makefile.am @@ -11,7 +11,7 @@ libnsplugin_la_SOURCES = plugin_part.cpp nspluginloader.cpp \ NSPluginCallbackIface.skel libnsplugin_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_PLUGIN) -no-undefined -libnsplugin_la_LIBADD = -lkparts +libnsplugin_la_LIBADD = -ltdeparts bin_PROGRAMS = nspluginscan nspluginscan_SOURCES = pluginscan.cpp @@ -25,7 +25,7 @@ kcm_nsplugins_la_LIBADD = $(LIB_TDECORE) libpluginpaths.la noinst_LTLIBRARIES = libpluginpaths.la libpluginpaths_la_SOURCES = plugin_paths.cpp -xdg_apps_DATA = khtml_plugins.desktop +xdg_apps_DATA = tdehtml_plugins.desktop partrcdir = $(kde_datadir)/plugin partrc_DATA = nspluginpart.rc diff --git a/nsplugins/khtml_plugins.desktop b/nsplugins/khtml_plugins.desktop deleted file mode 100644 index 9a2e0813a..000000000 --- a/nsplugins/khtml_plugins.desktop +++ /dev/null @@ -1,233 +0,0 @@ -[Desktop Entry] -Type=Application -DocPath=kcontrol/khtml/index.html#kbrowse-plugins -Icon=konqueror -Exec=kcmshell khtml_plugins - -X-TDE-ModuleType=Library -X-TDE-Library=konqhtml -X-TDE-FactoryName=khtml_plugins -X-TDE-Init-Library=nsplugins -X-TDE-Init=nsplugin -X-TDE-ParentApp=kcontrol - -Name=Plugins -Name[af]=Inprop modules -Name[az]=Əlavələr -Name[be]=Утулкі -Name[bg]=Приставки -Name[bn]=প্লাগ-ইন -Name[br]=Lugantoù -Name[bs]=Dodaci -Name[ca]=Connectors -Name[cs]=Moduly -Name[csb]=Pluginsë -Name[cy]=Ategion -Name[da]=Plugin -Name[el]=Πρόσθετα -Name[eo]=Kromaĵoj -Name[es]=Complementos -Name[et]=Pluginad -Name[eu]=Pluginak -Name[fa]=وصله‌ها -Name[fi]=Liitännäiset -Name[fr]=Modules externes -Name[ga]=Breiseáin -Name[he]=תוספים -Name[hi]=प्लगइन्स -Name[hr]=Dodaci -Name[hu]=Bővítőmodulok -Name[is]=Íforrit -Name[it]=Plugin -Name[ja]=プラグイン -Name[ka]=პლაგინები -Name[kk]=Модульдер -Name[km]=កម្មវិធី​ជំនួយ -Name[ko]=플러그인 -Name[lo]=ລງບ -Name[lt]=Priedai -Name[lv]=Spraudņi -Name[mk]=Приклучоци -Name[mn]=Плугин -Name[ms]=Plugin -Name[mt]=Plagins -Name[nb]=Programtillegg -Name[ne]=प्लगइन -Name[nn]=Programtillegg -Name[nso]=Ditsenyo -Name[pa]=ਪਲੱਗਇਨ -Name[pl]=Wtyczki -Name[pt]='Plugins' -Name[pt_BR]=Plug-ins -Name[ro]=Module -Name[ru]=Модули -Name[rw]=Amacomeka -Name[se]=Lassemoduvllat -Name[sk]=Moduly -Name[sl]=Vstavki -Name[sr]=Прикључци -Name[sr@Latn]=Priključci -Name[ss]=Ema- Plugin -Name[sv]=Insticksprogram -Name[ta]=செருகல்கள் -Name[te]=ప్లగిన్లు -Name[tg]=Мутассалкунандаҳо -Name[th]=ปลั๊กอิน -Name[tr]=Eklentiler -Name[tt]=Quşımta -Name[uk]=Втулки -Name[uz]=Plaginlar -Name[uz@cyrillic]=Плагинлар -Name[vi]=Các trình bổ sung -Name[wa]=Tchôke-divins -Name[xh]=Iiplagi ezingaphakathi -Name[zh_CN]=插件 -Name[zh_TW]=外掛程式 -Name[zu]=Ama-Plugin -Comment=Configure the browser plugins -Comment[af]=Konfigureer die blaaier inprop modules -Comment[az]=Səyyah əlavələrini quraşdırın -Comment[be]=Настаўленні модуляў вандроўніка -Comment[bg]=Настройване приставките на браузъра -Comment[bn]=বিভিন্ন ব্রাউজার প্লাগ-ইন কনফিগার করুন -Comment[br]=Kefluniañ lugantoù ar furcher -Comment[bs]=Podesite dodatke preglednika (browser plugins) -Comment[ca]=Aquí podeu configurar els connectors del navegador -Comment[cs]=Nastavení modulů prohlížeče (pluginy) -Comment[csb]=Kònfigùracëjô pluginsów przezérnika -Comment[cy]=Ffurfweddu ategion y porydd -Comment[da]=Indstil browserens plugin -Comment[de]=Plugins für Webbrowser einrichten -Comment[el]=Ρυθμίστε τα πρόσθετα του περιηγητή -Comment[eo]=Agordu la foliumilajn kromaĵojn -Comment[es]=Configurar los complementos del navegador -Comment[et]=Veebilehitseja pluginate seadistamine -Comment[eu]=Konfiguratu arakatzailearen pluginak -Comment[fa]=پیکربندی وصله‌های مرورگر -Comment[fi]=Muokkaa selaimen liitännäisasetuksia -Comment[fr]=Configuration des modules externes du navigateur -Comment[fy]=Hjir kinne jo de blêder-plugins ynstelle -Comment[ga]=Cumraigh na Breiseáin Brabhsálaithe -Comment[gl]=Configurar os plugins do navegador -Comment[he]=שינוי הגדרות התוספים של הדפדפן -Comment[hi]=ब्राउज़र प्लगइन कॉन्फ़िगर करें -Comment[hr]=Konfiguriranje dodataka preglednika -Comment[hu]=A böngésző bővítőmoduljainak beállításai -Comment[is]=Stilla íforrit vafra -Comment[it]=Configura i plugin del browser -Comment[ja]=ブラウザのプラグインの設定 -Comment[ka]=ბრაუზერის პლაგინების კონფიგურაცია -Comment[kk]=Браузер модульдерінің баптауы -Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​ជំនួយ​របស់​កម្មវិធី​រុករក -Comment[ko]=브라우저 플러그인 설정 -Comment[lo]=ປັກອິນສອດສອ່ງຊີພີຍູ -Comment[lt]=Konfigūruoti naršyklės priedus -Comment[lv]=Konfigurēt pārlūka spaudņus -Comment[mk]=Конфигурација на приклучоците на прелистувачот -Comment[mn]=Вэб хөтөчийн плугин тохируулга -Comment[ms]=Tetapkan plugin pelayar -Comment[mt]=Ikkonfigura l-plugins tal-browser -Comment[nb]=Sett opp programtillegg for nettleseren -Comment[nds]=Kiekerplugins instellen -Comment[ne]=प्लगइन ब्राउजर कन्फिगर गर्नुहोस् -Comment[nl]=Hier kunt u de browser-plugins instellen -Comment[nn]=Set opp programtillegg for nettlesaren -Comment[nso]=Beakanya ditsenyo tsa seinyakisi -Comment[pa]=ਝਲਕਾਰਾ ਪਲੱਗਇਨ ਸੰਰਚਨਾ -Comment[pl]=Konfiguracja wtyczek przeglądarki -Comment[pt]=Configurar os 'plugins' do navegador -Comment[pt_BR]=Configura os plug-ins do navegador -Comment[ro]=Configurează modulele de navigator de web -Comment[ru]=Настройка модулей браузера -Comment[rw]=Kuboneza Amacomeka ya Mucukumbuzi -Comment[se]=Heivet fierpmádatlogana lassemoduvllaid -Comment[sk]=Nastavenie modulov prehliadača -Comment[sl]=Tu lahko nastavite predpomnilnik -Comment[sr]=Подешавање прикључака прегледача -Comment[sr@Latn]=Podešavanje priključaka pregledača -Comment[sv]=Anpassa insticksprogram för webbläsare -Comment[ta]= மேலோடியின் செருகல்களை வடிவமைக்கலாம் -Comment[tg]=Танзими мутассалкунандаҳои тафсир -Comment[th]=ปรับแต่งปลั้กอินของบราวเซอร์ -Comment[tr]=Tarayıcı eklentilerini yapılandırın -Comment[tt]=Gizgeç östämälären caylaw -Comment[uk]=Налаштування втулків навігатора -Comment[uz]=Brauzerning plaginlarini moslash -Comment[uz@cyrillic]=Браузернинг плагинларини мослаш -Comment[ven]=Dzudzanyani plugins ya burausa -Comment[vi]=Cấu hình trình bổ sung cho trình duyệt -Comment[wa]=Apontyî les tchôke-divins do betchteu -Comment[xh]=Qwalasela umkhangheli zincwadi zeplagi ezingaphakathi -Comment[zh_CN]=配置浏览器插件 -Comment[zh_TW]=設定瀏覽器外掛程式 -Comment[zu]=Hlanganisela ama-plugin omcingi -Keywords=konqueror,kfm,browser,html,web,www,fonts,plugins -Keywords[az]=konqueror,kfm,browser,html,web,www,fonts,plugins,konqueror,kfm,səyyah,html,şəbəkə,www,yazı növləri,rənglər,java,javascript,hərf,hərf dəstəsi,kodlama,bağlantılar,rəsmlər,ox -Keywords[be]=Вандроўнік,Сеціва,Шрыфты,Утулкі,konqueror,kfm,browser,html,web,www,fonts,plugins -Keywords[bg]=приставки, настройване, браузър, уеб, шрифтове, Интернет, приставка, модул, konqueror, kfm, browser, html, web, www, fonts, plugins -Keywords[br]=konqueror,kfm,furcher,html,web,gwiad,livioù,java,javascript -Keywords[ca]=konqueror,kfm,navegador,html,web,www,lletres,connectors -Keywords[cs]=Konqueror,Kfm,Prohlížeč,HTML,Web,WWW,Písma,Moduly -Keywords[csb]=konqueror,kfm,przezérnik,html,séc,www,fòntë,pluginsë -Keywords[cy]=konqueror,kfm,porwr,porydd,html,gwe,www,wynebfathau,ffontiau,ategion -Keywords[da]=konqueror,kfm,browser,html,net,www,skrifttyper,plugin -Keywords[de]=Konqueror,kfm,Browser,HTML,Web,WWW,Schriften,Plugins -Keywords[el]=konqueror,kfm,περιηγητής,html,ιστός,www,γραμματοσειρές,πρόσθετα -Keywords[eo]=Konkeranto,Kfm,TTT,HTML,WWW,tiparo,koloro,Javo,Javoskripto,kursoro, kursilo,ligo,referenco,bildo,signaro,kodo -Keywords[es]=konqueror,kfm,navegador,html,web,www,tipos de letra,complementos -Keywords[et]=konqueror,kfm,veebilehitseja,html,veeb,www,fondid,pluginad -Keywords[eu]=konqueror,kfm,arakatzailea,html,web,www,letra-tipoak,pluginak -Keywords[fa]=konqueror، kfm، مرورگر، html، وب، www، قلمها، وصله‌ها -Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,liitännäiset -Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,plugins,modules externe -Keywords[fy]=konqueror,kfm,browser,blêder,html,web,www,fonts,lettertypen,plugins,internet,ynternet,netscape plugins -Keywords[ga]=konqueror,kfm,brabhsálaí,html,idirlíon,www,clófhoirne,breiseáin -Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,plugins -Keywords[he]=konqueror,kfm,דפדפן,html,web,www,אינטרנט,גופנים,תוספים, fonts,plugins -Keywords[hi]=कॉन्करर केएफएम,ब्राउजर,एचटीएमएल,वेब,डब्ल्यूडब्ल्यूडब्ल्यू,फ़ॉन्ट्स,प्लगइन्स -Keywords[hr]=konqueror,kfm,preglednik,html,web,www,fontovi,dodaci,mreža -Keywords[hu]=Konqueror,kfm,böngésző,HTML,web,WWW,betűtípusok,bővítőmodulok -Keywords[is]=konqueror,kfm,flakkari,html,web,www,letur,íforrit,vefur -Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,plugin -Keywords[ja]=konqueror,kfm,ブラウザ,html,web,ウェブ,www,フォント,プラグイン -Keywords[km]=konqueror,kfm,កម្មវិធី​រុករក,html,បណ្ដាញ,វើលវ៉ាយវិប,ពុម្ពអក្សរ,កម្មវិធី​ជំនួយ -Keywords[lt]=konqueror,kfm,browser,html,web,www,fonts,plugins. naršyklė,tinklalapiai,šriftai,priedai -Keywords[lv]=iekarotājs,kfm,pārlūks,html,web,www,fonti,spraudņi -Keywords[mk]=konqueror,kfm,browser,html,web,www,fonts,plugins, прелистувач,веб,фонтови,приклучоци -Keywords[mn]=Конкюрор,kfm,Хөтөч,HTML,Вэб,WWW,Бичиг,Плугин -Keywords[ms]=konqueror,kfm,pelayar,html,web,www,font,plugin -Keywords[mt]=konqueror,kfm,browser,html,web,www,fonts,plugins,plagins -Keywords[nb]=Konqueror,KFM,nettleser,HTML,verdensveven,WWW,Internett,skrifter,programtillegg -Keywords[nds]=Konqueror,kfm,Nettkieker,HTML,web,www,Schriftoorden,Plugins -Keywords[ne]=कन्क्वेरर,kfm, ब्राउजर,html, वेब,www, फन्ट, प्लगइन -Keywords[nl]=konqueror,kfm,browser,html,web,www,fonts,lettertypen,plugins,internet,netscape plugins -Keywords[nn]=Konqueror,KFM,nettlesar,HTML,verdsveven,WWW,skrifter,programtillegg -Keywords[nso]=konqueror,kfm,senyakisi,html,web,www,difonto,ditsenyo -Keywords[pa]=konqueror,kfm,browser,html,web,www,ਫੋਂਟ,ਪਲੱਗਇਨ,ਕੋਨਕਿਉਰਰ,ਝਲਕਾਰਾ,ਵੈਬ -Keywords[pl]=konqueror,kfm,przeglądarka,html,sieć,www,czcionki,wtyczki -Keywords[pt]=konqueror,kfm,navegador,HTML,web,WWW,tipos de letra,'plugins' -Keywords[pt_BR]=konqueror,kfm,navegador,html,web,www,fontes,plug-ins -Keywords[ro]=konqueror,kfm,navigator,html,web,www,fonturi,module -Keywords[rw]= Konqueror,Mucukumbuzi,html,Urubuga,www,Imyandikire, Amacomeka -Keywords[se]=konqueror,kfm,fierpmádatlogan,html,web,www,fonttat,lassemoduvllat -Keywords[sk]=konqueror,kfm,prehliadač,html,web,www,písma,moduly -Keywords[sl]=konqueror,kfm,brskalnik,html,splet,web,pisave,www,vstavki -Keywords[sr]=konqueror,kfm,прегледач,html,web,www,фонтови,додаци -Keywords[sr@Latn]=konqueror,kfm,pregledač,html,web,www,fontovi,dodaci -Keywords[ss]=konqueror,kfm,brawuza,html,web,www,timo tetinhlamvu temagama,ema-plugin -Keywords[sv]=konqueror,kfm,webbläsare,html,webb,www,teckensnitt,insticksprogram -Keywords[ta]=கான்கொரர், கோப்பு மேலாளர், மேலோடி, உலாவி, html, இணையம், வலையம், வலை, எழுத்துரு, www, செருகல்கள் -Keywords[th]=คอนเควอร์เรอร์,kfm,บราวเซอร์,html,เว็บ,www,แบบอักษร,ปลั้กอิน -Keywords[tr]=konqueror,kfm,browser,html,web,www,yazıtipleri,eklentiler,tarayıcı -Keywords[tt]=konqueror,kfm,browser,html,web,www,fonts,plugins,quşımta,şäkel,päräwez,çeltär -Keywords[uk]=konqueror,kfm,навігатор,html,тенета,www,шрифти,втулки -Keywords[uz]=konqueror,kfm,html,www,brauzer,veb,shriftlar,plaginlar -Keywords[uz@cyrillic]=konqueror,kfm,html,www,браузер,веб,шрифтлар,плагинлар -Keywords[vi]=konqueror,kfm,trình duyệt,html,web;www,phông chữ,trình bổ sung -Keywords[wa]=konqueror,kfm,foyteuse,betchteu,html,waibe,www,fontes,tchôke-divins -Keywords[xh]=konqueror,kfm,umkhangeli zincwadi,html,web, www,imigca,iplagi ezingaphakathi -Keywords[zh_CN]=konqueror,kfm,browser,html,web,www,fonts,plugins,浏览器,字体,插件 -Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,fonts,plugins,征服家,瀏覽器,網頁,字型,外掛程式 -Keywords[zu]=komqueror,kfm,umcingi,html,web,www,izinhlobo zamagama, ama-plugin - -Categories=Qt;TDE;X-TDE-settings-webbrowsing; diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 55fd769cf..115490552 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -378,7 +378,7 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType) int cnt = 0; while (!kapp->dcopClient()->isApplicationRegistered(_dcopid)) { - //kapp->processEvents(); // would lead to recursive calls in khtml + //kapp->processEvents(); // would lead to recursive calls in tdehtml #ifdef HAVE_USLEEP usleep( 50*1000 ); #else diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index 714a4c269..104619f29 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include @@ -210,7 +210,7 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject kdDebug(1432) << "PluginPart::PluginPart" << endl; // we have to keep the class name of KParts::PluginBrowserExtension - // to let khtml find it + // to let tdehtml find it _extension = static_cast(new KParts::BrowserExtension(this)); _liveconnect = new PluginLiveConnectExtension(this); @@ -277,7 +277,7 @@ bool PluginPart::openURL(const KURL &url) kdDebug(1432) << "name=" << name << " value=" << value << endl; if (!name.isEmpty()) { - // hack to pass view mode from khtml + // hack to pass view mode from tdehtml if ( name=="__KHTML__PLUGINEMBED" ) { embed = true; kdDebug(1432) << "__KHTML__PLUGINEMBED found" << endl; diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h index e29d91ee7..f3fa68984 100644 --- a/nsplugins/plugin_part.h +++ b/nsplugins/plugin_part.h @@ -24,9 +24,9 @@ #ifndef __plugin_part_h__ #define __plugin_part_h__ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/nsplugins/tdehtml_plugins.desktop b/nsplugins/tdehtml_plugins.desktop new file mode 100644 index 000000000..b38c16160 --- /dev/null +++ b/nsplugins/tdehtml_plugins.desktop @@ -0,0 +1,233 @@ +[Desktop Entry] +Type=Application +DocPath=kcontrol/tdehtml/index.html#kbrowse-plugins +Icon=konqueror +Exec=kcmshell tdehtml_plugins + +X-TDE-ModuleType=Library +X-TDE-Library=konqhtml +X-TDE-FactoryName=tdehtml_plugins +X-TDE-Init-Library=nsplugins +X-TDE-Init=nsplugin +X-TDE-ParentApp=kcontrol + +Name=Plugins +Name[af]=Inprop modules +Name[az]=Əlavələr +Name[be]=Утулкі +Name[bg]=Приставки +Name[bn]=প্লাগ-ইন +Name[br]=Lugantoù +Name[bs]=Dodaci +Name[ca]=Connectors +Name[cs]=Moduly +Name[csb]=Pluginsë +Name[cy]=Ategion +Name[da]=Plugin +Name[el]=Πρόσθετα +Name[eo]=Kromaĵoj +Name[es]=Complementos +Name[et]=Pluginad +Name[eu]=Pluginak +Name[fa]=وصله‌ها +Name[fi]=Liitännäiset +Name[fr]=Modules externes +Name[ga]=Breiseáin +Name[he]=תוספים +Name[hi]=प्लगइन्स +Name[hr]=Dodaci +Name[hu]=Bővítőmodulok +Name[is]=Íforrit +Name[it]=Plugin +Name[ja]=プラグイン +Name[ka]=პლაგინები +Name[kk]=Модульдер +Name[km]=កម្មវិធី​ជំនួយ +Name[ko]=플러그인 +Name[lo]=ລງບ +Name[lt]=Priedai +Name[lv]=Spraudņi +Name[mk]=Приклучоци +Name[mn]=Плугин +Name[ms]=Plugin +Name[mt]=Plagins +Name[nb]=Programtillegg +Name[ne]=प्लगइन +Name[nn]=Programtillegg +Name[nso]=Ditsenyo +Name[pa]=ਪਲੱਗਇਨ +Name[pl]=Wtyczki +Name[pt]='Plugins' +Name[pt_BR]=Plug-ins +Name[ro]=Module +Name[ru]=Модули +Name[rw]=Amacomeka +Name[se]=Lassemoduvllat +Name[sk]=Moduly +Name[sl]=Vstavki +Name[sr]=Прикључци +Name[sr@Latn]=Priključci +Name[ss]=Ema- Plugin +Name[sv]=Insticksprogram +Name[ta]=செருகல்கள் +Name[te]=ప్లగిన్లు +Name[tg]=Мутассалкунандаҳо +Name[th]=ปลั๊กอิน +Name[tr]=Eklentiler +Name[tt]=Quşımta +Name[uk]=Втулки +Name[uz]=Plaginlar +Name[uz@cyrillic]=Плагинлар +Name[vi]=Các trình bổ sung +Name[wa]=Tchôke-divins +Name[xh]=Iiplagi ezingaphakathi +Name[zh_CN]=插件 +Name[zh_TW]=外掛程式 +Name[zu]=Ama-Plugin +Comment=Configure the browser plugins +Comment[af]=Konfigureer die blaaier inprop modules +Comment[az]=Səyyah əlavələrini quraşdırın +Comment[be]=Настаўленні модуляў вандроўніка +Comment[bg]=Настройване приставките на браузъра +Comment[bn]=বিভিন্ন ব্রাউজার প্লাগ-ইন কনফিগার করুন +Comment[br]=Kefluniañ lugantoù ar furcher +Comment[bs]=Podesite dodatke preglednika (browser plugins) +Comment[ca]=Aquí podeu configurar els connectors del navegador +Comment[cs]=Nastavení modulů prohlížeče (pluginy) +Comment[csb]=Kònfigùracëjô pluginsów przezérnika +Comment[cy]=Ffurfweddu ategion y porydd +Comment[da]=Indstil browserens plugin +Comment[de]=Plugins für Webbrowser einrichten +Comment[el]=Ρυθμίστε τα πρόσθετα του περιηγητή +Comment[eo]=Agordu la foliumilajn kromaĵojn +Comment[es]=Configurar los complementos del navegador +Comment[et]=Veebilehitseja pluginate seadistamine +Comment[eu]=Konfiguratu arakatzailearen pluginak +Comment[fa]=پیکربندی وصله‌های مرورگر +Comment[fi]=Muokkaa selaimen liitännäisasetuksia +Comment[fr]=Configuration des modules externes du navigateur +Comment[fy]=Hjir kinne jo de blêder-plugins ynstelle +Comment[ga]=Cumraigh na Breiseáin Brabhsálaithe +Comment[gl]=Configurar os plugins do navegador +Comment[he]=שינוי הגדרות התוספים של הדפדפן +Comment[hi]=ब्राउज़र प्लगइन कॉन्फ़िगर करें +Comment[hr]=Konfiguriranje dodataka preglednika +Comment[hu]=A böngésző bővítőmoduljainak beállításai +Comment[is]=Stilla íforrit vafra +Comment[it]=Configura i plugin del browser +Comment[ja]=ブラウザのプラグインの設定 +Comment[ka]=ბრაუზერის პლაგინების კონფიგურაცია +Comment[kk]=Браузер модульдерінің баптауы +Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​កម្មវិធី​ជំនួយ​របស់​កម្មវិធី​រុករក +Comment[ko]=브라우저 플러그인 설정 +Comment[lo]=ປັກອິນສອດສອ່ງຊີພີຍູ +Comment[lt]=Konfigūruoti naršyklės priedus +Comment[lv]=Konfigurēt pārlūka spaudņus +Comment[mk]=Конфигурација на приклучоците на прелистувачот +Comment[mn]=Вэб хөтөчийн плугин тохируулга +Comment[ms]=Tetapkan plugin pelayar +Comment[mt]=Ikkonfigura l-plugins tal-browser +Comment[nb]=Sett opp programtillegg for nettleseren +Comment[nds]=Kiekerplugins instellen +Comment[ne]=प्लगइन ब्राउजर कन्फिगर गर्नुहोस् +Comment[nl]=Hier kunt u de browser-plugins instellen +Comment[nn]=Set opp programtillegg for nettlesaren +Comment[nso]=Beakanya ditsenyo tsa seinyakisi +Comment[pa]=ਝਲਕਾਰਾ ਪਲੱਗਇਨ ਸੰਰਚਨਾ +Comment[pl]=Konfiguracja wtyczek przeglądarki +Comment[pt]=Configurar os 'plugins' do navegador +Comment[pt_BR]=Configura os plug-ins do navegador +Comment[ro]=Configurează modulele de navigator de web +Comment[ru]=Настройка модулей браузера +Comment[rw]=Kuboneza Amacomeka ya Mucukumbuzi +Comment[se]=Heivet fierpmádatlogana lassemoduvllaid +Comment[sk]=Nastavenie modulov prehliadača +Comment[sl]=Tu lahko nastavite predpomnilnik +Comment[sr]=Подешавање прикључака прегледача +Comment[sr@Latn]=Podešavanje priključaka pregledača +Comment[sv]=Anpassa insticksprogram för webbläsare +Comment[ta]= மேலோடியின் செருகல்களை வடிவமைக்கலாம் +Comment[tg]=Танзими мутассалкунандаҳои тафсир +Comment[th]=ปรับแต่งปลั้กอินของบราวเซอร์ +Comment[tr]=Tarayıcı eklentilerini yapılandırın +Comment[tt]=Gizgeç östämälären caylaw +Comment[uk]=Налаштування втулків навігатора +Comment[uz]=Brauzerning plaginlarini moslash +Comment[uz@cyrillic]=Браузернинг плагинларини мослаш +Comment[ven]=Dzudzanyani plugins ya burausa +Comment[vi]=Cấu hình trình bổ sung cho trình duyệt +Comment[wa]=Apontyî les tchôke-divins do betchteu +Comment[xh]=Qwalasela umkhangheli zincwadi zeplagi ezingaphakathi +Comment[zh_CN]=配置浏览器插件 +Comment[zh_TW]=設定瀏覽器外掛程式 +Comment[zu]=Hlanganisela ama-plugin omcingi +Keywords=konqueror,kfm,browser,html,web,www,fonts,plugins +Keywords[az]=konqueror,kfm,browser,html,web,www,fonts,plugins,konqueror,kfm,səyyah,html,şəbəkə,www,yazı növləri,rənglər,java,javascript,hərf,hərf dəstəsi,kodlama,bağlantılar,rəsmlər,ox +Keywords[be]=Вандроўнік,Сеціва,Шрыфты,Утулкі,konqueror,kfm,browser,html,web,www,fonts,plugins +Keywords[bg]=приставки, настройване, браузър, уеб, шрифтове, Интернет, приставка, модул, konqueror, kfm, browser, html, web, www, fonts, plugins +Keywords[br]=konqueror,kfm,furcher,html,web,gwiad,livioù,java,javascript +Keywords[ca]=konqueror,kfm,navegador,html,web,www,lletres,connectors +Keywords[cs]=Konqueror,Kfm,Prohlížeč,HTML,Web,WWW,Písma,Moduly +Keywords[csb]=konqueror,kfm,przezérnik,html,séc,www,fòntë,pluginsë +Keywords[cy]=konqueror,kfm,porwr,porydd,html,gwe,www,wynebfathau,ffontiau,ategion +Keywords[da]=konqueror,kfm,browser,html,net,www,skrifttyper,plugin +Keywords[de]=Konqueror,kfm,Browser,HTML,Web,WWW,Schriften,Plugins +Keywords[el]=konqueror,kfm,περιηγητής,html,ιστός,www,γραμματοσειρές,πρόσθετα +Keywords[eo]=Konkeranto,Kfm,TTT,HTML,WWW,tiparo,koloro,Javo,Javoskripto,kursoro, kursilo,ligo,referenco,bildo,signaro,kodo +Keywords[es]=konqueror,kfm,navegador,html,web,www,tipos de letra,complementos +Keywords[et]=konqueror,kfm,veebilehitseja,html,veeb,www,fondid,pluginad +Keywords[eu]=konqueror,kfm,arakatzailea,html,web,www,letra-tipoak,pluginak +Keywords[fa]=konqueror، kfm، مرورگر، html، وب، www، قلمها، وصله‌ها +Keywords[fi]=konqueror,kfm,selain,html,web,www,kirjasimet,liitännäiset +Keywords[fr]=konqueror,kfm,navigateur,html,web,www,polices,plugins,modules externe +Keywords[fy]=konqueror,kfm,browser,blêder,html,web,www,fonts,lettertypen,plugins,internet,ynternet,netscape plugins +Keywords[ga]=konqueror,kfm,brabhsálaí,html,idirlíon,www,clófhoirne,breiseáin +Keywords[gl]=konqueror,kfm,navegador,html,web,www,fontes,plugins +Keywords[he]=konqueror,kfm,דפדפן,html,web,www,אינטרנט,גופנים,תוספים, fonts,plugins +Keywords[hi]=कॉन्करर केएफएम,ब्राउजर,एचटीएमएल,वेब,डब्ल्यूडब्ल्यूडब्ल्यू,फ़ॉन्ट्स,प्लगइन्स +Keywords[hr]=konqueror,kfm,preglednik,html,web,www,fontovi,dodaci,mreža +Keywords[hu]=Konqueror,kfm,böngésző,HTML,web,WWW,betűtípusok,bővítőmodulok +Keywords[is]=konqueror,kfm,flakkari,html,web,www,letur,íforrit,vefur +Keywords[it]=konqueror,kfm,browser,html,web,www,caratteri,plugin +Keywords[ja]=konqueror,kfm,ブラウザ,html,web,ウェブ,www,フォント,プラグイン +Keywords[km]=konqueror,kfm,កម្មវិធី​រុករក,html,បណ្ដាញ,វើលវ៉ាយវិប,ពុម្ពអក្សរ,កម្មវិធី​ជំនួយ +Keywords[lt]=konqueror,kfm,browser,html,web,www,fonts,plugins. naršyklė,tinklalapiai,šriftai,priedai +Keywords[lv]=iekarotājs,kfm,pārlūks,html,web,www,fonti,spraudņi +Keywords[mk]=konqueror,kfm,browser,html,web,www,fonts,plugins, прелистувач,веб,фонтови,приклучоци +Keywords[mn]=Конкюрор,kfm,Хөтөч,HTML,Вэб,WWW,Бичиг,Плугин +Keywords[ms]=konqueror,kfm,pelayar,html,web,www,font,plugin +Keywords[mt]=konqueror,kfm,browser,html,web,www,fonts,plugins,plagins +Keywords[nb]=Konqueror,KFM,nettleser,HTML,verdensveven,WWW,Internett,skrifter,programtillegg +Keywords[nds]=Konqueror,kfm,Nettkieker,HTML,web,www,Schriftoorden,Plugins +Keywords[ne]=कन्क्वेरर,kfm, ब्राउजर,html, वेब,www, फन्ट, प्लगइन +Keywords[nl]=konqueror,kfm,browser,html,web,www,fonts,lettertypen,plugins,internet,netscape plugins +Keywords[nn]=Konqueror,KFM,nettlesar,HTML,verdsveven,WWW,skrifter,programtillegg +Keywords[nso]=konqueror,kfm,senyakisi,html,web,www,difonto,ditsenyo +Keywords[pa]=konqueror,kfm,browser,html,web,www,ਫੋਂਟ,ਪਲੱਗਇਨ,ਕੋਨਕਿਉਰਰ,ਝਲਕਾਰਾ,ਵੈਬ +Keywords[pl]=konqueror,kfm,przeglądarka,html,sieć,www,czcionki,wtyczki +Keywords[pt]=konqueror,kfm,navegador,HTML,web,WWW,tipos de letra,'plugins' +Keywords[pt_BR]=konqueror,kfm,navegador,html,web,www,fontes,plug-ins +Keywords[ro]=konqueror,kfm,navigator,html,web,www,fonturi,module +Keywords[rw]= Konqueror,Mucukumbuzi,html,Urubuga,www,Imyandikire, Amacomeka +Keywords[se]=konqueror,kfm,fierpmádatlogan,html,web,www,fonttat,lassemoduvllat +Keywords[sk]=konqueror,kfm,prehliadač,html,web,www,písma,moduly +Keywords[sl]=konqueror,kfm,brskalnik,html,splet,web,pisave,www,vstavki +Keywords[sr]=konqueror,kfm,прегледач,html,web,www,фонтови,додаци +Keywords[sr@Latn]=konqueror,kfm,pregledač,html,web,www,fontovi,dodaci +Keywords[ss]=konqueror,kfm,brawuza,html,web,www,timo tetinhlamvu temagama,ema-plugin +Keywords[sv]=konqueror,kfm,webbläsare,html,webb,www,teckensnitt,insticksprogram +Keywords[ta]=கான்கொரர், கோப்பு மேலாளர், மேலோடி, உலாவி, html, இணையம், வலையம், வலை, எழுத்துரு, www, செருகல்கள் +Keywords[th]=คอนเควอร์เรอร์,kfm,บราวเซอร์,html,เว็บ,www,แบบอักษร,ปลั้กอิน +Keywords[tr]=konqueror,kfm,browser,html,web,www,yazıtipleri,eklentiler,tarayıcı +Keywords[tt]=konqueror,kfm,browser,html,web,www,fonts,plugins,quşımta,şäkel,päräwez,çeltär +Keywords[uk]=konqueror,kfm,навігатор,html,тенета,www,шрифти,втулки +Keywords[uz]=konqueror,kfm,html,www,brauzer,veb,shriftlar,plaginlar +Keywords[uz@cyrillic]=konqueror,kfm,html,www,браузер,веб,шрифтлар,плагинлар +Keywords[vi]=konqueror,kfm,trình duyệt,html,web;www,phông chữ,trình bổ sung +Keywords[wa]=konqueror,kfm,foyteuse,betchteu,html,waibe,www,fontes,tchôke-divins +Keywords[xh]=konqueror,kfm,umkhangeli zincwadi,html,web, www,imigca,iplagi ezingaphakathi +Keywords[zh_CN]=konqueror,kfm,browser,html,web,www,fonts,plugins,浏览器,字体,插件 +Keywords[zh_TW]=konqueror,kfm,browser,html,web,www,fonts,plugins,征服家,瀏覽器,網頁,字型,外掛程式 +Keywords[zu]=komqueror,kfm,umcingi,html,web,www,izinhlobo zamagama, ama-plugin + +Categories=Qt;TDE;X-TDE-settings-webbrowsing; diff --git a/nsplugins/test/Makefile.am b/nsplugins/test/Makefile.am index 1fc99ceba..24985baa1 100644 --- a/nsplugins/test/Makefile.am +++ b/nsplugins/test/Makefile.am @@ -4,7 +4,7 @@ noinst_HEADERS = testnsplugin.h check_PROGRAMS = testnsplugin testnsplugin_SOURCES = testnsplugin.cpp -testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testnsplugin_LDADD = $(LIB_TDEUI) ../libnsplugin.la $(srcdir)/testnsplugin.cpp: ../NSPluginClassIface_stub.h diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt index 23452e84f..cfd95de6c 100644 --- a/nsplugins/viewer/CMakeLists.txt +++ b/nsplugins/viewer/CMakeLists.txt @@ -30,6 +30,6 @@ tde_add_executable( nspluginviewer AUTOMOC ../NSPluginCallbackIface.stub NSPluginClassIface.skel nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp glibevents.cpp - LINK kparts-shared kio-shared ${GLIB2_LIBRARIES} Xt dl + LINK tdeparts-shared kio-shared ${GLIB2_LIBRARIES} Xt dl DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h index d06ffada3..6eb5d6be3 100644 --- a/nsplugins/viewer/nsplugin.h +++ b/nsplugins/viewer/nsplugin.h @@ -41,7 +41,7 @@ #include #include -#include // for URLArgs +#include // for URLArgs #include diff --git a/r14-xdg-update b/r14-xdg-update index 0af275409..b9098f1ca 100644 --- a/r14-xdg-update +++ b/r14-xdg-update @@ -292,8 +292,8 @@ fi # Remember that this script may be run more than once. The new directory # might already exist. if [ -n "$CACHE_DIR" ] && [ -d "$CACHE_DIR" ]; then - # Flush the old ksycoca cache files. This is safe at any time. - rm -f ${CACHE_DIR}/ksycoca* 2>/dev/null + # Flush the old tdesycoca cache files. This is safe at any time. + rm -f ${CACHE_DIR}/tdesycoca* 2>/dev/null # Old cache directory: /var/tmp/kde*cache-$USER # New cache directory: /var/tmp/tdecache-$USER # Rename/move the directory name but only when the new name does not exist. diff --git a/tdeinit/CMakeLists.txt b/tdeinit/CMakeLists.txt index 3fd7d934e..fe94e1218 100644 --- a/tdeinit/CMakeLists.txt +++ b/tdeinit/CMakeLists.txt @@ -31,7 +31,7 @@ tde_add_executable( tdeinit_phase1 ##### tdeinit_displayconfig (executable) ####################### if( WITH_XRANDR ) - set( TDEINIT_DISPLAYCONFIG_OPTIONAL_LINK "krandr-shared" ) + set( TDEINIT_DISPLAYCONFIG_OPTIONAL_LINK "tderandr-shared" ) endif ( ) tde_add_executable( tdeinit_displayconfig diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp index eb1a3ffc1..565e02e85 100644 --- a/tdeinit/displayconfig.cpp +++ b/tdeinit/displayconfig.cpp @@ -35,7 +35,7 @@ #include #ifdef WITH_XRANDR -#include +#include #endif static const char description[] = I18N_NOOP("TDE Initialization Display Configuration"); diff --git a/tdeprint/tdeprint_part/CMakeLists.txt b/tdeprint/tdeprint_part/CMakeLists.txt index 586d134c6..c0f04a9fe 100644 --- a/tdeprint/tdeprint_part/CMakeLists.txt +++ b/tdeprint/tdeprint_part/CMakeLists.txt @@ -32,6 +32,6 @@ install( FILES tdeprint_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( libtdeprint_part AUTOMOC SOURCES printpart.cpp - LINK tdeprint_management-shared kparts-shared + LINK tdeprint_management-shared tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp index 0ac1adcd2..c725aa872 100644 --- a/tdeprint/tdeprint_part/printpart.cpp +++ b/tdeprint/tdeprint_part/printpart.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include typedef KParts::GenericFactory PrintPartFactory; diff --git a/tdeprint/tdeprint_part/printpart.h b/tdeprint/tdeprint_part/printpart.h index 98881d0f9..40e8041ea 100644 --- a/tdeprint/tdeprint_part/printpart.h +++ b/tdeprint/tdeprint_part/printpart.h @@ -20,8 +20,8 @@ #ifndef PRINTPART_H #define PRINTPART_H -#include -#include +#include +#include class PrintPartExtension; class KMMainView; diff --git a/tdeprint/tdeprintfax/Makefile.am b/tdeprint/tdeprintfax/Makefile.am index 643a805b0..5c0b21659 100644 --- a/tdeprint/tdeprintfax/Makefile.am +++ b/tdeprint/tdeprintfax/Makefile.am @@ -3,7 +3,7 @@ INCLUDES= $(all_includes) bin_PROGRAMS = tdeprintfax tdeprintfax_SOURCES = main.cpp tdeprintfax.cpp faxab.cpp faxctrl.cpp confgeneral.cpp configdlg.cpp \ conffax.cpp confsystem.cpp conffilters.cpp filterdlg.cpp defcmds.cpp -tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdeprintfax_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor tdeprintfax_LDADD = $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) -lkabc tdeprintfax_METASOURCES = AUTO diff --git a/tdescreensaver.pamd b/tdescreensaver.pamd new file mode 100644 index 000000000..aae5d16b8 --- /dev/null +++ b/tdescreensaver.pamd @@ -0,0 +1,4 @@ +#%PAM-1.0 +auth sufficient /lib/security/pam_linux_afs.so ignore_root +#auth sufficient /lib/security/pam_linux_afs.so no_unlog ignore_root +auth required /lib/security/pam_pwdb.so shadow nullok diff --git a/tdescreensaver/AUTHORS b/tdescreensaver/AUTHORS new file mode 100644 index 000000000..fda66bb39 --- /dev/null +++ b/tdescreensaver/AUTHORS @@ -0,0 +1,23 @@ + blank - Copyright (c) 1997 Martin Jones + banner - Copyright (c) 1997 Martin Jones + polygon - Copyright (c) 1997 Martin Jones + lines - Copyright (c) 1997 Dirk Staneker + blob - Copyright (c) 1997 Tiaan Wessels + +Ported from xlockmore: (but blame Martin if they don't work) + rock - Copyright (c) 1992 Jamie Zawinski + flame - Copyright (c) 1991 Scott Draves + pyro - Copyright (c) 1991 Patrick J. Naughton + laser - Copyright (c) 1995 Pascal Pensa + +Ported from xlockmore by Emanuel Pirker : + bat - Copyright (c) 1988 Sun Microsystems + forest - Copyright (c) 1995 Pascal Pensa + hop - Copyright (c) 1991 Patrick J. Naughton + lissie - Copyright (c) Alexander Jolk + slip - Copyright (c) 1992 Scott Draves + swarm - Copyright (c) 1991 Patrick J. Naughton + morph3d - Copyright (c) 1997 by Marcelo F. Vianna + +Ported from xscreensaver by Alex Zepeda + bsod - Copyright (c) 1998 Jamie Zawinski diff --git a/tdescreensaver/CMakeLists.txt b/tdescreensaver/CMakeLists.txt new file mode 100644 index 000000000..289ec1661 --- /dev/null +++ b/tdescreensaver/CMakeLists.txt @@ -0,0 +1,44 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( FILES KRandom.desktop KBlankscreen.desktop DESTINATION ${APPS_INSTALL_DIR}/System/ScreenSavers ) + + +##### krandom (executable) ###################### + +tde_add_executable( krandom.kss AUTOMOC + SOURCES random.cpp + LINK tdeui-shared ${GL_LIBRARY} + DESTINATION ${BIN_INSTALL_DIR} +) + + +##### kblankscrn (executable) ################### + +tde_add_executable( kblankscrn.kss AUTOMOC + SOURCES blankscrn.cpp + LINK tdescreensaver-shared tdeui-shared + DESTINATION ${BIN_INSTALL_DIR} +) diff --git a/tdescreensaver/ChangeLog b/tdescreensaver/ChangeLog new file mode 100644 index 000000000..7bfaa2596 --- /dev/null +++ b/tdescreensaver/ChangeLog @@ -0,0 +1,93 @@ +2001-03-10 Martin R. Jones + * added libtdescreensaver and ported KDE savers to it. + * big cleanup. + +2000-01-10 Alexander Neundorf + * banner.h, banner.cpp: + -added cycling color option + -added "show current time" option + -replaced the readEntry()'s with the appropriate read*Entry()'s + * replaced the glocale->translate with i18n in + attraction.cpp, banner.cpp, bat.cpp, blankscrn.cpp, blob.cpp, + bouboule.cpp, flame.cpp, forest.cpp, hop.cpp, laser.cpp, lines.cpp, + lissie.cpp, main.cpp, morph3d.cpp, pipes.cpp, polygon.cpp, pyro.cpp, rock.cpp, + slidescreen.cpp, slideshow.cpp, slip.cpp, space.cpp, swarm.cpp + +1999-04-28 Christophe Prud'homme + + * bouboule.cpp: the global variable initialized in bouboule is + used also in qt2. I just renamed the variable to + bouboule_initialized. However it is just a hack, and I think that + such global variables are C pratice and not C++ + +1998-12-13 Christian Esken + + * Calling kcheckpass (only on Shadow systems). This checks if the password + database can be acessed. This uses the new return code (#2) by kcheckpass. + +1998-10-24 Alex Zepeda + + * bsod.cpp (BSODSaver::BSODSaver): Use srandomdev where available. + +1998-10-23 Alex Zepeda + + * bsod.cpp (BSODSaver::BSODSaver): initialize the random seed correctly. + + * amiga.xpm, atari.xbm, bsod.cpp, bsod.h, mac.xbm, AUTHORS, Makefile.am: + New screensaver: BSOD. Yay! Still needs some final polishing however (such as a + configuration dialog box). + + * saver.h: Add correct C style prototypes for startScreenSaver and friends. + + * main.cpp: Make startScreenSaver and friends use C style name mangling. + +Version 0.3.7 + +added geometry management to all screensaver setups except kmorph3d (Mario +Weilguni ) + +Version 0.3.6 + +added "blob" saver from Tiaan Wessels + +Version 0.3.5 + +fixes from Emanuel Pirker for ported xlock savers. + +Version 0.3.4 + +More xlock ports from Emanuel Pirker + +Version 0.3.3 + +Fix small window problem under kwm (hopefully) +Fixes for Qt-1.2 + + +Version 0.3.2 + +Updated lines +added About dialogs for all savers +Shadow password support added by Martin Hartig +Use libtdeui for colour dialog + + +Version 0.3.1 + +Ported some xlock savers. Basic interface code done, but will need more work + for some savers yet to be ported. +Included "lines" (contributed by Dirk Staneker + ) +locking bug fix + +Version 0.3 + +fixes to password stuff + +Version 0.2 + +tdescreensaver.h/cpp external control files +SIGUSR1 causes the screen saver to lock immediately +hopefully StaysOnTop and windows opening after ss invoked will not display + over saver window anymore +minor bug fixes diff --git a/tdescreensaver/KBlankscreen.desktop b/tdescreensaver/KBlankscreen.desktop new file mode 100644 index 000000000..a69ca3779 --- /dev/null +++ b/tdescreensaver/KBlankscreen.desktop @@ -0,0 +1,323 @@ +[Desktop Entry] +Exec=kblankscrn.kss +Icon=tdescreensaver +Type=Application +Actions=Setup;InWindow;Root; +OnlyShowIn=TDE; +Name=Blank Screen +Name[af]=Leë Skerm +Name[ar]=شاشة فارغة +Name[az]=Boş Ekran +Name[be]=Чысты экран +Name[bg]=Празен екран +Name[bn]=ফাঁকা স্ক্রীণ +Name[br]=Skramm goullo +Name[bs]=Prazan ekran +Name[ca]=Pantalla en blanc +Name[cs]=Prázdná obrazovka +Name[csb]=Czôrny ekran +Name[cy]=Sgrîn Gwag +Name[da]=Blank skærm +Name[de]=Leerer Bildschirm +Name[el]=Κενή οθόνη +Name[eo]=Nigra ekrano +Name[es]=Pantalla negra +Name[et]=Tühi ekraan +Name[eu]=Leiho beltza +Name[fa]=پردۀ خالی +Name[fi]=Tyhjä ruutu +Name[fr]=Écran vide +Name[fy]=Leech skerm +Name[ga]=Scáileán Glan +Name[gl]=Pantalla baleira +Name[he]=מסך ריק +Name[hi]=स्क्रीन शून्य करें +Name[hr]=Prazan zaslon +Name[hu]=Üres képernyő +Name[id]=Layar Kosong +Name[is]=Svartur skjár +Name[it]=Schermo nero +Name[ja]=なし +Name[ka]=ცარიელი ეკრანი +Name[kk]=Бос экран +Name[km]=អេក្រង់​ទទេ +Name[ko]=빈 화면 +Name[lo]=ຈໍວ່າງ +Name[lt]=Tuščias ekranas +Name[lv]=Tukšs Ekrāns +Name[mk]=Празен екран +Name[mn]=Хоосон дэлгэц +Name[ms]=Skrin Kosong +Name[mt]=Skrin Vojt +Name[nb]=Tom skjerm +Name[nds]=Leddig Schirm +Name[ne]=खाली पर्दा +Name[nl]=Leeg scherm +Name[nn]=Tom skjerm +Name[nso]=Pontsho yeo Esenago Selo +Name[oc]=Ecran blanc +Name[pa]=ਖਾਲੀ ਸਕਰੀਨ +Name[pl]=Czarny ekran +Name[pt]=Ecrã Vazio +Name[pt_BR]=Limpar Tela +Name[ro]=Ecran gol +Name[ru]=Пустой экран +Name[rw]=Mugaragaza Itanditseho +Name[se]=Guorus šearbma +Name[sk]=Prázdna obrazovka +Name[sl]=Prazen zaslon +Name[sr]=Празан екран +Name[sr@Latn]=Prazan ekran +Name[ss]=Skrini lesingenalutfo +Name[sv]=Tom skärm +Name[ta]=வெற்று திரை +Name[te]=ఖాళి తెర +Name[tg]=Пардаи сафед +Name[th]=หน้าจอว่าง +Name[tr]=Boş Ekran +Name[tt]=Buş Küräk +Name[uk]=Порожній екран +Name[uz]=Boʻsh ekran +Name[uz@cyrillic]=Бўш экран +Name[ven]=Tshikirini tshi sina tshithu +Name[vi]=Màn hình Trống +Name[wa]=Noere waitroûle +Name[xh]=Ikhusi Elingenanto +Name[zh_CN]=空屏幕 +Name[zh_TW]=空白螢幕 +Name[zu]=Iskrini Esingenalutho + +[Desktop Action Setup] +Exec=kblankscrn.kss -setup +Name=Setup... +Name[af]=Opstelling... +Name[ar]=إعداد... +Name[az]=Qurğular... +Name[be]=Настаўленні... +Name[bg]=Настройване... +Name[bn]=সেট-আপ... +Name[br]=Kefluniadur ... +Name[bs]=Postavke... +Name[ca]=Configuració... +Name[cs]=Nastavení... +Name[csb]=Ùstôw... +Name[cy]=Gosod... +Name[da]=Opsætning... +Name[de]=Einrichtung ... +Name[el]=Ρύθμιση... +Name[eo]=Agordo... +Name[es]=Configuración... +Name[et]=Seadistused... +Name[eu]=Konfigurazioa... +Name[fa]=برپایی... +Name[fi]=Asetukset... +Name[fr]=Configuration... +Name[fy]=Opset... +Name[ga]=Cumraigh... +Name[gl]=Configuración... +Name[he]=הגדרות... +Name[hi]=सेटअप... +Name[hr]=Postavke... +Name[hu]=Beállítás... +Name[id]=Aturan... +Name[is]=Stillingar... +Name[it]=Impostazioni... +Name[ja]=セットアップ... +Name[ka]=კონფიგურაცია... +Name[kk]=Баптау... +Name[km]=ដំឡើង... +Name[ko]=설정... +Name[lo]=ຕິດຕັ້ງ.. +Name[lt]=Nustatymas... +Name[lv]=Uzstādīšana... +Name[mk]=Постави... +Name[mn]=Тохируулга... +Name[ms]=Tetapan... +Name[nb]=Oppsett … +Name[nds]=Instellen... +Name[ne]=सेटअप... +Name[nl]=Instellingen... +Name[nn]=Oppsett … +Name[nso]=Beakanya... +Name[oc]=Configuracion... +Name[pa]=ਸੈੱਟਅੱਪ... +Name[pl]=Ustawienia... +Name[pt]=Configurar... +Name[pt_BR]=Configurar... +Name[ro]=Opțiuni... +Name[ru]=Настройка... +Name[rw]=Iboneza... +Name[se]=Heiveheapmi … +Name[sk]=Nastavenie... +Name[sl]=Nastavitve ... +Name[sr]=Подеси... +Name[sr@Latn]=Podesi... +Name[ss]=Lungiselela... +Name[sv]=Inställningar... +Name[ta]=அமைப்பு... +Name[te]=సెటప్... +Name[tg]=Танзимот... +Name[th]=ตั้งค่า... +Name[tr]=Kurulum... +Name[tt]=Caylaw... +Name[uk]=Встановити... +Name[uz]=Oʻrnatish +Name[uz@cyrillic]=Ўрнатиш +Name[ven]=Vhekanya... +Name[vi]=Cài đặt... +Name[wa]=Apontyî... +Name[xh]=Iyacwangciswa... +Name[zh_CN]=设置... +Name[zh_TW]=設定... +Name[zu]=Iyalungiselela... +Icon=tdescreensaver + +[Desktop Action InWindow] +Exec=kblankscrn.kss -window-id %w +Name=Display in Specified Window +Name[af]=Vertoon in gespesifiseerde venster +Name[ar]=أعرض في النافذة المحددة +Name[az]=Bildirilən Pəncərədə Göstər +Name[be]=Паказваць у вызначаным акне +Name[bg]=Стартиране в избран прозорец +Name[bn]=নির্দিষ্ট উইণ্ডোয় দেখাও +Name[br]=Diskwel er prenestr spisaet +Name[bs]=Prikaži u navedenom prozoru +Name[ca]=Mostra a la finestra especificada +Name[cs]=Zobrazit v určeném okně +Name[csb]=Wëskrzëni w pòdónym òknie +Name[cy]=Dangos mewn Ffenestr Benodol +Name[da]=Visning i angivet vindue +Name[de]=In angegebenem Fenster anzeigen +Name[el]=Προβολή στο καθορισμένο παράθυρο +Name[eo]=Montru en indikita fenestro +Name[es]=Mostrar en la ventana especificada +Name[et]=Määratud aknas näitamine +Name[eu]=Erakutsi adierazitako leihoan +Name[fa]=نمایش در پنجرۀ مشخص‌شده +Name[fi]=Näytä määrätyssä ikkunassa +Name[fr]=Affichage dans la fenêtre spécifiée +Name[fy]=Werjefte yn in definiëare finster +Name[ga]=Taispeáin san Fhuinneog Sonraithe +Name[gl]=Mostrar na fiestra especificada +Name[he]=הצג בחלון המצוין +Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें +Name[hr]=Prikaži u odabranom prozoru +Name[hu]=Megjelenítés egy megadott ablakban +Name[is]=Birta í völdum glugga +Name[it]=Mostra nella finestra specificata +Name[ja]=特定のウィンドウで表示 +Name[ka]=მოცემულ ფანჯარაში ასახვა +Name[kk]=Келтірілген терезеде көрсету +Name[km]=បង្ហាញ​ក្នុង​បង្អួច​ដែល​បាន​បញ្ជាក់​លម្អិត +Name[ko]=지정한 창에 보이기 +Name[lt]=Rodyti nurodytame lange +Name[lv]=Rādīt norādītajā logā +Name[mk]=Прикажи во наведениот прозорец +Name[ms]=Paparan dalam Tetingkap Yang Dinyatakan +Name[mt]=Uri f'window speċifika +Name[nb]=Vis i det valgte vinduet +Name[nds]=In't utsöchte Finster wiesen +Name[ne]=निर्दिष्ट गरिएको सञ्झ्यालमा प्रदर्शन गर्नुहोस् +Name[nl]=In een gedefinieerd venster weergeven +Name[nn]=Vis i vald vindauge +Name[pa]=ਦਿੱਤੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ +Name[pl]=Wyświetl w podanym oknie +Name[pt]=Mostrar na Janela Indicada +Name[pt_BR]=Mostrar em janela especificada +Name[ro]=Afișează în fereastra specificată +Name[ru]=Показать в указанном окне +Name[rw]=Kwerekana mu Idirishya Ryihariye +Name[se]=Čájet meroštuvvon láses +Name[sk]=Zobraziť v zadanom okne +Name[sl]=Prikaz v določenemu oknu +Name[sr]=Прикажи у задатом прозору +Name[sr@Latn]=Prikaži u zadatom prozoru +Name[sv]=Visa i angivet fönster +Name[ta]=குறிப்பிடப்பட்ட சாளரத்தில் காட்டு +Name[th]=แสดงในหน้าต่างที่กำหนด +Name[tr]=Belirtilen Pencerede Göster +Name[tt]=Äytelgän Täräzädä Kürsät +Name[uk]=Відобразити у вказаному вікні +Name[uz]=Koʻrsatilgan oynada koʻrsatish +Name[uz@cyrillic]=Кўрсатилган ойнада кўрсатиш +Name[vi]=Hiển thị trong một Cửa sổ Đặc biệt +Name[wa]=Håyner dins l' purnea specifyî +Name[zh_CN]=在指定窗口中显示 +Name[zh_TW]=在指定的視窗中顯示 +NoDisplay=true + +[Desktop Action Root] +Exec=kblankscrn.kss -root +Name=Display in Root Window +Name[af]=Vertoon in root venster +Name[ar]=أعرض في النافذة الجذرية +Name[az]=Kök Pəncərədə Göstər +Name[be]=Паказваць у галоўным акне +Name[bg]=Стартиране в главния прозорец +Name[bn]=রুট উইণ্ডোয় দেখাও +Name[br]=Diskwel er prenestr gwrizienn +Name[bs]=Prikaži u korijenskom prozoru +Name[ca]=Mostra a la finestra root +Name[cs]=Zobrazit na pozadí plochy +Name[csb]=Wëskrzëni w przédnym òknie +Name[cy]=Dangos mewn Ffenestr Wraidd +Name[da]=Visning i root-vindue +Name[de]=Im Basisfenster (Root Window) anzeigen +Name[el]=Προβολή στο βασικό παράθυρο +Name[eo]=Montru en radika fenestro +Name[es]=Mostrar en la ventana raíz +Name[et]=Juuraknas näitamine +Name[eu]=Erakutsi leiho nagusian +Name[fa]=نمایش در پنجرۀ ریشه +Name[fi]=Näytä juuri-ikkunassa +Name[fr]=Affichage dans la fenêtre racine +Name[fy]=Werjefte yn haadfinster +Name[ga]=Taispeáin sa bhFréamhfhuinneog +Name[gl]=Mostrar na fiestra raiz +Name[he]=הצג בחלון השורש +Name[hi]=रूट विंडो में प्रदर्शित करें +Name[hr]=Prikaži u korijenskom prozoru +Name[hu]=Megjelenítés a gyökérablakban +Name[is]=Birta í bakgrunni skjáborðs +Name[it]=Mostra sulla finestra di sfondo +Name[ja]=ルートウィンドウで表示 +Name[ka]=ძირეულ ფანჯარაში ასახვა +Name[kk]=Root терезесінде көрсету +Name[km]=បង្ហាញ​ក្នុង​បង្អួច Root +Name[ko]=전체 화면에 보이기 +Name[lt]=Rodyti root lange +Name[lv]=Rādīt saknes logā +Name[mk]=Прикажи во кореновиот прозорец +Name[ms]=Papar dalam Tetingkap Root +Name[mt]=Uri fil-window ewlenija +Name[nb]=Vis i rotvinduet +Name[nds]=In't Hööftfinster wiesen +Name[ne]=रुट सञ्झ्यालमा प्रदर्शन गर्नुहोस् +Name[nl]=In hoofdvenster weergeven +Name[nn]=Vis i rotvindauget +Name[pa]=ਰੂਟ(Root) ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ +Name[pl]=Wyświetl w oknie głównym +Name[pt]=Mostrar na Janela de Fundo +Name[pt_BR]=Mostrar na janela-raiz +Name[ro]=Afișează în fereastra rădăcină +Name[ru]=Показать в корневом окне +Name[rw]=Kwerekana mu Idirishya Umuzi +Name[se]=Čájet ruohtasláses +Name[sk]=Zobraziť v koreňovom okne +Name[sl]=Prikaz v korenskem oknu +Name[sr]=Прикажи у кореном прозору +Name[sr@Latn]=Prikaži u korenom prozoru +Name[sv]=Visa i rotfönstret +Name[ta]=மூல சாளரத்தில் காட்டு +Name[th]=แสดงในหน้าต่างหลัก +Name[tr]=Kök Pencerede Göster +Name[tt]=Root Täräzäsendä Kürsät +Name[uk]=Відобразити на тлі екрана +Name[uz]=Tub oynada koʻrsatish +Name[uz@cyrillic]=Туб ойнада кўрсатиш +Name[vi]=Hiển thị trong Cửa sổ của Gốc +Name[wa]=Håyner e purnea raecene (li fond do scribanne) +Name[zh_CN]=在 Root 窗口中显示 +Name[zh_TW]=在 Root 視窗中顯示 +NoDisplay=true diff --git a/tdescreensaver/KRandom.desktop b/tdescreensaver/KRandom.desktop new file mode 100644 index 000000000..9ab77efd2 --- /dev/null +++ b/tdescreensaver/KRandom.desktop @@ -0,0 +1,321 @@ +[Desktop Entry] +Exec=krandom.kss +Icon=tdescreensaver +Type=Application +Actions=Setup;InWindow;Root; +OnlyShowIn=TDE; +Name=Random +Name[af]=Lukrake +Name[ar]=عشوائي +Name[az]=Təsadüfi +Name[be]=Выпадковы +Name[bg]=Произволен +Name[bn]=এলোমেলোভাবে +Name[br]=Dre zegouezh +Name[bs]=Bilo koji +Name[ca]=Aleatori +Name[cs]=Náhodný +Name[csb]=Przëtrôfkòwi +Name[cy]=Ar Hap +Name[da]=Tilfældig +Name[de]=Zufällig +Name[el]=Τυχαία +Name[eo]=Hazardo +Name[es]=Aleatorio +Name[et]=Juhuslik +Name[eu]=Ausazkoa +Name[fa]=تصادفی +Name[fi]=Satunnainen +Name[fr]=Aléatoire +Name[fy]=Samar in +Name[ga]=Fánach +Name[gl]=Aleatório +Name[he]=אקראי +Name[hi]=बेतरतीब +Name[hr]=Nasumice +Name[hu]=Véletlenszerű +Name[id]=Acak +Name[is]=Slembið +Name[it]=Casuale +Name[ja]=ランダム +Name[ka]=შემთხვევითი +Name[kk]=Кездейсоқ +Name[km]=ចៃដន្យ +Name[ko]=아무거나 +Name[lo]=ສຸ່ມ +Name[lt]=Atsitiktinis +Name[lv]=Gadījuma +Name[mk]=Случаен +Name[mn]=Дурын +Name[ms]=Rawak +Name[mt]=Imtella' bil-Polza +Name[nb]=Tilfeldig +Name[nds]=Tofall +Name[ne]=अनियमित +Name[nl]=Willekeurig +Name[nn]=Tilfeldig +Name[nso]=Kago Rarela +Name[oc]=Aleatori +Name[pa]=ਰਲਵਾਂ +Name[pl]=Losowy +Name[pt]=Aleatório +Name[pt_BR]=Aleatório +Name[ro]=Aleator +Name[ru]=Случайный +Name[rw]=Bibonetse +Name[se]=Sáhtodohko +Name[sk]=Náhodný +Name[sl]=Naključno +Name[sr]=Случајно +Name[sr@Latn]=Slučajno +Name[sv]=Slumpmässig +Name[ta]=ஒழுங்கற்ற +Name[tg]=Тассодуфӣ +Name[th]=สุ่ม +Name[tr]=Rastgele +Name[tt]=Oçraqlı +Name[uk]=Випадковий +Name[uz]=Tasodifiy +Name[uz@cyrillic]=Тасодифий +Name[ven]=Zwothe +Name[vi]=Ngẫu nhiên +Name[wa]=A l' astcheyance +Name[xh]=Ngaphandle kwenjongo +Name[zh_CN]=随机 +Name[zh_TW]=隨機 +Name[zu]=Okungenaphethini + +[Desktop Action Setup] +Exec=krandom.kss -setup +Name=Setup... +Name[af]=Opstelling... +Name[ar]=إعداد... +Name[az]=Qurğular... +Name[be]=Настаўленні... +Name[bg]=Настройване... +Name[bn]=সেট-আপ... +Name[br]=Kefluniadur ... +Name[bs]=Postavke... +Name[ca]=Configuració... +Name[cs]=Nastavení... +Name[csb]=Ùstôw... +Name[cy]=Gosod... +Name[da]=Opsætning... +Name[de]=Einrichtung ... +Name[el]=Ρύθμιση... +Name[eo]=Agordo... +Name[es]=Configuración... +Name[et]=Seadistused... +Name[eu]=Konfigurazioa... +Name[fa]=برپایی... +Name[fi]=Asetukset... +Name[fr]=Configuration... +Name[fy]=Opset... +Name[ga]=Cumraigh... +Name[gl]=Configuración... +Name[he]=הגדרות... +Name[hi]=सेटअप... +Name[hr]=Postavke... +Name[hu]=Beállítás... +Name[id]=Aturan... +Name[is]=Stillingar... +Name[it]=Impostazioni... +Name[ja]=セットアップ... +Name[ka]=კონფიგურაცია... +Name[kk]=Баптау... +Name[km]=ដំឡើង... +Name[ko]=설정... +Name[lo]=ຕິດຕັ້ງ.. +Name[lt]=Nustatymas... +Name[lv]=Uzstādīšana... +Name[mk]=Постави... +Name[mn]=Тохируулга... +Name[ms]=Tetapan... +Name[nb]=Oppsett … +Name[nds]=Instellen... +Name[ne]=सेटअप... +Name[nl]=Instellingen... +Name[nn]=Oppsett … +Name[nso]=Beakanya... +Name[oc]=Configuracion... +Name[pa]=ਸੈੱਟਅੱਪ... +Name[pl]=Ustawienia... +Name[pt]=Configurar... +Name[pt_BR]=Configurar... +Name[ro]=Opțiuni... +Name[ru]=Настройка... +Name[rw]=Iboneza... +Name[se]=Heiveheapmi … +Name[sk]=Nastavenie... +Name[sl]=Nastavitve ... +Name[sr]=Подеси... +Name[sr@Latn]=Podesi... +Name[ss]=Lungiselela... +Name[sv]=Inställningar... +Name[ta]=அமைப்பு... +Name[te]=సెటప్... +Name[tg]=Танзимот... +Name[th]=ตั้งค่า... +Name[tr]=Kurulum... +Name[tt]=Caylaw... +Name[uk]=Встановити... +Name[uz]=Oʻrnatish +Name[uz@cyrillic]=Ўрнатиш +Name[ven]=Vhekanya... +Name[vi]=Cài đặt... +Name[wa]=Apontyî... +Name[xh]=Iyacwangciswa... +Name[zh_CN]=设置... +Name[zh_TW]=設定... +Name[zu]=Iyalungiselela... +Icon=tdescreensaver + +[Desktop Action InWindow] +Exec=krandom.kss -window-id %w +Name=Display in Specified Window +Name[af]=Vertoon in gespesifiseerde venster +Name[ar]=أعرض في النافذة المحددة +Name[az]=Bildirilən Pəncərədə Göstər +Name[be]=Паказваць у вызначаным акне +Name[bg]=Стартиране в избран прозорец +Name[bn]=নির্দিষ্ট উইণ্ডোয় দেখাও +Name[br]=Diskwel er prenestr spisaet +Name[bs]=Prikaži u navedenom prozoru +Name[ca]=Mostra a la finestra especificada +Name[cs]=Zobrazit v určeném okně +Name[csb]=Wëskrzëni w pòdónym òknie +Name[cy]=Dangos mewn Ffenestr Benodol +Name[da]=Visning i angivet vindue +Name[de]=In angegebenem Fenster anzeigen +Name[el]=Προβολή στο καθορισμένο παράθυρο +Name[eo]=Montru en indikita fenestro +Name[es]=Mostrar en la ventana especificada +Name[et]=Määratud aknas näitamine +Name[eu]=Erakutsi adierazitako leihoan +Name[fa]=نمایش در پنجرۀ مشخص‌شده +Name[fi]=Näytä määrätyssä ikkunassa +Name[fr]=Affichage dans la fenêtre spécifiée +Name[fy]=Werjefte yn in definiëare finster +Name[ga]=Taispeáin san Fhuinneog Sonraithe +Name[gl]=Mostrar na fiestra especificada +Name[he]=הצג בחלון המצוין +Name[hi]=निर्दिष्ट विंडो में प्रदर्शित करें +Name[hr]=Prikaži u odabranom prozoru +Name[hu]=Megjelenítés egy megadott ablakban +Name[is]=Birta í völdum glugga +Name[it]=Mostra nella finestra specificata +Name[ja]=特定のウィンドウで表示 +Name[ka]=მოცემულ ფანჯარაში ასახვა +Name[kk]=Келтірілген терезеде көрсету +Name[km]=បង្ហាញ​ក្នុង​បង្អួច​ដែល​បាន​បញ្ជាក់​លម្អិត +Name[ko]=지정한 창에 보이기 +Name[lt]=Rodyti nurodytame lange +Name[lv]=Rādīt norādītajā logā +Name[mk]=Прикажи во наведениот прозорец +Name[ms]=Paparan dalam Tetingkap Yang Dinyatakan +Name[mt]=Uri f'window speċifika +Name[nb]=Vis i det valgte vinduet +Name[nds]=In't utsöchte Finster wiesen +Name[ne]=निर्दिष्ट गरिएको सञ्झ्यालमा प्रदर्शन गर्नुहोस् +Name[nl]=In een gedefinieerd venster weergeven +Name[nn]=Vis i vald vindauge +Name[pa]=ਦਿੱਤੇ ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ +Name[pl]=Wyświetl w podanym oknie +Name[pt]=Mostrar na Janela Indicada +Name[pt_BR]=Mostrar em janela especificada +Name[ro]=Afișează în fereastra specificată +Name[ru]=Показать в указанном окне +Name[rw]=Kwerekana mu Idirishya Ryihariye +Name[se]=Čájet meroštuvvon láses +Name[sk]=Zobraziť v zadanom okne +Name[sl]=Prikaz v določenemu oknu +Name[sr]=Прикажи у задатом прозору +Name[sr@Latn]=Prikaži u zadatom prozoru +Name[sv]=Visa i angivet fönster +Name[ta]=குறிப்பிடப்பட்ட சாளரத்தில் காட்டு +Name[th]=แสดงในหน้าต่างที่กำหนด +Name[tr]=Belirtilen Pencerede Göster +Name[tt]=Äytelgän Täräzädä Kürsät +Name[uk]=Відобразити у вказаному вікні +Name[uz]=Koʻrsatilgan oynada koʻrsatish +Name[uz@cyrillic]=Кўрсатилган ойнада кўрсатиш +Name[vi]=Hiển thị trong một Cửa sổ Đặc biệt +Name[wa]=Håyner dins l' purnea specifyî +Name[zh_CN]=在指定窗口中显示 +Name[zh_TW]=在指定的視窗中顯示 +NoDisplay=true + +[Desktop Action Root] +Exec=krandom.kss -root +Name=Display in Root Window +Name[af]=Vertoon in root venster +Name[ar]=أعرض في النافذة الجذرية +Name[az]=Kök Pəncərədə Göstər +Name[be]=Паказваць у галоўным акне +Name[bg]=Стартиране в главния прозорец +Name[bn]=রুট উইণ্ডোয় দেখাও +Name[br]=Diskwel er prenestr gwrizienn +Name[bs]=Prikaži u korijenskom prozoru +Name[ca]=Mostra a la finestra root +Name[cs]=Zobrazit na pozadí plochy +Name[csb]=Wëskrzëni w przédnym òknie +Name[cy]=Dangos mewn Ffenestr Wraidd +Name[da]=Visning i root-vindue +Name[de]=Im Basisfenster (Root Window) anzeigen +Name[el]=Προβολή στο βασικό παράθυρο +Name[eo]=Montru en radika fenestro +Name[es]=Mostrar en la ventana raíz +Name[et]=Juuraknas näitamine +Name[eu]=Erakutsi leiho nagusian +Name[fa]=نمایش در پنجرۀ ریشه +Name[fi]=Näytä juuri-ikkunassa +Name[fr]=Affichage dans la fenêtre racine +Name[fy]=Werjefte yn haadfinster +Name[ga]=Taispeáin sa bhFréamhfhuinneog +Name[gl]=Mostrar na fiestra raiz +Name[he]=הצג בחלון השורש +Name[hi]=रूट विंडो में प्रदर्शित करें +Name[hr]=Prikaži u korijenskom prozoru +Name[hu]=Megjelenítés a gyökérablakban +Name[is]=Birta í bakgrunni skjáborðs +Name[it]=Mostra sulla finestra di sfondo +Name[ja]=ルートウィンドウで表示 +Name[ka]=ძირეულ ფანჯარაში ასახვა +Name[kk]=Root терезесінде көрсету +Name[km]=បង្ហាញ​ក្នុង​បង្អួច Root +Name[ko]=전체 화면에 보이기 +Name[lt]=Rodyti root lange +Name[lv]=Rādīt saknes logā +Name[mk]=Прикажи во кореновиот прозорец +Name[ms]=Papar dalam Tetingkap Root +Name[mt]=Uri fil-window ewlenija +Name[nb]=Vis i rotvinduet +Name[nds]=In't Hööftfinster wiesen +Name[ne]=रुट सञ्झ्यालमा प्रदर्शन गर्नुहोस् +Name[nl]=In hoofdvenster weergeven +Name[nn]=Vis i rotvindauget +Name[pa]=ਰੂਟ(Root) ਝਰੋਖੇ ਵਿੱਚ ਵੇਖਾਓ +Name[pl]=Wyświetl w oknie głównym +Name[pt]=Mostrar na Janela de Fundo +Name[pt_BR]=Mostrar na janela-raiz +Name[ro]=Afișează în fereastra rădăcină +Name[ru]=Показать в корневом окне +Name[rw]=Kwerekana mu Idirishya Umuzi +Name[se]=Čájet ruohtasláses +Name[sk]=Zobraziť v koreňovom okne +Name[sl]=Prikaz v korenskem oknu +Name[sr]=Прикажи у кореном прозору +Name[sr@Latn]=Prikaži u korenom prozoru +Name[sv]=Visa i rotfönstret +Name[ta]=மூல சாளரத்தில் காட்டு +Name[th]=แสดงในหน้าต่างหลัก +Name[tr]=Kök Pencerede Göster +Name[tt]=Root Täräzäsendä Kürsät +Name[uk]=Відобразити на тлі екрана +Name[uz]=Tub oynada koʻrsatish +Name[uz@cyrillic]=Туб ойнада кўрсатиш +Name[vi]=Hiển thị trong Cửa sổ của Gốc +Name[wa]=Håyner e purnea raecene (li fond do scribanne) +Name[zh_CN]=在 Root 窗口中显示 +Name[zh_TW]=在 Root 視窗中顯示 +NoDisplay=true diff --git a/tdescreensaver/Makefile.am b/tdescreensaver/Makefile.am new file mode 100644 index 000000000..f46573d5f --- /dev/null +++ b/tdescreensaver/Makefile.am @@ -0,0 +1,27 @@ +# Makefile.am for tdescreensaver. +# + +AM_CPPFLAGS = -UQT_NO_ASCII_CAST + +INCLUDES = $(GLINC) $(all_includes) +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor + +bin_PROGRAMS = krandom.kss kblankscrn.kss + +krandom_kss_SOURCES = random.cpp +krandom_kss_LDADD = $(LIB_TDEUI) $(GLLIB) -lm + +kblankscrn_kss_SOURCES = blankscrn.cpp +kblankscrn_kss_LDADD = $(LIB_TDEUI) -ltdescreensaver -lm + +METASOURCES = AUTO + +messages: + $(XGETTEXT) *.cpp *.h -o $(podir)/tdescreensaver.pot + +########## Meta objects ########## + +desktop_DATA = KRandom.desktop KBlankscreen.desktop +desktopdir = $(kde_appsdir)/System/ScreenSavers + +EXTRA_DIST = $(desktop_DATA) diff --git a/tdescreensaver/blankscrn.cpp b/tdescreensaver/blankscrn.cpp new file mode 100644 index 000000000..e2c6ed889 --- /dev/null +++ b/tdescreensaver/blankscrn.cpp @@ -0,0 +1,135 @@ +//----------------------------------------------------------------------------- +// +// kblankscrn - Basic screen saver for KDE +// +// Copyright (c) Martin R. Jones 1996 +// +// 1998/04/19 Layout management added by Mario Weilguni +// 2001/03/04 Converted to use libtdescreensaver by Martin R. Jones + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "blankscrn.h" +#include "blankscrn.moc" + +// libtdescreensaver interface +extern "C" +{ + KDE_EXPORT const char *kss_applicationName = "kblankscrn.kss"; + KDE_EXPORT const char *kss_description = I18N_NOOP( "KBlankScreen" ); + KDE_EXPORT const char *kss_version = "2.2.0"; + + KDE_EXPORT KScreenSaver* kss_create( WId id ) + { + return new KBlankSaver( id ); + } + + KDE_EXPORT TQDialog* kss_setup() + { + return new KBlankSetup(); + } +} + +//----------------------------------------------------------------------------- +// dialog to setup screen saver parameters +// +KBlankSetup::KBlankSetup( TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n( "Setup Blank Screen Saver" ), + Ok|Cancel, Ok, true ) +{ + readSettings(); + + TQFrame *main = makeMainWidget(); + TQGridLayout *grid = new TQGridLayout(main, 4, 2, 0, spacingHint() ); + + TQLabel *label = new TQLabel( i18n("Color:"), main ); + grid->addWidget(label, 0, 0); + + KColorButton *colorPush = new KColorButton( color, main ); + colorPush->setMinimumWidth(80); + connect( colorPush, TQT_SIGNAL( changed(const TQColor &) ), + TQT_SLOT( slotColor(const TQColor &) ) ); + grid->addWidget(colorPush, 1, 0); + + preview = new TQWidget( main ); + preview->setFixedSize( 220, 165 ); + preview->setBackgroundColor( black ); + preview->show(); // otherwise saver does not get correct size + saver = new KBlankSaver( preview->winId() ); + grid->addMultiCellWidget(preview, 0, 2, 1, 1); + + grid->setRowStretch( 2, 10 ); + grid->setRowStretch( 3, 20 ); + + setMinimumSize( sizeHint() ); +} + +// read settings from config file +void KBlankSetup::readSettings() +{ + TDEConfig *config = TDEGlobal::config(); + config->setGroup( "Settings" ); + + color = config->readColorEntry( "Color", &black ); +} + +void KBlankSetup::slotColor( const TQColor &col ) +{ + color = col; + saver->setColor( color ); +} + +// Ok pressed - save settings and exit +void KBlankSetup::slotOk() +{ + TDEConfig *config = TDEGlobal::config(); + config->setGroup( "Settings" ); + config->writeEntry( "Color", color ); + config->sync(); + + accept(); +} + +//----------------------------------------------------------------------------- + + +KBlankSaver::KBlankSaver( WId id ) : KScreenSaver( id ) +{ + readSettings(); + blank(); +} + +KBlankSaver::~KBlankSaver() +{ +} + +// set the color +void KBlankSaver::setColor( const TQColor &col ) +{ + color = col; + blank(); +} + +// read configuration settings from config file +void KBlankSaver::readSettings() +{ + TDEConfig *config = TDEGlobal::config(); + config->setGroup( "Settings" ); + + color = config->readColorEntry( "Color", &black ); +} + +void KBlankSaver::blank() +{ + setBackgroundColor( color ); + erase(); +} + diff --git a/tdescreensaver/blankscrn.h b/tdescreensaver/blankscrn.h new file mode 100644 index 000000000..ba6da0226 --- /dev/null +++ b/tdescreensaver/blankscrn.h @@ -0,0 +1,56 @@ +//----------------------------------------------------------------------------- +// +// kblankscrn - Basic screen saver for KDE +// +// Copyright (c) Martin R. Jones 1996 +// + +#ifndef __BLANKSCRN_H__ +#define __BLANKSCRN_H__ + +#include +#include +#include + +class KColorButton; + + +class KBlankSaver : public KScreenSaver +{ + Q_OBJECT +public: + KBlankSaver( WId drawable ); + virtual ~KBlankSaver(); + + void setColor( const TQColor &col ); + +private: + void readSettings(); + void blank(); + +private: + TQColor color; +}; + +class KBlankSetup : public KDialogBase +{ + Q_OBJECT +public: + KBlankSetup( TQWidget *parent = NULL, const char *name = NULL ); + +protected: + void readSettings(); + +private slots: + void slotColor( const TQColor & ); + void slotOk(); + +private: + TQWidget *preview; + KBlankSaver *saver; + + TQColor color; +}; + +#endif + diff --git a/tdescreensaver/random.cpp b/tdescreensaver/random.cpp new file mode 100644 index 000000000..cc8b7d279 --- /dev/null +++ b/tdescreensaver/random.cpp @@ -0,0 +1,292 @@ + //----------------------------------------------------------------------------- +// +// Screen savers for KDE +// +// Copyright (c) Martin R. Jones 1999 +// +// This is an extremely simple program that starts a random screensaver. +// + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "tdescreensaver_vroot.h" +#include "random.h" + +#define MAX_ARGS 20 + +static void usage(char *name) +{ + puts(i18n("Usage: %1 [-setup] [args]\n" + "Starts a random screen saver.\n" + "Any arguments (except -setup) are passed on to the screen saver.").arg( name ).local8Bit().data()); +} + +static const char appName[] = "random"; + +static const char description[] = I18N_NOOP("Start a random TDE screen saver"); + +static const char version[] = "2.0.0"; + +static const KCmdLineOptions options[] = +{ + { "setup", I18N_NOOP("Setup screen saver"), 0 }, + { "window-id wid", I18N_NOOP("Run in the specified XWindow"), 0 }, + { "root", I18N_NOOP("Run in the root XWindow"), 0 }, + // { "+-- [options]", I18N_NOOP("Options to pass to the screen saver"), 0 } + KCmdLineLastOption +}; + +//---------------------------------------------------------------------------- + +#ifdef HAVE_GLXCHOOSEVISUAL +#include +#endif + +//------------------------------------- +bool hasDirectRendering () { + Display *dpy = TQApplication::desktop()->x11Display(); + +#ifdef HAVE_GLXCHOOSEVISUAL + int attribSingle[] = { + GLX_RGBA, + GLX_RED_SIZE, 1, + GLX_GREEN_SIZE, 1, + GLX_BLUE_SIZE, 1, + None + }; + XVisualInfo* visinfo = glXChooseVisual ( + dpy, TQApplication::desktop()->primaryScreen(), attribSingle + ); + if (visinfo) { + GLXContext ctx = glXCreateContext ( dpy, visinfo, NULL, True ); + if (glXIsDirect(dpy, ctx)) { + glXDestroyContext (dpy,ctx); + return true; + } + glXDestroyContext (dpy,ctx); + return false; + } else { + return false; + } +#else +#error no GL? + return false; +#endif + +} + +int main(int argc, char *argv[]) +{ + KLocale::setMainCatalogue("tdescreensaver"); + TDECmdLineArgs::init(argc, argv, appName, I18N_NOOP("Random screen saver"), description, version); + + TDECmdLineArgs::addCmdLineOptions(options); + + TDEApplication app; + + Window windowId = 0; + + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); + + if (args->isSet("setup")) + { + KRandomSetup setup; + setup.exec(); + exit(0); + } + + if (args->isSet("window-id")) + { + windowId = atol(args->getOption("window-id")); + } + + if (args->isSet("root")) + { + windowId = RootWindow(tqt_xdisplay(), tqt_xscreen()); + } + + TDEGlobal::dirs()->addResourceType("scrsav", + TDEGlobal::dirs()->kde_default("apps") + + "apps/ScreenSavers/"); + TDEGlobal::dirs()->addResourceType("scrsav", + TDEGlobal::dirs()->kde_default("apps") + + "System/ScreenSavers/"); + TQStringList tempSaverFileList = TDEGlobal::dirs()->findAllResources("scrsav", + "*.desktop", false, true); + + TQStringList saverFileList; + + TDEConfig type("krandom.kssrc"); + type.setGroup("Settings"); + bool opengl = type.readBoolEntry("OpenGL", hasDirectRendering()); + kdDebug() << "hasOPEN " << opengl << endl; + bool manipulatescreen = type.readBoolEntry("ManipulateScreen"); + bool fortune = !KStandardDirs::findExe("fortune").isEmpty(); + TQStringList defaults = type.readListEntry( "Defaults" ); + TQMap def_numbers; + for ( TQStringList::ConstIterator it = defaults.begin(); it != defaults.end(); ++it ) { + int index = ( *it ).find( ':' ); + if ( index == -1 ) + def_numbers[*it] = 1; + else + def_numbers[( *it ).left( index )] = ( *it ).mid( index + 1 ).toInt(); + } + + for (uint i = 0; i < tempSaverFileList.count(); i++) + { + int howoften = 1; + if ( defaults.count() != 0 ) { + TQFileInfo fi( tempSaverFileList[i] ); + if ( def_numbers.contains( fi.fileName() ) ) + howoften = def_numbers[fi.fileName()]; + else + howoften = 0; + } + + KDesktopFile saver(tempSaverFileList[i], true); + if (!saver.tryExec()) + continue; + TQString saverType = saver.readEntry("X-TDE-Type"); + if (!saverType.isEmpty()) // no X-TDE-Type defined so must be OK + { + TQStringList saverTypes = TQStringList::split(";", saverType); + for (TQStringList::ConstIterator it = saverTypes.begin(); it != saverTypes.end(); ++it ) + { + if (*it == "ManipulateScreen") + { + if (!manipulatescreen) + howoften = 0; + } + else + if (*it == "OpenGL") + { + if (!opengl) + howoften = 0; + } + if (*it == "Fortune") + { + if (!fortune) + howoften = 0; + } + + } + } + for ( int j = 0; j < howoften; ++j ) + saverFileList.append(tempSaverFileList[i]); + } + kdDebug() << "final " << saverFileList << endl; + + KRandomSequence rnd; + int indx = rnd.getLong(saverFileList.count()); + TQString filename = *(saverFileList.at(indx)); + + KDesktopFile config(filename, true); + + TQString cmd; + if (windowId && config.hasActionGroup("InWindow")) + { + config.setActionGroup("InWindow"); + } + else if ((windowId == 0) && config.hasActionGroup("Root")) + { + config.setActionGroup("Root"); + } + cmd = config.readPathEntry("Exec"); + + TQTextStream ts(&cmd, IO_ReadOnly); + TQString word; + ts >> word; + TQString exeFile = KStandardDirs::findExe(word); + + if (!exeFile.isEmpty()) + { + char *sargs[MAX_ARGS]; + sargs[0] = new char [strlen(word.ascii())+1]; + strcpy(sargs[0], word.ascii()); + + int i = 1; + while (!ts.atEnd() && i < MAX_ARGS-1) + { + ts >> word; + if (word == "%w") + { + word = word.setNum(windowId); + } + + sargs[i] = new char [strlen(word.ascii())+1]; + strcpy(sargs[i], word.ascii()); + kdDebug() << "word is " << word.ascii() << endl; + + i++; + } + + sargs[i] = 0; + + execv(exeFile.ascii(), sargs); + } + + // If we end up here then we couldn't start a saver. + // If we have been supplied a window id or root window then blank it. + Window win = windowId ? windowId : RootWindow(tqt_xdisplay(), tqt_xscreen()); + XSetWindowBackground(tqt_xdisplay(), win, + BlackPixel(tqt_xdisplay(), tqt_xscreen())); + XClearWindow(tqt_xdisplay(), win); +} + + +KRandomSetup::KRandomSetup( TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n( "Setup Random Screen Saver" ), + Ok|Cancel, Ok, true ) +{ + + TQFrame *main = makeMainWidget(); + TQGridLayout *grid = new TQGridLayout(main, 4, 2, 0, spacingHint() ); + + openGL = new TQCheckBox( i18n("Use OpenGL screen savers"), main ); + grid->addWidget(openGL, 0, 0); + + manipulateScreen = new TQCheckBox(i18n("Use screen savers that manipulate the screen"), main); + grid->addWidget(manipulateScreen, 1, 0); + + setMinimumSize( sizeHint() ); + + TDEConfig config("krandom.kssrc"); + config.setGroup("Settings"); + openGL->setChecked(config.readBoolEntry("OpenGL", hasDirectRendering())); + manipulateScreen->setChecked(config.readBoolEntry("ManipulateScreen", true)); +} + +void KRandomSetup::slotOk() +{ + TDEConfig config("krandom.kssrc"); + config.setGroup("Settings"); + config.writeEntry("OpenGL", openGL->isChecked()); + config.writeEntry("ManipulateScreen", manipulateScreen->isChecked()); + + accept(); +} + +#include "random.moc" diff --git a/tdescreensaver/random.h b/tdescreensaver/random.h new file mode 100644 index 000000000..e34556662 --- /dev/null +++ b/tdescreensaver/random.h @@ -0,0 +1,38 @@ +/* + Copyright (c) 2003 Chris Howells + + ************************************************************************* + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; version * + * 2 of the License. * + * * + ************************************************************************* +*/ + +#ifndef RANDOM_H +#define RANDOM_H + +class TQWidget; +class TQCheckBox; + +class KRandomSetup : public KDialogBase +{ + Q_OBJECT + public: + KRandomSetup( TQWidget *parent = NULL, const char *name = NULL ); + + private: + + TQWidget *preview; + TQCheckBox *openGL; + TQCheckBox *manipulateScreen; + + private slots: + + void slotOk(); + +}; + +#endif diff --git a/tdesu/tdesu/Makefile.am b/tdesu/tdesu/Makefile.am index 411e6661b..2afc27b70 100644 --- a/tdesu/tdesu/Makefile.am +++ b/tdesu/tdesu/Makefile.am @@ -5,7 +5,7 @@ INCLUDES= $(all_includes) ## tdesu bin_PROGRAMS = tdesu tdesu_SOURCES = tdesu.cpp sudlg.cpp -tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdesu_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor tdesu_LDADD = $(LIB_KIO) -ltdesu tdesu_METASOURCES = AUTO noinst_HEADERS = sudlg.h diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index 209b985b4..0159b828d 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/tdesu/tdesu/tdesu.cpp @@ -303,8 +303,8 @@ static int startApp() if (!new_dcop) { - TQCString ksycoca = "TDESYCOCA="+TQFile::encodeName(locateLocal("cache", "ksycoca")); - env << ksycoca; + TQCString tdesycoca = "TDESYCOCA="+TQFile::encodeName(locateLocal("cache", "tdesycoca")); + env << tdesycoca; options += "xf"; // X-only, dcop forwarding enabled. } diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt index 4a069a3ae..bf2449fd6 100644 --- a/tdm/kfrontend/CMakeLists.txt +++ b/tdm/kfrontend/CMakeLists.txt @@ -58,7 +58,7 @@ tde_add_executable( tdm_config ##### tdm_greet (executable) #################### if( WITH_XRANDR ) - set( TDMGREET_OPTIONAL_LINK "krandr-shared" ) + set( TDMGREET_OPTIONAL_LINK "tderandr-shared" ) endif ( ) tde_add_executable( tdm_greet AUTOMOC diff --git a/tdm/kfrontend/Makefile.am b/tdm/kfrontend/Makefile.am index 7c58dc67f..c659ca62f 100644 --- a/tdm/kfrontend/Makefile.am +++ b/tdm/kfrontend/Makefile.am @@ -24,11 +24,11 @@ tdm_greet_SOURCES = \ tdmadmindialog.cpp \ kgreeter.cpp \ kgapp.cpp -tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor tdm_greet_LDADD = themer/libtdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4) krootimage_SOURCES = krootimage.cpp -krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO) METASOURCES = AUTO diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index d6fc4fc43..60a32c735 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include #include #ifdef WITH_XRANDR -#include +#include #endif #include diff --git a/tqt3integration/README b/tqt3integration/README index 989d59d5c..0e81a7ed6 100644 --- a/tqt3integration/README +++ b/tqt3integration/README @@ -17,7 +17,7 @@ the .h file additionally should go to include/private . v kded nesmi byt nic, co znovu vstupuje do event loop - udelat na to test - - spravit kwallet + - spravit tdewallet blokovat uzivatelsky vstup, jako to dela kapp pro dcop diff --git a/twin/clients/keramik/Makefile.am b/twin/clients/keramik/Makefile.am index 4c7c6e10c..a1525f1e2 100644 --- a/twin/clients/keramik/Makefile.am +++ b/twin/clients/keramik/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = tiles.h embedtool_SOURCES = embedtool.cpp embedtool_LDADD = $(LIB_QT) -embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kde_module_LTLIBRARIES = twin3_keramik.la diff --git a/twin/clients/kwmtheme/cli_installer/Makefile.am b/twin/clients/kwmtheme/cli_installer/Makefile.am index 1541c1742..d311639e8 100644 --- a/twin/clients/kwmtheme/cli_installer/Makefile.am +++ b/twin/clients/kwmtheme/cli_installer/Makefile.am @@ -10,7 +10,7 @@ bin_PROGRAMS = kwmtheme kwmtheme_SOURCES = main.cpp # the library search path. -kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/twin/killer/Makefile.am b/twin/killer/Makefile.am index cd396bde7..74e8858aa 100644 --- a/twin/killer/Makefile.am +++ b/twin/killer/Makefile.am @@ -4,6 +4,6 @@ bin_PROGRAMS = twin_killer_helper twin_killer_helper_SOURCES = killer.cpp twin_killer_helper_LDADD = $(LIB_TDEUI) -twin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +twin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor METASOURCES = AUTO diff --git a/twin/tools/Makefile.am b/twin/tools/Makefile.am index 7bc1284a5..555b576c5 100644 --- a/twin/tools/Makefile.am +++ b/twin/tools/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = decobenchmark INCLUDES = $(all_includes) test_gravity_SOURCES = test_gravity.cpp -test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor test_gravity_LDADD = $(LIB_X11) METASOURCES = AUTO -- cgit v1.2.3