Browse Source

Update XDG information in support of bug report 892.

tags/r14.0.0
Darrell Anderson 8 years ago
parent
commit
6ed1ea98db
100 changed files with 297 additions and 297 deletions
  1. +6
    -6
      KDE3PORTING.html
  2. +1
    -1
      arts/kde/mcop-dcop/kmcop.desktop
  3. +1
    -1
      arts/knotify/knotify.desktop
  4. +1
    -1
      interfaces/khexedit/kbytesedit.desktop
  5. +1
    -1
      interfaces/kimproxy/interface/dcopinstantmessenger.desktop
  6. +2
    -2
      interfaces/kmediaplayer/kmediaplayer.desktop
  7. +1
    -1
      interfaces/kmediaplayer/kmediaplayerengine.desktop
  8. +1
    -1
      interfaces/kregexpeditor/kregexpeditor.desktop
  9. +2
    -2
      interfaces/kscript/sample/shellscript.desktop
  10. +1
    -1
      interfaces/kscript/scriptclientinterface.h
  11. +2
    -2
      interfaces/kscript/scriptinterface.desktop
  12. +2
    -2
      interfaces/kscript/scriptmanager.cpp
  13. +1
    -1
      interfaces/kspeech/dcoptexttospeech.desktop
  14. +2
    -2
      interfaces/ktexteditor/ktexteditor.desktop
  15. +2
    -2
      interfaces/ktexteditor/ktexteditoreditor.desktop
  16. +2
    -2
      interfaces/ktexteditor/ktexteditorplugin.desktop
  17. +1
    -1
      kabc/formatfactory.cpp
  18. +1
    -1
      kabc/formats/binary.desktop
  19. +1
    -1
      kabc/kab2kabc.desktop
  20. +1
    -1
      kabc/kabc_manager.desktop
  21. +3
    -3
      kabc/plugins/dir/dir.desktop
  22. +3
    -3
      kabc/plugins/evolution/evolution.desktop
  23. +3
    -3
      kabc/plugins/file/file.desktop
  24. +3
    -3
      kabc/plugins/ldapkio/ldapkio.desktop
  25. +3
    -3
      kabc/plugins/net/net.desktop
  26. +1
    -1
      kabc/plugins/sql/sql.desktop
  27. +1
    -1
      kate/data/katepart.desktop
  28. +1
    -1
      kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
  29. +1
    -1
      kate/plugins/insertfile/ktexteditor_insertfile.desktop
  30. +1
    -1
      kate/plugins/isearch/ktexteditor_isearch.desktop
  31. +1
    -1
      kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
  32. +1
    -1
      kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
  33. +1
    -1
      kcert/kcertpart.desktop
  34. +5
    -5
      kded/README.kded
  35. +32
    -32
      kded/applications.menu
  36. +1
    -1
      kded/kbuildservicegroupfactory.h
  37. +1
    -1
      kded/kbuildservicetypefactory.cpp
  38. +8
    -8
      kded/kded.cpp
  39. +4
    -4
      kded/kdedmodule.desktop
  40. +5
    -5
      kded/test/test.desktop
  41. +1
    -1
      kfile-plugins/elf/kfile_elf.desktop
  42. +1
    -1
      khtml/ecma/kjs_navigator.cpp
  43. +2
    -2
      khtml/java/kjavaappletviewer.desktop
  44. +1
    -1
      khtml/khtml.desktop
  45. +1
    -1
      khtml/khtmlimage.desktop
  46. +1
    -1
      khtml/kmultipart/kmultipart.desktop
  47. +4
    -4
      kinit/README.autostart
  48. +4
    -4
      kinit/autostart.cpp
  49. +7
    -7
      kio/DESIGN.mimetypes
  50. +8
    -8
      kio/application.desktop
  51. +8
    -8
      kio/kcmodule.desktop
  52. +1
    -1
      kio/kcomprfilter.desktop
  53. +1
    -1
      kio/kdatatool.desktop
  54. +3
    -3
      kio/kfile/kfiledialog.cpp
  55. +2
    -2
      kio/kfile/kfilemetapreview.cpp
  56. +1
    -1
      kio/kfile/kopenwith.cpp
  57. +15
    -15
      kio/kfile/kpropertiesdialog.cpp
  58. +1
    -1
      kio/kfile/kpropertiesdialog.h
  59. +2
    -2
      kio/kfile/kpropsdlgplugin.desktop
  60. +2
    -2
      kio/kfile/krecentdocument.cpp
  61. +1
    -1
      kio/kfileplugin.desktop
  62. +1
    -1
      kio/kio/job.cpp
  63. +2
    -2
      kio/kio/kfilemetainfo.cpp
  64. +2
    -2
      kio/kio/kfilemetainfo.h
  65. +14
    -14
      kio/kio/kmimetype.cpp
  66. +2
    -2
      kio/kio/kmimetype.h
  67. +5
    -5
      kio/kio/krun.cpp
  68. +2
    -2
      kio/kio/krun.h
  69. +10
    -10
      kio/kio/kservice.cpp
  70. +1
    -1
      kio/kio/kservicefactory.h
  71. +2
    -2
      kio/kio/kservicegroup.cpp
  72. +2
    -2
      kio/kio/kservicegroup.h
  73. +5
    -5
      kio/kio/kservicetype.cpp
  74. +5
    -5
      kio/kio/ktrader.h
  75. +2
    -2
      kio/kio/previewjob.cpp
  76. +1
    -1
      kio/kio/thumbcreator.h
  77. +5
    -5
      kio/kpasswdserver.desktop
  78. +1
    -1
      kio/kscan.desktop
  79. +1
    -1
      kio/kurifilterplugin.desktop
  80. +1
    -1
      kio/misc/kio_uiserver.desktop
  81. +5
    -5
      kio/misc/kpac/proxyscout.desktop
  82. +5
    -5
      kio/misc/kssld/kssld.desktop
  83. +5
    -5
      kio/misc/kwalletd/kwalletd.desktop
  84. +1
    -1
      kio/renamedlgplugin.desktop
  85. +1
    -1
      kio/tests/dummymeta.desktop
  86. +1
    -1
      kio/tests/kruntest.cpp
  87. +1
    -1
      kioslave/bzip2/kbzip2filter.desktop
  88. +1
    -1
      kioslave/gzip/kgzipfilter.desktop
  89. +1
    -1
      kioslave/http/http_cache_cleaner.desktop
  90. +6
    -6
      kioslave/http/kcookiejar/kcookiejar.desktop
  91. +1
    -1
      kioslave/iso/kio_iso.desktop
  92. +15
    -15
      kparts/browserview.desktop
  93. +1
    -1
      kparts/kpart.desktop
  94. +2
    -2
      kparts/krop.desktop
  95. +2
    -2
      kparts/krwp.desktop
  96. +1
    -1
      kparts/plugin.cpp
  97. +1
    -1
      kparts/plugin.h
  98. +1
    -1
      kparts/tests/notepad.desktop
  99. +2
    -2
      kresources/configpage.cpp
  100. +2
    -2
      kresources/factory.cpp

+ 6
- 6
KDE3PORTING.html View File

@@ -624,17 +624,17 @@ The change should affect only code using hardcoded numeric values instead of usi
<H3><A NAME="kcontrol">Changes in KControl</A></H3>

<H4>Modules that require root permission</H4>
The meaning of the <i>X-KDE-RootOnly</i> flag in the .desktop files has changed.
The meaning of the <i>X-TDE-RootOnly</i> flag in the .desktop files has changed.
In KControl 2.0 a message was shown if the user did not press the &quot;modify&quot;
button. With the additional flag <i>X-KDE-HasReadOnlyMode</i> it was possible to show
button. With the additional flag <i>X-TDE-HasReadOnlyMode</i> it was possible to show
a disabled version of the module instead of the message. The behavior was inconsistent
and has been changed:

<ul>
<li><i>X-KDE-HasReadOnlyMode</i> is not used anymore and is ignored by KControl &gt; 2.0.
<li><i>X-KDE-RootOnly</i> does now show a disabled preview of the widget and a notification box.
<li>If you want the old behavior back set <i>X-KDE-IsHiddenByDefault</i> along with
<i>X-KDE-RootOnly</i>. Please note that this behavior is deprecated the sake of
<li><i>X-TDE-HasReadOnlyMode</i> is not used anymore and is ignored by KControl &gt; 2.0.
<li><i>X-TDE-RootOnly</i> does now show a disabled preview of the widget and a notification box.
<li>If you want the old behavior back set <i>X-TDE-IsHiddenByDefault</i> along with
<i>X-TDE-RootOnly</i>. Please note that this behavior is deprecated the sake of
usability.
</ul>



+ 1
- 1
arts/kde/mcop-dcop/kmcop.desktop View File

@@ -87,4 +87,4 @@ Comment[zu]=Ibhulogo le-TDE MCOP-DCOP
Icon=kmcop
ServiceTypes=KMCOP
X-DCOP-ServiceType=Unique
X-KDE-StartupNotify=false
X-TDE-StartupNotify=false

+ 1
- 1
arts/knotify/knotify.desktop View File

@@ -116,4 +116,4 @@ Comment[zu]=Isaziso se-Daemon ye-TDE
Icon=knotify
ServiceTypes=KNotify
X-DCOP-ServiceType=Unique
X-KDE-StartupNotify=false
X-TDE-StartupNotify=false

+ 1
- 1
interfaces/khexedit/kbytesedit.desktop View File

@@ -1,4 +1,4 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KHexEdit/KBytesEdit
X-TDE-ServiceType=KHexEdit/KBytesEdit


+ 1
- 1
interfaces/kimproxy/interface/dcopinstantmessenger.desktop View File

@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=DCOP/InstantMessenger
X-TDE-ServiceType=DCOP/InstantMessenger
Comment=Instant Messenger with a DCOP interface
Comment[af]=Oombliklike Boodskapper met DCOP intervlak
Comment[be]=Імгненны абвестнік з інтэрфэйсам DCOP


