From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:02:02 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kcontrol/TODO | 2 +- kcontrol/access/CMakeLists.txt | 2 +- kcontrol/access/kaccess.cpp | 2 +- kcontrol/access/kcmaccess.cpp | 2 +- kcontrol/access/kcmaccess.desktop | 2 +- kcontrol/accessibility/accessibility.cpp | 2 +- kcontrol/accessibility/accessibility.desktop | 2 +- kcontrol/arts/CMakeLists.txt | 2 +- kcontrol/arts/arts.desktop | 2 +- kcontrol/background/background.desktop | 2 +- kcontrol/background/bgadvanced.cpp | 2 +- kcontrol/background/bgdialog.cpp | 10 +- kcontrol/background/bgrender.cpp | 2 +- kcontrol/background/bgwallpaper.cpp | 2 +- kcontrol/background/main.cpp | 2 +- kcontrol/bell/bell.cpp | 2 +- kcontrol/bell/bell.desktop | 2 +- kcontrol/clock/CMakeLists.txt | 2 +- kcontrol/clock/clock.desktop | 2 +- kcontrol/clock/dtime.cpp | 2 +- kcontrol/clock/tzone.cpp | 2 +- kcontrol/colors/CMakeLists.txt | 2 +- kcontrol/colors/colors.desktop | 2 +- kcontrol/colors/colorscm.cpp | 4 +- kcontrol/colors/widgetcanvas.cpp | 2 +- kcontrol/componentchooser/CMakeLists.txt | 2 +- kcontrol/componentchooser/Makefile.am | 2 +- kcontrol/componentchooser/componentchooser.cpp | 2 +- kcontrol/componentchooser/componentchooser.desktop | 2 +- kcontrol/crypto/CMakeLists.txt | 2 +- kcontrol/crypto/certexport.cpp | 2 +- kcontrol/crypto/crypto.cpp | 4 +- kcontrol/crypto/crypto.desktop | 2 +- kcontrol/css/CMakeLists.txt | 2 +- kcontrol/css/kcmcss.cpp | 2 +- kcontrol/css/kcmcss.desktop | 2 +- kcontrol/display/display.desktop | 2 +- kcontrol/displayconfig/CMakeLists.txt | 2 +- kcontrol/displayconfig/displayconfig.cpp | 2 +- kcontrol/displayconfig/displayconfig.desktop | 2 +- kcontrol/dnssd/kcm_tdednssd.desktop | 2 +- kcontrol/ebrowsing/CMakeLists.txt | 2 +- kcontrol/ebrowsing/Makefile.am | 2 +- kcontrol/ebrowsing/ebrowsing.desktop | 2 +- kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt | 4 +- kcontrol/ebrowsing/plugins/ikws/Makefile.am | 2 +- kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp | 2 +- kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp | 2 +- .../ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp | 4 +- .../ebrowsing/plugins/ikws/kurisearchfilter.cpp | 2 +- .../ebrowsing/plugins/localdomain/CMakeLists.txt | 2 +- .../plugins/localdomain/localdomainurifilter.cpp | 2 +- kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt | 2 +- .../ebrowsing/plugins/shorturi/kshorturifilter.cpp | 6 +- kcontrol/energy/CMakeLists.txt | 2 +- kcontrol/energy/energy.cpp | 2 +- kcontrol/energy/energy.desktop | 2 +- kcontrol/filetypes/CMakeLists.txt | 4 +- kcontrol/filetypes/filetypedetails.cpp | 2 +- kcontrol/filetypes/filetypes.desktop | 2 +- kcontrol/filetypes/filetypesview.h | 2 +- kcontrol/filetypes/typeslistitem.cpp | 2 +- kcontrol/fonts/fonts.desktop | 2 +- kcontrol/hwmanager/CMakeLists.txt | 2 +- kcontrol/hwmanager/hwmanager.cpp | 2 +- kcontrol/hwmanager/hwmanager.desktop | 2 +- kcontrol/iccconfig/CMakeLists.txt | 2 +- kcontrol/iccconfig/iccconfig.cpp | 2 +- kcontrol/iccconfig/iccconfig.desktop | 2 +- kcontrol/icons/CMakeLists.txt | 2 +- kcontrol/icons/icons.cpp | 2 +- kcontrol/icons/icons.desktop | 2 +- kcontrol/icons/iconthemes.cpp | 4 +- kcontrol/info/cdinfo.desktop | 2 +- kcontrol/info/devices.desktop | 2 +- kcontrol/info/dma.desktop | 2 +- kcontrol/info/info_netbsd.cpp | 2 +- kcontrol/info/interrupts.desktop | 2 +- kcontrol/info/ioports.desktop | 2 +- kcontrol/info/memory.desktop | 2 +- kcontrol/info/opengl.desktop | 2 +- kcontrol/info/partitions.desktop | 2 +- kcontrol/info/pci.desktop | 2 +- kcontrol/info/processor.desktop | 2 +- kcontrol/info/scsi.desktop | 2 +- kcontrol/info/sound.desktop | 2 +- kcontrol/info/xserver.desktop | 2 +- kcontrol/input/CMakeLists.txt | 2 +- kcontrol/input/Makefile.am | 2 +- kcontrol/input/core/themepage.cpp | 6 +- kcontrol/input/logitechmouse.h | 2 +- kcontrol/input/main.cpp | 10 +- kcontrol/input/mouse.cpp | 2 +- kcontrol/input/mouse.desktop | 2 +- kcontrol/input/xcursor/themepage.cpp | 4 +- kcontrol/ioslaveinfo/CMakeLists.txt | 2 +- kcontrol/ioslaveinfo/ioslaveinfo.desktop | 2 +- kcontrol/ioslaveinfo/kcmioslaveinfo.cpp | 8 +- kcontrol/ioslaveinfo/kcmioslaveinfo.h | 2 +- kcontrol/joystick/joystick.desktop | 2 +- kcontrol/kcontrol/main.cpp | 2 +- kcontrol/kcontrol/moduleIface.cpp | 2 +- kcontrol/kcontrol/modules.cpp | 8 +- kcontrol/kcontrol/toplevel.cpp | 2 +- kcontrol/kded/CMakeLists.txt | 2 +- kcontrol/kded/kcmkded.desktop | 2 +- kcontrol/keys/CMakeLists.txt | 2 +- kcontrol/keys/Makefile.am | 2 +- kcontrol/keys/keys.desktop | 2 +- kcontrol/keys/modifiers.cpp | 2 +- kcontrol/kfontinst/CMakeLists.txt | 2 +- kcontrol/kfontinst/ChangeLog | 4 +- kcontrol/kfontinst/Makefile.am | 2 +- kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp | 6 +- kcontrol/kfontinst/kcmfontinst/KCmFontInst.h | 4 +- .../kfontinst/kcmfontinst/KFileFontIconView.cpp | 2 +- kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h | 2 +- kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp | 4 +- kcontrol/kfontinst/kcmfontinst/KFileFontView.h | 4 +- kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp | 6 +- kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop | 2 +- kcontrol/kfontinst/kfile-plugin/CMakeLists.txt | 36 -- kcontrol/kfontinst/kfile-plugin/KFileFont.cpp | 422 --------------------- kcontrol/kfontinst/kfile-plugin/KFileFont.h | 58 --- kcontrol/kfontinst/kfile-plugin/Makefile.am | 13 - kcontrol/kfontinst/kfile-plugin/kfile_font.desktop | 86 ----- kcontrol/kfontinst/kfontinst/CMakeLists.txt | 2 +- kcontrol/kfontinst/kio/KioFonts.cpp | 10 +- kcontrol/kfontinst/kio/KioFonts.h | 2 +- kcontrol/kfontinst/lib/CMakeLists.txt | 2 +- kcontrol/kfontinst/lib/FcEngine.cpp | 4 +- kcontrol/kfontinst/lib/Misc.cpp | 2 +- kcontrol/kfontinst/tdefile-plugin/CMakeLists.txt | 36 ++ kcontrol/kfontinst/tdefile-plugin/KFileFont.cpp | 422 +++++++++++++++++++++ kcontrol/kfontinst/tdefile-plugin/KFileFont.h | 58 +++ kcontrol/kfontinst/tdefile-plugin/Makefile.am | 13 + .../kfontinst/tdefile-plugin/tdefile_font.desktop | 86 +++++ kcontrol/kfontinst/thumbnail/FontThumbnail.h | 2 +- kcontrol/kfontinst/viewpart/FontViewPart.cpp | 2 +- kcontrol/kfontinst/viewpart/FontViewerApp.cpp | 4 +- kcontrol/kicker/applettab_impl.cpp | 4 +- kcontrol/kicker/kicker_config.desktop | 2 +- kcontrol/kicker/kicker_config_appearance.desktop | 2 +- kcontrol/kicker/kicker_config_arrangement.desktop | 2 +- kcontrol/kicker/kicker_config_hiding.desktop | 2 +- kcontrol/kicker/kicker_config_menus.desktop | 2 +- kcontrol/kicker/lookandfeeltab_impl.cpp | 2 +- kcontrol/kicker/main.h | 2 +- kcontrol/kicker/panel.desktop | 2 +- kcontrol/kio/CMakeLists.txt | 2 +- kcontrol/kio/Makefile.am | 2 +- kcontrol/kio/cache.cpp | 2 +- kcontrol/kio/cache.desktop | 2 +- kcontrol/kio/cookies.desktop | 2 +- kcontrol/kio/kcookiespolicies.cpp | 2 +- kcontrol/kio/kioslave.kcfg | 44 --- kcontrol/kio/kioslave.kcfgc | 5 - kcontrol/kio/kmanualproxydlg.cpp | 2 +- kcontrol/kio/ksaveioconfig.cpp | 6 +- kcontrol/kio/ksaveioconfig.h | 2 +- kcontrol/kio/lanbrowser.desktop | 2 +- kcontrol/kio/netpref.cpp | 4 +- kcontrol/kio/netpref.desktop | 2 +- kcontrol/kio/proxy.desktop | 2 +- kcontrol/kio/smb.desktop | 2 +- kcontrol/kio/smbrodlg.cpp | 6 +- kcontrol/kio/socks.cpp | 2 +- kcontrol/kio/tdeioslave.kcfg | 44 +++ kcontrol/kio/tdeioslave.kcfgc | 5 + kcontrol/kio/useragent.desktop | 2 +- kcontrol/kio/useragentdlg.cpp | 4 +- kcontrol/knotify/CMakeLists.txt | 2 +- kcontrol/knotify/kcmnotify.desktop | 2 +- kcontrol/knotify/knotify.cpp | 4 +- kcontrol/konq/CMakeLists.txt | 2 +- kcontrol/konq/Makefile.am | 2 +- kcontrol/konq/behaviour.cpp | 8 +- kcontrol/konq/desktop.cpp | 2 +- kcontrol/konq/desktop.desktop | 2 +- kcontrol/konq/desktopbehavior.desktop | 2 +- kcontrol/konq/desktopbehavior_impl.h | 2 +- kcontrol/konq/desktoppath.desktop | 2 +- kcontrol/konq/fileappearance.desktop | 2 +- kcontrol/konq/filebehavior.desktop | 2 +- kcontrol/konq/filebrowser.desktop | 2 +- kcontrol/konq/filepreviews.desktop | 2 +- kcontrol/konq/fontopts.cpp | 2 +- kcontrol/konq/main.cpp | 2 +- kcontrol/konq/previews.cpp | 2 +- kcontrol/konq/rootopts.cpp | 4 +- kcontrol/konq/rootopts.h | 2 +- kcontrol/konq/webappearance.desktop | 2 +- kcontrol/konq/webbehavior.desktop | 2 +- kcontrol/konqhtml/advancedTabDialog.cpp | 2 +- kcontrol/konqhtml/appearance.cpp | 2 +- kcontrol/konqhtml/domainlistview.cpp | 2 +- kcontrol/konqhtml/filteropts.cpp | 4 +- kcontrol/konqhtml/htmlopts.h | 2 +- kcontrol/konqhtml/jsopts.cpp | 2 +- kcontrol/konqhtml/jspolicies.cpp | 2 +- kcontrol/konqhtml/khttpoptdlg.h | 2 +- kcontrol/konqhtml/pluginopts.cpp | 2 +- kcontrol/konqhtml/policies.cpp | 2 +- kcontrol/konqhtml/tdehtml_behavior.desktop | 2 +- kcontrol/konqhtml/tdehtml_filter.desktop | 2 +- kcontrol/konqhtml/tdehtml_fonts.desktop | 2 +- kcontrol/konqhtml/tdehtml_java_js.desktop | 2 +- kcontrol/konsole/CMakeLists.txt | 2 +- kcontrol/konsole/kcmkonsole.cpp | 4 +- kcontrol/konsole/kcmkonsole.desktop | 2 +- kcontrol/konsole/schemaeditor.cpp | 2 +- kcontrol/konsole/sessioneditor.cpp | 2 +- kcontrol/krdb/CMakeLists.txt | 2 +- kcontrol/krdb/Makefile.am | 2 +- kcontrol/krdb/krdb.cpp | 6 +- kcontrol/kthememanager/CMakeLists.txt | 2 +- kcontrol/kthememanager/ktheme.cpp | 6 +- kcontrol/kthememanager/kthemedlg.ui.h | 12 +- kcontrol/kthememanager/kthememanager.cpp | 2 +- kcontrol/kthememanager/kthememanager.desktop | 2 +- kcontrol/launch/kcmlaunch.cpp | 2 +- kcontrol/launch/kcmlaunch.desktop | 2 +- kcontrol/locale/CMakeLists.txt | 2 +- kcontrol/locale/language.desktop | 2 +- kcontrol/locale/toplevel.cpp | 2 +- kcontrol/nics/CMakeLists.txt | 2 +- kcontrol/nics/nic.desktop | 2 +- kcontrol/performance/kcmkonqyperformance.desktop | 2 +- kcontrol/performance/kcmperformance.desktop | 2 +- kcontrol/performance/konqueror.cpp | 2 +- kcontrol/performance/system.cpp | 12 +- kcontrol/performance/system_ui.ui | 4 +- kcontrol/privacy/CMakeLists.txt | 2 +- kcontrol/privacy/kprivacymanager.cpp | 2 +- kcontrol/privacy/privacy.cpp | 2 +- kcontrol/privacy/privacy.desktop | 2 +- kcontrol/randr/randr.desktop | 2 +- kcontrol/samba/CMakeLists.txt | 2 +- kcontrol/samba/kcmsambaimports.h | 2 +- kcontrol/samba/kcmsambalog.h | 2 +- kcontrol/samba/ksmbstatus.h | 2 +- kcontrol/samba/smbstatus.desktop | 2 +- kcontrol/screensaver/CMakeLists.txt | 2 +- kcontrol/screensaver/advanceddialog.h | 2 +- kcontrol/screensaver/screensaver.desktop | 2 +- kcontrol/smartcard/smartcard.cpp | 2 +- kcontrol/smartcard/smartcard.desktop | 2 +- kcontrol/smserver/kcmsmserver.cpp | 2 +- kcontrol/smserver/kcmsmserver.desktop | 2 +- kcontrol/spellchecking/spellchecking.desktop | 2 +- kcontrol/style/CMakeLists.txt | 2 +- kcontrol/style/kcmstyle.cpp | 6 +- kcontrol/style/keramik/CMakeLists.txt | 2 +- kcontrol/style/keramik/Makefile.am | 4 +- kcontrol/style/keramik/keramikconf.cpp | 103 ----- kcontrol/style/keramik/keramikconf.h | 62 --- kcontrol/style/keramik/keramitdeconf.cpp | 103 +++++ kcontrol/style/keramik/keramitdeconf.h | 62 +++ kcontrol/style/style.desktop | 2 +- kcontrol/taskbar/kcmtaskbar.cpp | 2 +- kcontrol/taskbar/kcmtaskbar.desktop | 2 +- kcontrol/tdm/tdm-appear.cpp | 2 +- kcontrol/tdm/tdm-appear.h | 2 +- kcontrol/tdm/tdm-users.cpp | 4 +- kcontrol/tdm/tdm.desktop | 2 +- kcontrol/usbview/kcmusb.desktop | 2 +- kcontrol/view1394/kcmview1394.desktop | 2 +- kcontrol/xinerama/kcmxinerama.cpp | 2 +- kcontrol/xinerama/xinerama.desktop | 2 +- 269 files changed, 1152 insertions(+), 1152 deletions(-) delete mode 100644 kcontrol/kfontinst/kfile-plugin/CMakeLists.txt delete mode 100644 kcontrol/kfontinst/kfile-plugin/KFileFont.cpp delete mode 100644 kcontrol/kfontinst/kfile-plugin/KFileFont.h delete mode 100644 kcontrol/kfontinst/kfile-plugin/Makefile.am delete mode 100644 kcontrol/kfontinst/kfile-plugin/kfile_font.desktop create mode 100644 kcontrol/kfontinst/tdefile-plugin/CMakeLists.txt create mode 100644 kcontrol/kfontinst/tdefile-plugin/KFileFont.cpp create mode 100644 kcontrol/kfontinst/tdefile-plugin/KFileFont.h create mode 100644 kcontrol/kfontinst/tdefile-plugin/Makefile.am create mode 100644 kcontrol/kfontinst/tdefile-plugin/tdefile_font.desktop delete mode 100644 kcontrol/kio/kioslave.kcfg delete mode 100644 kcontrol/kio/kioslave.kcfgc create mode 100644 kcontrol/kio/tdeioslave.kcfg create mode 100644 kcontrol/kio/tdeioslave.kcfgc delete mode 100644 kcontrol/style/keramik/keramikconf.cpp delete mode 100644 kcontrol/style/keramik/keramikconf.h create mode 100644 kcontrol/style/keramik/keramitdeconf.cpp create mode 100644 kcontrol/style/keramik/keramitdeconf.h (limited to 'kcontrol') diff --git a/kcontrol/TODO b/kcontrol/TODO index 2e791d895..7ed8b8523 100644 --- a/kcontrol/TODO +++ b/kcontrol/TODO @@ -117,7 +117,7 @@ properly in 800x600 (is it 800x600 or 1024x768?). For a start, someone needs to * Tons of KCMs and applications have options for selecting binaries which they use(frontends etc.). We need to be a little consistent here and adopt a general policy in this issue. If a binary is not in $PATH it is the distributors fault and not KDE. The reason we have a GUI is so people don't have to know about this kinds of internals. The options doesn't mean anything because users use KDE, they're not in run level 3("WTF? cdparanoia? diff? What's that?"). PATH options("Where to search for X") should be removed - it is up to the distributor. Options for selecting what binary to use should be moved out to KConfEdit - they have a use but are very rarely used. -* Rewrite kcmshell to the new TDECModuleProxy and fix bugs. Move it to tdelibs. +* Rewrite tdecmshell to the new TDECModuleProxy and fix bugs. Move it to tdelibs. -------------------------------------------------------------------------- diff --git a/kcontrol/access/CMakeLists.txt b/kcontrol/access/CMakeLists.txt index bc13f53cd..9764fa9c8 100644 --- a/kcontrol/access/CMakeLists.txt +++ b/kcontrol/access/CMakeLists.txt @@ -31,7 +31,7 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kaccess ) tde_add_kpart( kcm_access AUTOMOC SOURCES kcmaccess.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 48c649c9a..7d66fa17f 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index 218dbfbb4..3a7833c05 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/access/kcmaccess.desktop b/kcontrol/access/kcmaccess.desktop index ec3d5d9a1..c748c636a 100644 --- a/kcontrol/access/kcmaccess.desktop +++ b/kcontrol/access/kcmaccess.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=access Type=Application -Exec=kcmshell kcmaccess +Exec=tdecmshell kcmaccess DocPath=kcontrol/kcmaccess/index.html diff --git a/kcontrol/accessibility/accessibility.cpp b/kcontrol/accessibility/accessibility.cpp index b9dd2a734..eb360e85e 100644 --- a/kcontrol/accessibility/accessibility.cpp +++ b/kcontrol/accessibility/accessibility.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/accessibility/accessibility.desktop b/kcontrol/accessibility/accessibility.desktop index 12afdde45..058d178db 100644 --- a/kcontrol/accessibility/accessibility.desktop +++ b/kcontrol/accessibility/accessibility.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell accessibility +Exec=tdecmshell accessibility Icon=access Type=Application diff --git a/kcontrol/arts/CMakeLists.txt b/kcontrol/arts/CMakeLists.txt index aaf41edaa..01399cfa8 100644 --- a/kcontrol/arts/CMakeLists.txt +++ b/kcontrol/arts/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES arts.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_arts AUTOMOC SOURCES arts.cpp generaltab.ui hardwaretab.ui krichtextlabel.cpp - LINK kio-shared tdemid-shared + LINK tdeio-shared tdemid-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/arts/arts.desktop b/kcontrol/arts/arts.desktop index 4defb35e3..b00caf62f 100644 --- a/kcontrol/arts/arts.desktop +++ b/kcontrol/arts/arts.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell arts +Exec=tdecmshell arts Icon=arts Type=Application DocPath=kcontrol/arts/index.html diff --git a/kcontrol/background/background.desktop b/kcontrol/background/background.desktop index f6b63372a..05fe47bd5 100644 --- a/kcontrol/background/background.desktop +++ b/kcontrol/background/background.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell background +Exec=tdecmshell background Icon=background Type=Application DocPath=kcontrol/background/index.html diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index 5eae86c62..bfe3eff28 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 448eda455..ff200149a 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -40,10 +40,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include @@ -1243,10 +1243,10 @@ void BGDialog::slotGetNewStuff() { //FIXME set this to a server when we get one //should really be in a .rc file but could be either - //kcmshellrc or kcontrolrc + //tdecmshellrc or kcontrolrc TDEConfig* config = TDEGlobal::config(); config->setGroup("KNewStuff"); - config->writeEntry( "ProvidersUrl", "http://download.kde.org/khotnewstuff/wallpaper-providers.xml" ); + config->writeEntry( "ProvidersUrl", "http://download.kde.org/tdehotnewstuff/wallpaper-providers.xml" ); config->writeEntry( "StandardResource", "wallpaper" ); config->sync(); diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 3aed1a6fd..9c207e409 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #ifdef HAVE_LIBART #include diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp index f10add59a..1edf37a8d 100644 --- a/kcontrol/background/bgwallpaper.cpp +++ b/kcontrol/background/bgwallpaper.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index 06d84ff86..fa71af901 100644 --- a/kcontrol/background/main.cpp +++ b/kcontrol/background/main.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index 0c04a8aa4..5831c042a 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/bell/bell.desktop b/kcontrol/bell/bell.desktop index 91ee2765d..369c499be 100644 --- a/kcontrol/bell/bell.desktop +++ b/kcontrol/bell/bell.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell bell +Exec=tdecmshell bell Icon=bell Type=Application DocPath=kcontrol/bell/index.html diff --git a/kcontrol/clock/CMakeLists.txt b/kcontrol/clock/CMakeLists.txt index 0be0eabd1..b64527389 100644 --- a/kcontrol/clock/CMakeLists.txt +++ b/kcontrol/clock/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES clock.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_clock AUTOMOC SOURCES dtime.cpp tzone.cpp main.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/clock/clock.desktop b/kcontrol/clock/clock.desktop index d74a8a6f4..2d5f06467 100644 --- a/kcontrol/clock/clock.desktop +++ b/kcontrol/clock/clock.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=kcmshell tde-clock.desktop +Exec=tdecmshell tde-clock.desktop Icon=date DocPath=kcontrol/clock/index.html diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index 663b4735e..f46031640 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include "dtime.h" #include "dtime.moc" diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index 541f0cf83..4af720b04 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include //#include "xpm/world.xpm" #include "tzone.h" diff --git a/kcontrol/colors/CMakeLists.txt b/kcontrol/colors/CMakeLists.txt index de87133b7..e5cab510f 100644 --- a/kcontrol/colors/CMakeLists.txt +++ b/kcontrol/colors/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES colors.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_colors AUTOMOC SOURCES colorscm.cpp widgetcanvas.cpp - LINK krdb-static kio-shared + LINK krdb-static tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/colors/colors.desktop b/kcontrol/colors/colors.desktop index 4553d5824..e2fb3ca19 100644 --- a/kcontrol/colors/colors.desktop +++ b/kcontrol/colors/colors.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell colors +Exec=tdecmshell colors Icon=colorscm Type=Application DocPath=kcontrol/colors/index.html diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index 32fa1125f..baf56c5c3 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -24,11 +24,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index a0e59323d..684e9d6d3 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/kcontrol/componentchooser/CMakeLists.txt b/kcontrol/componentchooser/CMakeLists.txt index 0a7eef7f5..53a77b2a1 100644 --- a/kcontrol/componentchooser/CMakeLists.txt +++ b/kcontrol/componentchooser/CMakeLists.txt @@ -33,6 +33,6 @@ tde_add_kpart( kcm_componentchooser AUTOMOC componentchooser_ui.ui componentconfig_ui.ui emailclientconfig_ui.ui terminalemulatorconfig_ui.ui browserconfig_ui.ui componentchooser.cpp kcm_componentchooser.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/componentchooser/Makefile.am b/kcontrol/componentchooser/Makefile.am index 3a63947a0..6abd5f414 100644 --- a/kcontrol/componentchooser/Makefile.am +++ b/kcontrol/componentchooser/Makefile.am @@ -1,5 +1,5 @@ SUBDIRS= . componentservices -AM_CPPFLAGS = -I../ -I$(top_srcdir)/kio -I$(top_srcdir) $(all_includes) +AM_CPPFLAGS = -I../ -I$(top_srcdir)/tdeio -I$(top_srcdir) $(all_includes) METASOURCES = AUTO diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index c2d5305c5..8eab27216 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -262,7 +262,7 @@ void CfgTerminalEmulator::save(TDEConfig *) { delete config; KIPC::sendMessageAll(KIPC::SettingsChanged); - kapp->dcopClient()->send("klauncher", "klauncher","reparseConfiguration()", TQString::null); + kapp->dcopClient()->send("tdelauncher", "tdelauncher","reparseConfiguration()", TQString::null); emit changed(false); } diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop index d686b7448..5e30df9dc 100644 --- a/kcontrol/componentchooser/componentchooser.desktop +++ b/kcontrol/componentchooser/componentchooser.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell componentchooser +Exec=tdecmshell componentchooser Icon=misc Type=Application diff --git a/kcontrol/crypto/CMakeLists.txt b/kcontrol/crypto/CMakeLists.txt index 1541c1ddb..414e6d605 100644 --- a/kcontrol/crypto/CMakeLists.txt +++ b/kcontrol/crypto/CMakeLists.txt @@ -44,6 +44,6 @@ install( FILES crypto.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_crypto AUTOMOC SOURCES crypto.cpp certexport.cpp kdatetimedlg.cpp - LINK kio-shared ${SSL_LIBRARIES} + LINK tdeio-shared ${SSL_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/crypto/certexport.cpp b/kcontrol/crypto/certexport.cpp index 9c60d4f00..4a6bda892 100644 --- a/kcontrol/crypto/certexport.cpp +++ b/kcontrol/crypto/certexport.cpp @@ -26,7 +26,7 @@ #include "certexport.h" #include #include -#include +#include #include #include #include diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index c718184ba..023799844 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -50,11 +50,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/crypto/crypto.desktop b/kcontrol/crypto/crypto.desktop index 98025c9b6..e637ad5ff 100644 --- a/kcontrol/crypto/crypto.desktop +++ b/kcontrol/crypto/crypto.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=encrypted Type=Application -Exec=kcmshell crypto +Exec=tdecmshell crypto DocPath=kcontrol/crypto/index.html X-TDE-Library=crypto diff --git a/kcontrol/css/CMakeLists.txt b/kcontrol/css/CMakeLists.txt index f5410f187..56226c836 100644 --- a/kcontrol/css/CMakeLists.txt +++ b/kcontrol/css/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES template.css DESTINATION ${DATA_INSTALL_DIR}/kcmcss ) tde_add_kpart( kcm_css AUTOMOC SOURCES template.cpp cssconfig.ui csscustom.ui kcmcss.cpp preview.ui - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index 4b1ba47ea..b35c9c04c 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/css/kcmcss.desktop b/kcontrol/css/kcmcss.desktop index d457a31b7..a8fe02b9e 100644 --- a/kcontrol/css/kcmcss.desktop +++ b/kcontrol/css/kcmcss.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=stylesheet Type=Application -Exec=kcmshell kcmcss +Exec=tdecmshell kcmcss DocPath=kcontrol/kcmcss/index.html diff --git a/kcontrol/display/display.desktop b/kcontrol/display/display.desktop index a8d0bd5dc..3da4e03d2 100644 --- a/kcontrol/display/display.desktop +++ b/kcontrol/display/display.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=tdescreensaver Type=Application -Exec=kcmshell display +Exec=tdecmshell display DocPath=kcontrol/kcmdisplay/index.html X-TDE-Library=display diff --git a/kcontrol/displayconfig/CMakeLists.txt b/kcontrol/displayconfig/CMakeLists.txt index 774743329..dfa45882b 100644 --- a/kcontrol/displayconfig/CMakeLists.txt +++ b/kcontrol/displayconfig/CMakeLists.txt @@ -36,6 +36,6 @@ set_source_files_properties( displayconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CO tde_add_kpart( kcm_displayconfig AUTOMOC SOURCES monitorworkspace.cpp displayconfig.cpp displayconfigbase.ui displayconfig.skel - LINK kio-shared tderandr-shared tdeutils-shared + LINK tdeio-shared tderandr-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 017b1537c..34259f425 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/displayconfig/displayconfig.desktop b/kcontrol/displayconfig/displayconfig.desktop index a94a37b97..738d3a293 100644 --- a/kcontrol/displayconfig/displayconfig.desktop +++ b/kcontrol/displayconfig/displayconfig.desktop @@ -3,7 +3,7 @@ Categories=Qt;TDE;X-TDE-settings-system; Comment=Configure display Comment[en_US]=Configure display DocPath=kcontrol/displayconfig.html -Exec=kcmshell displayconfig +Exec=tdecmshell displayconfig GenericName= GenericName[en_US]= Icon=background diff --git a/kcontrol/dnssd/kcm_tdednssd.desktop b/kcontrol/dnssd/kcm_tdednssd.desktop index ffa16d753..371c8cea3 100644 --- a/kcontrol/dnssd/kcm_tdednssd.desktop +++ b/kcontrol/dnssd/kcm_tdednssd.desktop @@ -67,7 +67,7 @@ Comment[vi]=Cấu hình dịch vụ khám phá Comment[wa]=Apontiaedjes do discovraedje do siervice Comment[zh_CN]=配置探索服务 Comment[zh_TW]=設定服務偵測 -Exec=kcmshell kcm_tdednssd +Exec=tdecmshell kcm_tdednssd GenericName= GenericName[ko]=일반 Icon=network_local diff --git a/kcontrol/ebrowsing/CMakeLists.txt b/kcontrol/ebrowsing/CMakeLists.txt index 47ebb7e64..bacbce722 100644 --- a/kcontrol/ebrowsing/CMakeLists.txt +++ b/kcontrol/ebrowsing/CMakeLists.txt @@ -30,6 +30,6 @@ install( FILES ebrowsing.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_kurifilt AUTOMOC SOURCES filteropts.cpp main.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/ebrowsing/Makefile.am b/kcontrol/ebrowsing/Makefile.am index dfb9fdbe8..72bb632cd 100644 --- a/kcontrol/ebrowsing/Makefile.am +++ b/kcontrol/ebrowsing/Makefile.am @@ -11,7 +11,7 @@ kcm_kurifilt_la_SOURCES = filteropts.cpp main.cpp kcm_kurifilt_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined kcm_kurifilt_la_LIBADD = $(LIB_KSYCOCA) # Don't link this lib to the plugins. They are dlopened and linking to them -# results in crashes when closing kcmshell. +# results in crashes when closing tdecmshell. # plugins/ikws/libkuriikwsfilter.la plugins/shorturi/libkshorturifilter.la messages: rc.cpp diff --git a/kcontrol/ebrowsing/ebrowsing.desktop b/kcontrol/ebrowsing/ebrowsing.desktop index 42319e236..b76532e55 100644 --- a/kcontrol/ebrowsing/ebrowsing.desktop +++ b/kcontrol/ebrowsing/ebrowsing.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/ebrowsing/index.html Icon=enhanced_browsing -Exec=kcmshell ebrowsing +Exec=tdecmshell ebrowsing X-TDE-Library=kurifilt diff --git a/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt b/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt index b5c470483..9fffe268e 100644 --- a/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt +++ b/kcontrol/ebrowsing/plugins/ikws/CMakeLists.txt @@ -34,7 +34,7 @@ tde_add_kpart( libkuriikwsfilter AUTOMOC SOURCES kuriikwsfiltereng.cpp kuriikwsfilter.skel kuriikwsfilter.cpp searchprovider.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -46,6 +46,6 @@ tde_add_kpart( libkurisearchfilter AUTOMOC kurisearchfilter.cpp kurisearchfilter.skel kuriikwsfiltereng.cpp ikwsopts.cpp searchproviderdlg.cpp searchprovider.cpp searchproviderdlg_ui.ui ikwsopts_ui.ui - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) \ No newline at end of file diff --git a/kcontrol/ebrowsing/plugins/ikws/Makefile.am b/kcontrol/ebrowsing/plugins/ikws/Makefile.am index bb00b6e90..4cdb46d42 100644 --- a/kcontrol/ebrowsing/plugins/ikws/Makefile.am +++ b/kcontrol/ebrowsing/plugins/ikws/Makefile.am @@ -22,7 +22,7 @@ libkurisearchfilter_la_SOURCES = kurisearchfilter.cpp kurisearchfilter.skel \ searchproviderdlg_ui.ui ikwsopts_ui.ui update_DATA = kuriikwsfilter.upd -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update service_DATA = kuriikwsfilter.desktop kurisearchfilter.desktop servicedir = $(kde_servicesdir) diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index 3073250f7..474394108 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp index 4631524e0..e0acab4e4 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp @@ -32,7 +32,7 @@ /** * IMPORTANT: If you change anything here, please run the regression test - * tdelibs/kio/tests/kurifiltertest + * tdelibs/tdeio/tests/kurifiltertest */ typedef KGenericFactory KAutoWebSearchFactory; diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index c57d3e080..63c61eaf4 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include @@ -46,7 +46,7 @@ /** * IMPORTANT: If you change anything here, please run the regression test - * tdelibs/kio/tests/kurifiltertest + * tdelibs/tdeio/tests/kurifiltertest */ KURISearchFilterEngine *KURISearchFilterEngine::s_pSelf = 0; diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp index a8c8dbda9..c42a6be0c 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp @@ -32,7 +32,7 @@ /** * IMPORTANT: If you change anything here, please run the regression test - * tdelibs/kio/tests/kurifiltertest + * tdelibs/tdeio/tests/kurifiltertest */ typedef KGenericFactory KURISearchFilterFactory; diff --git a/kcontrol/ebrowsing/plugins/localdomain/CMakeLists.txt b/kcontrol/ebrowsing/plugins/localdomain/CMakeLists.txt index df8d0eefa..222b6556d 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/CMakeLists.txt +++ b/kcontrol/ebrowsing/plugins/localdomain/CMakeLists.txt @@ -29,7 +29,7 @@ install( FILES localdomainurifilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} tde_add_kpart( liblocaldomainurifilter AUTOMOC SOURCES localdomainurifilter.cpp localdomainurifilter.skel - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp index 8b6da2a99..1fc6ad629 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp @@ -33,7 +33,7 @@ /** * IMPORTANT: If you change anything here, please run the regression test - * tdelibs/kio/tests/kurifiltertest + * tdelibs/tdeio/tests/kurifiltertest */ LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name, diff --git a/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt b/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt index c8d25b1bf..4eb1c5441 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt +++ b/kcontrol/ebrowsing/plugins/shorturi/CMakeLists.txt @@ -29,6 +29,6 @@ install( FILES kshorturifilterrc DESTINATION ${CONFIG_INSTALL_DIR} ) tde_add_kpart( libkshorturifilter AUTOMOC SOURCES kshorturifilter.cpp kshorturifilter.skel - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp index c394de693..57bc2e92f 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include "kshorturifilter.h" @@ -48,10 +48,10 @@ /** * IMPORTANT: * If you change anything here, please run the regression test - * tdelibs/kio/tests/kurifiltertest. + * tdelibs/tdeio/tests/kurifiltertest. * * If you add anything here, make sure to add a corresponding - * test code to tdelibs/kio/tests/kurifiltertest. + * test code to tdelibs/tdeio/tests/kurifiltertest. */ typedef TQMap EntryMap; diff --git a/kcontrol/energy/CMakeLists.txt b/kcontrol/energy/CMakeLists.txt index ee9bf8ab0..9e194602a 100644 --- a/kcontrol/energy/CMakeLists.txt +++ b/kcontrol/energy/CMakeLists.txt @@ -60,6 +60,6 @@ install( FILES energy.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden ) tde_add_kpart( kcm_energy AUTOMOC SOURCES energy.cpp - LINK kio-shared ${XEXT_LIBRARY} + LINK tdeio-shared ${XEXT_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp index a6fb21887..19c46e235 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/energy/energy.desktop b/kcontrol/energy/energy.desktop index 8b0d24373..e3a4d2093 100644 --- a/kcontrol/energy/energy.desktop +++ b/kcontrol/energy/energy.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell energy +Exec=tdecmshell energy Icon=energy_star DocPath=kcontrol/energy/index.html Type=Application diff --git a/kcontrol/filetypes/CMakeLists.txt b/kcontrol/filetypes/CMakeLists.txt index dbcf5e929..c906287d8 100644 --- a/kcontrol/filetypes/CMakeLists.txt +++ b/kcontrol/filetypes/CMakeLists.txt @@ -28,7 +28,7 @@ install( FILES filetypes.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_filetypes AUTOMOC SOURCES control.cpp - LINK filetypes-static kio-shared + LINK filetypes-static tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -46,6 +46,6 @@ tde_add_library( filetypes STATIC_PIC AUTOMOC tde_add_executable( keditfiletype AUTOMOC SOURCES keditfiletype.cpp - LINK filetypes-static kio-shared + LINK filetypes-static tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp index abb973580..a98f68cce 100644 --- a/kcontrol/filetypes/filetypedetails.cpp +++ b/kcontrol/filetypes/filetypedetails.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/filetypes/filetypes.desktop b/kcontrol/filetypes/filetypes.desktop index 41a23a1c4..42d2db5cb 100644 --- a/kcontrol/filetypes/filetypes.desktop +++ b/kcontrol/filetypes/filetypes.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=filetypes Type=Application -Exec=kcmshell filetypes +Exec=tdecmshell filetypes DocPath=kcontrol/filetypes/index.html Categories=Qt;TDE;X-TDE-settings-components; diff --git a/kcontrol/filetypes/filetypesview.h b/kcontrol/filetypes/filetypesview.h index e7217c4ba..b83158519 100644 --- a/kcontrol/filetypes/filetypesview.h +++ b/kcontrol/filetypes/filetypesview.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include "typeslistitem.h" diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp index df59d4b31..bde058d00 100644 --- a/kcontrol/filetypes/typeslistitem.cpp +++ b/kcontrol/filetypes/typeslistitem.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include diff --git a/kcontrol/fonts/fonts.desktop b/kcontrol/fonts/fonts.desktop index 8ee345b7b..9b527e751 100644 --- a/kcontrol/fonts/fonts.desktop +++ b/kcontrol/fonts/fonts.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell fonts +Exec=tdecmshell fonts Icon=fonts Type=Application DocPath=kcontrol/fonts/index.html diff --git a/kcontrol/hwmanager/CMakeLists.txt b/kcontrol/hwmanager/CMakeLists.txt index 4973c894f..584eba7bc 100644 --- a/kcontrol/hwmanager/CMakeLists.txt +++ b/kcontrol/hwmanager/CMakeLists.txt @@ -34,6 +34,6 @@ set_source_files_properties( hwmanager.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDI tde_add_kpart( kcm_hwmanager AUTOMOC SOURCES hwmanager.cpp deviceiconview.cpp devicepropsdlg.cpp devicepropsdlgbase.ui hwmanagerbase.ui hwmanager.skel - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index b1bae281a..35845a380 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/hwmanager/hwmanager.desktop b/kcontrol/hwmanager/hwmanager.desktop index d8d3c9db3..1b006504b 100644 --- a/kcontrol/hwmanager/hwmanager.desktop +++ b/kcontrol/hwmanager/hwmanager.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell kwmanager +Exec=tdecmshell kwmanager Icon=background Type=Application DocPath=kcontrol/hwmanager/index.html diff --git a/kcontrol/iccconfig/CMakeLists.txt b/kcontrol/iccconfig/CMakeLists.txt index de5a8905a..4af3af694 100644 --- a/kcontrol/iccconfig/CMakeLists.txt +++ b/kcontrol/iccconfig/CMakeLists.txt @@ -33,6 +33,6 @@ set_source_files_properties( iccconfig.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDI tde_add_kpart( kcm_iccconfig AUTOMOC SOURCES iccconfig.cpp iccconfigbase.ui iccconfig.skel - LINK kio-shared tderandr-shared + LINK tdeio-shared tderandr-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index c65699489..a12d26b2d 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/iccconfig/iccconfig.desktop b/kcontrol/iccconfig/iccconfig.desktop index 0ac801513..008914acb 100644 --- a/kcontrol/iccconfig/iccconfig.desktop +++ b/kcontrol/iccconfig/iccconfig.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell iccconfig +Exec=tdecmshell iccconfig Icon=background Type=Application DocPath=kcontrol/iccconfig/index.html diff --git a/kcontrol/icons/CMakeLists.txt b/kcontrol/icons/CMakeLists.txt index 0a7dfbefb..0961b6d62 100644 --- a/kcontrol/icons/CMakeLists.txt +++ b/kcontrol/icons/CMakeLists.txt @@ -31,6 +31,6 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/Settings/LookNF tde_add_kpart( kcm_icons AUTOMOC SOURCES iconthemes.cpp icons.cpp main.cpp - LINK kio-shared ${LIBART_LIBRARIES} + LINK tdeio-shared ${LIBART_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index cd529485c..710927b8a 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/icons/icons.desktop b/kcontrol/icons/icons.desktop index 6fd4adec8..721f2830a 100644 --- a/kcontrol/icons/icons.desktop +++ b/kcontrol/icons/icons.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/icons/index.html Icon=icons -Exec=kcmshell icons +Exec=tdecmshell icons X-TDE-Library=icons diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 835962ff6..812f382d2 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -41,8 +41,8 @@ #include #include -#include -#include +#include +#include #include #ifdef HAVE_LIBART diff --git a/kcontrol/info/cdinfo.desktop b/kcontrol/info/cdinfo.desktop index bb8f80779..1b71d65d0 100644 --- a/kcontrol/info/cdinfo.desktop +++ b/kcontrol/info/cdinfo.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell cdinfo +Exec=tdecmshell cdinfo Icon=kcmdevices Type=Application DocPath=kinfocenter/cdinfo/index.html diff --git a/kcontrol/info/devices.desktop b/kcontrol/info/devices.desktop index 5a738437b..2b7ad8f4a 100644 --- a/kcontrol/info/devices.desktop +++ b/kcontrol/info/devices.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell devices +Exec=tdecmshell devices Icon=kcmdevices Type=Application DocPath=kinfocenter/devices/index.html diff --git a/kcontrol/info/dma.desktop b/kcontrol/info/dma.desktop index 5421ff4d9..cd67d6be3 100644 --- a/kcontrol/info/dma.desktop +++ b/kcontrol/info/dma.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell dma +Exec=tdecmshell dma Icon=kcmmemory Type=Application DocPath=kinfocenter/dma/index.html diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp index 22efcd6d3..c2b7b953a 100644 --- a/kcontrol/info/info_netbsd.cpp +++ b/kcontrol/info/info_netbsd.cpp @@ -43,7 +43,7 @@ #include #include -#include /* for TDEIO::convertSize() */ +#include /* for TDEIO::convertSize() */ typedef struct { diff --git a/kcontrol/info/interrupts.desktop b/kcontrol/info/interrupts.desktop index 60588d0bf..84471002c 100644 --- a/kcontrol/info/interrupts.desktop +++ b/kcontrol/info/interrupts.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell interrupts +Exec=tdecmshell interrupts Icon=kcmmemory Type=Application DocPath=kinfocenter/interrupts/index.html diff --git a/kcontrol/info/ioports.desktop b/kcontrol/info/ioports.desktop index 2a6cfcffa..a3f670ad7 100644 --- a/kcontrol/info/ioports.desktop +++ b/kcontrol/info/ioports.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell ioports +Exec=tdecmshell ioports Icon=kcmmemory Type=Application DocPath=kinfocenter/ioports/index.html diff --git a/kcontrol/info/memory.desktop b/kcontrol/info/memory.desktop index 66f148fa1..1ff56664e 100644 --- a/kcontrol/info/memory.desktop +++ b/kcontrol/info/memory.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell memory +Exec=tdecmshell memory Icon=kcmmemory Type=Application DocPath=kinfocenter/memory/index.html diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop index 6aec4f804..c7cdf29a9 100644 --- a/kcontrol/info/opengl.desktop +++ b/kcontrol/info/opengl.desktop @@ -1,6 +1,6 @@ [Desktop Entry] NoDisplay=true -Exec=kcmshell opengl +Exec=tdecmshell opengl Icon=kcmopengl Type=Application DocPath=kinfocenter/opengl/index.html diff --git a/kcontrol/info/partitions.desktop b/kcontrol/info/partitions.desktop index 18659d77d..02e591db0 100644 --- a/kcontrol/info/partitions.desktop +++ b/kcontrol/info/partitions.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell partitions +Exec=tdecmshell partitions Icon=kcmpartitions Type=Application DocPath=kinfocenter/partitions/index.html diff --git a/kcontrol/info/pci.desktop b/kcontrol/info/pci.desktop index 3a9898592..9e2d3e635 100644 --- a/kcontrol/info/pci.desktop +++ b/kcontrol/info/pci.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell pci +Exec=tdecmshell pci Icon=kcmpci Type=Application DocPath=kinfocenter/pci/index.html diff --git a/kcontrol/info/processor.desktop b/kcontrol/info/processor.desktop index 9d8e2aa95..35cd337c7 100644 --- a/kcontrol/info/processor.desktop +++ b/kcontrol/info/processor.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell processor +Exec=tdecmshell processor Icon=kcmprocessor Type=Application DocPath=kinfocenter/processor/index.html diff --git a/kcontrol/info/scsi.desktop b/kcontrol/info/scsi.desktop index e8302f043..e2b6691c8 100644 --- a/kcontrol/info/scsi.desktop +++ b/kcontrol/info/scsi.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell scsi +Exec=tdecmshell scsi Icon=kcmscsi Type=Application DocPath=kinfocenter/scsi/index.html diff --git a/kcontrol/info/sound.desktop b/kcontrol/info/sound.desktop index c095c337b..0c90238fe 100644 --- a/kcontrol/info/sound.desktop +++ b/kcontrol/info/sound.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell sound +Exec=tdecmshell sound Icon=kcmsound Type=Application DocPath=kinfocenter/sound/index.html diff --git a/kcontrol/info/xserver.desktop b/kcontrol/info/xserver.desktop index 7e8e4c2ec..b253c2b53 100644 --- a/kcontrol/info/xserver.desktop +++ b/kcontrol/info/xserver.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell xserver +Exec=tdecmshell xserver Icon=kcmx Type=Application DocPath=kinfocenter/xserver/index.html diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt index 1ebd92184..0382a17ea 100644 --- a/kcontrol/input/CMakeLists.txt +++ b/kcontrol/input/CMakeLists.txt @@ -53,7 +53,7 @@ tde_add_kpart( kcm_input AUTOMOC SOURCES mouse.cpp kmousedlg.ui main.cpp logitechmouse.cpp logitechmouse_base.ui - LINK themepage-static kio-shared ${XCURSOR_LIBRARIES} ${LIBUSB_LIBRARIES} + LINK themepage-static tdeio-shared ${XCURSOR_LIBRARIES} ${LIBUSB_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/input/Makefile.am b/kcontrol/input/Makefile.am index 7ac995b97..840029c26 100644 --- a/kcontrol/input/Makefile.am +++ b/kcontrol/input/Makefile.am @@ -37,7 +37,7 @@ EXTRA_DIST = $(font_DATA) update_DATA = mouse_cursor_theme.upd -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update install-data-hook: $(mkinstalldirs) $(DESTDIR)$(datadir)/fonts/override diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index dcef9b85e..558998b4e 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/kcontrol/input/core/themepage.cpp @@ -23,11 +23,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h index 60780758a..e50838b72 100644 --- a/kcontrol/input/logitechmouse.h +++ b/kcontrol/input/logitechmouse.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp index 0ab009ec9..38bded500 100644 --- a/kcontrol/input/main.cpp +++ b/kcontrol/input/main.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include @@ -80,13 +80,13 @@ extern "C" XDefineCursor(tqt_xdisplay(), tqt_xrootwin(), handle); XFreeCursor(tqt_xdisplay(), handle); // Don't leak the cursor - // Tell klauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment + // Tell tdelauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment // variables when launching applications. - DCOPRef klauncher("klauncher"); + DCOPRef tdelauncher("tdelauncher"); if( !theme.isEmpty()) - klauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme); + tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme); if( !size.isEmpty()) - klauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size); + tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size); #endif delete config; diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 9253a1910..14d5787fa 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -58,7 +58,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/input/mouse.desktop b/kcontrol/input/mouse.desktop index c8a7c1e96..5873eb523 100644 --- a/kcontrol/input/mouse.desktop +++ b/kcontrol/input/mouse.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell mouse +Exec=tdecmshell mouse Icon=mouse Type=Application DocPath=kcontrol/mouse/index.html diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index a0f0ef0cf..0aa1224ec 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/kcontrol/ioslaveinfo/CMakeLists.txt b/kcontrol/ioslaveinfo/CMakeLists.txt index e0811d998..5a8a72d59 100644 --- a/kcontrol/ioslaveinfo/CMakeLists.txt +++ b/kcontrol/ioslaveinfo/CMakeLists.txt @@ -29,6 +29,6 @@ tde_install_empty_directory( ${DATA_INSTALL_DIR}/Settings/Information ) tde_add_kpart( kcm_ioslaveinfo AUTOMOC SOURCES kcmioslaveinfo.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/ioslaveinfo/ioslaveinfo.desktop b/kcontrol/ioslaveinfo/ioslaveinfo.desktop index 1dee413d3..451ded7f4 100644 --- a/kcontrol/ioslaveinfo/ioslaveinfo.desktop +++ b/kcontrol/ioslaveinfo/ioslaveinfo.desktop @@ -78,7 +78,7 @@ Comment[zh_CN]=可用协议的信息 Comment[zh_TW]=可用協定的資訊 Comment[zu]=Ulwazi mayelana nemithetho elandelwayo ekhona DocPath=kinfocenter/protocols/index.html -Exec=kcmshell ioslaveinfo +Exec=tdecmshell ioslaveinfo Icon=history Keywords=Protocol,IO slaves,Slaves,Network,Information,Timeout Keywords[ar]=الميفاق,IO Slaves,Slaves,الشبكة,معلومات نفاذ الوقت diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp index 9ee3d93f9..b0ae6866d 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp @@ -32,13 +32,13 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -118,7 +118,7 @@ void KCMIOSlaveInfo::slotResult(TDEIO::Job *) void KCMIOSlaveInfo::showInfo(const TQString& protocol) { - TQString file = TQString("kioslave/%1.docbook").arg( protocol ); + TQString file = TQString("tdeioslave/%1.docbook").arg( protocol ); file = TDEGlobal::locale()->langLookup( file ); if (m_tfj) { @@ -129,7 +129,7 @@ void KCMIOSlaveInfo::showInfo(const TQString& protocol) if (!file.isEmpty()) { helpData.truncate( 0 ); - m_tfj = TDEIO::get( KURL( TQString("help:/kioslave/%1.html").arg( protocol ) ), true, false ); + m_tfj = TDEIO::get( KURL( TQString("help:/tdeioslave/%1.html").arg( protocol ) ), true, false ); connect( m_tfj, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( slaveHelp( TDEIO::Job *, const TQByteArray &) ) ); connect( m_tfj, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) ); return; diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h index 04db54566..f2df0e1e4 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/joystick/joystick.desktop b/kcontrol/joystick/joystick.desktop index 6ba236435..243393457 100644 --- a/kcontrol/joystick/joystick.desktop +++ b/kcontrol/joystick/joystick.desktop @@ -66,7 +66,7 @@ Comment[vi]=cần điều khiển - một mô đun điều khiển TDE đêr ki Comment[wa]=djîsse di djeu - on module di kcontrol po sayî les djîsses di djeu Comment[zh_CN]=Joystick - 测试游戏杆的 kcontrol 模块 Comment[zh_TW]=搖桿 - 用來測試搖桿的 kcontrol 模組 -Exec=kcmshell joystick +Exec=tdecmshell joystick Keywords=joystick,gamepad Keywords[be]=Джойстык,joystick,gamepad Keywords[bg]=джойстик, игра, игри, управление, joystick, gamepad diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index ad61b11c1..27aaed1ba 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include "main.h" diff --git a/kcontrol/kcontrol/moduleIface.cpp b/kcontrol/kcontrol/moduleIface.cpp index 98135a27f..dbaba9054 100644 --- a/kcontrol/kcontrol/moduleIface.cpp +++ b/kcontrol/kcontrol/moduleIface.cpp @@ -21,7 +21,7 @@ #include "moduleIface.moc" #include -#include +#include ModuleIface::ModuleIface(TQObject *parent, const char *name) : TQObject(parent, name), DCOPObject(name) { diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index 8382c5d81..4c3ccbbc1 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -141,7 +141,7 @@ void ConfigModule::runAsRoot() delete _embedStack; // create an embed widget that will embed the - // kcmshell running as root + // tdecmshell running as root _embedLayout = new TQVBoxLayout(_module->parentWidget()); _embedFrame = new TQVBox( _module->parentWidget() ); _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised ); @@ -165,7 +165,7 @@ void ConfigModule::runAsRoot() _embedStack->raiseWidget(_busy); connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded())); - // prepare the process to run the kcmshell + // prepare the process to run the tdecmshell TQString cmd = service()->exec().stripWhiteSpace(); bool kdeshell = false; if (cmd.left(5) == "tdesu") @@ -179,7 +179,7 @@ void ConfigModule::runAsRoot() } } - if (cmd.left(8) == "kcmshell") + if (cmd.left(8) == "tdecmshell") { cmd = TQString(cmd.remove(0,8)).stripWhiteSpace(); kdeshell = true; @@ -198,7 +198,7 @@ void ConfigModule::runAsRoot() // We also don't have a way to close the module in that case. *_rootProcess << "--n"; // Don't keep password. if (kdeshell) { - *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "kcmshell")).arg(cmd).arg(_embedWidget->winId()).arg(TDEGlobal::locale()->language()); + *_rootProcess << TQString("%1 %2 --embed %3 --lang %4").arg(locate("exe", "tdecmshell")).arg(cmd).arg(_embedWidget->winId()).arg(TDEGlobal::locale()->language()); } else { *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() ); diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index fbfc86cd7..06a09e2d3 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/kded/CMakeLists.txt b/kcontrol/kded/CMakeLists.txt index 37ef62b5e..c974d7ca0 100644 --- a/kcontrol/kded/CMakeLists.txt +++ b/kcontrol/kded/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES kcmkded.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_kded AUTOMOC SOURCES kcmkded.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/kded/kcmkded.desktop b/kcontrol/kded/kcmkded.desktop index 6a6d1c7f3..a081096a8 100644 --- a/kcontrol/kded/kcmkded.desktop +++ b/kcontrol/kded/kcmkded.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell kcmkded +Exec=tdecmshell kcmkded Icon=services Type=Application diff --git a/kcontrol/keys/CMakeLists.txt b/kcontrol/keys/CMakeLists.txt index 219fb03a5..739cd47f2 100644 --- a/kcontrol/keys/CMakeLists.txt +++ b/kcontrol/keys/CMakeLists.txt @@ -38,6 +38,6 @@ tde_add_kpart( kcm_keys AUTOMOC SOURCES shortcuts.cpp modifiers.cpp main.cpp khotkeys.cpp treeview.cpp commandShortcuts.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/keys/Makefile.am b/kcontrol/keys/Makefile.am index e2d897c64..0f07b43a5 100644 --- a/kcontrol/keys/Makefile.am +++ b/kcontrol/keys/Makefile.am @@ -14,7 +14,7 @@ messages: update_DATA = kaccel.upd update_SCRIPTS = convertShortcuts.pl -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update xdg_apps_DATA = keys.desktop diff --git a/kcontrol/keys/keys.desktop b/kcontrol/keys/keys.desktop index 5ab196a6e..92fdd7bdd 100644 --- a/kcontrol/keys/keys.desktop +++ b/kcontrol/keys/keys.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell keys +Exec=tdecmshell keys Icon=key_bindings Type=Application DocPath=kcontrol/keys/index.html diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index 6da5c94f1..15cad733a 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/kfontinst/CMakeLists.txt b/kcontrol/kfontinst/CMakeLists.txt index 38056cd3c..0fe56e1b4 100644 --- a/kcontrol/kfontinst/CMakeLists.txt +++ b/kcontrol/kfontinst/CMakeLists.txt @@ -13,7 +13,7 @@ add_subdirectory( lib ) add_subdirectory( thumbnail ) add_subdirectory( viewpart ) add_subdirectory( kcmfontinst ) -add_subdirectory( kfile-plugin ) +add_subdirectory( tdefile-plugin ) add_subdirectory( kfontinst ) add_subdirectory( kio ) diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog index 0c2de0ed1..7916d0b45 100644 --- a/kcontrol/kfontinst/ChangeLog +++ b/kcontrol/kfontinst/ChangeLog @@ -118,11 +118,11 @@ KDE3.1 -> KDE3.2 4. Settings are saved on "Apply". 5. Settings tab simplified - some uneccesary settings removed. 6. Removal of Anti-Alias tab - relevant settings moved to kcmfonts. -7. Add kfile-plugin to display Meta data for fonts. +7. Add tdefile-plugin to display Meta data for fonts. 8. Remove settings wizard. 9. Drop use of internal version numbering - not tagging CVS anyway, so whats the point? 10. DCOP interface. -11. Remember size of main window when run via kcmshell. +11. Remember size of main window when run via tdecmshell. 0.10->0.11 (KDE3.0) =================== diff --git a/kcontrol/kfontinst/Makefile.am b/kcontrol/kfontinst/Makefile.am index 963ec3c93..190855a8a 100644 --- a/kcontrol/kfontinst/Makefile.am +++ b/kcontrol/kfontinst/Makefile.am @@ -3,7 +3,7 @@ FONTINST_TN_SUBDIR=thumbnail FONTINST_VP_SUBDIR=viewpart endif -SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst kfile-plugin kfontinst kio +SUBDIRS = lib $(FONTINST_TN_SUBDIR) $(FONTINST_VP_SUBDIR) kcmfontinst tdefile-plugin kfontinst kio EXTRA_DIST = TODO diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index c5db61ecc..bce091cd7 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -51,12 +51,12 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index c3d64c7b0..4895f273e 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include #ifdef HAVE_XFT #include #endif diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp index 241ac88bf..0770094e3 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.cpp @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////////////// #include -#include +#include #include #include "KFileFontIconView.h" diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h index bb5ccfa5a..8a86b1ae2 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontIconView.h @@ -29,7 +29,7 @@ // (C) Craig Drummond, 2003, 2004 //////////////////////////////////////////////////////////////////////////////// -#include +#include namespace KFI { diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp index 0d05799d9..3c8801e75 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp @@ -27,7 +27,7 @@ //////////////////////////////////////////////////////////////////////////////// // -// NOTE: HEAVILY copied from kfiledetailview.cpp... +// NOTE: HEAVILY copied from tdefiledetailview.cpp... // // Copyright (C) 1997 Stephan Kulow // 2000, 2001 Carsten Pfeiffer @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h index c160175be..6496c13fd 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h @@ -30,7 +30,7 @@ //////////////////////////////////////////////////////////////////////////////// // -// NOTE: HEAVILY copied from kfiledetailview.cpp... +// NOTE: HEAVILY copied from tdefiledetailview.cpp... // // Copyright (C) 1997 Stephan Kulow // 2000, 2001 Carste @@ -42,7 +42,7 @@ class TQKeyEvent; #include #include -#include "kfileview.h" +#include "tdefileview.h" /** * An item for the listiew, that has a reference to its corresponding diff --git a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp index c4a0d26b1..e555dc7fd 100644 --- a/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp +++ b/kcontrol/kfontinst/kcmfontinst/SettingsDialog.cpp @@ -34,10 +34,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include namespace KFI { diff --git a/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop b/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop index dfdb9bad6..134e658c8 100644 --- a/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop +++ b/kcontrol/kfontinst/kcmfontinst/kcmfontinst.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell kcmfontinst +Exec=tdecmshell kcmfontinst Icon=fonts Type=Application DocPath=kcontrol/kcmfontinst/index.html diff --git a/kcontrol/kfontinst/kfile-plugin/CMakeLists.txt b/kcontrol/kfontinst/kfile-plugin/CMakeLists.txt deleted file mode 100644 index 229c243d7..000000000 --- a/kcontrol/kfontinst/kfile-plugin/CMakeLists.txt +++ /dev/null @@ -1,36 +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} - ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -) - -link_directories( - ${TQT_LIBRARY_DIRS} -) - - -##### other data ################################ - -install( FILES kfile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) - - -##### kfile_font (module) ####################### - -tde_add_kpart( kfile_font - SOURCES KFileFont.cpp - LINK kfontinst-shared kio-shared - DESTINATION ${PLUGIN_INSTALL_DIR} -) diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp deleted file mode 100644 index 46339fc4f..000000000 --- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp +++ /dev/null @@ -1,422 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Class Name : KFI::KFileFont -// Author : Craig Drummond -// Project : K Font Installer -// Creation Date : 20/03/2003 -// Version : $Revision$ $Date$ -// -//////////////////////////////////////////////////////////////////////////////// -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -//////////////////////////////////////////////////////////////////////////////// -// (C) Craig Drummond, 2003, 2004 -//////////////////////////////////////////////////////////////////////////////// - -#include "KFileFont.h" -#include "KfiConstants.h" -#include -#include -#include -#include - -static void addEntry(int face, TQString &existing, const TQString &add) -{ - if(face>0) - existing.append(", "); - existing.append(add); -} - -static int strToWeight(const TQString &str) -{ - if(NULL==str) - return FC_WEIGHT_MEDIUM; - else if(str.contains("Bold", false)) - return FC_WEIGHT_BOLD; - else if(str.contains("Heavy", false)) - return FC_WEIGHT_HEAVY; - else if(str.contains("Black", false)) - return FC_WEIGHT_BLACK; - else if(str.contains("ExtraBold", false)) - return FC_WEIGHT_EXTRABOLD; - else if(str.contains("UltraBold", false)) - return FC_WEIGHT_ULTRABOLD; - else if(str.contains("ExtraLight", false)) - return FC_WEIGHT_EXTRALIGHT; - else if(str.contains("UltraLight", false)) - return FC_WEIGHT_ULTRALIGHT; - else if(str.contains("Light", false)) - return FC_WEIGHT_LIGHT; - else if(str.contains("Medium", false) || str.contains("Normal", false) || str.contains("Roman", false)) - return FC_WEIGHT_MEDIUM; - else if(str.contains("Regular", false)) - return FC_WEIGHT_REGULAR; - else if(str.contains("SemiBold", false)) - return FC_WEIGHT_SEMIBOLD; - else if(str.contains("DemiBold", false)) - return FC_WEIGHT_DEMIBOLD; - else if(str.contains("Thin", false)) - return FC_WEIGHT_THIN; - else if(str.contains("Book", false)) - return FC_WEIGHT_NORMAL; - else if(str.contains("Demi", false)) - return FC_WEIGHT_NORMAL; - else - return FC_WEIGHT_MEDIUM; -} - -#ifndef KFI_FC_NO_WIDTHS -static int strToWidth(const TQString &str) -{ - if(str.isEmpty()) - return FC_WIDTH_NORMAL; - else if(str.contains("UltraCondensed", false)) - return FC_WIDTH_ULTRACONDENSED; - else if(str.contains("ExtraCondensed", false)) - return FC_WIDTH_EXTRACONDENSED; - else if(str.contains("SemiCondensed", false)) - return FC_WIDTH_SEMICONDENSED; - else if(str.contains("Condensed", false)) - return FC_WIDTH_CONDENSED; - else if(str.contains("SemiExpanded", false)) - return FC_WIDTH_SEMIEXPANDED; - else if(str.contains("UltraExpanded", false)) - return FC_WIDTH_ULTRAEXPANDED; - else if(str.contains("ExtraExpanded", false)) - return FC_WIDTH_EXTRAEXPANDED; - else if(str.contains("Expanded", false)) - return FC_WIDTH_EXPANDED; - else - return FC_WIDTH_NORMAL; -} -#endif - -struct FoundryMap -{ - const char *noticeStr, - *foundry; - unsigned short len; -}; - -static const FoundryMap map[]= // These are (mainly) taken from type1inst -{ - { "Bigelow", "B&H", 3}, - { "Adobe", "Adobe", 5}, - { "Bitstream", "Bitstream", 9}, - { "Monotype", "Monotype", 8}, - { "Linotype", "Linotype", 8}, - { "LINOTYPE-HELL", "Linotype", 0}, - { "IBM", "IBM", 3}, - { "URW", "URW", 3}, - { "International Typeface Corporation", "ITC", 3}, - { "Tiro Typeworks", "Tiro", 4}, - { "XFree86", "XFree86", 7}, - { "Microsoft", "Microsoft", 9}, - { "Omega", "Omega", 5}, - { "Font21", "Hwan", 4}, - { "HanYang System", "Hanyang", 7}, - { "Richard Mitchell", "Mitchell", 8}, - { "Doug Miles", "Miles", 5}, - { "Hank Gillette", "Gillette", 8}, - { "Three Islands Press", "3ip", 3}, - { "MacroMind", "Macromind", 9}, - { "MWSoft", "MWSoft", 6}, - { "Digiteyes Multimedia", "DigitEyes", 9}, - { "ZSoft", "ZSoft", 5}, - { "Title Wave", "Titlewave", 9}, - { "Southern Software", "Southern", 8}, - { "Reasonable Solutions", "Reasonable", 10}, - { "David Rakowski", "Rakowski", 8}, - { "D. Rakowski", "Rakowski", 0}, - { "S. G. Moye", "Moye", 4}, - { "S.G. Moye", "Moye", 0}, - { "Andrew s. Meit", "Meit", 4}, - { "A.S.Meit", "Meit", 0}, - { "Hershey", "Hershey", 7}, - { "FontBank", "FontBank", 8}, - { "A. Carr", "Carr", 4}, - { "Brendel Informatik", "Brendel", 7}, - { "Jonathan Brecher", "Brecher", 7}, - { "SoftMaker", "Softmaker", 9}, - { "LETRASET", "Letraset", 8}, - { "Corel Corp", "Corel", 5}, - { "PUBLISHERS PARADISE", "Paradise", 8}, - { "Publishers Paradise", "Paradise", 0}, - { "Allied Corporation", "Allied", 6}, - { NULL, NULL, 0} -}; - -static const char * getFoundry(const char *notice) -{ - const FoundryMap *entry; - - if(notice) - for(entry=map; NULL!=entry->foundry; entry++) - if(NULL!=strstr(notice, entry->noticeStr)) - return entry->foundry; - - return NULL; -} - -static bool readAfm(const TQString &file, TQString &full, TQString &family, TQString &foundry, TQString &weight, -#ifndef KFI_FC_NO_WIDTHS - TQString &width, -#endif - TQString &spacing, TQString &slant) -{ - TQFile f(file); - bool foundName=false, - foundFamily=false; - int intSpacing=FC_PROPORTIONAL, -#ifndef KFI_FC_NO_WIDTHS - intWidth=FC_WIDTH_NORMAL, -#endif - intWeight=FC_WEIGHT_NORMAL, - intSlant=FC_SLANT_ROMAN, - intItalic=FC_SLANT_ROMAN; - - if(f.open(IO_ReadOnly)) - { - TQTextStream stream(&f); - TQString line; - bool inMetrics=false; - - while(!stream.atEnd()) - { - line=stream.readLine(); - line=line.simplifyWhiteSpace(); - - if(inMetrics) - { - if(0==line.find("FullName ")) - { - full=line.mid(9); -#ifndef KFI_FC_NO_WIDTHS - intWidth=strToWidth(full); -#endif - foundName=true; - } - else if(0==line.find("FamilyName ")) - { - family=line.mid(11); - foundFamily=true; - } - else if(0==line.find("Weight ")) - intWeight=strToWeight(line.mid(7)); - else if(0==line.find("ItalicAngle ")) - intSlant=0.0f==line.mid(12).toFloat() ? FC_SLANT_ROMAN : FC_SLANT_ITALIC; - else if(0==line.find("IsFixedPitch ")) - intSpacing=0==line.mid(13).find("false", 0, false) ? FC_PROPORTIONAL : FC_MONO; - else if(0==line.find("Notice ")) - foundry=getFoundry(line.mid(7).latin1()); - else if(0==line.find("StartCharMetrics")) - break; - } - else - if(0==line.find("StartFontMetrics")) - inMetrics=true; - }; - f.close(); - - if(!foundFamily && foundName) - { - family=full; - foundFamily=true; - } - - if(foundName && FC_SLANT_ITALIC==intItalic && (-1!=full.find("Oblique") || -1!=full.find("Slanted"))) - intItalic=FC_SLANT_OBLIQUE; - } - - if(foundName && foundFamily) - { - weight=KFI::CFcEngine::weightStr(intWeight, false); -#ifndef KFI_FC_NO_WIDTHS - width=KFI::CFcEngine::widthStr(intWidth, false); -#endif - slant=KFI::CFcEngine::slantStr(intSlant, false); - spacing=KFI::CFcEngine::spacingStr(intSpacing); - - if(foundry.isEmpty()) - foundry=i18n(KFI_UNKNOWN_FOUNDRY); - - return true; - } - - return false; -} - -typedef KGenericFactory KFileFontPluginFactory; -K_EXPORT_COMPONENT_FACTORY(kfile_font, KFileFontPluginFactory("kfontinst")) - -namespace KFI -{ - -KFileFontPlugin::KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args) - : KFilePlugin(parent, name, args) -{ - TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE); - - addMimeType("application/x-font-ttf"), - addMimeType("application/x-font-type1"); - //addMimeType("application/x-font-speedo"); - addMimeType("application/x-font-bdf"); - addMimeType("application/x-font-pcf"); - //addMimeType("application/x-font-snf"); - addMimeType("application/x-font-otf"); - addMimeType("application/x-font-ttc"); - addMimeType("application/x-afm"); -} - -void KFileFontPlugin::addMimeType(const char *mime) -{ - KFileMimeTypeInfo *info=addMimeTypeInfo(mime); - KFileMimeTypeInfo::GroupInfo *group=addGroupInfo(info, "General", i18n("General")); - - addItemInfo(group, "Full", i18n("Full Name"), TQVariant::String); - addItemInfo(group, "Family", i18n("Family"), TQVariant::String); - addItemInfo(group, "Foundry", i18n("Foundry"), TQVariant::String); - addItemInfo(group, "Weight", i18n("Weight"), TQVariant::String); -#ifndef KFI_FC_NO_WIDTHS - addItemInfo(group, "Width", i18n("Width"), TQVariant::String); -#endif - addItemInfo(group, "Spacing", i18n("Spacing"), TQVariant::String); - addItemInfo(group, "Slant", i18n("Slant"), TQVariant::String); -} - -bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what) -{ - TQString full, - lastFull, - family, - foundry, - weight, -#ifndef KFI_FC_NO_WIDTHS - width, -#endif - spacing, - slant, - fullAll, - familyAll, - foundryAll, - weightAll, -#ifndef KFI_FC_NO_WIDTHS - widthAll, -#endif - spacingAll, - slantAll; - KURL url(info.url()); - TQString fName; - bool fontsProt = KFI_KIO_FONTS_PROTOCOL == url.protocol(), - fileProt = "file" == url.protocol(), - downloaded = false, - status = false; - - what=0; - - if(!fontsProt && !fileProt && TDEIO::NetAccess::download(url, fName, NULL)) - { - downloaded=true; - url=KURL(fName); - } - - if(downloaded || fontsProt || fileProt) - { - if("application/x-afm"==info.mimeType()) // Then fontconfig can't give us the data :-( - status=readAfm(url.path(), fullAll, familyAll, foundryAll, weightAll, -#ifndef KFI_FC_NO_WIDTHS - widthAll, -#endif - spacingAll, slantAll); - else - for(int face=0; face<10; ++face) // How to get num faces from fontconfig? don't know - so just try 1st 10... - { - if(itsEngine.getInfo(url, face, full, family, foundry, weight, -#ifndef KFI_FC_NO_WIDTHS - width, -#endif - spacing, slant) && - !full.isEmpty() && full!=lastFull) - { - addEntry(face, fullAll, full); - lastFull=full; - - if(KFileMetaInfo::Fastest!=what) - { - addEntry(face, familyAll, family); - if(0==face) - { - foundryAll=foundry; - - if(foundryAll.isEmpty()) - foundryAll=i18n(KFI_UNKNOWN_FOUNDRY); - else - { - // Try to make sure foundry is capitalised, and looks the same as that of - // any AFM. - foundryAll[0]=foundryAll[0].upper(); - - const FoundryMap *entry; - - for(entry=map; NULL!=entry->foundry; entry++) - if(foundryAll.length()==entry->len && foundryAll.contains(entry->foundry, false)) - { - foundryAll=entry->foundry; - break; - } - } - } - addEntry(face, weightAll, weight); -#ifndef KFI_FC_NO_WIDTHS - addEntry(face, widthAll, width); -#endif - addEntry(face, spacingAll, spacing); - addEntry(face, slantAll, slant); - } - status=true; - } - else - break; - } - - if(status) - { - KFileMetaInfoGroup group; - - group=appendGroup(info, "General"); - appendItem(group, "Full", fullAll); - - if(KFileMetaInfo::Fastest!=what) - { - appendItem(group, "Family", familyAll); - appendItem(group, "Foundry", foundryAll); - appendItem(group, "Weight", weightAll); -#ifndef KFI_FC_NO_WIDTHS - appendItem(group, "Width", widthAll); -#endif - appendItem(group, "Spacing", spacingAll); - appendItem(group, "Slant", slantAll); - } - } - - if(downloaded) - TDEIO::NetAccess::removeTempFile(fName); - } - - return status; -} - -} diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.h b/kcontrol/kfontinst/kfile-plugin/KFileFont.h deleted file mode 100644 index d33079e0b..000000000 --- a/kcontrol/kfontinst/kfile-plugin/KFileFont.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef __KFILE_FONT_H__ -#define __KFILE_FONT_H__ - -//////////////////////////////////////////////////////////////////////////////// -// -// Class Name : KFileFont -// Author : Craig Drummond -// Project : K Font Installer -// Creation Date : 20/03/2003 -// Version : $Revision$ $Date$ -// -//////////////////////////////////////////////////////////////////////////////// -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -//////////////////////////////////////////////////////////////////////////////// -// (C) Craig Drummond, 2003, 2004 -//////////////////////////////////////////////////////////////////////////////// - -#include -#include "FcEngine.h" - -namespace KFI -{ - -class KFileFontPlugin : public KFilePlugin -{ - public: - - KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args); - virtual ~KFileFontPlugin() {} - - bool readInfo(KFileMetaInfo& info, uint what = KFileMetaInfo::Fastest); - - private: - - void addMimeType(const char *mime); - - private: - - CFcEngine itsEngine; -}; - -} - -#endif diff --git a/kcontrol/kfontinst/kfile-plugin/Makefile.am b/kcontrol/kfontinst/kfile-plugin/Makefile.am deleted file mode 100644 index 7f136357f..000000000 --- a/kcontrol/kfontinst/kfile-plugin/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -kde_module_LTLIBRARIES = kfile_font.la - -kfile_font_la_SOURCES = KFileFont.cpp -kfile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) -kfile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la - -kdelnkdir = $(kde_servicesdir) -kde_services_DATA = kfile_font.desktop - -AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) - -METASOURCES = AUTO -noinst_HEADERS = KFileFont.h diff --git a/kcontrol/kfontinst/kfile-plugin/kfile_font.desktop b/kcontrol/kfontinst/kfile-plugin/kfile_font.desktop deleted file mode 100644 index b18e51af7..000000000 --- a/kcontrol/kfontinst/kfile-plugin/kfile_font.desktop +++ /dev/null @@ -1,86 +0,0 @@ -[Desktop Entry] -Type=Service -Name=Font Information -Name[af]=Skrif tipe Informasie -Name[ar]=معلومات المحرف -Name[az]=Yazı Növü Mə'lumatı -Name[be]=Інфармацыя аб шрыфце -Name[bg]=Информация за шрифт -Name[bn]=ফন্ট তথ্য -Name[br]=Titouroù diwar-benn ar font -Name[bs]=Informacije o fontu -Name[ca]=Informació de la lletra -Name[cs]=Informace o písmu -Name[csb]=Wëdowiédzô ò fòntach -Name[cy]=Gwybodaeth Ffont -Name[da]=Skrifttypeinformation -Name[de]=Schriftarteninformation -Name[el]=Πληροφορίες γραμματοσειράς -Name[eo]=Tiparinformo -Name[es]=Información del tipo de letra -Name[et]=Fondi info -Name[eu]=Letra-tipoei buruzko informazioa -Name[fa]=اطلاعات قلم -Name[fi]=Kirjasintiedot -Name[fr]=Informations sur les polices -Name[fy]=Lettertype-Ynformaasje -Name[ga]=Eolas Clófhoirne -Name[gl]=Información da Fonte -Name[he]=מידע גופנים -Name[hi]=फ़ॉन्ट जानकारी -Name[hr]=Podaci o fontu -Name[hu]=Betűtípus-jellemzők -Name[id]=Informasi Font -Name[is]=Leturupplýsingar -Name[it]=Informazioni caratteri -Name[ja]=フォント情報 -Name[ka]=ინფორმაცია ფონტის შესახებ -Name[kk]=Қаріп мәліметі -Name[km]=ព័ត៌មាន​ពុម្ពអក្សរ -Name[ko]=연락처 정보 -Name[lo]=ຂໍ້ມູນຕ່າງໆ -Name[lt]=Šrifto(-ų) informacija -Name[lv]=Fontu Informācija -Name[mk]=Информации за фонтовите -Name[mn]=Бичиг-Мэдээлэл -Name[ms]=Maklumat Fon -Name[mt]=Informazzjoni dwar font -Name[nb]=Skriftinformasjon -Name[nds]=Schriftoort-Informatschoon -Name[ne]=फन्ट सूचना -Name[nl]=Lettertype-informatie -Name[nn]=Skriftinformasjon -Name[nso]=Tshedimoso ya Fonto -Name[pa]=ਫੋਂਟ ਜਾਣਕਾਰੀ -Name[pl]=Informacje o czcionkach -Name[pt]=Informação do Tipo de Letra -Name[pt_BR]=Informações sobre a Fonte -Name[ro]=Informații font -Name[ru]=Сведения о шрифте -Name[rw]=Amakuru y'Imyandikire -Name[se]=Fontadieđut -Name[sk]=Informácie o písmach -Name[sl]=Informacije o pisavi -Name[sr]=Информације о фонту -Name[sr@Latn]=Informacije o fontu -Name[sv]=Teckensnittsinformation -Name[ta]=எழுத்துரு தகவல் -Name[tg]=Иттилооти ҳарфҳо -Name[th]=ข้อมูลแบบอักษร -Name[tr]=Yazıtipi Bilgisi -Name[tt]=Yazu Turında -Name[uk]=Інформація про шрифти -Name[uz]=Shrift haqida maʼlumot -Name[uz@cyrillic]=Шрифт ҳақида маълумот -Name[ven]=Mafhungo a fontu -Name[vi]=Thông tin về Phông chữ -Name[wa]=Informåcion sol fonte -Name[xh]=Ulwazi Lohlobo lwamagama -Name[zh_CN]=字体信息 -Name[zh_TW]=字型資訊 -Name[zu]=Ulwazi lohlobo lwamagama -ServiceTypes=KFilePlugin -X-TDE-Library=kfile_font -MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-otf;application/x-font-ttc;application/x-afm -PreferredGroups=General -PreferredItems=Full,Family,Foundry,Weight,Width,Spacing,Slant diff --git a/kcontrol/kfontinst/kfontinst/CMakeLists.txt b/kcontrol/kfontinst/kfontinst/CMakeLists.txt index f288ca5ea..fdcb51b15 100644 --- a/kcontrol/kfontinst/kfontinst/CMakeLists.txt +++ b/kcontrol/kfontinst/kfontinst/CMakeLists.txt @@ -31,6 +31,6 @@ tde_add_executable( kfontinst SOURCES Main.cpp FontEngine.cpp Fontmap.cpp GetPid.c XConfig.cpp - LINK kxftconfig-static kfontinst-shared kio-shared + LINK kxftconfig-static kfontinst-shared tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp index c7c03d107..4c28a1c33 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/kio/KioFonts.cpp @@ -44,11 +44,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h index 1de87f5f1..ec8c69c4e 100644 --- a/kcontrol/kfontinst/kio/KioFonts.h +++ b/kcontrol/kfontinst/kio/KioFonts.h @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/kfontinst/lib/CMakeLists.txt b/kcontrol/kfontinst/lib/CMakeLists.txt index 989d60810..83f977aaa 100644 --- a/kcontrol/kfontinst/lib/CMakeLists.txt +++ b/kcontrol/kfontinst/lib/CMakeLists.txt @@ -28,6 +28,6 @@ link_directories( tde_add_library( kfontinst SHARED SOURCES Misc.cpp FcEngine.cpp VERSION 0.0.0 - LINK kio-shared ${XFT_LIBRARIES} + LINK tdeio-shared ${XFT_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp index 57fb765f1..6faf700c6 100644 --- a/kcontrol/kfontinst/lib/FcEngine.cpp +++ b/kcontrol/kfontinst/lib/FcEngine.cpp @@ -4,9 +4,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include "FcEngine.h" #include "KfiConstants.h" diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp index a2c150a08..5f39afec8 100644 --- a/kcontrol/kfontinst/lib/Misc.cpp +++ b/kcontrol/kfontinst/lib/Misc.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include namespace KFI diff --git a/kcontrol/kfontinst/tdefile-plugin/CMakeLists.txt b/kcontrol/kfontinst/tdefile-plugin/CMakeLists.txt new file mode 100644 index 000000000..d12537903 --- /dev/null +++ b/kcontrol/kfontinst/tdefile-plugin/CMakeLists.txt @@ -0,0 +1,36 @@ +################################################# +# +# (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} + ${CMAKE_SOURCE_DIR}/kcontrol/kfontinst/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### other data ################################ + +install( FILES tdefile_font.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) + + +##### tdefile_font (module) ####################### + +tde_add_kpart( tdefile_font + SOURCES KFileFont.cpp + LINK kfontinst-shared tdeio-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/kcontrol/kfontinst/tdefile-plugin/KFileFont.cpp b/kcontrol/kfontinst/tdefile-plugin/KFileFont.cpp new file mode 100644 index 000000000..4ac55807f --- /dev/null +++ b/kcontrol/kfontinst/tdefile-plugin/KFileFont.cpp @@ -0,0 +1,422 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Class Name : KFI::KFileFont +// Author : Craig Drummond +// Project : K Font Installer +// Creation Date : 20/03/2003 +// Version : $Revision$ $Date$ +// +//////////////////////////////////////////////////////////////////////////////// +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// +//////////////////////////////////////////////////////////////////////////////// +// (C) Craig Drummond, 2003, 2004 +//////////////////////////////////////////////////////////////////////////////// + +#include "KFileFont.h" +#include "KfiConstants.h" +#include +#include +#include +#include + +static void addEntry(int face, TQString &existing, const TQString &add) +{ + if(face>0) + existing.append(", "); + existing.append(add); +} + +static int strToWeight(const TQString &str) +{ + if(NULL==str) + return FC_WEIGHT_MEDIUM; + else if(str.contains("Bold", false)) + return FC_WEIGHT_BOLD; + else if(str.contains("Heavy", false)) + return FC_WEIGHT_HEAVY; + else if(str.contains("Black", false)) + return FC_WEIGHT_BLACK; + else if(str.contains("ExtraBold", false)) + return FC_WEIGHT_EXTRABOLD; + else if(str.contains("UltraBold", false)) + return FC_WEIGHT_ULTRABOLD; + else if(str.contains("ExtraLight", false)) + return FC_WEIGHT_EXTRALIGHT; + else if(str.contains("UltraLight", false)) + return FC_WEIGHT_ULTRALIGHT; + else if(str.contains("Light", false)) + return FC_WEIGHT_LIGHT; + else if(str.contains("Medium", false) || str.contains("Normal", false) || str.contains("Roman", false)) + return FC_WEIGHT_MEDIUM; + else if(str.contains("Regular", false)) + return FC_WEIGHT_REGULAR; + else if(str.contains("SemiBold", false)) + return FC_WEIGHT_SEMIBOLD; + else if(str.contains("DemiBold", false)) + return FC_WEIGHT_DEMIBOLD; + else if(str.contains("Thin", false)) + return FC_WEIGHT_THIN; + else if(str.contains("Book", false)) + return FC_WEIGHT_NORMAL; + else if(str.contains("Demi", false)) + return FC_WEIGHT_NORMAL; + else + return FC_WEIGHT_MEDIUM; +} + +#ifndef KFI_FC_NO_WIDTHS +static int strToWidth(const TQString &str) +{ + if(str.isEmpty()) + return FC_WIDTH_NORMAL; + else if(str.contains("UltraCondensed", false)) + return FC_WIDTH_ULTRACONDENSED; + else if(str.contains("ExtraCondensed", false)) + return FC_WIDTH_EXTRACONDENSED; + else if(str.contains("SemiCondensed", false)) + return FC_WIDTH_SEMICONDENSED; + else if(str.contains("Condensed", false)) + return FC_WIDTH_CONDENSED; + else if(str.contains("SemiExpanded", false)) + return FC_WIDTH_SEMIEXPANDED; + else if(str.contains("UltraExpanded", false)) + return FC_WIDTH_ULTRAEXPANDED; + else if(str.contains("ExtraExpanded", false)) + return FC_WIDTH_EXTRAEXPANDED; + else if(str.contains("Expanded", false)) + return FC_WIDTH_EXPANDED; + else + return FC_WIDTH_NORMAL; +} +#endif + +struct FoundryMap +{ + const char *noticeStr, + *foundry; + unsigned short len; +}; + +static const FoundryMap map[]= // These are (mainly) taken from type1inst +{ + { "Bigelow", "B&H", 3}, + { "Adobe", "Adobe", 5}, + { "Bitstream", "Bitstream", 9}, + { "Monotype", "Monotype", 8}, + { "Linotype", "Linotype", 8}, + { "LINOTYPE-HELL", "Linotype", 0}, + { "IBM", "IBM", 3}, + { "URW", "URW", 3}, + { "International Typeface Corporation", "ITC", 3}, + { "Tiro Typeworks", "Tiro", 4}, + { "XFree86", "XFree86", 7}, + { "Microsoft", "Microsoft", 9}, + { "Omega", "Omega", 5}, + { "Font21", "Hwan", 4}, + { "HanYang System", "Hanyang", 7}, + { "Richard Mitchell", "Mitchell", 8}, + { "Doug Miles", "Miles", 5}, + { "Hank Gillette", "Gillette", 8}, + { "Three Islands Press", "3ip", 3}, + { "MacroMind", "Macromind", 9}, + { "MWSoft", "MWSoft", 6}, + { "Digiteyes Multimedia", "DigitEyes", 9}, + { "ZSoft", "ZSoft", 5}, + { "Title Wave", "Titlewave", 9}, + { "Southern Software", "Southern", 8}, + { "Reasonable Solutions", "Reasonable", 10}, + { "David Rakowski", "Rakowski", 8}, + { "D. Rakowski", "Rakowski", 0}, + { "S. G. Moye", "Moye", 4}, + { "S.G. Moye", "Moye", 0}, + { "Andrew s. Meit", "Meit", 4}, + { "A.S.Meit", "Meit", 0}, + { "Hershey", "Hershey", 7}, + { "FontBank", "FontBank", 8}, + { "A. Carr", "Carr", 4}, + { "Brendel Informatik", "Brendel", 7}, + { "Jonathan Brecher", "Brecher", 7}, + { "SoftMaker", "Softmaker", 9}, + { "LETRASET", "Letraset", 8}, + { "Corel Corp", "Corel", 5}, + { "PUBLISHERS PARADISE", "Paradise", 8}, + { "Publishers Paradise", "Paradise", 0}, + { "Allied Corporation", "Allied", 6}, + { NULL, NULL, 0} +}; + +static const char * getFoundry(const char *notice) +{ + const FoundryMap *entry; + + if(notice) + for(entry=map; NULL!=entry->foundry; entry++) + if(NULL!=strstr(notice, entry->noticeStr)) + return entry->foundry; + + return NULL; +} + +static bool readAfm(const TQString &file, TQString &full, TQString &family, TQString &foundry, TQString &weight, +#ifndef KFI_FC_NO_WIDTHS + TQString &width, +#endif + TQString &spacing, TQString &slant) +{ + TQFile f(file); + bool foundName=false, + foundFamily=false; + int intSpacing=FC_PROPORTIONAL, +#ifndef KFI_FC_NO_WIDTHS + intWidth=FC_WIDTH_NORMAL, +#endif + intWeight=FC_WEIGHT_NORMAL, + intSlant=FC_SLANT_ROMAN, + intItalic=FC_SLANT_ROMAN; + + if(f.open(IO_ReadOnly)) + { + TQTextStream stream(&f); + TQString line; + bool inMetrics=false; + + while(!stream.atEnd()) + { + line=stream.readLine(); + line=line.simplifyWhiteSpace(); + + if(inMetrics) + { + if(0==line.find("FullName ")) + { + full=line.mid(9); +#ifndef KFI_FC_NO_WIDTHS + intWidth=strToWidth(full); +#endif + foundName=true; + } + else if(0==line.find("FamilyName ")) + { + family=line.mid(11); + foundFamily=true; + } + else if(0==line.find("Weight ")) + intWeight=strToWeight(line.mid(7)); + else if(0==line.find("ItalicAngle ")) + intSlant=0.0f==line.mid(12).toFloat() ? FC_SLANT_ROMAN : FC_SLANT_ITALIC; + else if(0==line.find("IsFixedPitch ")) + intSpacing=0==line.mid(13).find("false", 0, false) ? FC_PROPORTIONAL : FC_MONO; + else if(0==line.find("Notice ")) + foundry=getFoundry(line.mid(7).latin1()); + else if(0==line.find("StartCharMetrics")) + break; + } + else + if(0==line.find("StartFontMetrics")) + inMetrics=true; + }; + f.close(); + + if(!foundFamily && foundName) + { + family=full; + foundFamily=true; + } + + if(foundName && FC_SLANT_ITALIC==intItalic && (-1!=full.find("Oblique") || -1!=full.find("Slanted"))) + intItalic=FC_SLANT_OBLIQUE; + } + + if(foundName && foundFamily) + { + weight=KFI::CFcEngine::weightStr(intWeight, false); +#ifndef KFI_FC_NO_WIDTHS + width=KFI::CFcEngine::widthStr(intWidth, false); +#endif + slant=KFI::CFcEngine::slantStr(intSlant, false); + spacing=KFI::CFcEngine::spacingStr(intSpacing); + + if(foundry.isEmpty()) + foundry=i18n(KFI_UNKNOWN_FOUNDRY); + + return true; + } + + return false; +} + +typedef KGenericFactory KFileFontPluginFactory; +K_EXPORT_COMPONENT_FACTORY(tdefile_font, KFileFontPluginFactory("kfontinst")) + +namespace KFI +{ + +KFileFontPlugin::KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args) + : KFilePlugin(parent, name, args) +{ + TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE); + + addMimeType("application/x-font-ttf"), + addMimeType("application/x-font-type1"); + //addMimeType("application/x-font-speedo"); + addMimeType("application/x-font-bdf"); + addMimeType("application/x-font-pcf"); + //addMimeType("application/x-font-snf"); + addMimeType("application/x-font-otf"); + addMimeType("application/x-font-ttc"); + addMimeType("application/x-afm"); +} + +void KFileFontPlugin::addMimeType(const char *mime) +{ + KFileMimeTypeInfo *info=addMimeTypeInfo(mime); + KFileMimeTypeInfo::GroupInfo *group=addGroupInfo(info, "General", i18n("General")); + + addItemInfo(group, "Full", i18n("Full Name"), TQVariant::String); + addItemInfo(group, "Family", i18n("Family"), TQVariant::String); + addItemInfo(group, "Foundry", i18n("Foundry"), TQVariant::String); + addItemInfo(group, "Weight", i18n("Weight"), TQVariant::String); +#ifndef KFI_FC_NO_WIDTHS + addItemInfo(group, "Width", i18n("Width"), TQVariant::String); +#endif + addItemInfo(group, "Spacing", i18n("Spacing"), TQVariant::String); + addItemInfo(group, "Slant", i18n("Slant"), TQVariant::String); +} + +bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what) +{ + TQString full, + lastFull, + family, + foundry, + weight, +#ifndef KFI_FC_NO_WIDTHS + width, +#endif + spacing, + slant, + fullAll, + familyAll, + foundryAll, + weightAll, +#ifndef KFI_FC_NO_WIDTHS + widthAll, +#endif + spacingAll, + slantAll; + KURL url(info.url()); + TQString fName; + bool fontsProt = KFI_KIO_FONTS_PROTOCOL == url.protocol(), + fileProt = "file" == url.protocol(), + downloaded = false, + status = false; + + what=0; + + if(!fontsProt && !fileProt && TDEIO::NetAccess::download(url, fName, NULL)) + { + downloaded=true; + url=KURL(fName); + } + + if(downloaded || fontsProt || fileProt) + { + if("application/x-afm"==info.mimeType()) // Then fontconfig can't give us the data :-( + status=readAfm(url.path(), fullAll, familyAll, foundryAll, weightAll, +#ifndef KFI_FC_NO_WIDTHS + widthAll, +#endif + spacingAll, slantAll); + else + for(int face=0; face<10; ++face) // How to get num faces from fontconfig? don't know - so just try 1st 10... + { + if(itsEngine.getInfo(url, face, full, family, foundry, weight, +#ifndef KFI_FC_NO_WIDTHS + width, +#endif + spacing, slant) && + !full.isEmpty() && full!=lastFull) + { + addEntry(face, fullAll, full); + lastFull=full; + + if(KFileMetaInfo::Fastest!=what) + { + addEntry(face, familyAll, family); + if(0==face) + { + foundryAll=foundry; + + if(foundryAll.isEmpty()) + foundryAll=i18n(KFI_UNKNOWN_FOUNDRY); + else + { + // Try to make sure foundry is capitalised, and looks the same as that of + // any AFM. + foundryAll[0]=foundryAll[0].upper(); + + const FoundryMap *entry; + + for(entry=map; NULL!=entry->foundry; entry++) + if(foundryAll.length()==entry->len && foundryAll.contains(entry->foundry, false)) + { + foundryAll=entry->foundry; + break; + } + } + } + addEntry(face, weightAll, weight); +#ifndef KFI_FC_NO_WIDTHS + addEntry(face, widthAll, width); +#endif + addEntry(face, spacingAll, spacing); + addEntry(face, slantAll, slant); + } + status=true; + } + else + break; + } + + if(status) + { + KFileMetaInfoGroup group; + + group=appendGroup(info, "General"); + appendItem(group, "Full", fullAll); + + if(KFileMetaInfo::Fastest!=what) + { + appendItem(group, "Family", familyAll); + appendItem(group, "Foundry", foundryAll); + appendItem(group, "Weight", weightAll); +#ifndef KFI_FC_NO_WIDTHS + appendItem(group, "Width", widthAll); +#endif + appendItem(group, "Spacing", spacingAll); + appendItem(group, "Slant", slantAll); + } + } + + if(downloaded) + TDEIO::NetAccess::removeTempFile(fName); + } + + return status; +} + +} diff --git a/kcontrol/kfontinst/tdefile-plugin/KFileFont.h b/kcontrol/kfontinst/tdefile-plugin/KFileFont.h new file mode 100644 index 000000000..a383d9a8e --- /dev/null +++ b/kcontrol/kfontinst/tdefile-plugin/KFileFont.h @@ -0,0 +1,58 @@ +#ifndef __KFILE_FONT_H__ +#define __KFILE_FONT_H__ + +//////////////////////////////////////////////////////////////////////////////// +// +// Class Name : KFileFont +// Author : Craig Drummond +// Project : K Font Installer +// Creation Date : 20/03/2003 +// Version : $Revision$ $Date$ +// +//////////////////////////////////////////////////////////////////////////////// +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// +//////////////////////////////////////////////////////////////////////////////// +// (C) Craig Drummond, 2003, 2004 +//////////////////////////////////////////////////////////////////////////////// + +#include +#include "FcEngine.h" + +namespace KFI +{ + +class KFileFontPlugin : public KFilePlugin +{ + public: + + KFileFontPlugin(TQObject *parent, const char *name, const TQStringList& args); + virtual ~KFileFontPlugin() {} + + bool readInfo(KFileMetaInfo& info, uint what = KFileMetaInfo::Fastest); + + private: + + void addMimeType(const char *mime); + + private: + + CFcEngine itsEngine; +}; + +} + +#endif diff --git a/kcontrol/kfontinst/tdefile-plugin/Makefile.am b/kcontrol/kfontinst/tdefile-plugin/Makefile.am new file mode 100644 index 000000000..04ab41861 --- /dev/null +++ b/kcontrol/kfontinst/tdefile-plugin/Makefile.am @@ -0,0 +1,13 @@ +kde_module_LTLIBRARIES = tdefile_font.la + +tdefile_font_la_SOURCES = KFileFont.cpp +tdefile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) +tdefile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la + +kdelnkdir = $(kde_servicesdir) +kde_services_DATA = tdefile_font.desktop + +AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) + +METASOURCES = AUTO +noinst_HEADERS = KFileFont.h diff --git a/kcontrol/kfontinst/tdefile-plugin/tdefile_font.desktop b/kcontrol/kfontinst/tdefile-plugin/tdefile_font.desktop new file mode 100644 index 000000000..20e502c59 --- /dev/null +++ b/kcontrol/kfontinst/tdefile-plugin/tdefile_font.desktop @@ -0,0 +1,86 @@ +[Desktop Entry] +Type=Service +Name=Font Information +Name[af]=Skrif tipe Informasie +Name[ar]=معلومات المحرف +Name[az]=Yazı Növü Mə'lumatı +Name[be]=Інфармацыя аб шрыфце +Name[bg]=Информация за шрифт +Name[bn]=ফন্ট তথ্য +Name[br]=Titouroù diwar-benn ar font +Name[bs]=Informacije o fontu +Name[ca]=Informació de la lletra +Name[cs]=Informace o písmu +Name[csb]=Wëdowiédzô ò fòntach +Name[cy]=Gwybodaeth Ffont +Name[da]=Skrifttypeinformation +Name[de]=Schriftarteninformation +Name[el]=Πληροφορίες γραμματοσειράς +Name[eo]=Tiparinformo +Name[es]=Información del tipo de letra +Name[et]=Fondi info +Name[eu]=Letra-tipoei buruzko informazioa +Name[fa]=اطلاعات قلم +Name[fi]=Kirjasintiedot +Name[fr]=Informations sur les polices +Name[fy]=Lettertype-Ynformaasje +Name[ga]=Eolas Clófhoirne +Name[gl]=Información da Fonte +Name[he]=מידע גופנים +Name[hi]=फ़ॉन्ट जानकारी +Name[hr]=Podaci o fontu +Name[hu]=Betűtípus-jellemzők +Name[id]=Informasi Font +Name[is]=Leturupplýsingar +Name[it]=Informazioni caratteri +Name[ja]=フォント情報 +Name[ka]=ინფორმაცია ფონტის შესახებ +Name[kk]=Қаріп мәліметі +Name[km]=ព័ត៌មាន​ពុម្ពអក្សរ +Name[ko]=연락처 정보 +Name[lo]=ຂໍ້ມູນຕ່າງໆ +Name[lt]=Šrifto(-ų) informacija +Name[lv]=Fontu Informācija +Name[mk]=Информации за фонтовите +Name[mn]=Бичиг-Мэдээлэл +Name[ms]=Maklumat Fon +Name[mt]=Informazzjoni dwar font +Name[nb]=Skriftinformasjon +Name[nds]=Schriftoort-Informatschoon +Name[ne]=फन्ट सूचना +Name[nl]=Lettertype-informatie +Name[nn]=Skriftinformasjon +Name[nso]=Tshedimoso ya Fonto +Name[pa]=ਫੋਂਟ ਜਾਣਕਾਰੀ +Name[pl]=Informacje o czcionkach +Name[pt]=Informação do Tipo de Letra +Name[pt_BR]=Informações sobre a Fonte +Name[ro]=Informații font +Name[ru]=Сведения о шрифте +Name[rw]=Amakuru y'Imyandikire +Name[se]=Fontadieđut +Name[sk]=Informácie o písmach +Name[sl]=Informacije o pisavi +Name[sr]=Информације о фонту +Name[sr@Latn]=Informacije o fontu +Name[sv]=Teckensnittsinformation +Name[ta]=எழுத்துரு தகவல் +Name[tg]=Иттилооти ҳарфҳо +Name[th]=ข้อมูลแบบอักษร +Name[tr]=Yazıtipi Bilgisi +Name[tt]=Yazu Turında +Name[uk]=Інформація про шрифти +Name[uz]=Shrift haqida maʼlumot +Name[uz@cyrillic]=Шрифт ҳақида маълумот +Name[ven]=Mafhungo a fontu +Name[vi]=Thông tin về Phông chữ +Name[wa]=Informåcion sol fonte +Name[xh]=Ulwazi Lohlobo lwamagama +Name[zh_CN]=字体信息 +Name[zh_TW]=字型資訊 +Name[zu]=Ulwazi lohlobo lwamagama +ServiceTypes=KFilePlugin +X-TDE-Library=tdefile_font +MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-otf;application/x-font-ttc;application/x-afm +PreferredGroups=General +PreferredItems=Full,Family,Foundry,Weight,Width,Spacing,Slant diff --git a/kcontrol/kfontinst/thumbnail/FontThumbnail.h b/kcontrol/kfontinst/thumbnail/FontThumbnail.h index 456e38b65..c902ce019 100644 --- a/kcontrol/kfontinst/thumbnail/FontThumbnail.h +++ b/kcontrol/kfontinst/thumbnail/FontThumbnail.h @@ -29,7 +29,7 @@ // (C) Craig Drummond, 2003, 2004 //////////////////////////////////////////////////////////////////////////////// -#include +#include #include "FcEngine.h" namespace KFI diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index 1eeb2396c..6147363b9 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index f4b57bde0..6690cc44b 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #define CFG_GROUP "FontViewer Settings" #define CFG_SIZE_KEY "Window Size" diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index 73fa16d5c..e6eb85cb0 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include @@ -137,7 +137,7 @@ void AppletTab::load( bool useDefaults ) } } else - l_trusted << "clockapplet" << "ksystemtrayapplet" << "krunapplet" << "quicklauncher" + l_trusted << "clockapplet" << "ksystemtrayapplet" << "krunapplet" << "quictdelauncher" << "kminipagerapplet" << "ktaskbarapplet" << "eyesapplet" << "kmixapplet"; for ( TQStringList::Iterator it = available.begin(); it != available.end(); ++it ) diff --git a/kcontrol/kicker/kicker_config.desktop b/kcontrol/kicker/kicker_config.desktop index 6fce40452..f68d12082 100644 --- a/kcontrol/kicker/kicker_config.desktop +++ b/kcontrol/kicker/kicker_config.desktop @@ -2,7 +2,7 @@ Icon=kcmkicker Type=Application DocPath=kcontrol/panel/index.html -Exec=kcmshell panel +Exec=tdecmshell panel X-TDE-Library=kicker diff --git a/kcontrol/kicker/kicker_config_appearance.desktop b/kcontrol/kicker/kicker_config_appearance.desktop index f177626a2..3becc6a76 100644 --- a/kcontrol/kicker/kicker_config_appearance.desktop +++ b/kcontrol/kicker/kicker_config_appearance.desktop @@ -2,7 +2,7 @@ Icon=kcmkicker Type=Application DocPath=kcontrol/panel/index.html#panel-looknfeel -Exec=kcmshell kicker_appearance +Exec=tdecmshell kicker_appearance X-TDE-Library=kicker diff --git a/kcontrol/kicker/kicker_config_arrangement.desktop b/kcontrol/kicker/kicker_config_arrangement.desktop index 36ce3fa31..e9f6a5da4 100644 --- a/kcontrol/kicker/kicker_config_arrangement.desktop +++ b/kcontrol/kicker/kicker_config_arrangement.desktop @@ -2,7 +2,7 @@ Icon=kcmkicker Type=Application DocPath=kcontrol/panel/index.html#panel-position -Exec=kcmshell kicker_arrangement +Exec=tdecmshell kicker_arrangement X-TDE-Library=kicker X-TDE-FactoryName=kicker_arrangement diff --git a/kcontrol/kicker/kicker_config_hiding.desktop b/kcontrol/kicker/kicker_config_hiding.desktop index b3dde5626..368142cc5 100644 --- a/kcontrol/kicker/kicker_config_hiding.desktop +++ b/kcontrol/kicker/kicker_config_hiding.desktop @@ -2,7 +2,7 @@ Icon=kcmkicker Type=Application DocPath=kcontrol/panel/index.html#panel-hiding -Exec=kcmshell kicker_hiding +Exec=tdecmshell kicker_hiding X-TDE-Library=kicker X-TDE-FactoryName=kicker_hiding diff --git a/kcontrol/kicker/kicker_config_menus.desktop b/kcontrol/kicker/kicker_config_menus.desktop index 9a6bb64a2..4caf125f7 100644 --- a/kcontrol/kicker/kicker_config_menus.desktop +++ b/kcontrol/kicker/kicker_config_menus.desktop @@ -2,7 +2,7 @@ Icon=kcmkicker Type=Application DocPath=kcontrol/panel/index.html#panel-menus -Exec=kcmshell kicker_menus +Exec=tdecmshell kicker_menus X-TDE-Library=kicker X-TDE-FactoryName=kicker_menus diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp index 4d063b54e..73367d24d 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.cpp +++ b/kcontrol/kicker/lookandfeeltab_impl.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/kicker/main.h b/kcontrol/kicker/main.h index 45364c366..06bf2ec03 100644 --- a/kcontrol/kicker/main.h +++ b/kcontrol/kicker/main.h @@ -19,7 +19,7 @@ #define __main_h__ #include -#include +#include #include "extensionInfo.h" diff --git a/kcontrol/kicker/panel.desktop b/kcontrol/kicker/panel.desktop index b21e5a540..57e5e86a3 100644 --- a/kcontrol/kicker/panel.desktop +++ b/kcontrol/kicker/panel.desktop @@ -2,7 +2,7 @@ Icon=kcmkicker Type=Application DocPath=kcontrol/panel/index.html -Exec=kcmshell panel +Exec=tdecmshell panel X-TDE-Library=kicker diff --git a/kcontrol/kio/CMakeLists.txt b/kcontrol/kio/CMakeLists.txt index aa0d185e3..c807b075e 100644 --- a/kcontrol/kio/CMakeLists.txt +++ b/kcontrol/kio/CMakeLists.txt @@ -50,6 +50,6 @@ tde_add_kpart( kcm_kio AUTOMOC kproxydlg_ui.ui kcookiesmanagementdlg_ui.ui kcookiespoliciesdlg_ui.ui policydlg_ui.ui useragentdlg_ui.ui uagentproviderdlg_ui.ui manualproxy_ui.ui envvarproxy_ui.ui cache_ui.ui - LINK kio-shared tdeutils-shared + LINK tdeio-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/kio/Makefile.am b/kcontrol/kio/Makefile.am index 29f0cf30f..e2d8d7ae5 100644 --- a/kcontrol/kio/Makefile.am +++ b/kcontrol/kio/Makefile.am @@ -23,7 +23,7 @@ messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kcmkio.pot update_DATA = socks.upd -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update servicetypes_DATA = uasprovider.desktop servicetypesdir = $(kde_servicetypesdir) diff --git a/kcontrol/kio/cache.cpp b/kcontrol/kio/cache.cpp index eab4e54dd..db831ca6f 100644 --- a/kcontrol/kio/cache.cpp +++ b/kcontrol/kio/cache.cpp @@ -33,7 +33,7 @@ #include #include "ksaveioconfig.h" -#include +#include #include "cache.h" #include "cache_ui.h" diff --git a/kcontrol/kio/cache.desktop b/kcontrol/kio/cache.desktop index 315b0a450..affcb30bf 100644 --- a/kcontrol/kio/cache.desktop +++ b/kcontrol/kio/cache.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/cache/index.html Icon=cache -Exec=kcmshell cache +Exec=tdecmshell cache X-TDE-Library=kio diff --git a/kcontrol/kio/cookies.desktop b/kcontrol/kio/cookies.desktop index 4bfae61e8..433be9a18 100644 --- a/kcontrol/kio/cookies.desktop +++ b/kcontrol/kio/cookies.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/cookies/index.html Icon=cookie -Exec=kcmshell cookies +Exec=tdecmshell cookies X-TDE-Library=kio diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp index 30f1859c4..ad32eef3e 100644 --- a/kcontrol/kio/kcookiespolicies.cpp +++ b/kcontrol/kio/kcookiespolicies.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include "ksaveioconfig.h" diff --git a/kcontrol/kio/kioslave.kcfg b/kcontrol/kio/kioslave.kcfg deleted file mode 100644 index 4dcce7191..000000000 --- a/kcontrol/kio/kioslave.kcfg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - false - - - 10 - 2 - 3600 - - - 20 - 2 - 3600 - - - 15 - 2 - 3600 - - - 600 - 2 - 3600 - - - - - - - - - - - - - - - diff --git a/kcontrol/kio/kioslave.kcfgc b/kcontrol/kio/kioslave.kcfgc deleted file mode 100644 index 7b5ca780f..000000000 --- a/kcontrol/kio/kioslave.kcfgc +++ /dev/null @@ -1,5 +0,0 @@ -File=kio_ftprc.kcfg -ClassName=KioFtp -Singleton=true -Mutators=true - diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp index f240791c2..dd5dcfd16 100644 --- a/kcontrol/kio/kmanualproxydlg.cpp +++ b/kcontrol/kio/kmanualproxydlg.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "manualproxy_ui.h" #include "kmanualproxydlg.h" diff --git a/kcontrol/kio/ksaveioconfig.cpp b/kcontrol/kio/ksaveioconfig.cpp index 63e444b3b..b624cfa69 100644 --- a/kcontrol/kio/ksaveioconfig.cpp +++ b/kcontrol/kio/ksaveioconfig.cpp @@ -18,11 +18,11 @@ */ #include -#include +#include #include #include #include -#include +#include #include "ksaveioconfig.h" @@ -57,7 +57,7 @@ TDEConfig* KSaveIOConfig::config() d = new KSaveIOConfigPrivate; if (!d->config) - d->config = new TDEConfig("kioslaverc", false, false); + d->config = new TDEConfig("tdeioslaverc", false, false); return d->config; } diff --git a/kcontrol/kio/ksaveioconfig.h b/kcontrol/kio/ksaveioconfig.h index 27df8c51d..f14e98e22 100644 --- a/kcontrol/kio/ksaveioconfig.h +++ b/kcontrol/kio/ksaveioconfig.h @@ -29,7 +29,7 @@ class KSaveIOConfig { public: - /* Reload config file (kioslaverc) */ + /* Reload config file (tdeioslaverc) */ static void reparseConfiguration(); diff --git a/kcontrol/kio/lanbrowser.desktop b/kcontrol/kio/lanbrowser.desktop index b8ce5b10f..04e83e402 100644 --- a/kcontrol/kio/lanbrowser.desktop +++ b/kcontrol/kio/lanbrowser.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Icon=samba -Exec=kcmshell lanbrowser +Exec=tdecmshell lanbrowser X-TDE-Library=kio diff --git a/kcontrol/kio/netpref.cpp b/kcontrol/kio/netpref.cpp index b5788c973..b5879d0bd 100644 --- a/kcontrol/kio/netpref.cpp +++ b/kcontrol/kio/netpref.cpp @@ -3,11 +3,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include "ksaveioconfig.h" #include "netpref.h" diff --git a/kcontrol/kio/netpref.desktop b/kcontrol/kio/netpref.desktop index 62f95bd5e..22f51170b 100644 --- a/kcontrol/kio/netpref.desktop +++ b/kcontrol/kio/netpref.desktop @@ -75,7 +75,7 @@ Comment[xh]=Qwalasela iinketho zomsebenzi womnatha ka wonke-wonke, njengamaxabis Comment[zh_CN]=配置通用网络首选项，例如超时值 Comment[zh_TW]=設定一般網路喜好設定，例如逾時值 Comment[zu]=Hlanganisela okuncanyelwa uwonkewonke koxhumano olusazekile, njengamanani esikhathi sokuphuma -Exec=kcmshell netpref +Exec=tdecmshell netpref Icon=network Keywords=timeout,iopref,netpref,network preferences,ftp Keywords[be]=Тэрмін чакання,Уласцівасці сеткі,timeout,iopref,netpref,network preferences,ftp diff --git a/kcontrol/kio/proxy.desktop b/kcontrol/kio/proxy.desktop index 937753bdc..81325dd6d 100644 --- a/kcontrol/kio/proxy.desktop +++ b/kcontrol/kio/proxy.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/proxy/index.html Icon=proxy -Exec=kcmshell proxy +Exec=tdecmshell proxy X-TDE-Library=kio diff --git a/kcontrol/kio/smb.desktop b/kcontrol/kio/smb.desktop index b00a6b213..0e9cd2863 100644 --- a/kcontrol/kio/smb.desktop +++ b/kcontrol/kio/smb.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/smb/index.html Icon=samba -Exec=kcmshell smb +Exec=tdecmshell smb X-TDE-Library=kio diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp index 8ad181df6..9962555e7 100644 --- a/kcontrol/kio/smbrodlg.cpp +++ b/kcontrol/kio/smbrodlg.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -91,7 +91,7 @@ SMBRoOptions::~SMBRoOptions() void SMBRoOptions::load() { - TDEConfig *cfg = new TDEConfig("kioslaverc"); + TDEConfig *cfg = new TDEConfig("tdeioslaverc"); TQString tmp; cfg->setGroup( "Browser Settings/SMBro" ); @@ -124,7 +124,7 @@ void SMBRoOptions::load() void SMBRoOptions::save() { - TDEConfig *cfg = new TDEConfig("kioslaverc"); + TDEConfig *cfg = new TDEConfig("tdeioslaverc"); cfg->setGroup( "Browser Settings/SMBro" ); cfg->writeEntry( "User", m_userLe->text()); diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp index ef77a93c3..50c5f8003 100644 --- a/kcontrol/kio/socks.cpp +++ b/kcontrol/kio/socks.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/kio/tdeioslave.kcfg b/kcontrol/kio/tdeioslave.kcfg new file mode 100644 index 000000000..4dcce7191 --- /dev/null +++ b/kcontrol/kio/tdeioslave.kcfg @@ -0,0 +1,44 @@ + + + + + + false + + + 10 + 2 + 3600 + + + 20 + 2 + 3600 + + + 15 + 2 + 3600 + + + 600 + 2 + 3600 + + + + + + + + + + + + + + + diff --git a/kcontrol/kio/tdeioslave.kcfgc b/kcontrol/kio/tdeioslave.kcfgc new file mode 100644 index 000000000..7b5ca780f --- /dev/null +++ b/kcontrol/kio/tdeioslave.kcfgc @@ -0,0 +1,5 @@ +File=kio_ftprc.kcfg +ClassName=KioFtp +Singleton=true +Mutators=true + diff --git a/kcontrol/kio/useragent.desktop b/kcontrol/kio/useragent.desktop index 56ba4a0a4..200f7b883 100644 --- a/kcontrol/kio/useragent.desktop +++ b/kcontrol/kio/useragent.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Icon=agent -Exec=kcmshell useragent +Exec=tdecmshell useragent DocPath=kcontrol/useragent/index.html diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp index 29181f0a9..991200dd0 100644 --- a/kcontrol/kio/useragentdlg.cpp +++ b/kcontrol/kio/useragentdlg.cpp @@ -32,12 +32,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include "ksaveioconfig.h" #include "fakeuaprovider.h" diff --git a/kcontrol/knotify/CMakeLists.txt b/kcontrol/knotify/CMakeLists.txt index 1a5b81ca2..1072a389e 100644 --- a/kcontrol/knotify/CMakeLists.txt +++ b/kcontrol/knotify/CMakeLists.txt @@ -31,6 +31,6 @@ install( FILES play.png DESTINATION ${DATA_INSTALL_DIR}/kcontrol/pics ) tde_add_kpart( kcm_knotify AUTOMOC SOURCES knotify.cpp playersettings.ui - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/knotify/kcmnotify.desktop b/kcontrol/knotify/kcmnotify.desktop index 67b3c4e17..74aeb0cec 100644 --- a/kcontrol/knotify/kcmnotify.desktop +++ b/kcontrol/knotify/kcmnotify.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell kcmnotify +Exec=tdecmshell kcmnotify Icon=knotify Type=Application DocPath=kcontrol/kcmnotify/index.html diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index f8e97e573..0f4d9fff7 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include @@ -135,7 +135,7 @@ void KCMKNotify::slotAppActivated( const TQString& text ) void KCMKNotify::slotPlayerSettings() { - // kcmshell is a modal dialog, and apparently, we can't put a non-modal + // tdecmshell is a modal dialog, and apparently, we can't put a non-modal // dialog besides a modal dialog. sigh. if ( !m_playerSettings ) m_playerSettings = new PlayerSettingsDialog( this, true ); diff --git a/kcontrol/konq/CMakeLists.txt b/kcontrol/konq/CMakeLists.txt index d7b12811f..3e99e5f27 100644 --- a/kcontrol/konq/CMakeLists.txt +++ b/kcontrol/konq/CMakeLists.txt @@ -45,6 +45,6 @@ tde_add_kpart( kcm_konq AUTOMOC behaviour.cpp desktop.cpp desktopbehavior_impl.cpp previews.cpp browser.cpp main.cpp rootopts.cpp fontopts.cpp desktopbehavior.ui - LINK kio-shared tdeutils-shared + LINK tdeio-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/konq/Makefile.am b/kcontrol/konq/Makefile.am index f9ef60055..2dddd9426 100644 --- a/kcontrol/konq/Makefile.am +++ b/kcontrol/konq/Makefile.am @@ -21,7 +21,7 @@ kcmkonq_datadir = $(kde_appsdir)/.hidden xdg_apps_DATA = desktopbehavior.desktop desktop.desktop desktoppath.desktop filebrowser.desktop -uiserver_DIR = $(kde_includes)/kio +uiserver_DIR = $(kde_includes)/tdeio EXTRA_DIST = $(kcm_konq_la_DATA) $(kcmkonq_data_DATA) diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index 12bf6159c..70c6a1d1d 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -29,8 +29,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -258,9 +258,9 @@ void KBehaviourOptions::save() config.writeEntry( "ShowList", cbListProgress->isChecked() ); config.sync(); // Tell the running server - if ( kapp->dcopClient()->isApplicationRegistered( "kio_uiserver" ) ) + if ( kapp->dcopClient()->isApplicationRegistered( "tdeio_uiserver" ) ) { - UIServer_stub uiserver( "kio_uiserver", "UIServer" ); + UIServer_stub uiserver( "tdeio_uiserver", "UIServer" ); uiserver.setListMode( cbListProgress->isChecked() ); } diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index 3b4bcb32a..93fecee08 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include diff --git a/kcontrol/konq/desktop.desktop b/kcontrol/konq/desktop.desktop index 0fdb4a54f..e53afe11a 100644 --- a/kcontrol/konq/desktop.desktop +++ b/kcontrol/konq/desktop.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/desktop/index.html#desktop-number Icon=desktop -Exec=kcmshell desktop +Exec=tdecmshell desktop X-TDE-Library=konq diff --git a/kcontrol/konq/desktopbehavior.desktop b/kcontrol/konq/desktopbehavior.desktop index bb34bc904..4f973bc46 100644 --- a/kcontrol/konq/desktopbehavior.desktop +++ b/kcontrol/konq/desktopbehavior.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/desktopbehavior/index.html Icon=desktop -Exec=kcmshell desktopbehavior +Exec=tdecmshell desktopbehavior X-TDE-Library=konq diff --git a/kcontrol/konq/desktopbehavior_impl.h b/kcontrol/konq/desktopbehavior_impl.h index 640d6a2c3..d04d82136 100644 --- a/kcontrol/konq/desktopbehavior_impl.h +++ b/kcontrol/konq/desktopbehavior_impl.h @@ -23,7 +23,7 @@ #include "desktopbehavior.h" #include "tqlistview.h" -#include +#include #include class DesktopBehavior : public DesktopBehaviorBase diff --git a/kcontrol/konq/desktoppath.desktop b/kcontrol/konq/desktoppath.desktop index d4f072f1c..f316f8841 100644 --- a/kcontrol/konq/desktoppath.desktop +++ b/kcontrol/konq/desktoppath.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/desktop/index.html#desktop-desktop-path Icon=kfm -Exec=kcmshell desktoppath +Exec=tdecmshell desktoppath X-TDE-Library=konq diff --git a/kcontrol/konq/fileappearance.desktop b/kcontrol/konq/fileappearance.desktop index c2f74550e..b09e8380f 100644 --- a/kcontrol/konq/fileappearance.desktop +++ b/kcontrol/konq/fileappearance.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/filemanager/index.html Icon=kfm -Exec=kcmshell fileappearance +Exec=tdecmshell fileappearance X-TDE-Library=konq diff --git a/kcontrol/konq/filebehavior.desktop b/kcontrol/konq/filebehavior.desktop index 1e1e0c19b..6a85a2e1e 100644 --- a/kcontrol/konq/filebehavior.desktop +++ b/kcontrol/konq/filebehavior.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/filemanager/index.html Icon=kfm -Exec=kcmshell filebehavior +Exec=tdecmshell filebehavior X-TDE-Library=konq diff --git a/kcontrol/konq/filebrowser.desktop b/kcontrol/konq/filebrowser.desktop index 40e858e43..2f9520314 100644 --- a/kcontrol/konq/filebrowser.desktop +++ b/kcontrol/konq/filebrowser.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/filemanager/index.html Icon=kfm -Exec=kcmshell filebrowser +Exec=tdecmshell filebrowser X-TDE-Library=konq diff --git a/kcontrol/konq/filepreviews.desktop b/kcontrol/konq/filepreviews.desktop index e113c147f..a83ce3601 100644 --- a/kcontrol/konq/filepreviews.desktop +++ b/kcontrol/konq/filepreviews.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/filemanager/index.html Icon=kfm -Exec=kcmshell filepreviews +Exec=tdecmshell filepreviews X-TDE-Library=konq diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index c1f610a46..e7c3fd9cf 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp index e57a84859..8e5afa965 100644 --- a/kcontrol/konq/main.cpp +++ b/kcontrol/konq/main.cpp @@ -30,7 +30,7 @@ #include "browser.h" #include "desktopbehavior_impl.h" -#include +#include #include static TQCString configname() diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 0a6521a67..d69333a7c 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index a3234dba4..f2a15fd65 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -26,11 +26,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h index 5fe1fe5c7..ec4510b1c 100644 --- a/kcontrol/konq/rootopts.h +++ b/kcontrol/konq/rootopts.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include class TQCheckBox; diff --git a/kcontrol/konq/webappearance.desktop b/kcontrol/konq/webappearance.desktop index c2f74550e..b09e8380f 100644 --- a/kcontrol/konq/webappearance.desktop +++ b/kcontrol/konq/webappearance.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/filemanager/index.html Icon=kfm -Exec=kcmshell fileappearance +Exec=tdecmshell fileappearance X-TDE-Library=konq diff --git a/kcontrol/konq/webbehavior.desktop b/kcontrol/konq/webbehavior.desktop index 2cfdef4ea..6c8aac9eb 100644 --- a/kcontrol/konq/webbehavior.desktop +++ b/kcontrol/konq/webbehavior.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/filemanager/index.html Icon=kfm -Exec=kcmshell filebehavior +Exec=tdecmshell filebehavior X-TDE-Library=konq diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp index 0464f39bd..e76e6b9b2 100644 --- a/kcontrol/konqhtml/advancedTabDialog.cpp +++ b/kcontrol/konqhtml/advancedTabDialog.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "advancedTabDialog.h" #include "advancedTabOptions.h" diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index 163bdd4f4..617197eba 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index b61abd99b..8bc8a3e50 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index 1bb71d4db..06eb9bee1 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/kcontrol/konqhtml/filteropts.cpp @@ -16,11 +16,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include -#include +#include #include #include diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h index 5a582e68c..4e719d181 100644 --- a/kcontrol/konqhtml/htmlopts.h +++ b/kcontrol/konqhtml/htmlopts.h @@ -25,7 +25,7 @@ #include -#include +#include #include class TQRadioButton; class KIntNumInput; diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index e36743783..18baf833f 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index c035c1857..84ce7dda0 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/konqhtml/khttpoptdlg.h b/kcontrol/konqhtml/khttpoptdlg.h index 3342f434b..d4e17af56 100644 --- a/kcontrol/konqhtml/khttpoptdlg.h +++ b/kcontrol/konqhtml/khttpoptdlg.h @@ -8,7 +8,7 @@ #include #include -#include +#include /** diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index c8f9f760d..6be5c1972 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/konqhtml/policies.cpp b/kcontrol/konqhtml/policies.cpp index 0c1cd3bc5..1e1de227e 100644 --- a/kcontrol/konqhtml/policies.cpp +++ b/kcontrol/konqhtml/policies.cpp @@ -19,7 +19,7 @@ */ -#include +#include #include #include "policies.h" diff --git a/kcontrol/konqhtml/tdehtml_behavior.desktop b/kcontrol/konqhtml/tdehtml_behavior.desktop index 01488fad4..8179247e4 100644 --- a/kcontrol/konqhtml/tdehtml_behavior.desktop +++ b/kcontrol/konqhtml/tdehtml_behavior.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/tdehtml/index.html#kbrowse-html Icon=konqueror -Exec=kcmshell tdehtml_behavior +Exec=tdecmshell tdehtml_behavior X-TDE-Library=konqhtml diff --git a/kcontrol/konqhtml/tdehtml_filter.desktop b/kcontrol/konqhtml/tdehtml_filter.desktop index e23404714..b657c2e1f 100644 --- a/kcontrol/konqhtml/tdehtml_filter.desktop +++ b/kcontrol/konqhtml/tdehtml_filter.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/tdehtml/index.html#tdehtml-adblock Icon=filter -Exec=kcmshell tdehtml_filter +Exec=tdecmshell tdehtml_filter X-TDE-Library=konqhtml X-TDE-FactoryName=tdehtml_filter diff --git a/kcontrol/konqhtml/tdehtml_fonts.desktop b/kcontrol/konqhtml/tdehtml_fonts.desktop index 341508848..e6fbfa342 100644 --- a/kcontrol/konqhtml/tdehtml_fonts.desktop +++ b/kcontrol/konqhtml/tdehtml_fonts.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance Icon=fonts -Exec=kcmshell tdehtml_fonts +Exec=tdecmshell tdehtml_fonts X-TDE-Library=konqhtml diff --git a/kcontrol/konqhtml/tdehtml_java_js.desktop b/kcontrol/konqhtml/tdehtml_java_js.desktop index e0477c0e6..409f7f313 100644 --- a/kcontrol/konqhtml/tdehtml_java_js.desktop +++ b/kcontrol/konqhtml/tdehtml_java_js.desktop @@ -2,7 +2,7 @@ Type=Application DocPath=kcontrol/tdehtml/index.html#kbrowse-java Icon=konqueror -Exec=kcmshell tdehtml_java_js +Exec=tdecmshell tdehtml_java_js X-TDE-Library=konqhtml diff --git a/kcontrol/konsole/CMakeLists.txt b/kcontrol/konsole/CMakeLists.txt index 34e2b0041..c7e2ea1ed 100644 --- a/kcontrol/konsole/CMakeLists.txt +++ b/kcontrol/konsole/CMakeLists.txt @@ -32,6 +32,6 @@ tde_add_kpart( kcm_konsole AUTOMOC SOURCES schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 3d4e00bdd..6001c26d9 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include @@ -154,7 +154,7 @@ void KCMKonsole::save() DCOPClient *dcc = kapp->dcopClient(); dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray()); dcc->send("kdesktop", "default", "configure()", TQByteArray()); - dcc->send("klauncher", "klauncher", "reparseConfiguration()", TQByteArray()); + dcc->send("tdelauncher", "tdelauncher", "reparseConfiguration()", TQByteArray()); if (xonXoffOrig != xonXoffNew) { diff --git a/kcontrol/konsole/kcmkonsole.desktop b/kcontrol/konsole/kcmkonsole.desktop index 2336d5e11..c387ec6e7 100644 --- a/kcontrol/konsole/kcmkonsole.desktop +++ b/kcontrol/konsole/kcmkonsole.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=konsole Type=Application -Exec=kcmshell kcmkonsole +Exec=tdecmshell kcmkonsole DocPath=kcontrol/kcmkonsole/index.html X-TDE-Library=konsole diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp index f712c8c0d..7dd2bb19b 100644 --- a/kcontrol/konsole/schemaeditor.cpp +++ b/kcontrol/konsole/schemaeditor.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp index c9a767cac..d0f4f822a 100644 --- a/kcontrol/konsole/sessioneditor.cpp +++ b/kcontrol/konsole/sessioneditor.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/krdb/CMakeLists.txt b/kcontrol/krdb/CMakeLists.txt index 669875032..035505d98 100644 --- a/kcontrol/krdb/CMakeLists.txt +++ b/kcontrol/krdb/CMakeLists.txt @@ -27,7 +27,7 @@ link_directories( ##### other data ################################ -install( FILES kcmdisplayrc.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) +install( FILES kcmdisplayrc.upd DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update ) ##### krdb (static) ############################# diff --git a/kcontrol/krdb/Makefile.am b/kcontrol/krdb/Makefile.am index a478f2f83..db6dda987 100644 --- a/kcontrol/krdb/Makefile.am +++ b/kcontrol/krdb/Makefile.am @@ -12,4 +12,4 @@ messages: $(XGETTEXT) *.cpp -o $(podir)/krdb.pot update_DATA = kcmdisplayrc.upd -updatedir = $(kde_datadir)/kconf_update +updatedir = $(kde_datadir)/tdeconf_update diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 72d9c1fe0..613816f84 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include @@ -94,7 +94,7 @@ static void applyGtkStyles(bool active, int version) TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << name << value; - kapp->dcopClient()->send("klauncher", "klauncher", "setLaunchEnv(TQCString,TQCString)", params); + kapp->dcopClient()->send("tdelauncher", "tdelauncher", "setLaunchEnv(TQCString,TQCString)", params); } // ----------------------------------------------------------------------------- @@ -261,7 +261,7 @@ static void applyQtSettings( TDEConfig& kglobals, TQSettings& settings ) /* ##### looks like kcmfonts skips this, so we don't do this here */ /*bool usexft = kglobals.readBoolEntry("AntiAliasing", false); - kconfig.setGroup("General"); + tdeconfig.setGroup("General"); settings.writeEntry("/qt/enableXft", usexft); settings.writeEntry("/qt/useXft", usexft); */ diff --git a/kcontrol/kthememanager/CMakeLists.txt b/kcontrol/kthememanager/CMakeLists.txt index 2d71a367e..b3d000aa5 100644 --- a/kcontrol/kthememanager/CMakeLists.txt +++ b/kcontrol/kthememanager/CMakeLists.txt @@ -33,6 +33,6 @@ tde_add_kpart( kcm_kthememanager AUTOMOC SOURCES kthemedlg.ui newthemewidget.ui knewthemedlg.cpp ktheme.cpp kthememanager.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index faf6feb9c..e516ddd41 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/kcontrol/kthememanager/kthemedlg.ui.h b/kcontrol/kthememanager/kthemedlg.ui.h index 85d22cb9d..762de201d 100644 --- a/kcontrol/kthememanager/kthemedlg.ui.h +++ b/kcontrol/kthememanager/kthemedlg.ui.h @@ -16,34 +16,34 @@ void KThemeDlg::startKonqui( const TQString & url ) void KThemeDlg::startBackground() { - KRun::runCommand("kcmshell kde-background"); + KRun::runCommand("tdecmshell kde-background"); } void KThemeDlg::startColors() { - KRun::runCommand("kcmshell kde-colors"); + KRun::runCommand("tdecmshell kde-colors"); } void KThemeDlg::startStyle() { - KRun::runCommand("kcmshell kde-style"); + KRun::runCommand("tdecmshell kde-style"); } void KThemeDlg::startIcons() { - KRun::runCommand("kcmshell kde-icons"); + KRun::runCommand("tdecmshell kde-icons"); } void KThemeDlg::startFonts() { - KRun::runCommand("kcmshell kde-fonts"); + KRun::runCommand("tdecmshell kde-fonts"); } void KThemeDlg::startSaver() { - KRun::runCommand("kcmshell kde-screensaver"); + KRun::runCommand("tdecmshell kde-screensaver"); } diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 4a4817041..a72766837 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/kthememanager/kthememanager.desktop b/kcontrol/kthememanager/kthememanager.desktop index 26a3ed3cd..07e6b69b1 100644 --- a/kcontrol/kthememanager/kthememanager.desktop +++ b/kcontrol/kthememanager/kthememanager.desktop @@ -66,7 +66,7 @@ Comment[vi]=Trình quản lý các sắc thái của TDE Comment[wa]=Manaedjî tinmes pol rivnance globåle di TDE Comment[zh_CN]=管理全局 TDE 视觉主题 Comment[zh_TW]=管理全域 TDE 視覺佈景 -Exec=kcmshell kthememanager +Exec=tdecmshell kthememanager Icon=kthememgr Keywords=themes,look and feel Keywords[af]=themes,look and feel,temas diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index b1d209a24..c02101d54 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/kcontrol/launch/kcmlaunch.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/launch/kcmlaunch.desktop b/kcontrol/launch/kcmlaunch.desktop index 604b0701f..b60a45cf4 100644 --- a/kcontrol/launch/kcmlaunch.desktop +++ b/kcontrol/launch/kcmlaunch.desktop @@ -2,7 +2,7 @@ Icon=launch Type=Application DocPath=kcontrol/kcmlaunch/index.html -Exec=kcmshell kcmlaunch +Exec=tdecmshell kcmlaunch X-TDE-Library=launch diff --git a/kcontrol/locale/CMakeLists.txt b/kcontrol/locale/CMakeLists.txt index c990ab669..c604cf551 100644 --- a/kcontrol/locale/CMakeLists.txt +++ b/kcontrol/locale/CMakeLists.txt @@ -33,6 +33,6 @@ tde_add_kpart( kcm_locale AUTOMOC SOURCES main.cpp toplevel.cpp kcmlocale.cpp klocalesample.cpp localenum.cpp localemon.cpp localetime.cpp localeother.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/locale/language.desktop b/kcontrol/locale/language.desktop index dcd38c1de..55d6babde 100644 --- a/kcontrol/locale/language.desktop +++ b/kcontrol/locale/language.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell language +Exec=tdecmshell language Icon=locale Type=Application DocPath=kcontrol/language/index.html diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index 01e189fd4..e3a50847c 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/nics/CMakeLists.txt b/kcontrol/nics/CMakeLists.txt index 6d2c8e675..05ddf92a2 100644 --- a/kcontrol/nics/CMakeLists.txt +++ b/kcontrol/nics/CMakeLists.txt @@ -36,6 +36,6 @@ install( FILES nic.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_nic AUTOMOC SOURCES nic.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/nics/nic.desktop b/kcontrol/nics/nic.desktop index 0d123c1b9..6ebfd7daa 100644 --- a/kcontrol/nics/nic.desktop +++ b/kcontrol/nics/nic.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell nic +Exec=tdecmshell nic Type=Application DocPath=kinfocenter/nics/index.html Icon=network diff --git a/kcontrol/performance/kcmkonqyperformance.desktop b/kcontrol/performance/kcmkonqyperformance.desktop index 3104b244f..413953776 100644 --- a/kcontrol/performance/kcmkonqyperformance.desktop +++ b/kcontrol/performance/kcmkonqyperformance.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=launch Type=Application -Exec=kcmshell kcmkonqyperformance +Exec=tdecmshell kcmkonqyperformance X-TDE-Library=performance diff --git a/kcontrol/performance/kcmperformance.desktop b/kcontrol/performance/kcmperformance.desktop index 4b7eb3094..df51d96fc 100644 --- a/kcontrol/performance/kcmperformance.desktop +++ b/kcontrol/performance/kcmperformance.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=launch Type=Application -Exec=kcmshell kcmperformance +Exec=tdecmshell kcmperformance X-TDE-Library=performance diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp index 3c8bb6db3..46dd70774 100644 --- a/kcontrol/performance/konqueror.cpp +++ b/kcontrol/performance/konqueror.cpp @@ -19,7 +19,7 @@ #include "konqueror.h" #include -#include +#include #include #include #include diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp index 500178002..57d50ee14 100644 --- a/kcontrol/performance/system.cpp +++ b/kcontrol/performance/system.cpp @@ -18,7 +18,7 @@ #include "system.h" -#include +#include #include #include #include @@ -49,9 +49,9 @@ SystemWidget::SystemWidget( TQWidget* parent_P ) " handler will refuse to provide backtrace for the bugreport with this option" " turned on (you will need to reproduce it again with this option turned off," " or turn on the developer mode for the crash handler).

