diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-08 15:51:46 -0500 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-08 15:51:46 -0500 |
commit | 6ed1ea98db6b1b369e7561efcc2c666b810e5446 (patch) | |
tree | 69da6d265387965c04a9584547ec42d4d372717d /interfaces/kscript | |
parent | 09d01cacf80d21ad213e6520b35e7f06e9546a83 (diff) | |
download | tdelibs-6ed1ea98db6b1b369e7561efcc2c666b810e5446.tar.gz tdelibs-6ed1ea98db6b1b369e7561efcc2c666b810e5446.zip |
Update XDG information in support of bug report 892.
Diffstat (limited to 'interfaces/kscript')
-rw-r--r-- | interfaces/kscript/sample/shellscript.desktop | 4 | ||||
-rw-r--r-- | interfaces/kscript/scriptclientinterface.h | 2 | ||||
-rw-r--r-- | interfaces/kscript/scriptinterface.desktop | 4 | ||||
-rw-r--r-- | interfaces/kscript/scriptmanager.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/interfaces/kscript/sample/shellscript.desktop b/interfaces/kscript/sample/shellscript.desktop index 990a69386..e65713a3b 100644 --- a/interfaces/kscript/sample/shellscript.desktop +++ b/interfaces/kscript/sample/shellscript.desktop @@ -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. diff --git a/interfaces/kscript/scriptclientinterface.h b/interfaces/kscript/scriptclientinterface.h index 7aa82212b..0f07d34b2 100644 --- a/interfaces/kscript/scriptclientinterface.h +++ b/interfaces/kscript/scriptclientinterface.h @@ -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() diff --git a/interfaces/kscript/scriptinterface.desktop b/interfaces/kscript/scriptinterface.desktop index 878c506d9..397e650d8 100644 --- a/interfaces/kscript/scriptinterface.desktop +++ b/interfaces/kscript/scriptinterface.desktop @@ -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 diff --git a/interfaces/kscript/scriptmanager.cpp b/interfaces/kscript/scriptmanager.cpp index 5cdbd7459..647410b8b 100644 --- a/interfaces/kscript/scriptmanager.cpp +++ b/interfaces/kscript/scriptmanager.cpp @@ -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] ) |