+ 2
- 2
interfaces/kmediaplayer/kmediaplayer.desktop View File

@@ -1,4 +1,4 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KMediaPlayer/Player
X-KDE-Derived=KParts/ReadOnlyPart
X-TDE-ServiceType=KMediaPlayer/Player
X-TDE-Derived=KParts/ReadOnlyPart

+ 1
- 1
interfaces/kmediaplayer/kmediaplayerengine.desktop View File

@@ -1,3 +1,3 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KMediaPlayer/Engine
X-TDE-ServiceType=KMediaPlayer/Engine

+ 1
- 1
interfaces/kregexpeditor/kregexpeditor.desktop View File

@@ -1,4 +1,4 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KRegExpEditor/KRegExpEditor
X-TDE-ServiceType=KRegExpEditor/KRegExpEditor


+ 2
- 2
interfaces/kscript/sample/shellscript.desktop View File

@@ -71,8 +71,8 @@ Name[wa]=Enondeu di scripes shell bash
Name[zh_CN]=Bash Shell 脚本运行程序
Name[zh_TW]=Bash Shell Script 執行器
Type=Service
X-KDE-Library=libshellscript
X-KDE-Script-Runner=ShellScript/bash
X-TDE-Library=libshellscript
X-TDE-Script-Runner=ShellScript/bash
ServiceTypes=KScriptRunner/KScriptRunner
Comment=Runs bash shell scripts from inside the application.
Comment[af]=Laai bash tolk skripte vanuit die program.


+ 1
- 1
interfaces/kscript/scriptclientinterface.h View File

@@ -40,7 +40,7 @@ class TQString;
* {
* // Create your @ref KScriptInterface here.
* m_interface = KParts::ComponentFactory::createInstanceFromQuery<KScriptInterface>(
* "KScriptRunner/KScriptRunner", "([X-KDE-Script-Runner] == 'bash/shell')", this );
* "KScriptRunner/KScriptRunner", "([X-TDE-Script-Runner] == 'bash/shell')", this );
* }
*
* virtual ~KScriptAction()


+ 2
- 2
interfaces/kscript/scriptinterface.desktop View File

@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KScriptRunner/KScriptRunner
X-TDE-ServiceType=KScriptRunner/KScriptRunner
Comment=This is a generic test script engine for testing the script interface.
Comment[af]=Hierdie is 'n generies toets skrip masjien vir toetsing die skrip koppelvlak.
Comment[ar]=هذه آلة نصوص برمجية اختبارية لاختبار واجهة النص البرمجي.
@@ -84,6 +84,6 @@ Comment[zh_HK]=這是用來測試手稿介面用的一般性測試手稿引擎
Comment[zh_TW]=這是用來測試手稿介面用的一般性測試手稿引擎
Comment[zu]=Lena yinjini yesikripti sokuvivinya sawonke wonke yokuvivinya isikripti somxhumanisi.

[PropertyDef::X-KDE-Script-Runner]
[PropertyDef::X-TDE-Script-Runner]
Type=TQString


+ 2
- 2
interfaces/kscript/scriptmanager.cpp View File