" ); - TQWhatsThis::add( cb_disable_kbuildsycoca, tmp ); - TQWhatsThis::add( label_kbuildsycoca, tmp ); - connect( cb_disable_kbuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); + TQWhatsThis::add( cb_disable_tdebuildsycoca, tmp ); + TQWhatsThis::add( label_tdebuildsycoca, tmp ); + connect( cb_disable_tdebuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); defaults(); } @@ -60,14 +60,14 @@ void SystemWidget::load(bool useDefaults ) TDEConfig cfg( "kdedrc", true ); cfg.setReadDefaults( useDefaults ); cfg.setGroup( "General" ); - cb_disable_kbuildsycoca->setChecked( cfg.readBoolEntry( "DelayedCheck", false )); + cb_disable_tdebuildsycoca->setChecked( cfg.readBoolEntry( "DelayedCheck", false )); } void SystemWidget::save() { TDEConfig cfg( "kdedrc" ); cfg.setGroup( "General" ); - cfg.writeEntry( "DelayedCheck", cb_disable_kbuildsycoca->isChecked()); + cfg.writeEntry( "DelayedCheck", cb_disable_tdebuildsycoca->isChecked()); } void SystemWidget::defaults() diff --git a/kcontrol/performance/system_ui.ui b/kcontrol/performance/system_ui.ui index 384ad2f86..878c73ddf 100644 --- a/kcontrol/performance/system_ui.ui +++ b/kcontrol/performance/system_ui.ui @@ -29,7 +29,7 @@ - cb_disable_kbuildsycoca + cb_disable_tdebuildsycoca Disable &system configuration startup check @@ -37,7 +37,7 @@ - label_kbuildsycoca + label_tdebuildsycoca <b>WARNING:</b> This option may in rare cases lead to various problems. Consult the What's This? (Shift+F1) help for details. diff --git a/kcontrol/privacy/CMakeLists.txt b/kcontrol/privacy/CMakeLists.txt index 189202863..fe13ab4a7 100644 --- a/kcontrol/privacy/CMakeLists.txt +++ b/kcontrol/privacy/CMakeLists.txt @@ -28,6 +28,6 @@ install( FILES privacy.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_privacy AUTOMOC SOURCES privacy.cpp kprivacysettings.ui kcmprivacydialog.ui kprivacymanager.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index e4433ff8f..9ec3a5647 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/kcontrol/privacy/kprivacymanager.cpp @@ -21,7 +21,7 @@ #include "kprivacymanager.h" #include #include -#include +#include #include #include #include diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index 6b54baac6..6f5d52c33 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/privacy/privacy.desktop b/kcontrol/privacy/privacy.desktop index 86c1c4b68..47a1474ef 100644 --- a/kcontrol/privacy/privacy.desktop +++ b/kcontrol/privacy/privacy.desktop @@ -66,7 +66,7 @@ Comment[vi]=Riêng tư - trình điều khiển giúp xoá các dấu vết mà Comment[wa]=Vikereye da vosse - on module di kcontrol po rnetyî les passêyes nén volowes ki l' uzeu leye sol sistinme Comment[zh_CN]=隐私 - 清除用户留在系统中痕迹的 kcontrol 模块 Comment[zh_TW]=隱私權 - 一個控制模組用來清除使用者不希望留在系統中的痕跡 -Exec=kcmshell privacy +Exec=tdecmshell privacy Keywords=Privacy,privacy Keywords[ar]=خصوصية، الخصوصية Keywords[az]=Gizlilik,gizlilik diff --git a/kcontrol/randr/randr.desktop b/kcontrol/randr/randr.desktop index 1bf7e6018..d550481be 100644 --- a/kcontrol/randr/randr.desktop +++ b/kcontrol/randr/randr.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=randr Type=Application -Exec=kcmshell randr +Exec=tdecmshell randr X-TDE-Library=randr #X-TDE-Init=randr X-TDE-Test-Module=true diff --git a/kcontrol/samba/CMakeLists.txt b/kcontrol/samba/CMakeLists.txt index 1358e0d53..20a39f232 100644 --- a/kcontrol/samba/CMakeLists.txt +++ b/kcontrol/samba/CMakeLists.txt @@ -31,6 +31,6 @@ tde_add_kpart( kcm_samba AUTOMOC SOURCES main.cpp ksmbstatus.cpp kcmsambaimports.cpp kcmsambalog.cpp kcmsambastatistics.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/samba/kcmsambaimports.h b/kcontrol/samba/kcmsambaimports.h index bad8ab2fd..0897af021 100644 --- a/kcontrol/samba/kcmsambaimports.h +++ b/kcontrol/samba/kcmsambaimports.h @@ -26,7 +26,7 @@ #include #include -#include +#include class ImportsView: public TQWidget { diff --git a/kcontrol/samba/kcmsambalog.h b/kcontrol/samba/kcmsambalog.h index 05f6c3040..c3c8c07ea 100644 --- a/kcontrol/samba/kcmsambalog.h +++ b/kcontrol/samba/kcmsambalog.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include diff --git a/kcontrol/samba/ksmbstatus.h b/kcontrol/samba/ksmbstatus.h index 2d6c10fba..f787293ae 100644 --- a/kcontrol/samba/ksmbstatus.h +++ b/kcontrol/samba/ksmbstatus.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #define SCREEN_XY_OFFSET 20 diff --git a/kcontrol/samba/smbstatus.desktop b/kcontrol/samba/smbstatus.desktop index 19dfdb2fb..c4b32d115 100644 --- a/kcontrol/samba/smbstatus.desktop +++ b/kcontrol/samba/smbstatus.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell smbstatus +Exec=tdecmshell smbstatus Icon=samba Type=Application DocPath=kinfocenter/samba/index.html diff --git a/kcontrol/screensaver/CMakeLists.txt b/kcontrol/screensaver/CMakeLists.txt index 825418e4f..e57bc1eca 100644 --- a/kcontrol/screensaver/CMakeLists.txt +++ b/kcontrol/screensaver/CMakeLists.txt @@ -32,6 +32,6 @@ tde_add_kpart( kcm_screensaver AUTOMOC advanceddialogimpl.ui scrnsave.cpp testwin.cpp saverlist.cpp saverconfig.cpp advanceddialog.cpp kswidget.cpp - LINK kio-shared ${GL_LIBRARY} + LINK tdeio-shared ${GL_LIBRARY} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/screensaver/advanceddialog.h b/kcontrol/screensaver/advanceddialog.h index 8322dd3e2..87ee03a31 100644 --- a/kcontrol/screensaver/advanceddialog.h +++ b/kcontrol/screensaver/advanceddialog.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/screensaver/screensaver.desktop b/kcontrol/screensaver/screensaver.desktop index 566a8c506..821a445b5 100644 --- a/kcontrol/screensaver/screensaver.desktop +++ b/kcontrol/screensaver/screensaver.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell screensaver +Exec=tdecmshell screensaver Icon=tdescreensaver Type=Application DocPath=kcontrol/screensaver/index.html diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index acc66880e..2105c34d0 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/smartcard/smartcard.desktop b/kcontrol/smartcard/smartcard.desktop index c347590e4..600aea709 100644 --- a/kcontrol/smartcard/smartcard.desktop +++ b/kcontrol/smartcard/smartcard.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=identity Type=Application -Exec=kcmshell smartcard +Exec=tdecmshell smartcard DocPath=kcontrol/smartcard.html X-TDE-Library=smartcard diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp index 11c09baf7..38d47fa2c 100644 --- a/kcontrol/smserver/kcmsmserver.cpp +++ b/kcontrol/smserver/kcmsmserver.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/kcontrol/smserver/kcmsmserver.desktop b/kcontrol/smserver/kcmsmserver.desktop index 6ebee5632..9ee5ea88f 100644 --- a/kcontrol/smserver/kcmsmserver.desktop +++ b/kcontrol/smserver/kcmsmserver.desktop @@ -2,7 +2,7 @@ Icon=exit Type=Application DocPath=kcontrol/kcmsmserver/index.html -Exec=kcmshell kcmsmserver +Exec=tdecmshell kcmsmserver X-TDE-Library=smserver diff --git a/kcontrol/spellchecking/spellchecking.desktop b/kcontrol/spellchecking/spellchecking.desktop index d761af90c..24b47ebea 100644 --- a/kcontrol/spellchecking/spellchecking.desktop +++ b/kcontrol/spellchecking/spellchecking.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell spellchecking +Exec=tdecmshell spellchecking Icon=spellcheck Type=Application DocPath=kcontrol/spellchecking/index.html diff --git a/kcontrol/style/CMakeLists.txt b/kcontrol/style/CMakeLists.txt index 26a9569ff..88f0927af 100644 --- a/kcontrol/style/CMakeLists.txt +++ b/kcontrol/style/CMakeLists.txt @@ -33,6 +33,6 @@ tde_add_kpart( kcm_style AUTOMOC SOURCES kcmstyle.cpp stylepreview.ui menupreview.cpp styleconfdialog.cpp - LINK krdb-static kio-shared + LINK krdb-static tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index f540d7e75..5c274d3cc 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -634,9 +634,9 @@ void KCMStyle::save() if (m_bStyleDirty | m_bEffectsDirty) // Export only if necessary { uint flags = KRdbExportQtSettings; - TDEConfig kconfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/); - kconfig.setGroup("X11"); - bool exportKDEColors = kconfig.readBoolEntry("exportKDEColors", true); + TDEConfig tdeconfig("kcmdisplayrc", true /*readonly*/, false /*no globals*/); + tdeconfig.setGroup("X11"); + bool exportKDEColors = tdeconfig.readBoolEntry("exportKDEColors", true); if (exportKDEColors) flags |= KRdbExportColors; runRdb( flags ); diff --git a/kcontrol/style/keramik/CMakeLists.txt b/kcontrol/style/keramik/CMakeLists.txt index b68be1c2e..e03b85ef3 100644 --- a/kcontrol/style/keramik/CMakeLists.txt +++ b/kcontrol/style/keramik/CMakeLists.txt @@ -23,7 +23,7 @@ link_directories( ##### kstyle_keramik_config (module) ############ tde_add_kpart( kstyle_keramik_config AUTOMOC - SOURCES keramikconf.cpp + SOURCES keramitdeconf.cpp LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/style/keramik/Makefile.am b/kcontrol/style/keramik/Makefile.am index 56fbefa6b..78077b923 100644 --- a/kcontrol/style/keramik/Makefile.am +++ b/kcontrol/style/keramik/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = $(all_includes) -noinst_HEADERS = keramikconf.h +noinst_HEADERS = keramitdeconf.h kde_module_LTLIBRARIES = kstyle_keramik_config.la kstyle_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module kstyle_keramik_config_la_LIBADD = $(LIB_TDEUI) -kstyle_keramik_config_la_SOURCES = keramikconf.cpp +kstyle_keramik_config_la_SOURCES = keramitdeconf.cpp METASOURCES = AUTO diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp deleted file mode 100644 index 3027106cd..000000000 --- a/kcontrol/style/keramik/keramikconf.cpp +++ /dev/null @@ -1,103 +0,0 @@ -/* -Copyright (c) 2003 Maksim Orlovich - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -*/ - -#include -#include -#include -#include -#include -#include - -#include "keramikconf.h" - -extern "C" -{ - KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent) - { - return new KeramikStyleConfig(parent); - } -} - -KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent) -{ - //Should have no margins here, the dialog provides them - TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); - TDEGlobal::locale()->insertCatalogue("kstyle_keramik_config"); - - //highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this); - highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this); - animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this); - - //layout->add(highlightLineEdits); - layout->add(highlightScrollBar); - layout->add(animateProgressBar); - layout->addStretch(1); - - TQSettings s; - //origHlLineEdit = s.readBoolEntry("/keramik/Settings/highlightLineEdits", false); - //highlightLineEdits->setChecked(origHlLineEdit); - - origHlScrollbar = s.readBoolEntry("/keramik/Settings/highlightScrollBar", true); - highlightScrollBar->setChecked(origHlScrollbar); - - origAnimProgressBar = s.readBoolEntry("/keramik/Settings/animateProgressBar", false); - animateProgressBar->setChecked(origAnimProgressBar); - - //connect(highlightLineEdits, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(highlightScrollBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); -} - -KeramikStyleConfig::~KeramikStyleConfig() -{ - TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config"); -} - - -void KeramikStyleConfig::save() -{ - TQSettings s; - //s.writeEntry("/keramik/Settings/highlightLineEdits", highlightLineEdits->isChecked()); - s.writeEntry("/keramik/Settings/highlightScrollBar", highlightScrollBar->isChecked()); - s.writeEntry("/keramik/Settings/animateProgressBar", animateProgressBar->isChecked()); -} - -void KeramikStyleConfig::defaults() -{ - //highlightLineEdits->setChecked(false); - highlightScrollBar->setChecked(true); - animateProgressBar->setChecked(false); - //updateChanged would be done by setChecked already -} - -void KeramikStyleConfig::updateChanged() -{ - if ( /*(highlightLineEdits->isChecked() == origHlLineEdit) &&*/ - (highlightScrollBar->isChecked() == origHlScrollbar) && - (animateProgressBar->isChecked() == origAnimProgressBar) ) - emit changed(false); - else - emit changed(true); -} - -#include "keramikconf.moc" diff --git a/kcontrol/style/keramik/keramikconf.h b/kcontrol/style/keramik/keramikconf.h deleted file mode 100644 index 6de7edb10..000000000 --- a/kcontrol/style/keramik/keramikconf.h +++ /dev/null @@ -1,62 +0,0 @@ -/* -Copyright (c) 2003 Maksim Orlovich - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -*/ - -#ifndef KERAMIK_CONF_H -#define KERAMIK_CONF_H - -class TQCheckBox; - -class KeramikStyleConfig: public TQWidget -{ - Q_OBJECT -public: - KeramikStyleConfig(TQWidget* parent); - ~KeramikStyleConfig(); - - //This signal and the next two slots are the plugin - //page interface -signals: - void changed(bool); - -public slots: - void save(); - void defaults(); - - //Everything below this is internal. -protected slots: - void updateChanged(); - -protected: - //We store settings directly in widgets to - //avoid the hassle of sync'ing things - //TQCheckBox* highlightLineEdits; - TQCheckBox* animateProgressBar; - TQCheckBox* highlightScrollBar; - - //Original settings, for accurate dirtiness tracking - //bool origHlLineEdit; - bool origAnimProgressBar; - bool origHlScrollbar; -}; - -#endif diff --git a/kcontrol/style/keramik/keramitdeconf.cpp b/kcontrol/style/keramik/keramitdeconf.cpp new file mode 100644 index 000000000..742842876 --- /dev/null +++ b/kcontrol/style/keramik/keramitdeconf.cpp @@ -0,0 +1,103 @@ +/* +Copyright (c) 2003 Maksim Orlovich + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +*/ + +#include +#include +#include +#include +#include +#include + +#include "keramitdeconf.h" + +extern "C" +{ + KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent) + { + return new KeramikStyleConfig(parent); + } +} + +KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent) +{ + //Should have no margins here, the dialog provides them + TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); + TDEGlobal::locale()->insertCatalogue("kstyle_keramik_config"); + + //highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this); + highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this); + animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this); + + //layout->add(highlightLineEdits); + layout->add(highlightScrollBar); + layout->add(animateProgressBar); + layout->addStretch(1); + + TQSettings s; + //origHlLineEdit = s.readBoolEntry("/keramik/Settings/highlightLineEdits", false); + //highlightLineEdits->setChecked(origHlLineEdit); + + origHlScrollbar = s.readBoolEntry("/keramik/Settings/highlightScrollBar", true); + highlightScrollBar->setChecked(origHlScrollbar); + + origAnimProgressBar = s.readBoolEntry("/keramik/Settings/animateProgressBar", false); + animateProgressBar->setChecked(origAnimProgressBar); + + //connect(highlightLineEdits, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); + connect(highlightScrollBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); + connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); +} + +KeramikStyleConfig::~KeramikStyleConfig() +{ + TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config"); +} + + +void KeramikStyleConfig::save() +{ + TQSettings s; + //s.writeEntry("/keramik/Settings/highlightLineEdits", highlightLineEdits->isChecked()); + s.writeEntry("/keramik/Settings/highlightScrollBar", highlightScrollBar->isChecked()); + s.writeEntry("/keramik/Settings/animateProgressBar", animateProgressBar->isChecked()); +} + +void KeramikStyleConfig::defaults() +{ + //highlightLineEdits->setChecked(false); + highlightScrollBar->setChecked(true); + animateProgressBar->setChecked(false); + //updateChanged would be done by setChecked already +} + +void KeramikStyleConfig::updateChanged() +{ + if ( /*(highlightLineEdits->isChecked() == origHlLineEdit) &&*/ + (highlightScrollBar->isChecked() == origHlScrollbar) && + (animateProgressBar->isChecked() == origAnimProgressBar) ) + emit changed(false); + else + emit changed(true); +} + +#include "keramitdeconf.moc" diff --git a/kcontrol/style/keramik/keramitdeconf.h b/kcontrol/style/keramik/keramitdeconf.h new file mode 100644 index 000000000..6de7edb10 --- /dev/null +++ b/kcontrol/style/keramik/keramitdeconf.h @@ -0,0 +1,62 @@ +/* +Copyright (c) 2003 Maksim Orlovich + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +*/ + +#ifndef KERAMIK_CONF_H +#define KERAMIK_CONF_H + +class TQCheckBox; + +class KeramikStyleConfig: public TQWidget +{ + Q_OBJECT +public: + KeramikStyleConfig(TQWidget* parent); + ~KeramikStyleConfig(); + + //This signal and the next two slots are the plugin + //page interface +signals: + void changed(bool); + +public slots: + void save(); + void defaults(); + + //Everything below this is internal. +protected slots: + void updateChanged(); + +protected: + //We store settings directly in widgets to + //avoid the hassle of sync'ing things + //TQCheckBox* highlightLineEdits; + TQCheckBox* animateProgressBar; + TQCheckBox* highlightScrollBar; + + //Original settings, for accurate dirtiness tracking + //bool origHlLineEdit; + bool origAnimProgressBar; + bool origHlScrollbar; +}; + +#endif diff --git a/kcontrol/style/style.desktop b/kcontrol/style/style.desktop index 8786a7700..29d82d316 100644 --- a/kcontrol/style/style.desktop +++ b/kcontrol/style/style.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell style +Exec=tdecmshell style Icon=style Type=Application DocPath=kcontrol/kcmstyle/index.html diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 2429b59bc..1aa7c5a17 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kcontrol/taskbar/kcmtaskbar.desktop b/kcontrol/taskbar/kcmtaskbar.desktop index 204b2e4ec..91d116d89 100644 --- a/kcontrol/taskbar/kcmtaskbar.desktop +++ b/kcontrol/taskbar/kcmtaskbar.desktop @@ -2,7 +2,7 @@ Icon=kmenu Type=Application DocPath=kcontrol/kcmtaskbar/index.html -Exec=kcmshell kcmtaskbar +Exec=tdecmshell kcmtaskbar X-TDE-Library=taskbar diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index e549b38a1..0189c9e56 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/tdm/tdm-appear.h b/kcontrol/tdm/tdm-appear.h index 8ae739c2f..8e0acc93d 100644 --- a/kcontrol/tdm/tdm-appear.h +++ b/kcontrol/tdm/tdm-appear.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include "klanguagebutton.h" diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index d2fbcf002..daa507a51 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -29,10 +29,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/kcontrol/tdm/tdm.desktop b/kcontrol/tdm/tdm.desktop index 0c1b9af1e..ad8591cb4 100644 --- a/kcontrol/tdm/tdm.desktop +++ b/kcontrol/tdm/tdm.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell tdm +Exec=tdecmshell tdm Icon=tdmconfig Type=Application DocPath=tdm/index.html#configuring-tdm diff --git a/kcontrol/usbview/kcmusb.desktop b/kcontrol/usbview/kcmusb.desktop index 2c3586b05..f8825b7f5 100644 --- a/kcontrol/usbview/kcmusb.desktop +++ b/kcontrol/usbview/kcmusb.desktop @@ -2,7 +2,7 @@ Icon=usb Type=Application DocPath=kinfocenter/usb/index.html -Exec=kcmshell kcmusb +Exec=tdecmshell kcmusb X-TDE-Library=usb X-TDE-ParentApp=kinfocenter diff --git a/kcontrol/view1394/kcmview1394.desktop b/kcontrol/view1394/kcmview1394.desktop index 0b4a5bf34..61dfde6e2 100644 --- a/kcontrol/view1394/kcmview1394.desktop +++ b/kcontrol/view1394/kcmview1394.desktop @@ -2,7 +2,7 @@ Icon=ieee1394 Type=Application DocPath=kinfocenter/view1394/index.html -Exec=kcmshell kcmview1394 +Exec=tdecmshell kcmview1394 X-TDE-Library=view1394 X-TDE-ParentApp=kinfocenter diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index 9d1819223..e86689f2d 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/xinerama/xinerama.desktop b/kcontrol/xinerama/xinerama.desktop index c561d7f9d..1fc8b0774 100644 --- a/kcontrol/xinerama/xinerama.desktop +++ b/kcontrol/xinerama/xinerama.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=identity Type=Application -Exec=kcmshell xinerama +Exec=tdecmshell xinerama DocPath=kcontrol/multiplemonitors.html X-TDE-Library=xinerama -- cgit v1.2.1