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

6 files changed, 8 insertions, 8 deletions

diff --git a/mimetypes/video/trinity1/x-ms-wmv.desktop b/mimetypes/video/trinity1/x-ms-wmv.desktop
index 1c0b285..10cc463 100644
--- a/mimetypes/video/trinity1/x-ms-wmv.desktop
+++ b/mimetypes/video/trinity1/x-ms-wmv.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=video/x-ms-wmv
-Icon=video
+Icon=video-x-generic
 Patterns=*.avi;*.AVI;*.wmv;*.WMV;
 Comment=Microsoft AVI Video
 Comment[ar]=ميكروسوفت AVIفيديو
diff --git a/mimetypes/video/x-ms-wmp.desktop b/mimetypes/video/x-ms-wmp.desktop
index a036373..d33e137 100644
--- a/mimetypes/video/x-ms-wmp.desktop
+++ b/mimetypes/video/x-ms-wmp.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=MimeType
 MimeType=video/x-ms-wmp
-Icon=video
+Icon=video-x-generic
 Patterns=*.wmp;*.WMP;
 Comment=Microsoft AVI Video
 Comment[ar]=ميكروسوفت AVIفيديو
diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp
index 2482a91..205451b 100644
--- a/src/kmplayerapp.cpp
+++ b/src/kmplayerapp.cpp
@@ -590,7 +590,7 @@ KDE_NO_EXPORT void KMPlayerApp::initActions () {
     editVolumeInc = new TDEAction (i18n ("Increase Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT (increaseVolume ()), ac, "edit_volume_up");
     editVolumeDec = new TDEAction (i18n ("Decrease Volume"), TQString ("player_volume"), TDEShortcut (), m_player, TQT_SLOT(decreaseVolume ()), ac, "edit_volume_down");
     toggleView = new TDEAction (i18n ("C&onsole"), TQString ("konsole"), TDEShortcut (), TQT_TQOBJECT(m_player->view()), TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video");
-    //new TDEAction (i18n ("V&ideo"), TQString ("video"), TDEShortcut (), m_view, TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video");
+    //new TDEAction (i18n ("V&ideo"), TQString (video-x-generic"), TDEShortcut (), m_view, TQT_SLOT (toggleVideoConsoleWindow ()), ac, "view_video");
     new TDEAction (i18n ("Pla&y List"), TQString ("player_playlist"), TDEShortcut (), m_player, TQT_SLOT (showPlayListWindow ()), ac, "view_playlist");
     new TDEAction (i18n ("Minimal mode"), TQString ("empty"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (slotMinimalMode ()), ac, "view_minimal");
     new TDEAction (i18n ("50%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom50 ()), ac, "view_zoom_50");
@@ -769,7 +769,7 @@ KDE_NO_EXPORT void KMPlayerApp::windowVideoConsoleToggled (int wt) {
         toggleView->setIcon (TQString ("konsole"));
     } else {
         toggleView->setText (i18n ("V&ideo"));
-        toggleView->setIcon (TQString ("video"));
+        toggleView->setIcon (TQString ("video-x-generic"));
     }
 }
 
diff --git a/src/kmplayerview.cpp b/src/kmplayerview.cpp
index 060cb03..25b3078 100644
--- a/src/kmplayerview.cpp
+++ b/src/kmplayerview.cpp
@@ -396,7 +396,7 @@ void View::toggleVideoConsoleWindow () {
         wt = WT_Video;
         m_control_panel->popupMenu ()->changeItem (ControlPanel::menu_video, TDEGlobal::iconLoader ()->loadIconSet (TQString ("konsole"), TDEIcon::Small, 0, true), i18n ("Con&sole"));
     } else
-        m_control_panel->popupMenu ()->changeItem (ControlPanel::menu_video, TDEGlobal::iconLoader ()->loadIconSet (TQString ("video"), TDEIcon::Small, 0, true), i18n ("V&ideo"));
+        m_control_panel->popupMenu ()->changeItem (ControlPanel::menu_video, TDEGlobal::iconLoader ()->loadIconSet (TQString ("video-x-generic"), TDEIcon::Small, 0, true), i18n ("V&ideo"));
     showWidget (wt);
     emit windowVideoConsoleToggled (int (wt));
 }
diff --git a/src/playlistview.cpp b/src/playlistview.cpp
index a2cb803..11a0f1a 100644
--- a/src/playlistview.cpp
+++ b/src/playlistview.cpp
@@ -127,7 +127,7 @@ KDE_NO_CDTOR_EXPORT PlayListView::PlayListView (TQWidget * parent, View * view,
     m_itemmenu = new TQPopupMenu (this);
     folder_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("folder"), TDEIcon::Small);
     auxiliary_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("folder_grey"), TDEIcon::Small);
-    video_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("video"), TDEIcon::Small);
+    video_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("video-x-generic"), TDEIcon::Small);
     info_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("messagebox_info"), TDEIcon::Small);
     img_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("colorize"), TDEIcon::Small);
     unknown_pix = TDEGlobal::iconLoader ()->loadIcon (TQString ("unknown"), TDEIcon::Small);
diff --git a/src/pref.cpp b/src/pref.cpp
index ff9a943..5cb2305 100644
--- a/src/pref.cpp
+++ b/src/pref.cpp
@@ -92,7 +92,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti
     tab->insertTab (m_SourcePageURL, i18n ("URL"));
     entries.insert (i18n("Source"), tab);
 
-    frame = addPage (i18n ("Recording"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("video"), TDEIcon::NoGroup, 32));
+    frame = addPage (i18n ("Recording"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("video-x-generic"), TDEIcon::NoGroup, 32));
     vlay = new TQVBoxLayout (frame, marginHint(), spacingHint());
     tab = new TQTabWidget (frame);
     vlay->addWidget (tab);
@@ -120,7 +120,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti
     tab->setCurrentPage (0);
     entries.insert (i18n("Recording"), tab);
 
-    frame = addPage (i18n ("Output Plugins"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("image"), TDEIcon::NoGroup, 32));
+    frame = addPage (i18n ("Output Plugins"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("image-x-generic"), TDEIcon::NoGroup, 32));
     vlay = new TQVBoxLayout(frame, marginHint(), spacingHint());
     tab = new TQTabWidget (frame);
     vlay->addWidget (tab);