From bdfee9ac19493da144cafdc37708a9d72c5ad011 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 22 Oct 2014 11:54:59 -0500 Subject: [PATCH] Repair mimetype icon usage, part 1. The following are not fully verified in source as of this commit due to ubiquity: info, unknown --- src/kmplayerapp.cpp | 6 +++--- src/kmplayercontrolpanel.cpp | 2 +- src/kmplayertvsource.cpp | 2 +- src/kmplayervdr.cpp | 2 +- src/pref.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/kmplayerapp.cpp b/src/kmplayerapp.cpp index 205451b..d9daf24 100644 --- a/src/kmplayerapp.cpp +++ b/src/kmplayerapp.cpp @@ -592,7 +592,7 @@ KDE_NO_EXPORT void KMPlayerApp::initActions () { 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-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 ("Minimal mode"), TQString ("application-x-zerosize"), 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"); new TDEAction (i18n ("100%"), TQString ("zoom-fit-best"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (zoom100 ()), ac, "view_zoom_100"); new TDEAction (i18n ("150%"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (zoom150 ()), ac, "view_zoom_150"); @@ -2041,7 +2041,7 @@ KDE_NO_EXPORT void KMPlayerDVDSource::sync (bool fromUI) { KDE_NO_EXPORT void KMPlayerDVDSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { item = i18n ("Source"); - icon = TQString ("source"); + icon = TQString ("text-x-src"); tab = i18n ("DVD"); } @@ -2217,7 +2217,7 @@ KDE_NO_EXPORT void KMPlayerVCDSource::sync (bool fromUI) { KDE_NO_EXPORT void KMPlayerVCDSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { item = i18n ("Source"); - icon = TQString ("source"); + icon = TQString ("text-x-src"); tab = i18n ("VCD"); } diff --git a/src/kmplayercontrolpanel.cpp b/src/kmplayercontrolpanel.cpp index 7ac2d1c..09fda70 100644 --- a/src/kmplayercontrolpanel.cpp +++ b/src/kmplayercontrolpanel.cpp @@ -385,7 +385,7 @@ KDE_NO_CDTOR_EXPORT ControlPanel::ControlPanel(TQWidget * parent, View * view) m_popupMenu->insertItem (i18n("&Bookmarks"), m_bookmarkMenu, menu_bookmark); m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("konsole"), TDEIcon::Small, 0, true), i18n ("Con&sole"), menu_video); m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("player_playlist"), TDEIcon::Small, 0, true), i18n ("Play&list"), menu_playlist); - m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("empty"), TDEIcon::Small, 0, true), i18n ("Minimal mode"), menu_minimal); + m_popupMenu->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("application-x-zerosize"), TDEIcon::Small, 0, true), i18n ("Minimal mode"), menu_minimal); m_popupMenu->setAccel (TQKeySequence (TQt::Key_M), menu_minimal); m_popupMenu->insertItem (TDEGlobal::iconLoader()->loadIconSet (TQString ("view-fullscreen"), TDEIcon::Small, 0, true), i18n ("&Full Screen"), menu_fullscreen); m_popupMenu->setAccel (TQKeySequence (TQt::Key_F), menu_fullscreen); diff --git a/src/kmplayertvsource.cpp b/src/kmplayertvsource.cpp index ac6a8dd..9089d51 100644 --- a/src/kmplayertvsource.cpp +++ b/src/kmplayertvsource.cpp @@ -567,7 +567,7 @@ KDE_NO_EXPORT void KMPlayerTVSource::sync (bool fromUI) { KDE_NO_EXPORT void KMPlayerTVSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { item = i18n ("Source"); - icon = TQString ("source"); + icon = TQString ("text-x-src"); tab = i18n ("TV"); } diff --git a/src/kmplayervdr.cpp b/src/kmplayervdr.cpp index e0e74fc..287ce53 100644 --- a/src/kmplayervdr.cpp +++ b/src/kmplayervdr.cpp @@ -722,7 +722,7 @@ KDE_NO_EXPORT void KMPlayerVDRSource::configReceived () { KDE_NO_EXPORT void KMPlayerVDRSource::prefLocation (TQString & item, TQString & icon, TQString & tab) { item = i18n ("Source"); - icon = TQString ("source"); + icon = TQString ("text-x-src"); tab = i18n ("VDR"); } diff --git a/src/pref.cpp b/src/pref.cpp index 5cb2305..b18fb4c 100644 --- a/src/pref.cpp +++ b/src/pref.cpp @@ -84,7 +84,7 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti tab->insertTab (m_GeneralPageOutput, i18n("Output")); entries.insert (i18n("General Options"), tab); - frame = addPage (i18n ("Source"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("source"), TDEIcon::NoGroup, 32)); + frame = addPage (i18n ("Source"), TQString(), TDEGlobal::iconLoader()->loadIcon (TQString ("text-x-src"), TDEIcon::NoGroup, 32)); vlay = new TQVBoxLayout (frame, marginHint(), spacingHint()); tab = new TQTabWidget (frame); vlay->addWidget (tab);