@@ -51,7 +51,7 @@ bool KScriptManager::addScript( const TQString &scriptDesktopFile)
KDesktopFile desktop(scriptDesktopFile, true);
m_scripts.insert(desktop.readName(), new ScriptInfo());
m_scripts[desktop.readName()]->scriptType = desktop.readType();
TQString localpath = TQString(kapp->name()) + "/scripts/" + desktop.readEntry("X-KDE-ScriptName", "");
TQString localpath = TQString(kapp->name()) + "/scripts/" + desktop.readEntry("X-TDE-ScriptName", "");
m_scripts[desktop.readName()]->scriptFile = locate("data", localpath);
// m_scripts[desktop.readName()]->scriptMethod = tmpScriptMethod;
success = true;
@@ -86,7 +86,7 @@ void KScriptManager::runScript( const TQString &scriptName, TQObject *context, c
ScriptInfo *newScript = m_scripts[scriptName];
if (newScript)
{
TQString scriptType = "([X-KDE-Script-Runner] == '" + newScript->scriptType + "')";
TQString scriptType = "([X-TDE-Script-Runner] == '" + newScript->scriptType + "')";
kdDebug()<<"running script, type = '"<<scriptType<<"'"<<endl;
// See if the script is already cached...
if ( !m_scriptCache[scriptName] )


+ 1
- 1
interfaces/kspeech/dcoptexttospeech.desktop View File

@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=DCOP/Text-to-Speech
X-TDE-ServiceType=DCOP/Text-to-Speech
Comment=Text-to-Speech Service with a DCOP interface
Comment[af]=Tekste-tot-spraak diens met DCOP intervlak
Comment[be]=Сервіс агалошвання тэксту з інтэрфэйсам DCOP


+ 2
- 2
interfaces/ktexteditor/ktexteditor.desktop View File

@@ -1,7 +1,7 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KTextEditor/Document
X-KDE-Derived=KParts/ReadWritePart
X-TDE-ServiceType=KTextEditor/Document
X-TDE-Derived=KParts/ReadWritePart
Comment=Embeddable Text Editor Component (with Doc/View Separation)
Comment[af]=Inlegbare Teks Redigeerder Komponent (met Dok/Besigtig Seperasie)
Comment[ar]=مكوّن تحرير النصوص القابل للدمج )مع Doc/View Separation(


+ 2
- 2
interfaces/ktexteditor/ktexteditoreditor.desktop View File

@@ -1,7 +1,7 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KTextEditor/Editor
X-KDE-Derived=KParts/ReadWritePart
X-TDE-ServiceType=KTextEditor/Editor
X-TDE-Derived=KParts/ReadWritePart
Comment=Embeddable Text Editor Component (without Doc/View Separation)
Comment[af]=Inlegbare Teks Redigeerder Komponent (sonder om te Dok/Besigtig Seperasie)
Comment[ar]=مكوّن تحرير النصوص القابل للدمج )مع Doc/View Separation(


+ 2
- 2
interfaces/ktexteditor/ktexteditorplugin.desktop View File

@@ -1,7 +1,7 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KTextEditor/Plugin
X-KDE-Derived=
X-TDE-ServiceType=KTextEditor/Plugin
X-TDE-Derived=
Comment=KTextEditor Plugin
Comment[af]=KTextEditor Inprop Module
Comment[ar]=مساعد برنامج KTextEditor


+ 1
- 1
kabc/formatfactory.cpp View File

@@ -68,7 +68,7 @@ FormatFactory::FormatFactory()

config.setGroup( "Plugin" );
TQString type = config.readEntry( "Type" );
info->library = config.readEntry( "X-KDE-Library" );
info->library = config.readEntry( "X-TDE-Library" );

config.setGroup( "Misc" );
info->nameLabel = config.readEntry( "Name" );


+ 1
- 1
kabc/formats/binary.desktop View File

@@ -86,4 +86,4 @@ Name[zu]=Okuhambisana ngambili

[Plugin]
Type=binary
X-KDE-Library=kabcformat_binary
X-TDE-Library=kabcformat_binary

+ 1
- 1
kabc/kab2kabc.desktop View File

@@ -101,5 +101,5 @@ Comment[zh_TW]=libkab 至 libkabc 轉換工具
Comment[zu]=Ithuluzi lokuguqula le-libkab kuyaku-libkabc
Terminal=false
NoDisplay=true
X-KDE-autostart-condition=kab2kabcrc:Startup:EnableAutostart:true
X-TDE-autostart-condition=kab2kabcrc:Startup:EnableAutostart:true
OnlyShowIn=TDE;

+ 1
- 1
kabc/kabc_manager.desktop View File

@@ -73,4 +73,4 @@ Name[zh_TW]=聯絡人
Type=Service
ServiceTypes=KResources/Manager

X-KDE-ResourceFamily=contact
X-TDE-ResourceFamily=contact

+ 3
- 3
kabc/plugins/dir/dir.desktop View File

@@ -85,8 +85,8 @@ Name[zh_CN]=目录
Name[zh_HK]=目錄
Name[zh_TW]=目錄
Name[zu]=Uhlu lwamafayela
X-KDE-Library=kabc_dir
X-TDE-Library=kabc_dir
Type=Service
ServiceTypes=KResources/Plugin
X-KDE-ResourceFamily=contact
X-KDE-ResourceType=dir
X-TDE-ResourceFamily=contact
X-TDE-ResourceType=dir

+ 3
- 3
kabc/plugins/evolution/evolution.desktop View File

@@ -19,8 +19,8 @@ Name[ven]=Tsikoni
Name[wa]=Evolucion
Name[xh]=Utshintsho lwendawo ngokwenqanawa
Name[zu]=Evolushini
X-KDE-Library=kabc_evo
X-TDE-Library=kabc_evo
Type=Service
ServiceTypes=KResources/Plugin
X-KDE-ResourceFamily=contact
X-KDE-ResourceType=evolution
X-TDE-ResourceFamily=contact
X-TDE-ResourceType=evolution

+ 3
- 3
kabc/plugins/file/file.desktop View File

@@ -75,8 +75,8 @@ Name[wa]=Fitchî
Name[zh_CN]=文件
Name[zh_HK]=檔案
Name[zh_TW]=檔案
X-KDE-Library=kabc_file
X-TDE-Library=kabc_file
Type=Service
ServiceTypes=KResources/Plugin
X-KDE-ResourceFamily=contact
X-KDE-ResourceType=file
X-TDE-ResourceFamily=contact
X-TDE-ResourceType=file

+ 3
- 3
kabc/plugins/ldapkio/ldapkio.desktop View File

@@ -3,8 +3,8 @@ Name=LDAP
Name[bn]=এল-ডি-এ-পি (LDAP)
Name[hi]=एलडीएपी (LDAP)
Name[te]=ఎల్డిఏపి
X-KDE-Library=kabc_ldapkio
X-TDE-Library=kabc_ldapkio
Type=Service
ServiceTypes=KResources/Plugin
X-KDE-ResourceFamily=contact
X-KDE-ResourceType=ldapkio
X-TDE-ResourceFamily=contact
X-TDE-ResourceType=ldapkio

+ 3
- 3
kabc/plugins/net/net.desktop View File

@@ -83,8 +83,8 @@ Name[zh_CN]=网络
Name[zh_HK]=網絡
Name[zh_TW]=網路
Name[zu]=Umsebenzi wokuxhumana okusakazekile
X-KDE-Library=kabc_net
X-TDE-Library=kabc_net
Type=Service
ServiceTypes=KResources/Plugin
X-KDE-ResourceFamily=contact
X-KDE-ResourceType=net
X-TDE-ResourceFamily=contact
X-TDE-ResourceType=net

+ 1
- 1
kabc/plugins/sql/sql.desktop View File

@@ -7,4 +7,4 @@ Name[te]=ఏస్క్యుఎల్

[Plugin]
Type=sql
X-KDE-Library=kabc_sql
X-TDE-Library=kabc_sql

+ 1
- 1
kate/data/katepart.desktop View File

@@ -82,7 +82,7 @@ Name[zh_CN]=嵌入式 KDE 高级文本编辑器
Name[zh_HK]=嵌入式進階文字編輯器
Name[zh_TW]=嵌入式進階文字編輯器
Name[zu]=Umlungisi Wezinga Eliphezulu Oshuthekiwe
X-KDE-Library=libkatepart
X-TDE-Library=libkatepart
Icon=kate
ServiceTypes=KParts/ReadOnlyPart,Browser/View,KParts/ReadWritePart,KTextEditor/Editor,KTextEditor/Document
Type=Service


+ 1
- 1
kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop View File

@@ -128,7 +128,7 @@ Comment[uk]=Встановлює закладки на рядках, що від
Comment[vi]=Đặt đánh dấu trên các dòng khớp một mẫu nào đó khi tải tài liệu.
Comment[zh_CN]=文档装入时根据匹配模式自动设置书签
Comment[zh_TW]=文件載入時以字串比對演算法來設定書籤。
X-KDE-Library=ktexteditor_autobookmarker
X-TDE-Library=ktexteditor_autobookmarker
ServiceTypes=KTextEditor/Plugin
Type=Service
InitialPreference=8


+ 1
- 1
kate/plugins/insertfile/ktexteditor_insertfile.desktop View File

@@ -149,7 +149,7 @@ Comment[vi]=Chèn bất kỳ tập tin có khả năng đọc tại vị trí c
Comment[zh_CN]=在光标位置插入任何可读文件
Comment[zh_HK]=在游標處插入任意的檔案
Comment[zh_TW]=在游標處插入任意的可讀檔案
X-KDE-Library=ktexteditor_insertfile
X-TDE-Library=ktexteditor_insertfile
ServiceTypes=KTextEditor/Plugin
Type=Service
InitialPreference=8


+ 1
- 1
kate/plugins/isearch/ktexteditor_isearch.desktop View File

@@ -146,7 +146,7 @@ Comment[uk]=Також відомий як "Пошук за вводом"
Comment[vi]=Cũng được biết như là « Tìm kiếm trong khi gõ ».
Comment[zh_CN]=也称为“即输即搜”
Comment[zh_TW]=也稱做「即時搜尋」
X-KDE-Library=ktexteditor_isearch
X-TDE-Library=ktexteditor_isearch
ServiceTypes=KTextEditor/Plugin
Type=Service
InitialPreference=8


+ 1
- 1
kate/plugins/kdatatool/ktexteditor_kdatatool.desktop View File

@@ -162,7 +162,7 @@ Comment[zh_CN]=启用像辞典(thesaurus)和拼写检查(spell check)这样的
Comment[zh_HK]=如果有安裝的話,啟用像同義字字典和拼字檢查等的文字工具
Comment[zh_TW]=打開資料工具如同義字典與拼字檢查 (如果有安裝的話)
Comment[zu]=Nika amandla amathuluzi edata anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe)
X-KDE-Library=ktexteditor_kdatatool
X-TDE-Library=ktexteditor_kdatatool
ServiceTypes=KTextEditor/Plugin
Type=Service
InitialPreference=8


+ 1
- 1
kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop View File

@@ -132,7 +132,7 @@ Comment[uk]=Завершення слів у документі. Пряме аб
Comment[vi]=Khả năng nhập xong từ trong tài liệu, đựa vào chiều hoặc vào bộ bật lên.
Comment[zh_CN]=在文档中基于方向或弹出补全单词
Comment[zh_TW]=在編輯文件時的單字補完功能
X-KDE-Library=ktexteditor_docwordcompletion
X-TDE-Library=ktexteditor_docwordcompletion
ServiceTypes=KTextEditor/Plugin
Type=Service
InitialPreference=8


+ 1
- 1
kcert/kcertpart.desktop View File

@@ -95,5 +95,5 @@ Name[ta]=கேசான்றிதழ்பகுதி
Name[te]=కెసెర్ట్ పార్ట్
Name[ven]=Tshipida tsha cert ya K
ServiceTypes=KParts/ReadWritePart
X-KDE-Library=libkcertpart
X-TDE-Library=libkcertpart
InitialPreference=15

+ 5
- 5
kded/README.kded View File

@@ -106,7 +106,7 @@ A KDED module should install a .desktop file with
ServicesTypes=KDEDModule

A KDED module will be loaded on KDE startup if it has a line
X-KDE-Kded-autoload=true
X-TDE-Kded-autoload=true

Note that this flag doesn't cause the module to be loaded if the KDE desktop
is not running (i.e. when running a KDE application in another environment).
@@ -114,12 +114,12 @@ is not running (i.e. when running a KDE application in another environment).
Normally KDED modules are loaded whenever they are accessed, so you don't
need autoloading enabled. On demand loading can be disabled by putting
the following line in the .desktop file:
X-KDE-Kded-load-on-demand=false
X-TDE-Kded-load-on-demand=false

Further it should contain:
X-KDE-ModuleType=Library
X-KDE-Library=foo
X-KDE-FactoryName=foo
X-TDE-ModuleType=Library
X-TDE-Library=foo
X-TDE-FactoryName=foo

Which means that kded_foo.la is the name of the library that contains
the module and KDEDModule *create_foo(const QCString &) is the factory


+ 32
- 32
kded/applications.menu View File

@@ -26,10 +26,10 @@
<OnlyUnallocated/>
<Include>
<Not>
<!-- Don't list non-KDE core applications -->
<!-- Don't list non-TDE core applications -->
<And>
<Category>Core</Category>
<Not><Category>KDE</Category></Not>
<Not><Category>TDE</Category></Not>
</And>
<!-- Don't list SUSE's YaST in here -->
<Category>X-SuSE-YaST</Category>
@@ -40,12 +40,12 @@
<Name>Development</Name>
<Directory>tde-development.directory</Directory>
<Menu>
<Name>X-KDE-KDevelopIDE</Name>
<Name>X-TDE-KDevelopIDE</Name>
<Directory>tde-development-tdevelop.directory</Directory>
<Include>
<And>
<Category>Development</Category>
<Category>X-KDE-KDevelopIDE</Category>
<Category>X-TDE-KDevelopIDE</Category>
</And>
</Include>
</Menu>
@@ -72,7 +72,7 @@
<Include>
<And>
<Category>Development</Category>
<Not><Category>X-KDE-KDevelopIDE</Category></Not>
<Not><Category>X-TDE-KDevelopIDE</Category></Not>
<Not><Category>Translation</Category></Not>
<Not><Category>WebDevelopment</Category></Not>
</And>
@@ -108,7 +108,7 @@
<Category>Education</Category>
<Or>
<Category>Languages</Category>
<Category>X-KDE-Edu-Language</Category>
<Category>X-TDE-Edu-Language</Category>
</Or>
</And>
</Include>
@@ -131,11 +131,11 @@
<Category>Education</Category>
<Not>
<Category>Languages</Category>
<Category>X-KDE-Edu-Language</Category>
<Category>X-TDE-Edu-Language</Category>
<Category>Math</Category>
<Category>Science</Category>
<Category>Teaching</Category>
<Category>X-KDE-Edu-Teaching</Category>
<Category>X-TDE-Edu-Teaching</Category>
</Not>
</And>
</Include>
@@ -158,7 +158,7 @@
<Category>Education</Category>
<Or>
<Category>Teaching</Category>
<Category>X-KDE-Edu-Teaching</Category>
<Category>X-TDE-Edu-Teaching</Category>
</Or>
</And>
</Include>
@@ -204,7 +204,7 @@
<And>
<Category>Game</Category>
<Or>
<Category>X-KDE-KidsGame</Category>
<Category>X-TDE-KidsGame</Category>
<Category>KidsGame</Category>
</Or>
</And>
@@ -227,7 +227,7 @@
<Category>ArcadeGame</Category>
<Category>BoardGame</Category>
<Category>CardGame</Category>
<Category>X-KDE-KidsGame</Category>
<Category>X-TDE-KidsGame</Category>
<Category>KidsGame</Category>
<Category>StrategyGame</Category>
</Not>
@@ -240,7 +240,7 @@
<Include>
<And>
<Category>Graphics</Category>
<Not><Category>X-KDE-More</Category></Not>
<Not><Category>X-TDE-More</Category></Not>
<Not><Filename>ooo-draw.desktop</Filename></Not>
</And>
</Include>
@@ -250,7 +250,7 @@
<Include>
<And>
<Category>Graphics</Category>
<Category>X-KDE-More</Category>
<Category>X-TDE-More</Category>
</And>
</Include>
</Menu>
@@ -261,7 +261,7 @@
<Include>
<And>
<Category>Network</Category>
<Not><Category>X-KDE-More</Category></Not>
<Not><Category>X-TDE-More</Category></Not>
</And>
</Include>
<Menu>
@@ -274,7 +274,7 @@
<Include>
<And>
<Category>Network</Category>
<Category>X-KDE-More</Category>
<Category>X-TDE-More</Category>
</And>
</Include>
</Menu>
@@ -285,7 +285,7 @@
<Include>
<And>
<Category>AudioVideo</Category>
<Not><Category>X-KDE-More</Category></Not>
<Not><Category>X-TDE-More</Category></Not>
</And>
</Include>
<Menu>
@@ -294,7 +294,7 @@
<Include>
<And>
<Category>AudioVideo</Category>
<Category>X-KDE-More</Category>
<Category>X-TDE-More</Category>
</And>
</Include>
</Menu>
@@ -311,7 +311,7 @@
<Include>
<And>
<Category>Office</Category>
<Not><Category>X-KDE-More</Category></Not>
<Not><Category>X-TDE-More</Category></Not>
</And>
<Filename>ooo-draw.desktop</Filename>
</Include>
@@ -321,7 +321,7 @@
<Include>
<And>
<Category>Office</Category>
<Category>X-KDE-More</Category>
<Category>X-TDE-More</Category>
</And>
</Include>
</Menu>
@@ -339,7 +339,7 @@
<Include>
<And>
<Category>System</Category>
<Not><Category>X-KDE-More</Category></Not>
<Not><Category>X-TDE-More</Category></Not>
</And>
</Include>
<Menu>
@@ -347,8 +347,8 @@
<Directory>tde-system-su.directory</Directory>
<Include>
<And>
<Category>X-KDE-System-su</Category>
<Not><Category>X-KDE-More</Category></Not>
<Category>X-TDE-System-su</Category>
<Not><Category>X-TDE-More</Category></Not>
</And>
</Include>
</Menu>
@@ -358,7 +358,7 @@
<Include>
<And>
<Category>System</Category>
<Category>X-KDE-More</Category>
<Category>X-TDE-More</Category>
</And>
</Include>
</Menu>
@@ -378,10 +378,10 @@
<And>
<Category>Utility</Category>
<Not><Category>Accessibility</Category></Not>
<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
<Not><Category>X-KDE-Utilities-PIM</Category></Not>
<Not><Category>X-KDE-More</Category></Not>
<Not><Category>X-TDE-Utilities-Desktop</Category></Not>
<Not><Category>X-TDE-Utilities-Peripherals</Category></Not>
<Not><Category>X-TDE-Utilities-PIM</Category></Not>
<Not><Category>X-TDE-More</Category></Not>
</And>
</Include>
<Menu>
@@ -400,7 +400,7 @@
<Include>
<And>
<Category>Utility</Category>
<Category>X-KDE-Utilities-Desktop</Category>
<Category>X-TDE-Utilities-Desktop</Category>
</And>
</Include>
</Menu>
@@ -417,7 +417,7 @@
<Include>
<And>
<Category>Utility</Category>
<Category>X-KDE-Utilities-PIM</Category>
<Category>X-TDE-Utilities-PIM</Category>
</And>
</Include>
</Menu>
@@ -438,7 +438,7 @@
<Include>
<And>
<Category>Utility</Category>
<Category>X-KDE-More</Category>
<Category>X-TDE-More</Category>
</And>
</Include>
</Menu>
@@ -448,14 +448,14 @@
<Include>
<And>
<Category>Utility</Category>
<Category>X-KDE-More</Category>
<Category>X-TDE-More</Category>
</And>
</Include>
</Menu>
</Menu>
<Include>
<And>
<Category>KDE</Category>
<Category>TDE</Category>
<Category>Core</Category>
</And>
</Include>


+ 1
- 1
kded/kbuildservicegroupfactory.h View File

@@ -53,7 +53,7 @@ public:
* Adds the entry @p newEntry to the "parent group" @p parent, creating
* the group if necassery.
* A "parent group" is a group of services that all have the same
* "X-KDE-ParentApp".
* "X-TDE-ParentApp".
*/
KServiceGroup *addNewChild( const TQString &parent, const char *resource, KSycocaEntry *newEntry);


+ 1
- 1
kded/kbuildservicetypefactory.cpp View File

@@ -85,7 +85,7 @@ KBuildServiceTypeFactory::createEntry(const TQString &file, const char *resource

// TODO check Type field first
TQString mime = desktopFile.readEntry( "MimeType" );
TQString service = desktopFile.readEntry( "X-KDE-ServiceType" );
TQString service = desktopFile.readEntry( "X-TDE-ServiceType" );

if ( mime.isEmpty() && service.isEmpty() )
{


+ 8
- 8
kded/kded.cpp View File

@@ -172,7 +172,7 @@ void Kded::initModules()
for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
{
KService::Ptr service = *it;
bool autoload = service->property("X-KDE-Kded-autoload", TQVariant::Bool).toBool();
bool autoload = service->property("X-TDE-Kded-autoload", TQVariant::Bool).toBool();
config->setGroup(TQString("Module-%1").arg(service->desktopEntryName()));
autoload = config->readBoolEntry("autoload", autoload);
for (TQStringList::Iterator module = blacklist.begin(); module != blacklist.end(); ++module)
@@ -186,7 +186,7 @@ void Kded::initModules()
if( m_newStartup )
{
// see ksmserver's README for description of the phases
TQVariant phasev = service->property("X-KDE-Kded-phase", TQVariant::Int );
TQVariant phasev = service->property("X-TDE-Kded-phase", TQVariant::Int );
int phase = phasev.isValid() ? phasev.toInt() : 2;
bool prevent_autoload = false;
switch( phase )
@@ -211,7 +211,7 @@ void Kded::initModules()
loadModule(service, false);
}
bool dontLoad = false;
TQVariant p = service->property("X-KDE-Kded-load-on-demand", TQVariant::Bool);
TQVariant p = service->property("X-TDE-Kded-load-on-demand", TQVariant::Bool);
if (p.isValid() && (p.toBool() == false))
dontLoad = true;
if (dontLoad)
@@ -230,10 +230,10 @@ void Kded::loadSecondPhase()
for(KService::List::ConstIterator it = kdedModules.begin(); it != kdedModules.end(); ++it)
{
KService::Ptr service = *it;
bool autoload = service->property("X-KDE-Kded-autoload", TQVariant::Bool).toBool();
bool autoload = service->property("X-TDE-Kded-autoload", TQVariant::Bool).toBool();
config->setGroup(TQString("Module-%1").arg(service->desktopEntryName()));
autoload = config->readBoolEntry("autoload", autoload);
TQVariant phasev = service->property("X-KDE-Kded-phase", TQVariant::Int );
TQVariant phasev = service->property("X-TDE-Kded-phase", TQVariant::Int );
int phase = phasev.isValid() ? phasev.toInt() : 2;
if( phase == 2 && autoload )
loadModule(service, false);
@@ -266,7 +266,7 @@ KDEDModule *Kded::loadModule(const KService *s, bool onDemand)

if (onDemand)
{
TQVariant p = s->property("X-KDE-Kded-load-on-demand", TQVariant::Bool);
TQVariant p = s->property("X-TDE-Kded-load-on-demand", TQVariant::Bool);
if (p.isValid() && (p.toBool() == false))
{
noDemandLoad(s->desktopEntryName());
@@ -277,12 +277,12 @@ KDEDModule *Kded::loadModule(const KService *s, bool onDemand)

KLibLoader *loader = KLibLoader::self();

TQVariant v = s->property("X-KDE-FactoryName", TQVariant::String);
TQVariant v = s->property("X-TDE-FactoryName", TQVariant::String);
TQString factory = v.isValid() ? v.toString() : TQString::null;
if (factory.isEmpty())
{
// Stay bugward compatible
v = s->property("X-KDE-Factory", TQVariant::String);
v = s->property("X-TDE-Factory", TQVariant::String);
factory = v.isValid() ? v.toString() : TQString::null;
}
if (factory.isEmpty())


+ 4
- 4
kded/kdedmodule.desktop View File

@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KDEDModule
X-TDE-ServiceType=KDEDModule
Comment=KDED Module
Comment[ar]=وحدة KDED
Comment[az]=KDED Modulu
@@ -82,9 +82,9 @@ Comment[zh_CN]=KDED 模块
Comment[zh_HK]=KDED 模組
Comment[zh_TW]=KDED 模組
Comment[zu]=Ingxenye ye-KDED
[PropertyDef::X-KDE-FactoryName]
[PropertyDef::X-TDE-FactoryName]
Type=TQString
[PropertyDef::X-KDE-Kded-autoload]
[PropertyDef::X-TDE-Kded-autoload]
Type=bool
[PropertyDef::X-KDE-Kded-load-on-demand]
[PropertyDef::X-TDE-Kded-load-on-demand]
Type=bool

+ 5
- 5
kded/test/test.desktop View File

@@ -2,11 +2,11 @@
Type=Service

ServiceTypes=KDEDModule
X-KDE-ModuleType=Library
X-KDE-Library=test
X-KDE-Factory=test
X-KDE-Kded-autoload=false
X-KDE-Kded-load-on-demand=true
X-TDE-ModuleType=Library
X-TDE-Library=test
X-TDE-Factory=test
X-TDE-Kded-autoload=false
X-TDE-Kded-load-on-demand=true

Name=KDED Test Module
Name[af]=Kded Toets Module


+ 1
- 1
kfile-plugins/elf/kfile_elf.desktop View File

@@ -60,7 +60,7 @@ Name[zh_HK]=ELF 資訊
Name[zh_TW]=ELF 資訊
Name[zu]=Ulwazi lwe-ELF
ServiceTypes=KFilePlugin
X-KDE-Library=kfile_elf
X-TDE-Library=kfile_elf
MimeType=application/x-executable
PreferredItems=Name,Description,License,Copyright,Authors,Product,Organization,Version,DateTime,Notes"
SupportsThumbnail=false

+ 1
- 1
khtml/ecma/kjs_navigator.cpp View File

@@ -296,7 +296,7 @@ PluginBase::PluginBase(ExecState *exec, bool loadPluginInfo)
KTrader::OfferList::iterator it;
for ( it = offers.begin(); it != offers.end(); ++it ) {

TQVariant pluginsinfo = (**it).property( "X-KDE-BrowserView-PluginsInfo" );
TQVariant pluginsinfo = (**it).property( "X-TDE-BrowserView-PluginsInfo" );
if ( !pluginsinfo.isValid() ) {
// <backwards compatible>
if ((**it).library() == TQString("libnsplugin"))


+ 2
- 2
khtml/java/kjavaappletviewer.desktop View File

@@ -73,10 +73,10 @@ Name[vi]=Bộ xem tiểu dụng Java nhúng
Name[wa]=Ravalé håyneu d' apliketes Java
Name[zh_CN]=嵌入的 Java 小程序查看器
Name[zh_TW]=Embedded Java Applet 檢視器
X-KDE-Library=kjavaappletviewer
X-TDE-Library=kjavaappletviewer
Icon=java
MimeType=application/x-java-applet;application/x-java;
ServiceTypes=KParts/ReadOnlyPart,Browser/View
Type=Service
InitialPreference=2
X-KDE-BrowserView-PluginsInfo=kjava/pluginsinfo
X-TDE-BrowserView-PluginsInfo=kjava/pluginsinfo

+ 1
- 1
khtml/khtml.desktop View File

@@ -89,5 +89,5 @@ Name=KHTML
Name[hi]=केएचटीएमएल (KHTML)
Name[te]=కెహెచ్ టి ఎమ్ ఎల్
ServiceTypes=KParts/ReadOnlyPart,Browser/View
X-KDE-Library=libkhtmlpart
X-TDE-Library=libkhtmlpart
InitialPreference=10

+ 1
- 1
khtml/khtmlimage.desktop View File

@@ -167,4 +167,4 @@ Name[zh_TW]=可嵌入的影像檢視器
Name[zu]=Isithombe Sombukisi Oshuthisekayo
ServiceTypes=KParts/ReadOnlyPart,Browser/View
InitialPreference=4
X-KDE-Library=khtmlimagepart
X-TDE-Library=khtmlimagepart

+ 1
- 1
khtml/kmultipart/kmultipart.desktop View File

@@ -70,4 +70,4 @@ Name[zh_CN]=可嵌入的 multipart/mixed 组件
Name[zh_HK]=multipart/mixed 的可嵌入元件
Name[zh_TW]=multipart/mixed 的可嵌入元件
ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=libkmultipart
X-TDE-Library=libkmultipart

+ 4
- 4
kinit/README.autostart View File

@@ -15,7 +15,7 @@ application's .desktop file must be located in a KDE autostart directory such
as $TDEDIR/share/autostart or $TDEHOME/share/autostart. The .desktop file can
contain the following optional entries to control its autostart:

X-KDE-autostart-condition = rcfile:group:entry:default
X-TDE-autostart-condition = rcfile:group:entry:default

rcfile = name of a config file (including path if necessary)
group = name of a group within the config file
@@ -28,17 +28,17 @@ contain the following optional entries to control its autostart:
'default' is 'true'.
If the entry is not within a group, the group entry can be left empty.

X-KDE-autostart-after = desktop_name
X-TDE-autostart-after = desktop_name

desktop_name = the name of another .desktop file excluding path and
the .desktop suffix. E.g. panel.desktop would appear
as 'X-KDE-autostart-after=panel'
as 'X-TDE-autostart-after=panel'
Waits until the .desktop file specified by 'desktop_name' has been
autostarted. The entry is ignored if the specified application is not
scheduled in the same autostart phase as this .desktop file.

X-KDE-autostart-phase = phase
X-TDE-autostart-phase = phase

phase = 1 or 2



+ 4
- 4
kinit/autostart.cpp View File

@@ -128,7 +128,7 @@ AutoStart::loadAutoStartList()
continue;
}
else {
if (!startCondition(config.readEntry("X-KDE-autostart-condition")))
if (!startCondition(config.readEntry("X-TDE-autostart-condition")))
continue;
}
if (!config.tryExec())
@@ -193,13 +193,13 @@ AutoStart::loadAutoStartList()
if (config.hasKey("X-TDE-autostart-after"))
item->startAfter = config.readEntry("X-TDE-autostart-after");
else
item->startAfter = config.readEntry("X-KDE-autostart-after");
item->startAfter = config.readEntry("X-TDE-autostart-after");
if( m_newStartup )
{
if (config.hasKey("X-TDE-autostart-phase"))
item->phase = config.readNumEntry("X-TDE-autostart-phase", 2);
else
item->phase = config.readNumEntry("X-KDE-autostart-phase", 2);
item->phase = config.readNumEntry("X-TDE-autostart-phase", 2);
if (item->phase < 0)
item->phase = 0;
}
@@ -208,7 +208,7 @@ AutoStart::loadAutoStartList()
if (config.hasKey("X-TDE-autostart-phase"))
item->phase = config.readNumEntry("X-TDE-autostart-phase", 1);
else
item->phase = config.readNumEntry("X-KDE-autostart-phase", 1);
item->phase = config.readNumEntry("X-TDE-autostart-phase", 1);
if (item->phase < 1)
item->phase = 1;
}


+ 7
- 7
kio/DESIGN.mimetypes View File

@@ -1,9 +1,9 @@
TODO: servicetypes
TODO: mimetypes

Service type inheritance (X-KDE-Derived)
Service type inheritance (X-TDE-Derived)
========================================
X-KDE-Derived is for service types. ST1 derives from ST2 means ST1 is more specific than ST2.
X-TDE-Derived is for service types. ST1 derives from ST2 means ST1 is more specific than ST2.
If a service implements ST1, it also implements ST2, but not the other way round.

For instance, KoDocument derives from KParts/ReadWritePart, which derives from KParts/ReadOnlyPart,
@@ -16,19 +16,19 @@ We need a mechanism to also say that "text/xml is a special case of text/plain",
or "text/docbook is a kind of text/sgml", or "application/x-smb-workgroup is a kind
of inode/directory", etc. See below.

Why mimetype "inheritance" doesn't use X-KDE-Derived
Why mimetype "inheritance" doesn't use X-TDE-Derived
====================================================
The confusing thing is that we said "a mimetype is a servicetype". But that's not exactly correct.
As Waldo noted, "the ability to open a mimetype" is what's a servicetype.
So if text/xml said X-KDE-Derived=text/plain (i.e. ST1=text/xml, ST2=text/plain),
So if text/xml said X-TDE-Derived=text/plain (i.e. ST1=text/xml, ST2=text/plain),
then an application opening text/xml (ST1) could also open text/plain (ST2) - which is not necessarily true.

We want the other way round: to be able to open special kinds of text/plain in a plain text editor.
This is what X-KDE-IsAlso was introduced for. X-KDE-IsAlso kind of "works the other way" than X-KDE-Derived.
This is what X-TDE-IsAlso was introduced for. X-TDE-IsAlso kind of "works the other way" than X-TDE-Derived.
If M1 is a special kind of M2 (mimetypes), then "the ability to open M2" derives from "the ability to open M1"
So we say in text/xml: X-KDE-IsAlso=text/plain, and applications that can open text/plain can also open text/xml.
So we say in text/xml: X-TDE-IsAlso=text/plain, and applications that can open text/plain can also open text/xml.

Pattern Accuracy
======================
In some cases of inheritance several mimetypes shares the same extension (with the primary case being Ogg Multimedia files).
This has been solved sofar by matching the extension to most generic mimetype. To indicate that the mimetype can be refined further, the flag X-KDE-PatternsAccuracy can be set. The value to X-KDE-PatternsAccuracy is a number between 0-100, with 100 being the default if not set. Any values below 100 is interpreted as the possibility of further mimetype refinement.
This has been solved sofar by matching the extension to most generic mimetype. To indicate that the mimetype can be refined further, the flag X-TDE-PatternsAccuracy can be set. The value to X-TDE-PatternsAccuracy is a number between 0-100, with 100 being the default if not set. Any values below 100 is interpreted as the possibility of further mimetype refinement.

+ 8
- 8
kio/application.desktop View File

@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=Application
X-TDE-ServiceType=Application
Name=Application
Name[af]=Program
Name[ar]=تطبيق
@@ -92,10 +92,10 @@ Type=bool
[PropertyDef::DocPath]
Type=TQString

[PropertyDef::X-KDE-SubstituteUID]
[PropertyDef::X-TDE-SubstituteUID]
Type=bool

[PropertyDef::X-KDE-Username]
[PropertyDef::X-TDE-Username]
Type=TQString

[PropertyDef::StartupWMClass]
@@ -104,21 +104,21 @@ Type=TQString
[PropertyDef::StartupNotify]
Type=bool

[PropertyDef::X-KDE-WMClass]
[PropertyDef::X-TDE-WMClass]
Type=TQString

[PropertyDef::X-KDE-StartupNotify]
[PropertyDef::X-TDE-StartupNotify]
Type=bool

[PropertyDef::X-DCOP-ServiceName]
Type=TQString

[PropertyDef::X-KDE-ParentApp]
[PropertyDef::X-TDE-ParentApp]
Type=TQString

[PropertyDef::X-KDE-HasTempFileOption]
[PropertyDef::X-TDE-HasTempFileOption]
Type=bool

[PropertyDef::X-KDE-Protocols]
[PropertyDef::X-TDE-Protocols]
Type=TQStringList


+ 8
- 8
kio/kcmodule.desktop View File

@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KCModule
X-TDE-ServiceType=KCModule
Name=TDE Control Module
Name[af]=TDE Beheer Module
Name[ar]=وحدة تحكم كيدي
@@ -84,26 +84,26 @@ Name[zh_HK]=TDE 控制模組
Name[zh_TW]=TDE 控制模組
Name[zu]=Ingxenye ye-TDE Control

[PropertyDef::X-KDE-FactoryName]
[PropertyDef::X-TDE-FactoryName]
Type=TQString

[PropertyDef::X-KDE-RootOnly]
[PropertyDef::X-TDE-RootOnly]
Type=bool

# a list of all components this KCM belongs to
[PropertyDef::X-KDE-ParentComponents]
[PropertyDef::X-TDE-ParentComponents]
Type=TQStringList

# the id of the parent in the TreeList
[PropertyDef::X-KDE-CfgDlgHierarchy]
[PropertyDef::X-TDE-CfgDlgHierarchy]
Type=TQString

# sets the order of the modules in the TreeList/IconList
[PropertyDef::X-KDE-Weight]
[PropertyDef::X-TDE-Weight]
Type=int

[PropertyDef::X-KDE-RootOnly]
[PropertyDef::X-TDE-RootOnly]
Type=bool

[PropertyDef::X-KDE-IsHiddenByDefault]
[PropertyDef::X-TDE-IsHiddenByDefault]
Type=bool

+ 1
- 1
kio/kcomprfilter.desktop View File

@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KDECompressionFilter
X-TDE-ServiceType=KDECompressionFilter
Name=TDE Compression Filter
Name[af]=TDE Kompakteer Filter
Name[az]=TDE Sıxışdırma Filtri


+ 1
- 1
kio/kdatatool.desktop View File

@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KDataTool
X-TDE-ServiceType=KDataTool
Comment=TDE Data Tool
Comment[af]=TDE Data Program
Comment[ar]=أداة كيدي للبيانات


+ 3
- 3
kio/kfile/kfiledialog.cpp View File

@@ -1948,8 +1948,8 @@ void KFileDialog::updateAutoSelectExtension (void)
{
KMimeType::Ptr mime = KMimeType::mimeType (filter);

// first try X-KDE-NativeExtension
TQString nativeExtension = mime->property ("X-KDE-NativeExtension").toString ();
// first try X-TDE-NativeExtension
TQString nativeExtension = mime->property ("X-TDE-NativeExtension").toString ();
if (nativeExtension.at (0) == '.')
{
d->extension = nativeExtension.lower ();
@@ -1957,7 +1957,7 @@ void KFileDialog::updateAutoSelectExtension (void)
<< d->extension << "\'" << endl;
}

// no X-KDE-NativeExtension
// no X-TDE-NativeExtension
if (d->extension.isEmpty ())
{
d->extension = getExtensionFromPatternList (mime->patterns ()).lower ();


+ 2
- 2
kio/kfile/kfilemetapreview.cpp View File

@@ -117,8 +117,8 @@ KPreviewWidgetBase * KFileMetaPreview::previewProviderFor( const TQString& mimeT
parentMimeType = parentMimeInfo->parentMimeType();
}

// check X-KDE-Text property
TQVariant textProperty = mimeInfo->property( "X-KDE-text" );
// check X-TDE-Text property
TQVariant textProperty = mimeInfo->property( "X-TDE-text" );
if ( textProperty.isValid() && textProperty.type() == TQVariant::Bool )
{
if ( textProperty.toBool() )


+ 1
- 1
kio/kfile/kopenwith.cpp View File

@@ -768,7 +768,7 @@ void KOpenWithDlg::slotOK()
{
// Also make sure the "auto embed" setting for this mimetype is off
KDesktopFile mimeDesktop( locateLocal( "mime", qServiceType + ".desktop" ) );
mimeDesktop.writeEntry( "X-KDE-AutoEmbed", false );
mimeDesktop.writeEntry( "X-TDE-AutoEmbed", false );
mimeDesktop.sync();
}
}


+ 15
- 15
kio/kfile/kpropertiesdialog.cpp View File

@@ -518,8 +518,8 @@ void KPropertiesDialog::insertPages()

TQString query = TQString::fromLatin1(
"('KPropsDlg/Plugin' in ServiceTypes) and "
"((not exist [X-KDE-Protocol]) or "
" ([X-KDE-Protocol] == '%1' ) )" ).arg(item->url().protocol());
"((not exist [X-TDE-Protocol]) or "
" ([X-TDE-Protocol] == '%1' ) )" ).arg(item->url().protocol());

kdDebug( 250 ) << "trader query: " << query << endl;
KTrader::OfferList offers = KTrader::self()->query( mimetype, query );
@@ -2742,8 +2742,8 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl
if ( !m_sMimeStr.isEmpty() )
mimeEdit->setText( m_sMimeStr );
cbAutoEmbed->setTristate();
if ( config.hasKey( "X-KDE-AutoEmbed" ) )
cbAutoEmbed->setChecked( config.readBoolEntry( "X-KDE-AutoEmbed" ) );
if ( config.hasKey( "X-TDE-AutoEmbed" ) )
cbAutoEmbed->setChecked( config.readBoolEntry( "X-TDE-AutoEmbed" ) );
else
cbAutoEmbed->setNoChange();

@@ -2804,9 +2804,9 @@ void KBindingPropsPlugin::applyChanges()
commentEdit->text(), true, false, true ); // for compat
config.writeEntry( "MimeType", mimeEdit->text() );
if ( cbAutoEmbed->state() == TQButton::NoChange )
config.deleteEntry( "X-KDE-AutoEmbed", false );
config.deleteEntry( "X-TDE-AutoEmbed", false );
else
config.writeEntry( "X-KDE-AutoEmbed", cbAutoEmbed->isChecked() );
config.writeEntry( "X-TDE-AutoEmbed", cbAutoEmbed->isChecked() );
config.sync();
}

@@ -3154,12 +3154,12 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props )
TQString pathStr = config.readPathEntry( "Path" );
m_terminalBool = config.readBoolEntry( "Terminal" );
m_terminalOptionStr = config.readEntry( "TerminalOptions" );
m_suidBool = config.readBoolEntry( "X-KDE-SubstituteUID" );
m_suidUserStr = config.readEntry( "X-KDE-Username" );
m_suidBool = config.readBoolEntry( "X-TDE-SubstituteUID" );
m_suidUserStr = config.readEntry( "X-TDE-Username" );
if( config.hasKey( "StartupNotify" ))
m_startupBool = config.readBoolEntry( "StartupNotify", true );
else
m_startupBool = config.readBoolEntry( "X-KDE-StartupNotify", true );
m_startupBool = config.readBoolEntry( "X-TDE-StartupNotify", true );
m_dcopServiceType = config.readEntry("X-DCOP-ServiceType").lower();

TQStringList mimeTypes = config.readListEntry( "MimeType", ';' );
@@ -3395,8 +3395,8 @@ void KDesktopPropsPlugin::applyChanges()

config.writeEntry("Terminal", m_terminalBool);
config.writeEntry("TerminalOptions", m_terminalOptionStr);
config.writeEntry("X-KDE-SubstituteUID", m_suidBool);
config.writeEntry("X-KDE-Username", m_suidUserStr);
config.writeEntry("X-TDE-SubstituteUID", m_suidBool);
config.writeEntry("X-TDE-Username", m_suidUserStr);
config.writeEntry("StartupNotify", m_startupBool);
config.writeEntry("X-DCOP-ServiceType", m_dcopServiceType);
config.sync();
@@ -3734,8 +3734,8 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props )
swallowTitleStr = config.readEntry( "SwallowTitle" );
termBool = config.readBoolEntry( "Terminal" );
termOptionsStr = config.readEntry( "TerminalOptions" );
suidBool = config.readBoolEntry( "X-KDE-SubstituteUID" );
suidUserStr = config.readEntry( "X-KDE-Username" );
suidBool = config.readBoolEntry( "X-TDE-SubstituteUID" );
suidUserStr = config.readEntry( "X-TDE-Username" );

if ( !swallowExecStr.isNull() )
swallowExecEdit->setText( swallowExecStr );
@@ -3865,8 +3865,8 @@ void KExecPropsPlugin::applyChanges()
temp += TQString::fromLatin1("--noclose ");
temp = temp.stripWhiteSpace();
config.writeEntry( "TerminalOptions", temp );
config.writeEntry( "X-KDE-SubstituteUID", suidCheck->isChecked() );
config.writeEntry( "X-KDE-Username", suidEdit->text() );
config.writeEntry( "X-TDE-SubstituteUID", suidCheck->isChecked() );
config.writeEntry( "X-TDE-Username", suidEdit->text() );
}




+ 1
- 1
kio/kfile/kpropertiesdialog.h View File

@@ -431,7 +431,7 @@ private:
* servicetype, as well as the mimetypes for which the plugin should be created.
* For instance, ServiceTypes=KPropsDlg/Plugin,text/html,application/x-mymimetype.
*
* You can also include X-KDE-Protocol=file if you want that plugin
* You can also include X-TDE-Protocol=file if you want that plugin
* to be loaded only for local files, for instance.
*/
class KIO_EXPORT KPropsDlgPlugin : public TQObject


+ 2
- 2
kio/kfile/kpropsdlgplugin.desktop View File

@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KPropsDlg/Plugin
X-TDE-ServiceType=KPropsDlg/Plugin
Comment=Plugin for the Properties Dialog
Comment[af]=Inprop module vir die Eienskappe Dialoog
Comment[ar]=ملحق لمربع حوار خصائص
@@ -83,5 +83,5 @@ Comment[zh_HK]=屬性對話盒的外掛程式
Comment[zh_TW]=屬性對話盒的外掛程式
Comment[zu]=I-plugin Yengxoxo Yezinkomba zobunini

[PropertyDef::X-KDE-Protocol]
[PropertyDef::X-TDE-Protocol]
Type=TQString

+ 2
- 2
kio/kfile/krecentdocument.cpp View File

@@ -108,7 +108,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
// see if it points to the same file and application
KSimpleConfig tmp(ddesktop);
tmp.setDesktopGroup();
if(tmp.readEntry(TQString::fromLatin1("X-KDE-LastOpenedWith"))
if(tmp.readEntry(TQString::fromLatin1("X-TDE-LastOpenedWith"))
== desktopEntryName)
{
utime(TQFile::encodeName(ddesktop), NULL);
@@ -140,7 +140,7 @@ void KRecentDocument::add(const KURL& url, const TQString& desktopEntryName)
conf.writeEntry( TQString::fromLatin1("Type"), TQString::fromLatin1("Link") );
conf.writePathEntry( TQString::fromLatin1("URL"), openStr );
// If you change the line below, change the test in the above loop
conf.writeEntry( TQString::fromLatin1("X-KDE-LastOpenedWith"), desktopEntryName );
conf.writeEntry( TQString::fromLatin1("X-TDE-LastOpenedWith"), desktopEntryName );
TQString name = url.fileName();
if (name.isEmpty())
name = openStr;


+ 1
- 1
kio/kfileplugin.desktop View File

@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KFilePlugin
X-TDE-ServiceType=KFilePlugin
Name=KFile Meta Data Plugin
Name[af]=Klêer Meta Data Inprop module
Name[ar]=ملحق KFile Meta Data


+ 1
- 1
kio/kio/job.cpp View File

@@ -2115,7 +2115,7 @@ void ListJob::slotFinished()
if ( m_error == KIO::ERR_IS_FILE && m_url.isLocalFile() ) {
KMimeType::Ptr ptr = KMimeType::findByURL( m_url, 0, true, true );
if ( ptr ) {
TQString proto = ptr->property("X-KDE-LocalProtocol").toString();
TQString proto = ptr->property("X-TDE-LocalProtocol").toString();
if ( !proto.isEmpty() && KProtocolInfo::isKnownProtocol(proto) ) {
m_redirectionURL = m_url;
m_redirectionURL.setProtocol( proto );


+ 2
- 2
kio/kio/kfilemetainfo.cpp View File

@@ -934,10 +934,10 @@ KFilePlugin* KFileMetaInfoProvider::loadPlugin( const TQString& mimeType, const
// We need PNG fileinfo, and trash: fileinfo, but not "PNG in the trash".
TQString queryMimeType, query;
if ( !mimeType.isEmpty() ) {
query = "(not exist [X-KDE-Protocol])";
query = "(not exist [X-TDE-Protocol])";
queryMimeType = mimeType;
} else {
query = TQString::fromLatin1( "[X-KDE-Protocol] == '%1'" ).arg(protocol);
query = TQString::fromLatin1( "[X-TDE-Protocol] == '%1'" ).arg(protocol);
// querying for a protocol: we have no mimetype, so we need to use KFilePlugin as one
queryMimeType = "KFilePlugin";
// hopefully using KFilePlugin as genericMimeType too isn't a problem


+ 2
- 2
kio/kio/kfilemetainfo.h View File

@@ -1369,7 +1369,7 @@ private:
* - @c Type: must be @c "Service"
* - @c Name: the name of the plugin
* - @c ServiceTypes: must contain @c "KFilePlugin"
* - @c X-KDE-Library: the name of the library containing the KFile plugin
* - @c X-TDE-Library: the name of the library containing the KFile plugin
* - @c MimeType: the mimetype(s) which are supported by the plugin
* - @c PreferredGroups: a comma-separated list of the most important groups.
* This list defines the order in which the meta information groups should be
@@ -1385,7 +1385,7 @@ private:
* 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


+ 14
- 14
kio/kio/kmimetype.cpp View File

@@ -334,7 +334,7 @@ KMimeType::Format KMimeType::findFormatByFileContent( const TQString &fileName )
KMimeType::Ptr mime = findByPath(fileName);

result.text = mime->name().startsWith("text/");
TQVariant v = mime->property("X-KDE-text");
TQVariant v = mime->property("X-TDE-text");
if (v.isValid())
result.text = v.toBool();

@@ -381,16 +381,16 @@ void KMimeType::init( KDesktopFile * config )
config->setDesktopGroup();
m_lstPatterns = config->readListEntry( "Patterns", ';' );

// Read the X-KDE-AutoEmbed setting and store it in the properties map
TQString XKDEAutoEmbed = TQString::fromLatin1("X-KDE-AutoEmbed");
// Read the X-TDE-AutoEmbed setting and store it in the properties map
TQString XKDEAutoEmbed = TQString::fromLatin1("X-TDE-AutoEmbed");
if ( config->hasKey( XKDEAutoEmbed ) )
m_mapProps.insert( XKDEAutoEmbed, TQVariant( config->readBoolEntry( XKDEAutoEmbed ), 0 ) );

TQString XKDEText = TQString::fromLatin1("X-KDE-text");
TQString XKDEText = TQString::fromLatin1("X-TDE-text");
if ( config->hasKey( XKDEText ) )
m_mapProps.insert( XKDEText, config->readBoolEntry( XKDEText ) );

TQString XKDEIsAlso = TQString::fromLatin1("X-KDE-IsAlso");
TQString XKDEIsAlso = TQString::fromLatin1("X-TDE-IsAlso");
if ( config->hasKey( XKDEIsAlso ) ) {
TQString inherits = config->readEntry( XKDEIsAlso );
if ( inherits != name() )
@@ -399,7 +399,7 @@ void KMimeType::init( KDesktopFile * config )
kdWarning(7009) << "Error: " << inherits << " inherits from itself!!!!" << endl;
}

TQString XKDEPatternsAccuracy = TQString::fromLatin1("X-KDE-PatternsAccuracy");
TQString XKDEPatternsAccuracy = TQString::fromLatin1("X-TDE-PatternsAccuracy");
if ( config->hasKey( XKDEPatternsAccuracy ) )
m_mapProps.insert( XKDEPatternsAccuracy, config->readEntry( XKDEPatternsAccuracy ) );

@@ -552,7 +552,7 @@ TQString KMimeType::favIconForURL( const KURL& url )

TQString KMimeType::parentMimeType() const
{
TQVariant v = property("X-KDE-IsAlso");
TQVariant v = property("X-TDE-IsAlso");
return v.toString();
}

@@ -575,7 +575,7 @@ bool KMimeType::is( const TQString& mimeTypeName ) const
}

int KMimeType::patternsAccuracy() const {
TQVariant v = property("X-KDE-PatternsAccuracy");
TQVariant v = property("X-TDE-PatternsAccuracy");
if (!v.isValid()) return 100;
else
return v.toInt();
@@ -880,10 +880,10 @@ pid_t KDEDesktopMimeType::runLink( const KURL& _url, const KSimpleConfig &cfg )
KURL url ( u );
KRun* run = new KRun(url);

// X-KDE-LastOpenedWith holds the service desktop entry name that
// X-TDE-LastOpenedWith holds the service desktop entry name that
// was should be preferred for opening this URL if possible.
// This is used by the Recent Documents menu for instance.
TQString lastOpenedWidth = cfg.readEntry( "X-KDE-LastOpenedWith" );
TQString lastOpenedWidth = cfg.readEntry( "X-TDE-LastOpenedWith" );
if ( !lastOpenedWidth.isEmpty() )
run->setPreferredService( lastOpenedWidth );

@@ -979,7 +979,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices

cfg.setDesktopGroup();

if ( !cfg.hasKey( "Actions" ) && !cfg.hasKey( "X-KDE-GetActionMenu") )
if ( !cfg.hasKey( "Actions" ) && !cfg.hasKey( "X-TDE-GetActionMenu") )
return result;

if ( cfg.hasKey( "TryExec" ) )
@@ -993,8 +993,8 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices

TQStringList keys;

if( cfg.hasKey( "X-KDE-GetActionMenu" )) {
TQString dcopcall = cfg.readEntry( "X-KDE-GetActionMenu" );
if( cfg.hasKey( "X-TDE-GetActionMenu" )) {
TQString dcopcall = cfg.readEntry( "X-TDE-GetActionMenu" );
const TQCString app = TQString(dcopcall.section(' ', 0,0)).utf8();

TQByteArray dataToSend;
@@ -1005,7 +1005,7 @@ TQValueList<KDEDesktopMimeType::Service> KDEDesktopMimeType::userDefinedServices
TQCString object = TQString(dcopcall.section(' ', 1,-2)).utf8();
TQString function = dcopcall.section(' ', -1);
if(!function.endsWith("(KURL::List)")) {
kdWarning() << "Desktop file " << path << " contains an invalid X-KDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl;
kdWarning() << "Desktop file " << path << " contains an invalid X-TDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl;
} else {
if(kapp->dcopClient()->call( app, object,
function.utf8(),


+ 2
- 2
kio/kio/kmimetype.h View File

@@ -406,7 +406,7 @@ public:
* 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.
*
@@ -570,7 +570,7 @@ public:
/**
* 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.
* @since 3.5
*/
static TQValueList<Service> userDefinedServices( const TQString& path, KConfig& config, bool bLocalFiles, const KURL::List & file_list);


+ 5
- 5
kio/kio/krun.cpp View File

@@ -406,7 +406,7 @@ TQStringList KRun::processDesktopExec(const KService &_service, const KURL::List
// FIXME: the current way of invoking kioexec disables term and su use

// Check if we need "tempexec" (kioexec in fact)
appHasTempFileOption = tempFiles && _service.property("X-KDE-HasTempFileOption").toBool();
appHasTempFileOption = tempFiles && _service.property("X-TDE-HasTempFileOption").toBool();
if( tempFiles && !appHasTempFileOption && _urls.size() ) {
result << "kioexec" << "--tempfiles" << exec;
result += _urls.toStringList();
@@ -616,10 +616,10 @@ bool KRun::checkStartupNotify( const TQString& /*binName*/, const KService* serv
silent = !service->property( "StartupNotify" ).toBool();
wmclass = service->property( "StartupWMClass" ).toString().latin1();
}
else if( service && service->property( "X-KDE-StartupNotify" ).isValid())
else if( service && service->property( "X-TDE-StartupNotify" ).isValid())
{
silent = !service->property( "X-KDE-StartupNotify" ).toBool();
wmclass = service->property( "X-KDE-WMClass" ).toString().latin1();
silent = !service->property( "X-TDE-StartupNotify" ).toBool();
wmclass = service->property( "X-TDE-WMClass" ).toString().latin1();
}
else // non-compliant app
{
@@ -698,7 +698,7 @@ static KURL::List resolveURLs( const KURL::List& _urls, const KService& _service
{
// Check which protocols the application supports.
// This can be a list of actual protocol names, or just KIO for KDE apps.
TQStringList supportedProtocols = _service.property("X-KDE-Protocols").toStringList();
TQStringList supportedProtocols = _service.property("X-TDE-Protocols").toStringList();
KRunMX1 mx1( _service );
TQString exec = _service.exec();
if ( mx1.expandMacrosShellQuote( exec ) && !mx1.hasUrls ) {


+ 2
- 2
kio/kio/krun.h View File

@@ -165,7 +165,7 @@ public:
* 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".
*/
@@ -374,7 +374,7 @@ public:
* -# 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.
* @since 3.3


+ 10
- 10
kio/kio/kservice.cpp View File

@@ -199,7 +199,7 @@ KService::init( KDesktopFile *config )
m_strExec = config->readPathEntry( "Exec" );
if (kde4application && !m_strExec.startsWith("/")) {
m_strExec = "TDEHOME=$HOME/.kde XDG_DATA_DIRS=/usr/share TDEDIRS=/usr/ XDG_CONFIG_DIRS=/etc/xdg/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:$PATH "+m_strExec;
} else if (config->readBoolEntry("X-KDE-SubstituteUID")) {
} else if (config->readBoolEntry("X-TDE-SubstituteUID")) {
int space = m_strExec.find(" ");
if (space==-1)
m_strExec = KStandardDirs::findExe(m_strExec);
@@ -241,10 +241,10 @@ KService::init( KDesktopFile *config )
entryMap.remove("Keywords");
d->categories = config->readListEntry("Categories", ';');
entryMap.remove("Categories");
m_strLibrary = config->readEntry( "X-KDE-Library" );
entryMap.remove("X-KDE-Library");
m_strInit = config->readEntry("X-KDE-Init" );
entryMap.remove("X-KDE-Init");
m_strLibrary = config->readEntry( "X-TDE-Library" );
entryMap.remove("X-TDE-Library");
m_strInit = config->readEntry("X-TDE-Init" );
entryMap.remove("X-TDE-Init");

m_lstServiceTypes = config->readListEntry( "ServiceTypes" );
entryMap.remove("ServiceTypes");
@@ -275,8 +275,8 @@ KService::init( KDesktopFile *config )
m_bAllowAsDefault = config->readBoolEntry( "AllowDefault", true );
entryMap.remove("AllowDefault");

m_initialPreference = config->readNumEntry( "X-KDE-InitialPreference", 1 );
entryMap.remove("X-KDE-InitialPreference");
m_initialPreference = config->readNumEntry( "X-TDE-InitialPreference", 1 );
entryMap.remove("X-TDE-InitialPreference");
if ( m_initialPreference == 1 )
m_initialPreference = config->readNumEntry( "InitialPreference", 1 );
entryMap.remove("InitialPreference");
@@ -703,14 +703,14 @@ KService::List KService::allInitServices()
}

bool KService::substituteUid() const {
TQVariant v = property("X-KDE-SubstituteUID", TQVariant::Bool);
TQVariant v = property("X-TDE-SubstituteUID", TQVariant::Bool);
return v.isValid() && v.toBool();
}

TQString KService::username() const {
// See also KDesktopFile::tryExec()
TQString user;
TQVariant v = property("X-KDE-Username", TQVariant::String);
TQVariant v = property("X-TDE-Username", TQVariant::String);
user = v.isValid() ? v.toString() : TQString::null;
if (user.isEmpty())
user = ::getenv("ADMIN_ACCOUNT");
@@ -772,7 +772,7 @@ bool KService::SuSEunimportant() const {
}

TQString KService::parentApp() const {
TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "X-KDE-ParentApp" );
TQMap<TQString,TQVariant>::ConstIterator it = m_mapProps.find( "X-TDE-ParentApp" );
if ( (it == m_mapProps.end()) || (!it.data().isValid()))
{
return TQString::null;


+ 1
- 1
kio/kio/kservicefactory.h View File

@@ -82,7 +82,7 @@ public:
KService::List allServices();

/**
* @return all services which have a "X-KDE-Init" line.
* @return all services which have a "X-TDE-Init" line.
*/
KService::List allInitServices();



+ 2
- 2
kio/kio/kservicegroup.cpp View File

@@ -93,8 +93,8 @@ KServiceGroup::KServiceGroup( const TQString &configFile, const TQString & _relp
d->m_bNoDisplay = true;
}

m_strBaseGroupName = config.readEntry( "X-KDE-BaseGroup" );
d->suppressGenericNames = config.readListEntry( "X-KDE-SuppressGenericNames" );
m_strBaseGroupName = config.readEntry( "X-TDE-BaseGroup" );
d->suppressGenericNames = config.readListEntry( "X-TDE-SuppressGenericNames" );
d->sortOrder = config.readListEntry("SortOrder");

// Fill in defaults.


+ 2
- 2
kio/kio/kservicegroup.h View File

@@ -257,7 +257,7 @@ public:
* 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
*/
@@ -291,7 +291,7 @@ public:
static Ptr group(const TQString &relPath);

/**
* Returns the group of services that have X-KDE-ParentApp equal
* Returns the group of services that have X-TDE-ParentApp equal
* to @p parent (siblings).
* @param parent the name of the service's parent
* @return the services group


+ 5
- 5
kio/kio/kservicetype.cpp View File

@@ -63,7 +63,7 @@ KServiceType::init( KDesktopFile *config)
// Or is it a servicetype ?
if ( m_strName.isEmpty() )
{
m_strName = config->readEntry( "X-KDE-ServiceType" );
m_strName = config->readEntry( "X-TDE-ServiceType" );
}

m_strComment = config->readComment();
@@ -72,10 +72,10 @@ KServiceType::init( KDesktopFile *config)

// We store this as property to preserve BC, we can't change that
// because KSycoca needs to remain BC between KDE 2.x and KDE 3.x
TQString sDerived = config->readEntry( "X-KDE-Derived" );
TQString sDerived = config->readEntry( "X-TDE-Derived" );
m_bDerived = !sDerived.isEmpty();
if ( m_bDerived )
m_mapProps.insert( "X-KDE-Derived", sDerived );
m_mapProps.insert( "X-TDE-Derived", sDerived );

TQStringList tmpList = config->groupList();
TQStringList::Iterator gIt = tmpList.begin();
@@ -129,7 +129,7 @@ KServiceType::load( TQDataStream& _str )
_str >> m_strName >> m_strIcon >> m_strComment >> m_mapProps >> m_mapPropDefs
>> b;
m_bValid = b;
m_bDerived = m_mapProps.contains("X-KDE-Derived");
m_bDerived = m_mapProps.contains("X-TDE-Derived");
}

void
@@ -150,7 +150,7 @@ KServiceType::~KServiceType()

TQString KServiceType::parentServiceType() const
{
TQVariant v = property("X-KDE-Derived");
TQVariant v = property("X-TDE-Derived");
return v.toString();
}



+ 5
- 5
kio/kio/ktrader.h View File

@@ -68,13 +68,13 @@
* 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 @ref tradersyntax .
*
@@ -202,7 +202,7 @@ protected:
* list of the service types it supports. Note that only properties can
* be written as-is which start with an alphabetical character and contain
* only alphanumerical characters. Other properties have to be enclosed in
* brackets, e.g. <tt>[X-KDE-Init]</tt>. Properties must not contain any
* brackets, e.g. <tt>[X-TDE-Init]</tt>. Properties must not contain any
* special characters other than <tt>-</tt>.
*
* Special property names:
@@ -214,7 +214,7 @@ protected:
* here for completeness, better not use it (things can be moved
* around).
* - <b>Library</b> is the property whose value is set by
* <tt>X-KDE-Library</tt> in the .desktop file. This renaming
* <tt>X-TDE-Library</tt> in the .desktop file. This renaming
* happened to conform to the desktop file standard, but the
* property name didn't change.
*


+ 2
- 2
kio/kio/previewjob.cpp View File

@@ -208,9 +208,9 @@ void PreviewJob::startPreview()

if (plugin == mimeMap.end())
{
// check X-KDE-Text property
// check X-TDE-Text property
KMimeType::Ptr mimeInfo = KMimeType::mimeType(it.current()->mimetype());
TQVariant textProperty = mimeInfo->property("X-KDE-text");
TQVariant textProperty = mimeInfo->property("X-TDE-text");
if (textProperty.isValid() && textProperty.type() == TQVariant::Bool)
{
if (textProperty.toBool())


+ 1
- 1
kio/kio/thumbcreator.h View File

@@ -65,7 +65,7 @@ class TQImage;
* ServiceTypes=ThumbCreator
* MimeTypes=application/x-somemimetype
* CacheThumbnail=true
* X-KDE-Library=yourthumbcreator
* X-TDE-Library=yourthumbcreator
* \endcode
*
* You can supply a comma-separated list of mimetypes to the MimeTypes entry,


+ 5
- 5
kio/kpasswdserver.desktop View File

@@ -150,8 +150,8 @@ Comment[zh_CN]=密码缓存支持
Comment[zh_HK]=密碼暫存支援
Comment[zh_TW]=密碼暫存(cache)支援
ServiceTypes=KDEDModule
X-KDE-ModuleType=Library
X-KDE-Library=kpasswdserver
X-KDE-FactoryName=kpasswdserver
X-KDE-Kded-autoload=false
X-KDE-Kded-load-on-demand=true
X-TDE-ModuleType=Library
X-TDE-Library=kpasswdserver
X-TDE-FactoryName=kpasswdserver
X-TDE-Kded-autoload=false
X-TDE-Kded-load-on-demand=true

+ 1
- 1
kio/kscan.desktop View File

@@ -1,6 +1,6 @@
[Desktop Entry]
Type=ServiceType
X-KDE-ServiceType=KScan/KScanDialog
X-TDE-ServiceType=KScan/KScanDialog
Name=KScan
Name[bn]=কে-স্ক্যান
Name[cy]=KSgan