From 81fe3b6728d4530040c7efb088ed67e1d2493741 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 8 Jun 2012 15:47:02 -0500 Subject: Update XDG information in support of bug report 892. --- kdejava/koala/org/kde/koala/KCModule.java | 2 +- kdejava/koala/org/kde/koala/KCModuleInfo.java | 2 +- kdejava/koala/org/kde/koala/KCModuleLoader.java | 2 +- kdejava/koala/org/kde/koala/KDEDesktopMimeType.java | 2 +- kdejava/koala/org/kde/koala/KFilePlugin.java | 2 +- kdejava/koala/org/kde/koala/KMimeType.java | 2 +- kdejava/koala/org/kde/koala/KPanelApplet.java | 10 +++++----- kdejava/koala/org/kde/koala/KPanelExtension.java | 10 +++++----- kdejava/koala/org/kde/koala/KPanelMenu.java | 2 +- kdejava/koala/org/kde/koala/KRun.java | 4 ++-- kdejava/koala/org/kde/koala/KServiceGroup.java | 6 +++--- kdejava/koala/org/kde/koala/KTrader.java | 6 +++--- kdejava/koala/org/kde/koala/KUniqueApplication.java | 2 +- kdejava/koala/org/kde/koala/Plugin.java | 2 +- kjsembed/binding_type.desktop | 2 +- kjsembed/docs/embedding/simple-embed/embedjs.desktop | 2 +- kjsembed/docs/examples/buttonmaker/buttonmaker.desktop | 2 +- kjsembed/docs/examples/envelopemaker/envelopemaker.desktop | 2 +- kjsembed/kjscmd.desktop | 2 +- kjsembed/kscript/javascript.desktop | 4 ++-- kjsembed/kscript/swaptabs.desktop | 2 +- kjsembed/plugins/customobject_plugin.desktop | 2 +- kjsembed/plugins/customqobject_plugin.desktop | 2 +- kjsembed/plugins/imagefx_plugin.desktop | 2 +- kjsembed/plugins/kfileitem_plugin.desktop | 2 +- kjsembed/plugins/qprocess_plugin.desktop | 2 +- xparts/mozilla/kmozilla.desktop | 2 +- xparts/xpart_notepad/xp_notepad.desktop | 2 +- 28 files changed, 42 insertions(+), 42 deletions(-) diff --git a/kdejava/koala/org/kde/koala/KCModule.java b/kdejava/koala/org/kde/koala/KCModule.java index 8dfe8a55..f1798402 100644 --- a/kdejava/koala/org/kde/koala/KCModule.java +++ b/kdejava/koala/org/kde/koala/KCModule.java @@ -230,7 +230,7 @@ public class KCModule extends TQWidget { /** Sets the RootOnly message. This message will be shown at the top of the module of the - corresponding desktop file contains the line X-KDE-RootOnly=true. + corresponding desktop file contains the line X-TDE-RootOnly=true. If no message is set, a default one will be used. @short Sets the RootOnly message. @see KCModule#rootOnlyMsg diff --git a/kdejava/koala/org/kde/koala/KCModuleInfo.java b/kdejava/koala/org/kde/koala/KCModuleInfo.java index a5faf1c4..de3f3679 100644 --- a/kdejava/koala/org/kde/koala/KCModuleInfo.java +++ b/kdejava/koala/org/kde/koala/KCModuleInfo.java @@ -136,7 +136,7 @@ public class KCModuleInfo implements QtSupport { public native String handle(); /** @return the weight of the module which determines the order of the pages in - the KCMultiDialog. It's set by the X-KDE-Weight field. + the KCMultiDialog. It's set by the X-TDE-Weight field. @short */ diff --git a/kdejava/koala/org/kde/koala/KCModuleLoader.java b/kdejava/koala/org/kde/koala/KCModuleLoader.java index 41a84ed9..cd55d623 100644 --- a/kdejava/koala/org/kde/koala/KCModuleLoader.java +++ b/kdejava/koala/org/kde/koala/KCModuleLoader.java @@ -75,7 +75,7 @@ public class KCModuleLoader implements QtSupport { test function. If it is unsure whether a module should be shown, it should be made available, leaving the decision to the user. If false is returned, the module should not be loaded in any interface. - A module declares it needs to be tested by having "X-KDE-Test-Module=true" in + A module declares it needs to be tested by having "X-TDE-Test-Module=true" in its desktop file. When that line exists, the following code must be available in the module's library:
diff --git a/kdejava/koala/org/kde/koala/KDEDesktopMimeType.java b/kdejava/koala/org/kde/koala/KDEDesktopMimeType.java
index ead7e1dc..d5b7a18f 100644
--- a/kdejava/koala/org/kde/koala/KDEDesktopMimeType.java
+++ b/kdejava/koala/org/kde/koala/KDEDesktopMimeType.java
@@ -75,7 +75,7 @@ public class KDEDesktopMimeType extends KMimeType  {
 	/**	
 		 Overload of userDefinedServices but also allows you to pass a list of urls for this file.
 		 This allows for the menu to be changed depending on the exact files via
-		 the X-KDE-GetActionMenu extension.
+		 the X-TDE-GetActionMenu extension.
 				@short    Overload of userDefinedServices but also allows you to pass a list of urls for this file.
 	*/
 	// TQValueList userDefinedServices(const TQString& arg1,KConfig& arg2,bool arg3,const KURL::List& arg4); >>>> NOT CONVERTED
diff --git a/kdejava/koala/org/kde/koala/KFilePlugin.java b/kdejava/koala/org/kde/koala/KFilePlugin.java
index 704330fa..000c4ac4 100644
--- a/kdejava/koala/org/kde/koala/KFilePlugin.java
+++ b/kdejava/koala/org/kde/koala/KFilePlugin.java
@@ -115,7 +115,7 @@ import org.kde.qt.TQObject;
   Type=Service
   Name=Foo Info
   ServiceTypes=KFilePlugin
-  X-KDE-Library=kfile_foo
+  X-TDE-Library=kfile_foo
   MimeType=application/x-foo
   PreferredGroups=FooInfo
   PreferredItems=Items,Size
diff --git a/kdejava/koala/org/kde/koala/KMimeType.java b/kdejava/koala/org/kde/koala/KMimeType.java
index bab07d89..586a9530 100644
--- a/kdejava/koala/org/kde/koala/KMimeType.java
+++ b/kdejava/koala/org/kde/koala/KMimeType.java
@@ -194,7 +194,7 @@ public class KMimeType extends KServiceType  {
 		 If this mimetype inherits from ("is also") another mimetype,
 		 return the name of the parent.
 			 For instance a text/x-log is a special kind of text/plain,
-		 so the definition of text/x-log can say "X-KDE-IsAlso=text/plain".
+		 so the definition of text/x-log can say "X-TDE-IsAlso=text/plain".
 		 Or an smb-workgroup is a special kind of inode/directory, etc.
 		 This mechanism can also be used to rename mimetypes and preserve compat.
 			 Note that this notion doesn't map to the servicetype inheritance mechanism,
diff --git a/kdejava/koala/org/kde/koala/KPanelApplet.java b/kdejava/koala/org/kde/koala/KPanelApplet.java
index f008a60b..abff7872 100644
--- a/kdejava/koala/org/kde/koala/KPanelApplet.java
+++ b/kdejava/koala/org/kde/koala/KPanelApplet.java
@@ -29,10 +29,10 @@ import org.kde.qt.TQFrame;
  install a desktop file there to be recognized by the panel.
  Besides standard keys like "Name", "Comment" and "Icon" there are
  two panel applet specific keys:
- 
  • X-KDE-Library
  • +
  • X-TDE-Library
  • Used by the panel to locate the applet DSO (Dynamic Shared Object) - Example: X-KDE-Library=libexampleapplet -
  • X-KDE-UniqueApplet
  • + Example: X-TDE-Library=libexampleapplet +
  • X-TDE-UniqueApplet
  • Similar to KApplication and KUniqueApplication there are two types of panel applets. Use unique applets when it makes no sence to run more than one instance of a applet in the panel. A @@ -40,8 +40,8 @@ import org.kde.qt.TQFrame; applets when you need instance specific configuration. An example is the koolclock applet where you might want to run two instances in your panel, one configured as analog clock, the other one as - digital clock. X-KDE-UniqueApplet is a booleanean key which defaults - to "false". Example: X-KDE-UniqueApplet=true + digital clock. X-TDE-UniqueApplet is a booleanean key which defaults + to "false". Example: X-TDE-UniqueApplet=true Back to panel applet DSOs, the following conventions are used for %KDE: Name: libapplet.la LDFLAGS: -module -no-undefined diff --git a/kdejava/koala/org/kde/koala/KPanelExtension.java b/kdejava/koala/org/kde/koala/KPanelExtension.java index bb64f64e..b9175cc8 100644 --- a/kdejava/koala/org/kde/koala/KPanelExtension.java +++ b/kdejava/koala/org/kde/koala/KPanelExtension.java @@ -28,18 +28,18 @@ import org.kde.qt.TQFrame; install a desktop file there to be recognized by the panel. Besides standard keys like "Name", "Comment" and "Icon" there are two panel extension specific keys: -
  • X-KDE-Library
  • +
  • X-TDE-Library
  • Used by the panel to locate the extension DSO (Dynamic Shared Object) - Example: X-KDE-Library=libexampleextension -
  • X-KDE-UniqueExtension
  • + Example: X-TDE-Library=libexampleextension +
  • X-TDE-UniqueExtension
  • Similar to KApplication and KUniqueApplication there are two types of panel extensions. Use unique extensions when it makes no sence to run more than one instance of an extension in the panel. A good example for unique extensions is the taskbar extension. Use normal extensions when you need instance specific configuration. An example is a subpanel extension where you might want to run more than one instances. - X-KDE-UniqueExtension is a booleanean key which defaults - to "false". Example: X-KDE-UniqueExtension=true + X-TDE-UniqueExtension is a booleanean key which defaults + to "false". Example: X-TDE-UniqueExtension=true Back to panel extension DSOs, the following conventions are used for KDE: Name: libextension.la LDFLAGS: -module -no-undefined diff --git a/kdejava/koala/org/kde/koala/KPanelMenu.java b/kdejava/koala/org/kde/koala/KPanelMenu.java index d4b77f47..110da686 100644 --- a/kdejava/koala/org/kde/koala/KPanelMenu.java +++ b/kdejava/koala/org/kde/koala/KPanelMenu.java @@ -16,7 +16,7 @@ import org.kde.qt.TQWidget; object in your library, see KLibFactory. This factory is only used to construct the menu object. Finally, you also have to provide a desktop file describing your dynamic menu. The - relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the + relevant entries are: Name, Comment, Icon and X-TDE-Library (which contains the library name without any extension). This desktop file has to be installed in $TDEDIR/share/apps/kicker/menuext/. @author The kicker maintainers, Michael Goffioul diff --git a/kdejava/koala/org/kde/koala/KRun.java b/kdejava/koala/org/kde/koala/KRun.java index 210da4d3..cff760be 100644 --- a/kdejava/koala/org/kde/koala/KRun.java +++ b/kdejava/koala/org/kde/koala/KRun.java @@ -154,7 +154,7 @@ public class KRun extends TQObject { Set the preferred service for opening this URL, after its mimetype will have been found by KRun. IMPORTANT: the service is only used if its configuration says it can handle this mimetype. - This is used for instance for the X-KDE-LastOpenedWith key, for + This is used for instance for the X-TDE-LastOpenedWith key, for the recent documents list. @param desktopEntryName the desktopEntryName of the service, e.g. "kate". @short Set the preferred service for opening this URL, after its mimetype will have been found by KRun. @@ -313,7 +313,7 @@ public class KRun extends TQObject { -# The mime type must inherit application/x-executable or application/x-executable-script. To allow a script to run when the above rules are satisfied add the entry @code - X-KDE-IsAlso=application/x-executable-script + X-TDE-IsAlso=application/x-executable-script @endcode to the mimetype's desktop file. @short Returns wether the url of mimetype is executable. diff --git a/kdejava/koala/org/kde/koala/KServiceGroup.java b/kdejava/koala/org/kde/koala/KServiceGroup.java index 87e08a23..fcbb89ef 100644 --- a/kdejava/koala/org/kde/koala/KServiceGroup.java +++ b/kdejava/koala/org/kde/koala/KServiceGroup.java @@ -221,7 +221,7 @@ public class KServiceGroup extends KSycocaEntry { By default, "Settings/" is the kcontrol base group ("settings") and "System/Screensavers/" is the screensavers base group ("screensavers"). This allows moving the groups without breaking those apps. - The base group is defined by the X-KDE-BaseGroup key + The base group is defined by the X-TDE-BaseGroup key in the .directory file. @return the base group name, or null if no base group @@ -263,12 +263,12 @@ public class KServiceGroup extends KSycocaEntry { */ // KServiceGroup::Ptr group(const TQString& arg1); >>>> NOT CONVERTED /** - Returns the group of services that have X-KDE-ParentApp equal + Returns the group of services that have X-TDE-ParentApp equal to parent (siblings). @param parent the name of the service's parent @return the services group - @short Returns the group of services that have X-KDE-ParentApp equal to parent (siblings). + @short Returns the group of services that have X-TDE-ParentApp equal to parent (siblings). */ // KServiceGroup::Ptr childGroup(const TQString& arg1); >>>> NOT CONVERTED /** diff --git a/kdejava/koala/org/kde/koala/KTrader.java b/kdejava/koala/org/kde/koala/KTrader.java index 8f202be5..8b28f6c2 100644 --- a/kdejava/koala/org/kde/koala/KTrader.java +++ b/kdejava/koala/org/kde/koala/KTrader.java @@ -59,13 +59,13 @@ import org.kde.qt.TQObject; Please note that when including property names containing arithmetic operators like - or +, then you have to put brackets around the property name, in order to correctly separate arithmetic operations from the name. So for example a constraint expression like - X-KDE-Blah < 4 + X-TDE-Blah < 4 needs to be written as - [X-KDE-Blah] < 4 + [X-TDE-Blah] < 4 otherwise it could also be interpreted as Substract the numeric value of the property "KDE" and "Blah" from the property "X" and make sure it is less than 4. - Instead of the other meaning, make sure that the numeric value of "X-KDE-Blah" is less than 4. + Instead of the other meaning, make sure that the numeric value of "X-TDE-Blah" is less than 4. See also the formal syntax defined in {@link #tradersyntax} . @author Torben Weis diff --git a/kdejava/koala/org/kde/koala/KUniqueApplication.java b/kdejava/koala/org/kde/koala/KUniqueApplication.java index 17ac6f5f..0955b941 100644 --- a/kdejava/koala/org/kde/koala/KUniqueApplication.java +++ b/kdejava/koala/org/kde/koala/KUniqueApplication.java @@ -19,7 +19,7 @@ import java.util.ArrayList; see kapplication.h If your application is used to open files, it should also support the --tempfile option (see KCmdLineArgs.addTempFileOption()), to delete tempfiles after use. - Add X-KDE-HasTempFileOption=true to the .desktop file to indicate this. + Add X-TDE-HasTempFileOption=true to the .desktop file to indicate this. @author Preston Brown @short Maintains only a single instance of a running application at a time. diff --git a/kdejava/koala/org/kde/koala/Plugin.java b/kdejava/koala/org/kde/koala/Plugin.java index 63d973bb..349f4536 100644 --- a/kdejava/koala/org/kde/koala/Plugin.java +++ b/kdejava/koala/org/kde/koala/Plugin.java @@ -92,7 +92,7 @@ public class Plugin extends TQObject implements KXMLGUIClientInterface { plugins are enabled and which are disabled. What happens by default (i.e. for new plugins that are not in that config file) is controlled by enableNewPluginsByDefault. It can be overridden by the plugin if it - sets the X-KDE-PluginInfo-EnabledByDefault key in the .desktop file + sets the X-TDE-PluginInfo-EnabledByDefault key in the .desktop file (with the same name as the .rc file) If a disabled plugin is already loaded it will be removed from the GUI factory and deleted. diff --git a/kjsembed/binding_type.desktop b/kjsembed/binding_type.desktop index 0b8d0ca3..2a155ecf 100644 --- a/kjsembed/binding_type.desktop +++ b/kjsembed/binding_type.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Type=ServiceType -X-KDE-ServiceType=JSBindingPlugin/Binding +X-TDE-ServiceType=JSBindingPlugin/Binding diff --git a/kjsembed/docs/embedding/simple-embed/embedjs.desktop b/kjsembed/docs/embedding/simple-embed/embedjs.desktop index 8763191f..ec3b68ae 100644 --- a/kjsembed/docs/embedding/simple-embed/embedjs.desktop +++ b/kjsembed/docs/embedding/simple-embed/embedjs.desktop @@ -3,7 +3,7 @@ Name=EmbedJS Name[xx]=xxEmbedJSxx Exec=embedjs %i %m -caption "%c" Icon=embedjs -Categories=Qt;KDE;Debugger;Development; +Categories=Qt;TDE;Debugger;Development; Type=Application DocPath=embedjs/embedjs.html Comment=A TDE KPart Application diff --git a/kjsembed/docs/examples/buttonmaker/buttonmaker.desktop b/kjsembed/docs/examples/buttonmaker/buttonmaker.desktop index 5ecb4524..12768f39 100644 --- a/kjsembed/docs/examples/buttonmaker/buttonmaker.desktop +++ b/kjsembed/docs/examples/buttonmaker/buttonmaker.desktop @@ -7,4 +7,4 @@ Name=ButtonMaker StartupNotify=true Terminal=false Type=Application -X-KDE-SubstituteUID=false +X-TDE-SubstituteUID=false diff --git a/kjsembed/docs/examples/envelopemaker/envelopemaker.desktop b/kjsembed/docs/examples/envelopemaker/envelopemaker.desktop index 03d326df..29817735 100644 --- a/kjsembed/docs/examples/envelopemaker/envelopemaker.desktop +++ b/kjsembed/docs/examples/envelopemaker/envelopemaker.desktop @@ -7,4 +7,4 @@ Name=Envelope Maker StartupNotify=true Terminal=false Type=Application -X-KDE-SubstituteUID=false +X-TDE-SubstituteUID=false diff --git a/kjsembed/kjscmd.desktop b/kjsembed/kjscmd.desktop index 3de84bfe..a500a1b0 100644 --- a/kjsembed/kjscmd.desktop +++ b/kjsembed/kjscmd.desktop @@ -6,6 +6,6 @@ Exec=kjscmd --exec Icon=konsole Terminal=false X-DCOP-ServiceType=Multi -Categories=Qt;KDE;Development;Debugger; +Categories=Qt;TDE;Development;Debugger; InitialPreference=10 diff --git a/kjsembed/kscript/javascript.desktop b/kjsembed/kscript/javascript.desktop index 0055e68a..1d612975 100644 --- a/kjsembed/kscript/javascript.desktop +++ b/kjsembed/kscript/javascript.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=KJSEmbed Script Runner Type=Service -X-KDE-Library=libjavascript -X-KDE-Script-Runner=JavaScript/kjs +X-TDE-Library=libjavascript +X-TDE-Script-Runner=JavaScript/kjs ServiceTypes=KScriptRunner/KScriptRunner Comment=Javascript scripts from inside the application. diff --git a/kjsembed/kscript/swaptabs.desktop b/kjsembed/kscript/swaptabs.desktop index 7de4dcfa..ebe80ab9 100644 --- a/kjsembed/kscript/swaptabs.desktop +++ b/kjsembed/kscript/swaptabs.desktop @@ -2,4 +2,4 @@ Name=Swap tabs and spaces. Comment=Swap tabs and space indentation in text. Type=JavaScript/kjs -X-KDE-ScriptName=swaptabs.js +X-TDE-ScriptName=swaptabs.js diff --git a/kjsembed/plugins/customobject_plugin.desktop b/kjsembed/plugins/customobject_plugin.desktop index 129e8639..5a319cc6 100644 --- a/kjsembed/plugins/customobject_plugin.desktop +++ b/kjsembed/plugins/customobject_plugin.desktop @@ -2,4 +2,4 @@ Name=MyCustomObject ServiceTypes=JSBindingPlugin/Binding Type=Service -X-KDE-Library=libcustomobjectplugin +X-TDE-Library=libcustomobjectplugin diff --git a/kjsembed/plugins/customqobject_plugin.desktop b/kjsembed/plugins/customqobject_plugin.desktop index 7f4ae202..e4ef7ac1 100644 --- a/kjsembed/plugins/customqobject_plugin.desktop +++ b/kjsembed/plugins/customqobject_plugin.desktop @@ -2,4 +2,4 @@ Name=MyCustomTQObject ServiceTypes=JSBindingPlugin/Binding Type=Service -X-KDE-Library=libcustomqobjectplugin +X-TDE-Library=libcustomqobjectplugin diff --git a/kjsembed/plugins/imagefx_plugin.desktop b/kjsembed/plugins/imagefx_plugin.desktop index 36921e3b..1bec93e3 100644 --- a/kjsembed/plugins/imagefx_plugin.desktop +++ b/kjsembed/plugins/imagefx_plugin.desktop @@ -2,4 +2,4 @@ Name=ImageFX ServiceTypes=JSBindingPlugin/Binding Type=Service -X-KDE-Library=libimagefxplugin +X-TDE-Library=libimagefxplugin diff --git a/kjsembed/plugins/kfileitem_plugin.desktop b/kjsembed/plugins/kfileitem_plugin.desktop index 2cdab9aa..f5f91552 100644 --- a/kjsembed/plugins/kfileitem_plugin.desktop +++ b/kjsembed/plugins/kfileitem_plugin.desktop @@ -2,4 +2,4 @@ Name=KFileItem ServiceTypes=JSBindingPlugin/Binding Type=Service -X-KDE-Library=libfileitemplugin +X-TDE-Library=libfileitemplugin diff --git a/kjsembed/plugins/qprocess_plugin.desktop b/kjsembed/plugins/qprocess_plugin.desktop index 91d18c99..64bd0b72 100644 --- a/kjsembed/plugins/qprocess_plugin.desktop +++ b/kjsembed/plugins/qprocess_plugin.desktop @@ -2,4 +2,4 @@ Name=Process ServiceTypes=JSBindingPlugin/Binding Type=Service -X-KDE-Library=libqprocessplugin +X-TDE-Library=libqprocessplugin diff --git a/xparts/mozilla/kmozilla.desktop b/xparts/mozilla/kmozilla.desktop index de54312f..16b79c92 100644 --- a/xparts/mozilla/kmozilla.desktop +++ b/xparts/mozilla/kmozilla.desktop @@ -6,4 +6,4 @@ MimeType=text/html;text/xml; Icon=konqueror Name=KMOZILLA ServiceTypes=KParts/ReadOnlyPart,Browser/View -X-KDE-Library=libkmozillapart +X-TDE-Library=libkmozillapart diff --git a/xparts/xpart_notepad/xp_notepad.desktop b/xparts/xpart_notepad/xp_notepad.desktop index bda514ed..2a802b6f 100644 --- a/xparts/xpart_notepad/xp_notepad.desktop +++ b/xparts/xpart_notepad/xp_notepad.desktop @@ -6,4 +6,4 @@ Icon= Name=XNotepad (XPart example) MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;text/x-diff; ServiceTypes=KParts/ReadOnlyPart -X-KDE-Library=libxp_notepadpart +X-TDE-Library=libxp_notepadpart -- cgit v1.2.1