| f9a9d3f5 | 2014-10-11 17:19:24 | Timothy Pearson |
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications |
||
|
M buildtools/ada/kdevadaproject.desktop M buildtools/ant/kdevantproject.desktop M buildtools/autotools/addservicedlg.cpp M buildtools/autotools/kdevautoproject.desktop M buildtools/autotools/kdevtdeautoproject.desktop M buildtools/custommakefiles/kdevcustomproject.desktop M buildtools/pascal/kdevpascalproject.desktop M buildtools/qmake/kdevtmakeproject.desktop M buildtools/qmake/kdevtrollproject.desktop M buildtools/script/kdevscriptproject.desktop M editors/editor-chooser/kdeveditorchooser.desktop M embedded/visualboyadvance/kdevvisualboyadvance.desktop M kdevassistant.desktop M kdevdesigner/designer/kdevdesigner_part.desktop M kdevdesigner/src/kdevdesigner.desktop M languages/ada/kdevadasupport.desktop M languages/bash/kdevbashsupport.desktop M languages/cpp/app_templates/kapp/app.desktop M languages/cpp/app_templates/kateplugin/plugin.desktop M languages/cpp/app_templates/kateplugin2/plugin.desktop M languages/cpp/app_templates/kde4app/kapp4.desktop M languages/cpp/app_templates/kdevlang/kdevlang.desktop M languages/cpp/app_templates/kdevpart/kdevpart.desktop M languages/cpp/app_templates/kdevpart2/kdevpart.desktop M languages/cpp/app_templates/kmake/app.desktop M languages/cpp/app_templates/kofficepart/kopart.desktop M languages/cpp/app_templates/kpartapp/app.desktop M languages/cpp/app_templates/tdefileplugin/tdefile_plugin.desktop M languages/cpp/compiler/gccoptions/kdevg77options.desktop M languages/cpp/compiler/gccoptions/kdevgccoptions.desktop M languages/cpp/compiler/gccoptions/kdevgppoptions.desktop M languages/cpp/debugger/kdevdebugger.desktop M languages/cpp/kdevcppsupport.desktop M languages/cpp/kdevcsupport.desktop M languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop M languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop M languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop M languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop M languages/csharp/kdevcsharpsupport.desktop M languages/fortran/compiler/pgioptions/kdevpgf77options.desktop M languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop M languages/fortran/kdevfortransupport.desktop M languages/java/app_templates/kappjava/app.desktop M languages/java/kdevjavasupport.desktop M languages/kjssupport/kdevkjssupport.desktop M languages/pascal/compiler/dccoptions/kdevdccoptions.desktop M languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop M languages/pascal/kdevpascalsupport.desktop M languages/perl/kdevperlsupport.desktop M languages/php/kdevphpsupport.desktop M languages/python/kdevpythonsupport.desktop M languages/ruby/app_templates/kapp/app.desktop M languages/ruby/debugger/kdevrbdebugger.desktop M languages/ruby/kdevrubysupport.desktop M languages/sql/kdevsqlsupport.desktop M lib/interfaces/kdevplugin.h M lib/interfaces/kdevplugincontroller.h M parts/abbrev/kdevabbrev.desktop M parts/appwizard/common/tde-app.desktop M parts/appwizard/common/tde-part.desktop M parts/appwizard/kdevappwizard.desktop M parts/astyle/kdevastyle.desktop M parts/bookmarks/kdevbookmarks.desktop M parts/classview/kdevclassview.desktop M parts/ctags2/kdevctags2.desktop M parts/diff/kdevdiff.desktop M parts/distpart/kdevdistpart.desktop M parts/documentation/kdevdocumentation.desktop M parts/documentation/plugins/chm/docchmplugin.desktop M parts/documentation/plugins/custom/doccustomplugin.desktop M parts/documentation/plugins/devhelp/docdevhelpplugin.desktop M parts/documentation/plugins/djvu/docdjvuplugin.desktop M parts/documentation/plugins/doxygen/docdoxygenplugin.desktop M parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop M parts/documentation/plugins/pdb/docpdbplugin.desktop M parts/documentation/plugins/pdf/docpdfplugin.desktop M parts/documentation/plugins/qt/docqtplugin.desktop M parts/documentation/protocols/chm/kchmpart.desktop M parts/doxygen/kdevdoxygen.desktop M parts/filecreate/kdevfilecreate.desktop M parts/filelist/kdevfilelist.desktop M parts/fileselector/kdevfileselector.desktop M parts/fileview/kdevfilegroups.desktop M parts/fileview/kdevfileview.desktop M parts/filter/kdevfilter.desktop M parts/fullscreen/kdevfullscreen.desktop M parts/grepview/kdevgrepview.desktop M parts/konsole/kdevkonsoleview.desktop M parts/openwith/kdevopenwith.desktop M parts/outputviews/kdevappoutputview.desktop M parts/outputviews/kdevmakeview.desktop M parts/partexplorer/kdevpartexplorer.desktop M parts/quickopen/kdevquickopen.desktop M parts/regexptest/kdevregexptest.desktop M parts/replace/kdevreplace.desktop M parts/scripting/kdevscripting.desktop M parts/snippet/kdevsnippet.desktop M parts/texttools/kdevtexttools.desktop M parts/tipofday/kdevtipofday.desktop M parts/tools/kdevtools.desktop M parts/uimode/kdevuichooser.desktop M parts/valgrind/kdevvalgrind.desktop M parts/vcsmanager/kdevvcsmanager.desktop M tdevelop.desktop M tdevelop_c_cpp.desktop M tdevelop_kde_cpp.desktop M tdevelop_ruby.desktop M tdevelop_scripting.desktop M vcs/clearcase/integrator/kdevclearcaseintegrator.desktop M vcs/clearcase/kdevclearcase.desktop M vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop M vcs/cvsservice/kdevcvsservice.desktop M vcs/perforce/integrator/kdevperforceintegrator.desktop M vcs/perforce/kdevperforce.desktop M vcs/subversion/integrator/kdevsubversionintegrator.desktop M vcs/subversion/kdevsubversion.desktop M vcs/subversion/kdevsvnd.desktop |
||
diff --git a/buildtools/ada/kdevadaproject.desktop b/buildtools/ada/kdevadaproject.desktop
index 882b0f6..f28010a 100644
--- a/buildtools/ada/kdevadaproject.desktop
+++ b/buildtools/ada/kdevadaproject.desktop
@@ -94,7 +94,7 @@
GenericName[uz@cyrillic]=Ada ����������������
GenericName[zh_CN]=Ada ������
GenericName[zh_TW]=Ada ������
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
X-TDE-Library=libkdevadaproject
X-TDevelop-Version=5
X-TDevelop-Language=Ada
diff --git a/buildtools/ant/kdevantproject.desktop b/buildtools/ant/kdevantproject.desktop
index e288010..ad223c5 100644
--- a/buildtools/ant/kdevantproject.desktop
+++ b/buildtools/ant/kdevantproject.desktop
@@ -90,7 +90,7 @@
GenericName[uz@cyrillic]=Ant ����������������
GenericName[zh_CN]=Ant ������
GenericName[zh_TW]=Ant ������
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
X-TDE-Library=libkdevantproject
X-TDevelop-Version=5
X-TDevelop-Args=
diff --git a/buildtools/autotools/addservicedlg.cpp b/buildtools/autotools/addservicedlg.cpp
index 1b94555..705d924 100644
--- a/buildtools/autotools/addservicedlg.cpp
+++ b/buildtools/autotools/addservicedlg.cpp
@@ -187,7 +187,7 @@
stream << "Comment=" << comment_edit->text() << endl;
if (!iconName.isNull())
stream << "Icon=" << iconName << endl;
- stream << "ServiceTypes=" << serviceTypes.join(",") << endl;
+ stream << "X-TDE-ServiceTypes=" << serviceTypes.join(",") << endl;
item = properties_listview->firstChild();
while (item) {
stream << item->text(0) << "=" << item->text(1) << endl;
diff --git a/buildtools/autotools/kdevautoproject.desktop b/buildtools/autotools/kdevautoproject.desktop
index a149c87..043a6c5 100644
--- a/buildtools/autotools/kdevautoproject.desktop
+++ b/buildtools/autotools/kdevautoproject.desktop
@@ -90,7 +90,7 @@
GenericName[uz@cyrillic]=Automake ����������������
GenericName[zh_CN]=Automake ������
GenericName[zh_TW]=Automake ������
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
Icon=make
X-TDE-Library=libkdevautoproject
X-TDevelop-Version=5
diff --git a/buildtools/autotools/kdevtdeautoproject.desktop b/buildtools/autotools/kdevtdeautoproject.desktop
index b9b6abd..18d5364 100644
--- a/buildtools/autotools/kdevtdeautoproject.desktop
+++ b/buildtools/autotools/kdevtdeautoproject.desktop
@@ -85,7 +85,7 @@
GenericName[tr]=TDE Automake Projesi
GenericName[zh_CN]=TDE Automake ������
GenericName[zh_TW]=TDE Automake ������
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
Icon=make
X-TDE-Library=libkdevautoproject
X-TDevelop-Version=5
diff --git a/buildtools/custommakefiles/kdevcustomproject.desktop b/buildtools/custommakefiles/kdevcustomproject.desktop
index 9f81a3d..90cdac0 100644
--- a/buildtools/custommakefiles/kdevcustomproject.desktop
+++ b/buildtools/custommakefiles/kdevcustomproject.desktop
@@ -85,7 +85,7 @@
GenericName[tr]=��zel Proje
GenericName[zh_CN]=���������������
GenericName[zh_TW]=������������
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
X-TDE-Library=libkdevcustomproject
X-TDevelop-Version=5
X-TDevelop-Args=
diff --git a/buildtools/pascal/kdevpascalproject.desktop b/buildtools/pascal/kdevpascalproject.desktop
index cde3c21..2e96196 100644
--- a/buildtools/pascal/kdevpascalproject.desktop
+++ b/buildtools/pascal/kdevpascalproject.desktop
@@ -88,6 +88,6 @@
GenericName[uz@cyrillic]=Pascal ����������������
GenericName[zh_CN]=Pascal ������
GenericName[zh_TW]=Pascal ������
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
X-TDE-Library=libkdevpascalproject
X-TDevelop-Version=5
diff --git a/buildtools/qmake/kdevtmakeproject.desktop b/buildtools/qmake/kdevtmakeproject.desktop
index 97b4b52..cb9e181 100644
--- a/buildtools/qmake/kdevtmakeproject.desktop
+++ b/buildtools/qmake/kdevtmakeproject.desktop
@@ -84,7 +84,7 @@
GenericName[tr]=TMake Projesi
GenericName[zh_CN]=TMake ������
GenericName[zh_TW]=TMake ������
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
X-TDE-Library=libkdevtrollproject
X-TDevelop-Version=5
X-TDevelop-Args=TMake
diff --git a/buildtools/qmake/kdevtrollproject.desktop b/buildtools/qmake/kdevtrollproject.desktop
index bf118c5..2f0e5eb 100644
--- a/buildtools/qmake/kdevtrollproject.desktop
+++ b/buildtools/qmake/kdevtrollproject.desktop
@@ -89,7 +89,7 @@
GenericName[uz@cyrillic]=QMake ����������������
GenericName[zh_CN]=QMake ������
GenericName[zh_TW]=QMake ������
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
X-TDE-Library=libkdevtrollproject
X-TDevelop-Version=5
X-TDevelop-Args=
diff --git a/buildtools/script/kdevscriptproject.desktop b/buildtools/script/kdevscriptproject.desktop
index 6e135c1..3f91926 100644
--- a/buildtools/script/kdevscriptproject.desktop
+++ b/buildtools/script/kdevscriptproject.desktop
@@ -81,7 +81,7 @@
GenericName[tr]=Betik Dili Projesi
GenericName[zh_CN]=������������������
GenericName[zh_TW]=������������������
-ServiceTypes=TDevelop/Project
+X-TDE-ServiceTypes=TDevelop/Project
Icon=tdevelop
X-TDE-Library=libkdevscriptproject
X-TDevelop-Version=5
diff --git a/editors/editor-chooser/kdeveditorchooser.desktop b/editors/editor-chooser/kdeveditorchooser.desktop
index 94f0690..db2c7d8 100644
--- a/editors/editor-chooser/kdeveditorchooser.desktop
+++ b/editors/editor-chooser/kdeveditorchooser.desktop
@@ -84,7 +84,7 @@
GenericName[zh_CN]=���������������
GenericName[zh_TW]=���������������
Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
X-TDE-Library=libkdeveditorchooser
X-TDevelop-Version=5
X-TDevelop-Scope=Core
diff --git a/embedded/visualboyadvance/kdevvisualboyadvance.desktop b/embedded/visualboyadvance/kdevvisualboyadvance.desktop
index 292fe6d..fbf1fdf 100644
--- a/embedded/visualboyadvance/kdevvisualboyadvance.desktop
+++ b/embedded/visualboyadvance/kdevvisualboyadvance.desktop
@@ -78,7 +78,7 @@
GenericName[zh_CN]=VisualBoyAdvance ������
GenericName[zh_TW]=VisualBoyAdvance ������
Icon=tdevelop
-ServiceTypes=TDevelop/Plugin
+X-TDE-ServiceTypes=TDevelop/Plugin
X-TDE-Library=libkdevvisualboyadvance
X-TDevelop-Version=5
X-TDevelop-Scope=Project
diff --git a/kdevassistant.desktop b/kdevassistant.desktop
index 0e8192c..478aa02 100644
--- a/kdevassistant.desktop
+++ b/kdevassistant.desktop
@@ -2,7 +2,7 @@
Type=Application
Exec=kdevassistant %u
Icon=tdevelop
-DocPath=tdevelop/index.html
+X-DocPath=tdevelop/index.html
Terminal=false
Name=TDevelop Assistant
Name[br]=Skoazeller TDevelop
diff --git a/kdevdesigner/designer/kdevdesigner_part.desktop b/kdevdesigner/designer/kdevdesigner_part.desktop
index 2928a8a..7ca2b60 100644
--- a/kdevdesigner/designer/kdevdesigner_part.desktop
+++ b/kdevdesigner/designer/kdevdesigner_part.desktop
@@ -9,8 +9,8 @@
Name[tg]=KDev���������� ������������������
Name[zh_TW]=TDevelop ������������
MimeType=application/x-designer
-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
X-TDE-Library=libkdevdesignerpart
Type=Service
-InitialPreference=10
+X-TDE-InitialPreference=10
diff --git a/kdevdesigner/src/kdevdesigner.desktop b/kdevdesigner/src/kdevdesigner.desktop
index 1cd245f..7bba736 100644
--- a/kdevdesigner/src/kdevdesigner.desktop
+++ b/kdevdesigner/src/kdevdesigner.desktop
@@ -58,7 +58,7 @@
Exec=kdevdesigner %i -caption "%c"
Icon=kdevdesigner
Type=Application
-DocPath=kdevdesigner/index.html
+X-DocPath=kdevdesigner/index.html
Comment=GUI Designer for Qt/TDE
Comment[ca]=Dissenyador de IGU per Qt/TDE
Comment[da]=Grafisk brugerfladedesigner til Qt/TDE
diff --git a/languages/ada/kdevadasupport.desktop b/languages/ada/kdevadasupport.desktop
index f1ae3bf..a9da428 100644
--- a/languages/ada/kdevadasupport.desktop
+++ b/languages/ada/kdevadasupport.desktop
@@ -81,7 +81,7 @@
GenericName[tr]=Ada Dil Deste��i
GenericName[zh_CN]=Ada ������������
GenericName[zh_TW]=Ada ������������
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
X-TDE-Library=libkdevadasupport
X-TDevelop-Version=5
X-TDevelop-Language=Ada
diff --git a/languages/bash/kdevbashsupport.desktop b/languages/bash/kdevbashsupport.desktop
index 91a98e3..27d902d 100644
--- a/languages/bash/kdevbashsupport.desktop
+++ b/languages/bash/kdevbashsupport.desktop
@@ -79,7 +79,7 @@
GenericName[tr]=Bash Deste��i
GenericName[zh_CN]=Bash ������
GenericName[zh_TW]=Bash ������
-ServiceTypes=TDevelop/LanguageSupport
+X-TDE-ServiceTypes=TDevelop/LanguageSupport
X-TDE-Library=libkdevbashsupport
X-TDevelop-Version=5
X-TDevelop-Language=Bash
diff --git a/languages/cpp/app_templates/kapp/app.desktop b/languages/cpp/app_templates/kapp/app.desktop
index 5c7ab92..ec6d872 100644
--- a/languages/cpp/app_templates/kapp/app.desktop
+++ b/languages/cpp/app_templates/kapp/app.desktop
@@ -3,7 +3,7 @@
Exec=%{APPNAMELC} %i -caption "%c"
Icon=%{APPNAMELC}
Type=Application
-DocPath=%{APPNAMELC}/%{APPNAMELC}.html
+X-DocPath=%{APPNAMELC}/%{APPNAMELC}.html
Comment=A TDE KPart Application
Comment[br]=Ur meziant Kpart evit TDE
Comment[ca]=Una aplicaci�� KPart per al TDE
diff --git a/languages/cpp/app_templates/kateplugin/plugin.desktop b/languages/cpp/app_templates/kateplugin/plugin.desktop
index 8958ed0..1995d38 100644
--- a/languages/cpp/app_templates/kateplugin/plugin.desktop
+++ b/languages/cpp/app_templates/kateplugin/plugin.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=Service
-ServiceTypes=Kate/Plugin
+X-TDE-ServiceTypes=Kate/Plugin
X-TDE-Library=lib%{APPNAMELC}plugin
X-Kate-Version=2.2
Name=My First Kate Plugin
diff --git a/languages/cpp/app_templates/kateplugin2/plugin.desktop b/languages/cpp/app_templates/kateplugin2/plugin.desktop
index 8958ed0..1995d38 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin.desktop
** Diff limit reached (max: 250 lines) **
|
||