Branch: master

9ece43d7 2014-10-22 13:24:50 Timothy Pearson
Fix remaining issues from mimetype icon rename
M kaffeine/src/input/audiobrowser/urllistview.cpp
M kaffeine/src/input/dvb/dvbpanel.cpp
M kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
M kaffeine/src/player-parts/xine-part/xine_part.cpp
diff --git a/kaffeine/src/input/audiobrowser/urllistview.cpp b/kaffeine/src/input/audiobrowser/urllistview.cpp
index b7d6ece..f3a6da1 100644
--- a/kaffeine/src/input/audiobrowser/urllistview.cpp
+++ b/kaffeine/src/input/audiobrowser/urllistview.cpp
@@ -54,7 +54,7 @@
   m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("indent", TDEIcon::Small), i18n("Add Sub&title..."), this, TQT_SLOT(slotAddSubtitle()),TQKeySequence(),100 );
   m_contextMenu->insertSeparator();
   m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("edit", TDEIcon::Small), i18n("&Edit Title"), this, TQT_SLOT(slotEditTitle()));
-  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("info", TDEIcon::Small), i18n("&Info"), this, TQT_SLOT(slotShowInfo()));
+  m_contextMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet("application-vnd.tde.info", TDEIcon::Small), i18n("&Info"), this, TQT_SLOT(slotShowInfo()));
 
 /* width of the "length"-column */
   TQFontMetrics met(TDEGlobalSettings::generalFont());
diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
index 5c8cdd7..0d552f3 100644
--- a/kaffeine/src/input/dvb/dvbpanel.cpp
+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
@@ -245,7 +245,7 @@
 	broadcastBtn->setIconSet( icon->loadIconSet("network_local", TDEIcon::Small) );
 	dateBtn->setIconSet( icon->loadIconSet("date", TDEIcon::Small) );
 	infoBtn->setIconSet( icon->loadIconSet("view_text", TDEIcon::Small) );
-	osdBtn->setIconSet( icon->loadIconSet("info", TDEIcon::Small) );
+	osdBtn->setIconSet( icon->loadIconSet("application-vnd.tde.info", TDEIcon::Small) );
 	channelsBtn->setIconSet( icon->loadIconSet("kdvbtv", TDEIcon::Small) );
 	configBtn->setIconSet( icon->loadIconSet("configure", TDEIcon::Small) );
 	recallBtn->setIconSet( icon->loadIconSet("reload", TDEIcon::Small) );
@@ -442,7 +442,7 @@
 	new TDEAction(i18n("OSD Previous Event"), "go-up", CTRL+SHIFT+Key_A, this, TQT_SLOT(dvbOSDRetreat()), actionCollection(), "dvb_browse_retreat");
 	new TDEAction(i18n("Instant Record"), "document-save", 0, this, TQT_SLOT(setRecord()), actionCollection(), "dvb_instant_record");
 	new TDEAction(i18n("Recall"), "reload", CTRL+SHIFT+Key_Z, this, TQT_SLOT(recallZap()), actionCollection(), "dvb_recall");
-	new TDEAction(i18n("Show OSD"), "info", Key_O, this, TQT_SLOT(dvbOSD()), actionCollection(), "dvb_show_osd");
+	new TDEAction(i18n("Show OSD"), "application-vnd.tde.info", Key_O, this, TQT_SLOT(dvbOSD()), actionCollection(), "dvb_show_osd");
 	new TDEAction(i18n("EPG..."), "view_text", Key_G, this, TQT_SLOT(showEvents()), actionCollection(), "dvb_show_epg");
 	new TDEAction(i18n("Timers..."), "date", Key_T, this, TQT_SLOT(showTimers()), actionCollection(), "dvb_show_timers");
 	new TDEAction(i18n("Broadcasting..."), "network_local", Key_B, this, TQT_SLOT(setBroadcast()), actionCollection(), "dvb_show_broadcast");
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
index 76bb34c..2e5c9b2 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
@@ -716,7 +716,7 @@
 	new TDEAction(i18n("&DVB"), "zoom-fit-best", Key_F8, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioDVB()), actionCollection(), "aspect_dvb");
 	new TDEAction(i18n("&Square"), "zoom-fit-best", Key_F9, TQT_TQOBJECT(m_video), TQT_SLOT(slotAspectRatioSquare()), actionCollection(), "aspect_square");
 	new TDEAction(i18n("&Video Settings"), "configure", Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotVideoSettings()), actionCollection(), "video_settings");
-	new TDEAction(i18n("Track &Info"), "info", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actionCollection(), "player_track_info");
+	new TDEAction(i18n("Track &Info"), "application-vnd.tde.info", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actionCollection(), "player_track_info");
 
 	m_volume = new TQSlider(Qt::Horizontal, 0);
 	TQToolTip::add(m_volume, i18n("Volume"));
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
index 44426b4..df8afd6 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
@@ -1406,7 +1406,7 @@
 	m_dvdAngles = new TDESelectAction(i18n("Angles"), 0, actionCollection(), "dvd_angle_menu");
 	connect(m_dvdAngles, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotSetDVDAngle(const TQString&)));
 
-	new TDEAction(i18n("Track &Info"), "info", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actionCollection(), "player_track_info");
+	new TDEAction(i18n("Track &Info"), "application-vnd.tde.info", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actionCollection(), "player_track_info");
 	new TDEAction(i18n("Effect &Plugins..."), "filter", Key_X, TQT_TQOBJECT(this), TQT_SLOT(slotFilterDialog()), actionCollection(), "player_post_filters");
 
 	/* settings menu */