| 145f5ae3 | 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 kate/xmlcheck/plugin_katexmlcheck.cpp M kicker-applets/kolourpicker/kolourpicker.cpp M konq-plugins/crashes/crashesplugin.cpp M konq-plugins/crashes/crashesplugin.desktop M konq-plugins/imagerotation/imageconverter.desktop M konq-plugins/imagerotation/jpegorient.desktop M konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop M konq-plugins/kuick/kdirmenu.cpp M konq-plugins/kuick/kuick_plugin.desktop M konq-plugins/kuick/kuickplugin.desktop M konq-plugins/sidebar/metabar/src/protocolplugin.cpp M noatun-plugins/lyrics/cmodule.cpp M tdefile-plugins/lnk/lnkforward.desktop M tdefile-plugins/lnk/x-win-lnk.desktop |
||
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp
index 65a8b7c..287a460 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.cpp
+++ b/kate/xmlcheck/plugin_katexmlcheck.cpp
@@ -68,7 +68,7 @@
void PluginKateXMLCheck::addView(Kate::MainWindow *win)
{
Kate::ToolViewManager *viewmanager = win->toolViewManager();
- TQWidget *dock = viewmanager->createToolView("kate_plugin_xmlcheck_ouputview", Kate::ToolViewManager::Bottom, SmallIcon("misc"), i18n("XML Checker Output"));
+ TQWidget *dock = viewmanager->createToolView("kate_plugin_xmlcheck_ouputview", Kate::ToolViewManager::Bottom, SmallIcon("application-vnd.tde.misc"), i18n("XML Checker Output"));
PluginKateXMLCheckView *view = new PluginKateXMLCheckView (dock,win,"katexmlcheck_outputview");
view->dock = dock;
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index 8f82fe2..77e4ff8 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -293,21 +293,21 @@
popup->insertItem(SmallIcon("text"), value);
// HTML, lower case hex chars
value.sprintf("#%.2x%.2x%.2x", c.red(), c.green(), c.blue());
- popup->insertItem(SmallIcon("html"), value);
+ popup->insertItem(SmallIcon("text-html"), value);
if (value.find(TQRegExp("[a-f]")) >= 0)
{
// HTML, upper case hex chars
value.sprintf("#%.2X%.2X%.2X", c.red(), c.green(), c.blue());
- popup->insertItem(SmallIcon("html"), value);
+ popup->insertItem(SmallIcon("text-html"), value);
}
// lower case hex chars
value.sprintf( "%.2x%.2x%.2x", c.red(), c.green(), c.blue() );
- popup->insertItem( SmallIcon( "html" ), value );
+ popup->insertItem( SmallIcon( "text-html" ), value );
if ( value.find( TQRegExp( "[a-f]" ) ) >= 0 )
{
// upper case hex chars
value.sprintf( "%.2X%.2X%.2X", c.red(), c.green(), c.blue() );
- popup->insertItem( SmallIcon( "html" ), value );
+ popup->insertItem( SmallIcon( "text-html" ), value );
}
// Color name
TQStringList names = colorNames(c.red(), c.green(), c.blue());
diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp
index dfe8e3b..1150d31 100644
--- a/konq-plugins/crashes/crashesplugin.cpp
+++ b/konq-plugins/crashes/crashesplugin.cpp
@@ -42,7 +42,7 @@
{
m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast<TDEHTMLPart*>(parent) : 0L;
- m_pCrashesMenu = new TDEActionMenu( i18n("&Crashes"), "core",
+ m_pCrashesMenu = new TDEActionMenu( i18n("&Crashes"), "application-x-core",
actionCollection(), "crashes" );
m_pCrashesMenu->setDelayed( false );
diff --git a/konq-plugins/crashes/crashesplugin.desktop b/konq-plugins/crashes/crashesplugin.desktop
index 1ef344f..e6e3758 100644
--- a/konq-plugins/crashes/crashesplugin.desktop
+++ b/konq-plugins/crashes/crashesplugin.desktop
@@ -120,5 +120,5 @@
Comment[zh_CN]=���������������
Comment[zh_TW]=���������������
X-TDE-ParentApp=konqueror
-Icon=core
+Icon=application-x-core
X-DocPath=konq-plugins/crashes/index.html
diff --git a/konq-plugins/imagerotation/imageconverter.desktop b/konq-plugins/imagerotation/imageconverter.desktop
index 1876a07..51eef45 100644
--- a/konq-plugins/imagerotation/imageconverter.desktop
+++ b/konq-plugins/imagerotation/imageconverter.desktop
@@ -57,27 +57,27 @@
Name=JPEG
Name[hi]=���������������������
Name[ne]=���������������������
-Icon=image
+Icon=image-x-generic
Exec=convert %f "`echo %f | perl -pe 's/\.[^.]+$//'`.jpg"
[Desktop Action convToPNG]
Name=PNG
Name[hi]=������������������
Name[ne]=������������������
-Icon=image
+Icon=image-x-generic
Exec=convert %f "`echo %f | perl -pe 's/\.[^.]+$//'`.png"
[Desktop Action convToTIF]
Name=TIF
Name[hi]=������������
Name[ne]=������������������
-Icon=image
+Icon=image-x-generic
Exec=convert %f "`echo %f | perl -pe 's/\.[^.]+$//'`.tif"
[Desktop Action convToGIF]
Name=GIF
Name[hi]=������������
Name[ne]=������������������
-Icon=image
+Icon=image-x-generic
Exec=convert %f "`echo %f | perl -pe 's/\.[^.]+$//'`.gif"
diff --git a/konq-plugins/imagerotation/jpegorient.desktop b/konq-plugins/imagerotation/jpegorient.desktop
index bed67a9..f24fcd2 100644
--- a/konq-plugins/imagerotation/jpegorient.desktop
+++ b/konq-plugins/imagerotation/jpegorient.desktop
@@ -178,7 +178,7 @@
#[Desktop Action jpegRot180]
#Name=Rotate 180
-#Icon=misc
+#Icon=application-vnd.tde.misc
#Exec=jpegorient +180 %F
[Desktop Action jpegFlipV]
diff --git a/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop b/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop
index c804b65..703c52a 100644
--- a/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop
+++ b/konq-plugins/kimgalleryplugin/kimgalleryplugin.desktop
@@ -124,6 +124,6 @@
Comment[xh]=Indlela elula yokwenza iHTML igumbi lomboniso wemifanekiso
Comment[zh_CN]=������ HTML ������������������������
Comment[zh_TW]=������������ HTML ���������������
-Icon=imagegallery
+Icon=image-x-genericgallery
X-TDE-ParentApp=konqueror
X-DocPath=konq-plugins/imgallery/index.html
diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index 8a9758f..984326d 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -154,7 +154,7 @@
_icons->insert("kdisknav", SmallIcon("kdisknav"));
_icons->insert("kfm", SmallIcon("kfm"));
_icons->insert("terminal", SmallIcon("terminal"));
- _icons->insert("txt", SmallIcon("txt"));
+ _icons->insert("txt", SmallIcon("text-plain"));
_icons->insert("exec", SmallIcon("exec"));
_icons->insert("chardevice", SmallIcon("chardevice"));
}
diff --git a/konq-plugins/kuick/kuick_plugin.desktop b/konq-plugins/kuick/kuick_plugin.desktop
index dba182c..29bbe6b 100644
--- a/konq-plugins/kuick/kuick_plugin.desktop
+++ b/konq-plugins/kuick/kuick_plugin.desktop
@@ -62,6 +62,6 @@
Name[zh_CN]=���������������������
Name[zh_TW]=Kuick ���������������
Name[zu]=Kuick Khiphela futhi Ususe
-Icon=tdemultiple
+Icon=application-vnd.tde.tdemultiple
X-TDE-Library=libkuickplugin
X-TDE-ServiceTypes=KonqPopupMenu/Plugin,all/all
diff --git a/konq-plugins/kuick/kuickplugin.desktop b/konq-plugins/kuick/kuickplugin.desktop
index 7af2c7d..2b0a056 100644
--- a/konq-plugins/kuick/kuickplugin.desktop
+++ b/konq-plugins/kuick/kuickplugin.desktop
@@ -61,6 +61,6 @@
Name[zh_CN]=���������������������
Name[zh_TW]=Kuick ���������������
Name[zu]=Kuick Khiphela futhi Ususe
-Icon=tdemultiple
+Icon=application-vnd.tde.tdemultiple
X-TDE-ParentApp=konqueror
X-DocPath=konq-plugins/kuick/index.html
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index 877133b..e63eb0a 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -64,7 +64,7 @@
pix = m_items.getFirst()->pixmap(TDEIcon::SizeLarge);
}
else{
- pix = DesktopIcon("tdemultiple", TDEIcon::SizeLarge);
+ pix = DesktopIcon("application-vnd.tde.tdemultiple", TDEIcon::SizeLarge);
}
TQByteArray data;
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 51aef3f..ac21c22 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -44,7 +44,7 @@
"http://everything2.com/index.pl?node=$(author),"
"http://www.letssingit.com/cgi-exe/am.cgi?a=search&p=1&s=$(title)&l=song";
-LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("Configure Lyrics Plugin"), "document", _parent) {
+LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("Configure Lyrics Plugin"), "text-x-generic", _parent) {
/* Thanks to the kde-usability guys for the help designing this dialog!
* help to simon edwards of KGuardGod, for a big help designing it */
TQVBoxLayout *vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
diff --git a/tdefile-plugins/lnk/lnkforward.desktop b/tdefile-plugins/lnk/lnkforward.desktop
index 8897490..1bdfb5e 100644
--- a/tdefile-plugins/lnk/lnkforward.desktop
+++ b/tdefile-plugins/lnk/lnkforward.desktop
@@ -110,5 +110,5 @@
StartupNotify=false
Terminal=false
X-TDE-SubstituteUID=false
-Icon=exec_wine
+Icon=application-x-mswinurl
NoDisplay=true
diff --git a/tdefile-plugins/lnk/x-win-lnk.desktop b/tdefile-plugins/lnk/x-win-lnk.desktop
index 18429dc..ef50c9e 100644
--- a/tdefile-plugins/lnk/x-win-lnk.desktop
+++ b/tdefile-plugins/lnk/x-win-lnk.desktop
@@ -56,6 +56,6 @@
Comment[zh_CN]=Windows ������������������
Comment[zh_TW]=Windows Link ���
Hidden=false
-Icon=exec_wine
+Icon=application-x-mswinurl
MimeType=application/x-win-lnk
Patterns=*.lnk
|
||