[dolphin][master] 5b1f358a

Branch: master

5b1f358a	2014-10-11 17:19:16	Timothy Pearson
Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications
M src/d3lphin.desktop M src/dolphincontextmenu.cpp M src/infosidebarpage.cpp M src/servicemenus/amarok_addaspodcast.desktop M src/servicemenus/amarok_append.desktop M src/servicemenus/amarok_play_audiocd.desktop M src/servicemenus/ark_compress.desktop M src/servicemenus/ark_extract.desktop M src/servicemenus/ark_extract_subdir.desktop M src/servicemenus/compress.desktop M src/servicemenus/d3lphin_su.desktop M src/servicemenus/edit_as_root.desktop M src/servicemenus/encryptfile.desktop M src/servicemenus/encryptfolder.desktop M src/servicemenus/floppy_format.desktop M src/servicemenus/imageconverter.desktop M src/servicemenus/installfont.desktop M src/servicemenus/isoservice.desktop M src/servicemenus/jpegorient.desktop M src/servicemenus/k3b_audiocd_rip.desktop M src/servicemenus/k3b_cd_copy.desktop M src/servicemenus/k3b_create_audio_cd.desktop M src/servicemenus/k3b_create_video_cd.desktop M src/servicemenus/k3b_dvd_copy.desktop M src/servicemenus/k3b_handle_empty_cd.desktop M src/servicemenus/k3b_handle_empty_dvd.desktop M src/servicemenus/k3b_videodvd_rip.desktop M src/servicemenus/k3b_write_bin_image.desktop M src/servicemenus/k3b_write_iso_image.desktop M src/servicemenus/kdesktopSetAsBackground.desktop M src/servicemenus/konqgwenview.desktop M src/servicemenus/konsolehere.desktop M src/servicemenus/mail_as_attachment.desktop M src/servicemenus/media_eject.desktop M src/servicemenus/media_mount.desktop M src/servicemenus/media_realfolder.desktop M src/servicemenus/media_safelyremove.desktop M src/servicemenus/media_unmount.desktop M src/servicemenus/open_in_digikam.desktop M src/servicemenus/run_as_root.desktop M src/servicemenus/smb2rdc.desktop M src/servicemenus/text-ada-print.desktop M src/servicemenus/text-c++-print.desktop M src/servicemenus/text-c++h-print.desktop M src/servicemenus/text-ch-print.desktop M src/servicemenus/text-css-print.desktop M src/servicemenus/text-diff-print.desktop M src/servicemenus/text-html-print.desktop M src/servicemenus/text-java-print.desktop M src/servicemenus/text-log-print.desktop M src/servicemenus/text-makefile-print.desktop M src/servicemenus/text-pas-print.desktop M src/servicemenus/text-perl-print.desktop M src/servicemenus/text-print.desktop M src/servicemenus/text-python-print.desktop M src/servicemenus/text-tcl-print.desktop M src/servicemenus/text-tex-print.desktop M src/servicemenus/text-xml-print.desktop M src/servicemenus/text-xslt-print.desktop
diff --git a/src/d3lphin.desktop b/src/d3lphin.desktop index 711e943..f25721b 100644 --- a/src/d3lphin.desktop +++ b/src/d3lphin.desktop @@ -12,7 +12,7 @@ Exec=d3lphin %i -caption "%c" "%u" Icon=d3lphin Type=Application -DocPath=d3lphin/index.html +X-DocPath=d3lphin/index.html Categories=Qt;TDE;System;FileManager; GenericName=File Manager GenericName[ar]=�� diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 7864b9f..1b9dbbf 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -367,8 +367,8 @@ for (TQStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) { KSimpleConfig cfg(dirIt + entryIt, true); cfg.setDesktopGroup(); - if ((cfg.hasKey("Actions") \|\| cfg.hasKey("X-TDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) { - const TQStringList types = cfg.readListEntry("ServiceTypes"); + if ((cfg.hasKey("Actions") \|\| cfg.hasKey("X-TDE-GetActionMenu")) && cfg.hasKey("X-TDE-ServiceTypes")) { + const TQStringList types = cfg.readListEntry("X-TDE-ServiceTypes"); for (TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it) { // check whether the mime type is equal or whether the // mimegroup (e. g. image/) is supported diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index cf6f527..5e20c5d 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -443,8 +443,8 @@ for (TQStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) { KSimpleConfig cfg(dirIt + entryIt, true); cfg.setDesktopGroup(); - if ((cfg.hasKey("Actions") \|\| cfg.hasKey("X-TDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) { - const TQStringList types = cfg.readListEntry("ServiceTypes"); + if ((cfg.hasKey("Actions") \|\| cfg.hasKey("X-TDE-GetActionMenu")) && cfg.hasKey("X-TDE-ServiceTypes")) { + const TQStringList types = cfg.readListEntry("X-TDE-ServiceTypes"); for (TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it) { // check whether the mime type is equal or whether the // mimegroup (e. g. image/) is supported diff --git a/src/servicemenus/amarok_addaspodcast.desktop b/src/servicemenus/amarok_addaspodcast.desktop index 7c61588..cf523e2 100644 --- a/src/servicemenus/amarok_addaspodcast.desktop +++ b/src/servicemenus/amarok_addaspodcast.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -ServiceTypes=text/html,text/xml,application/xml,text/rss +X-TDE-ServiceTypes=text/html,text/xml,application/xml,text/rss Actions=addAsPodcast [Desktop Action addAsPodcast] Name=Add as podcast to amaroK diff --git a/src/servicemenus/amarok_append.desktop b/src/servicemenus/amarok_append.desktop index 590fc6e..7530d5a 100644 --- a/src/servicemenus/amarok_append.desktop +++ b/src/servicemenus/amarok_append.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -ServiceTypes=application/asx,audio/* +X-TDE-ServiceTypes=application/asx,audio/* Actions=appendToPlaylist;appendAndPlay;queueTrack; X-TDE-Submenu=Amarok X-TDE-Submenu[bn]=�� diff --git a/src/servicemenus/amarok_play_audiocd.desktop b/src/servicemenus/amarok_play_audiocd.desktop index f59ef77..f838cdf 100644 --- a/src/servicemenus/amarok_play_audiocd.desktop +++ b/src/servicemenus/amarok_play_audiocd.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -ServiceTypes=media/audiocd +X-TDE-ServiceTypes=media/audiocd Actions=Play; Encoding=UTF-8 X-TDE-Priority=TopLevel diff --git a/src/servicemenus/ark_compress.desktop b/src/servicemenus/ark_compress.desktop index b2fcd67..9183dc1 100644 --- a/src/servicemenus/ark_compress.desktop +++ b/src/servicemenus/ark_compress.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -ServiceTypes=inode/directory +X-TDE-ServiceTypes=inode/directory Actions=CompressZip;CompressTarGz;CompressTarBz2 X-TDE-Priority=TopLevel X-TDE-Submenu=Compress diff --git a/src/servicemenus/ark_extract.desktop b/src/servicemenus/ark_extract.desktop index 1c54fd6..17fd3f9 100644 --- a/src/servicemenus/ark_extract.desktop +++ b/src/servicemenus/ark_extract.desktop @@ -1,7 +1,7 @@ [Desktop Entry] X-SuSE-translate=true Encoding=UTF-8 -ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak +X-TDE-ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak Actions=extractHere [Desktop Action extractHere] diff --git a/src/servicemenus/ark_extract_subdir.desktop b/src/servicemenus/ark_extract_subdir.desktop index 9d52df1..dba80b6 100644 --- a/src/servicemenus/ark_extract_subdir.desktop +++ b/src/servicemenus/ark_extract_subdir.desktop @@ -1,7 +1,7 @@ [Desktop Entry] X-SuSE-translate=true Encoding=UTF-8 -ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak +X-TDE-ServiceTypes=application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-tbz2,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-rar-compressed,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb,application/x-ace,application/x-7z,application/x-arc,application/x-arj,application/x-compress,application/x-cpio,application/x-pak Actions=ExtractSubdir [Desktop Action ExtractSubdir] diff --git a/src/servicemenus/compress.desktop b/src/servicemenus/compress.desktop index 1d38617..ac76ade 100644 --- a/src/servicemenus/compress.desktop +++ b/src/servicemenus/compress.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -ServiceTypes=all/allfiles +X-TDE-ServiceTypes=all/allfiles Actions=CompressZip;CompressTarGz;CompressTarBz2 X-TDE-Priority=TopLevel X-TDE-Submenu=Compress diff --git a/src/servicemenus/d3lphin_su.desktop b/src/servicemenus/d3lphin_su.desktop index f0e2e4c..aa1b3bc 100644 --- a/src/servicemenus/d3lphin_su.desktop +++ b/src/servicemenus/d3lphin_su.desktop @@ -1,9 +1,9 @@ [Desktop Entry] -ServiceTypes=inode/directory +X-TDE-ServiceTypes=inode/directory Actions=D3lphinSU; [Desktop Action D3lphinSU] -ServiceTypes=inode/directory +X-TDE-ServiceTypes=inode/directory Name=Open as Root Name[de]=��ffne als Root Name[ru]=�� root diff --git a/src/servicemenus/edit_as_root.desktop b/src/servicemenus/edit_as_root.desktop index e3df170..f927ac1 100644 --- a/src/servicemenus/edit_as_root.desktop +++ b/src/servicemenus/edit_as_root.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -ServiceTypes=text/,application/x-desktop +X-TDE-ServiceTypes=text/,application/x-desktop Actions=Editassu [Desktop Action Editassu] diff --git a/src/servicemenus/encryptfile.desktop b/src/servicemenus/encryptfile.desktop index 797698e..8e3eb82 100644 --- a/src/servicemenus/encryptfile.desktop +++ b/src/servicemenus/encryptfile.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -ServiceTypes=all/allfiles -ExcludeServiceTypes=kdedevice/* +X-TDE-ServiceTypes=all/allfiles +X-TDE-ExcludeServiceTypes=kdedevice/* Actions=encrypt [Desktop Action encrypt] diff --git a/src/servicemenus/encryptfolder.desktop b/src/servicemenus/encryptfolder.desktop index b322b64..af4309d 100644 --- a/src/servicemenus/encryptfolder.desktop +++ b/src/servicemenus/encryptfolder.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -ServiceTypes=inode/directory +X-TDE-ServiceTypes=inode/directory Actions=encrypt [Desktop Action encrypt] diff --git a/src/servicemenus/floppy_format.desktop b/src/servicemenus/floppy_format.desktop index b64df47..c51a65c 100644 --- a/src/servicemenus/floppy_format.desktop +++ b/src/servicemenus/floppy_format.desktop @@ -31,6 +31,6 @@ [Desktop Entry] Actions=Format; -ServiceTypes=media/floppy_unmounted,media/floppy5_unmounted +X-TDE-ServiceTypes=media/floppy_unmounted,media/floppy5_unmounted X-TDE-Priority=TopLevel X-TDE-MediaNotifierHide=true diff --git a/src/servicemenus/imageconverter.desktop b/src/servicemenus/imageconverter.desktop index 39a8a55..e5c9b36 100644 --- a/src/servicemenus/imageconverter.desktop +++ b/src/servicemenus/imageconverter.desktop @@ -3,7 +3,7 @@ # Released under the same license as the KDE core distribution (GPL 2.0). # [Desktop Entry] -ServiceTypes=image/* +X-TDE-ServiceTypes=image/* Actions=convToJPEG;convToPNG;convToGIF;convToTIF; X-TDE-Submenu=Convert To X-TDE-Submenu[bg]=�� diff --git a/src/servicemenus/installfont.desktop b/src/servicemenus/installfont.desktop index 3ca14fa..bac2509 100644 --- a/src/servicemenus/installfont.desktop +++ b/src/servicemenus/installfont.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -ServiceTypes=application/x-font-ttf,application/x-font-type1,application/x-font-speedo,application/x-font-bdf,application/x-font-pcf,application/x-font-snf,application/x-font-otf,application/x-font-ttc,application/x-afm +X-TDE-ServiceTypes=application/x-font-ttf,application/x-font-type1,application/x-font-speedo,application/x-font-bdf,application/x-font-pcf,application/x-font-snf,application/x-font-otf,application/x-font-ttc,application/x-afm Actions=installFont; X-SuSE-translate=true diff --git a/src/servicemenus/isoservice.desktop b/src/servicemenus/isoservice.desktop index 4b86111..5e539fe 100644 --- a/src/servicemenus/isoservice.desktop +++ b/src/servicemenus/isoservice.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Actions=OpenISO -ServiceTypes=inode/blockdevice,application/x-iso +X-TDE-ServiceTypes=inode/blockdevice,application/x-iso [Desktop Action OpenISO] Comment=ISO9660 View diff --git a/src/servicemenus/jpegorient.desktop b/src/servicemenus/jpegorient.desktop index 98cd73b..6cd2efc 100644 --- a/src/servicemenus/jpegorient.desktop +++ b/src/servicemenus/jpegorient.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -ServiceTypes=image/jpeg +X-TDE-ServiceTypes=image/jpeg Actions=jpegRot90;jpegRot270;jpegFlipV;jpegFlipH; X-TDE-Submenu=Transform Image X-TDE-Submenu[bg]=�� diff --git a/src/servicemenus/k3b_audiocd_rip.desktop b/src/servicemenus/k3b_audiocd_rip.desktop index 4f839e2..b733817 100644 --- a/src/servicemenus/k3b_audiocd_rip.desktop +++ b/src/servicemenus/k3b_audiocd_rip.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -ServiceTypes=media/audiocd,media/mixedcd +X-TDE-ServiceTypes=media/audiocd,media/mixedcd Actions=K3bRip; X-TDE-Priority=TopLevel diff --git a/src/servicemenus/k3b_cd_copy.desktop b/src/servicemenus/k3b_cd_copy.desktop index 21f419f..421f2f7 100644 --- a/src/servicemenus/k3b_cd_copy.desktop +++ b/src/servicemenus/k3b_cd_copy.desktop Diff limit reached (max: 250 lines)