| 46e2e93f | 2014-10-22 01:27:29 | Timothy Pearson |
Bring most mimetypes in line with XDG specifications. The following are not fully verified in source as of this commit due to ubiquity: html, empty, info, make, man, misc, source, unknown |
||
|
M applnk/compat/konqhtml.desktop M kappfinder/apps/Internet/Terminal/ncftp.desktop M kappfinder/apps/Internet/gFTP.desktop M kappfinder/apps/Multimedia/aviplay.desktop M kappfinder/apps/Multimedia/gtv.desktop M kappfinder/apps/Multimedia/mplayer.desktop M kappfinder/apps/Multimedia/mtv.desktop M kappfinder/apps/Multimedia/ogle.desktop M kappfinder/apps/Multimedia/oqtplayer.desktop M kappfinder/apps/Multimedia/xine.desktop M kappfinder/apps/Office/Applix.desktop M kappfinder/apps/System/sam.desktop M kappfinder/apps/System/xosview.desktop M kappfinder/apps/Utilities/SystemLogViewer.desktop M kate/app/katemainwindow.cpp M kcontrol/colors/colors.desktop M kcontrol/componentchooser/componentchooser.desktop M kcontrol/fonts/fonts.desktop M kcontrol/icons/iconthemes.cpp M kcontrol/konqhtml/tdehtml_fonts.desktop M kcontrol/kthememanager/kthememanager.cpp M kcontrol/tdefontinst/installfont.desktop M kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp M kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp M kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop M kcontrol/tdefontinst/tdeio/fonts.desktop M kcontrol/tdefontinst/tdeio/fonts.protocol M kcontrol/tdefontinst/tdeio/package.desktop M kcontrol/tdefontinst/viewpart/tdefontview.desktop M kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop M kdesktop/init/Templates/CDROM-Device.desktop M kdesktop/init/Templates/HTMLFile.desktop M kdesktop/init/Templates/TextFile.desktop M kdesktop/init/Templates/ZIP-Device.desktop M kdesktop/init/Templates/linkCDROM.desktop M kdesktop/init/Templates/linkZIP.desktop M khelpcenter/docentry.cpp M khelpcenter/navigator.cpp M khelpcenter/plugins/Manpages/.directory M khelpcenter/scrollkeepertreebuilder.cpp M khelpcenter/toc.cpp M kicker/kicker/ui/browser_mnu.cpp M kicker/menuext/recentdocs/recentdocs.desktop M kicker/menuext/tom/tom.cc M klipper/configdialog.cpp M konqueror/listview/konq_listviewwidget.cc M konqueror/sidebar/sidebar_widget.cpp M konsole/konsole/konsole.cpp M konsole/konsole/konsole_part.cpp M ksysguard/gui/SensorDisplayLib/ProcessList.cc M libkonq/kivdirectoryoverlay.cc M tdeioslave/cgi/cgi.protocol M tdeioslave/man/man.protocol M tdeioslave/media/mimetypes/cdrom_mounted.desktop M tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop M tdeioslave/media/mimetypes/cdrom_unmounted.desktop M tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop M tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop M tdeioslave/media/mimetypes/svcd.desktop M tdeioslave/media/mimetypes/vcd.desktop M tdeioslave/media/mimetypes/zip_mounted.desktop M tdeioslave/media/mimetypes/zip_unmounted.desktop M tdeioslave/tar/ar.protocol M tdeioslave/tar/tar.protocol M tdeioslave/tar/zip.protocol M tdeprint/slave/mimetypes/driver.desktop M tdeprint/slave/print.protocol M tdeprint/slave/printdb.protocol |
||
diff --git a/applnk/compat/konqhtml.desktop b/applnk/compat/konqhtml.desktop
index 16bb26d..2b48669 100644
--- a/applnk/compat/konqhtml.desktop
+++ b/applnk/compat/konqhtml.desktop
@@ -76,7 +76,7 @@
Name[zh_CN]=Konqueror ���������
Name[zh_TW]=Konqueror ���������������
Type=Application
-Icon=fonts
+Icon=font-x-generics
Exec=tdecmshell tdehtml_fonts
X-TDE-ModuleType=Library
X-TDE-Library=konqhtml
diff --git a/kappfinder/apps/Internet/Terminal/ncftp.desktop b/kappfinder/apps/Internet/Terminal/ncftp.desktop
index 06f406d..84330d9 100644
--- a/kappfinder/apps/Internet/Terminal/ncftp.desktop
+++ b/kappfinder/apps/Internet/Terminal/ncftp.desktop
@@ -89,7 +89,7 @@
GenericName[zu]=Umxhasi we-FTP
MimeType=
Exec=ncftp
-Icon=misc
+Icon=application-vnd.tde.misc
Path=
Type=Application
Terminal=true
diff --git a/kappfinder/apps/Internet/gFTP.desktop b/kappfinder/apps/Internet/gFTP.desktop
index c6c81e3..959754f 100644
--- a/kappfinder/apps/Internet/gFTP.desktop
+++ b/kappfinder/apps/Internet/gFTP.desktop
@@ -75,5 +75,5 @@
GenericName[zh_TW]=FTP ���������
Exec=gftp
Terminal=false
-Icon=gftp
+Icon=application-x-tex-gftp
Type=Application
diff --git a/kappfinder/apps/Multimedia/aviplay.desktop b/kappfinder/apps/Multimedia/aviplay.desktop
index a19f9d7..451ff81 100644
--- a/kappfinder/apps/Multimedia/aviplay.desktop
+++ b/kappfinder/apps/Multimedia/aviplay.desktop
@@ -79,7 +79,7 @@
GenericName[zh_TW]=AVI ������������������
GenericName[zu]=Umdlali we-Vidiyo ye-AVI
Exec=aviplay %f
-Icon=video
+Icon=video-x-generic
MimeType=application/vnd.ms-asf;video/mpeg;video/quicktime;video/x-flic;video/x-msvideo
Name=Aviplay
Name[bn]=���.������.������-������������
diff --git a/kappfinder/apps/Multimedia/gtv.desktop b/kappfinder/apps/Multimedia/gtv.desktop
index 2a7eb0c..996a444 100644
--- a/kappfinder/apps/Multimedia/gtv.desktop
+++ b/kappfinder/apps/Multimedia/gtv.desktop
@@ -81,7 +81,7 @@
GenericName[zh_TW]=MPEG ������������
GenericName[zu]=Umdlali we-MPEG
Exec=gtv
-Icon=video
+Icon=video-x-generic
MimeType=video/mpeg
Name=GTV
Name[bn]=������������������
diff --git a/kappfinder/apps/Multimedia/mplayer.desktop b/kappfinder/apps/Multimedia/mplayer.desktop
index e08dbc8..e6ba041 100644
--- a/kappfinder/apps/Multimedia/mplayer.desktop
+++ b/kappfinder/apps/Multimedia/mplayer.desktop
@@ -82,7 +82,7 @@
GenericName[zh_TW]=���������������������
GenericName[zu]=Umdlali we-Vidiyo
Exec=gmplayer %U
-Icon=video
+Icon=video-x-generic
MimeType=application/vnd.ms-asf;video/mpeg;video/quicktime;video/x-flic;video/x-msvideo
Name=MPlayer
Name[bn]=������-���������������������
diff --git a/kappfinder/apps/Multimedia/mtv.desktop b/kappfinder/apps/Multimedia/mtv.desktop
index 116eb5c..1509f5a 100644
--- a/kappfinder/apps/Multimedia/mtv.desktop
+++ b/kappfinder/apps/Multimedia/mtv.desktop
@@ -82,7 +82,7 @@
GenericName[zh_TW]=���������������������
GenericName[zu]=Umdlali we-Vidiyo
Exec=mtv
-Icon=video
+Icon=video-x-generic
Name=MpegTV
Name[af]=Mpegtv
Name[bn]=���������������-������������
diff --git a/kappfinder/apps/Multimedia/ogle.desktop b/kappfinder/apps/Multimedia/ogle.desktop
index e50b28a..6fe0430 100644
--- a/kappfinder/apps/Multimedia/ogle.desktop
+++ b/kappfinder/apps/Multimedia/ogle.desktop
@@ -80,7 +80,7 @@
GenericName[zh_TW]=DVD ���������
GenericName[zu]=Umdlali we-DVD
Exec=ogle %f
-Icon=video
+Icon=video-x-generic
MimeType=inode/chardevice;inode/directory
Name=Ogle
Name[bn]=���������
diff --git a/kappfinder/apps/Multimedia/oqtplayer.desktop b/kappfinder/apps/Multimedia/oqtplayer.desktop
index d511da2..64a01ee 100644
--- a/kappfinder/apps/Multimedia/oqtplayer.desktop
+++ b/kappfinder/apps/Multimedia/oqtplayer.desktop
@@ -80,7 +80,7 @@
GenericName[zh_TW]=MOV ������������������
GenericName[zu]=Umdlali we-MOV ye-Vidiyo
Exec=oqtplayer %f
-Icon=video
+Icon=video-x-generic
MimeType=video/quicktime
Name=OQTPlayer
Name[de]=OQT-Abspieler
diff --git a/kappfinder/apps/Multimedia/xine.desktop b/kappfinder/apps/Multimedia/xine.desktop
index 3944dbe..e9a7a0f 100644
--- a/kappfinder/apps/Multimedia/xine.desktop
+++ b/kappfinder/apps/Multimedia/xine.desktop
@@ -82,7 +82,7 @@
GenericName[zh_TW]=���������������������
GenericName[zu]=Umdlali we-Vidiyo
Exec=xine %f
-Icon=video
+Icon=video-x-generic
MimeType=video/mpeg;video/quicktime;video/x-flic;video/x-msvideo;video/x-ogm;video/x-theora;video/mp4
Name=Xine
Name[hi]=���������������������
diff --git a/kappfinder/apps/Office/Applix.desktop b/kappfinder/apps/Office/Applix.desktop
index e803360..d256ec2 100644
--- a/kappfinder/apps/Office/Applix.desktop
+++ b/kappfinder/apps/Office/Applix.desktop
@@ -8,7 +8,7 @@
Name[te]=��������� ������������������
MimeType=
Exec=applix
-Icon=applixware
+Icon=application-x-applix-wordware
Path=
X-DocPath=
Type=Application
diff --git a/kappfinder/apps/System/sam.desktop b/kappfinder/apps/System/sam.desktop
index 4c03f73..55707f1 100644
--- a/kappfinder/apps/System/sam.desktop
+++ b/kappfinder/apps/System/sam.desktop
@@ -81,7 +81,7 @@
Name[zu]=Ukugcinwa kwesisitimu kwe-SAM
MimeType=
Exec=sam
-Icon=log
+Icon=text-x-text-x-log
Path=
Type=Application
Terminal=false
diff --git a/kappfinder/apps/System/xosview.desktop b/kappfinder/apps/System/xosview.desktop
index 81443f9..457c3d8 100644
--- a/kappfinder/apps/System/xosview.desktop
+++ b/kappfinder/apps/System/xosview.desktop
@@ -101,7 +101,7 @@
GenericName[zh_TW]=���������������
GenericName[zu]=I-Monitor yesistimu
Exec=xosview
-Icon=log
+Icon=text-x-text-x-log
Path=
Type=Application
Terminal=false
diff --git a/kappfinder/apps/Utilities/SystemLogViewer.desktop b/kappfinder/apps/Utilities/SystemLogViewer.desktop
index 29fdd59..41b10ed 100644
--- a/kappfinder/apps/Utilities/SystemLogViewer.desktop
+++ b/kappfinder/apps/Utilities/SystemLogViewer.desktop
@@ -79,5 +79,5 @@
Name[zu]=Umbukisi Wenqubo eqoshiwe Yesistimu
Exec=logview
Terminal=false
-Icon=logview
+Icon=text-x-text-x-logview
Type=Application
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index af06170..0bcf088 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -209,7 +209,7 @@
m_viewManager = new KateViewManager (this);
- KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("tdemultiple"), i18n("Documents"));
+ KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, SmallIcon("application-vnd.tde.tdemultiple"), i18n("Documents"));
filelist = new KateFileList (this, m_viewManager, ft, "filelist");
filelist->readConfig(KateApp::self()->config(), "Filelist");
diff --git a/kcontrol/colors/colors.desktop b/kcontrol/colors/colors.desktop
index 07b0f76..51423b6 100644
--- a/kcontrol/colors/colors.desktop
+++ b/kcontrol/colors/colors.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Exec=tdecmshell colors
-Icon=colorscm
+Icon=application-x-kcsrc
Type=Application
X-DocPath=kcontrol/colors/index.html
diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
index 3202fd3..e97c999 100644
--- a/kcontrol/componentchooser/componentchooser.desktop
+++ b/kcontrol/componentchooser/componentchooser.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Exec=tdecmshell componentchooser
-Icon=misc
+Icon=application-vnd.tde.misc
Type=Application
X-TDE-Library=componentchooser
X-TDE-ParentApp=kcontrol
diff --git a/kcontrol/fonts/fonts.desktop b/kcontrol/fonts/fonts.desktop
index 1890069..c2a48eb 100644
--- a/kcontrol/fonts/fonts.desktop
+++ b/kcontrol/fonts/fonts.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Exec=tdecmshell fonts
-Icon=fonts
+Icon=font-x-generics
Type=Application
X-DocPath=kcontrol/fonts/index.html
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index fe0a59e..c75bf5f 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -66,7 +66,7 @@
m_previewFolder=new TQLabel(m_preview);
m_previewFolder->setPixmap(DesktopIcon("folder"));
m_previewDocument=new TQLabel(m_preview);
- m_previewDocument->setPixmap(DesktopIcon("document"));
+ m_previewDocument->setPixmap(DesktopIcon("text-x-generic"));
lh2->addStretch(10);
lh2->addWidget(m_previewExec);
diff --git a/kcontrol/konqhtml/tdehtml_fonts.desktop b/kcontrol/konqhtml/tdehtml_fonts.desktop
index 06eab09..981ae25 100644
--- a/kcontrol/konqhtml/tdehtml_fonts.desktop
+++ b/kcontrol/konqhtml/tdehtml_fonts.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
X-DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance
-Icon=fonts
+Icon=font-x-generics
** Diff limit reached (max: 250 lines) **
|
||