Rename most device icons to comply with XDG standards

pull/1/head
Timothy Pearson 10 years ago
parent ce84059db7
commit 78bfb9d643

@ -581,9 +581,9 @@ KDE_NO_EXPORT void KMPlayerApp::initActions () {
new TDEAction (i18n ("Clear &History"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT (slotClearHistory ()), ac, "clear_history");
fileClose = KStdAction::close (TQT_TQOBJECT(this), TQT_SLOT (slotFileClose ()), ac);
fileQuit = KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT (slotFileQuit ()), ac);
new TDEAction (i18n ("&Open DVD"), TQString ("dvd_mount"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openDVD ()), ac, "opendvd");
new TDEAction (i18n ("&Open VCD"), TQString ("cdrom_mount"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openVCD ()), ac, "openvcd");
new TDEAction (i18n ("&Open Audio CD"), TQString ("cdrom_mount"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openAudioCD ()), ac, "openaudiocd");
new TDEAction (i18n ("&Open DVD"), TQString ("media-optical-dvd-mounted"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openDVD ()), ac, "opendvd");
new TDEAction (i18n ("&Open VCD"), TQString ("media-optical-cdrom-mounted"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openVCD ()), ac, "openvcd");
new TDEAction (i18n ("&Open Audio CD"), TQString ("media-optical-cdrom-mounted"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openAudioCD ()), ac, "openaudiocd");
new TDEAction (i18n ("&Open Pipe..."), TQString ("pipe"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT(openPipe ()), ac, "source_pipe");
//TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), TDEIcon::Small, 0,true)
new TDEAction (i18n ("&Connect"), TQString ("connect_established"), TDEShortcut (), TQT_TQOBJECT(this), TQT_SLOT (openVDR ()), ac, "vdr_connect");
@ -642,7 +642,7 @@ KDE_NO_EXPORT void KMPlayerApp::initMenu () {
menuBar ()->insertItem (i18n ("&Bookmarks"), bookmarkmenu, -1, 2);
m_sourcemenu = menuBar ()->findItem (menuBar ()->idAt (0));
m_sourcemenu->setText (i18n ("S&ource"));
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("dvd_mount"), TDEIcon::Small, 0, true), i18n ("&DVD"), m_dvdmenu, -1, 5);
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("media-optical-dvd-mounted"), TDEIcon::Small, 0, true), i18n ("&DVD"), m_dvdmenu, -1, 5);
m_dvdmenu->clear ();
#ifdef HAVE_XINE
m_dvdnavmenu->clear ();
@ -652,11 +652,11 @@ KDE_NO_EXPORT void KMPlayerApp::initMenu () {
#else
m_dvdmenu->insertItem (i18n ("&Open DVD"), TQT_TQOBJECT(this), TQT_SLOT(openDVD ()), 0,-1, 1);
#endif
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("cdrom_mount"), TDEIcon::Small, 0, true), i18n ("V&CD"), m_vcdmenu, -1, 6);
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("media-optical-cdrom-mounted"), TDEIcon::Small, 0, true), i18n ("V&CD"), m_vcdmenu, -1, 6);
m_vcdmenu->clear ();
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("tv"), TDEIcon::Small, 0, true), i18n ("&TV"), m_tvmenu, -1, 8);
m_vcdmenu->insertItem (i18n ("&Open VCD"), TQT_TQOBJECT(this), TQT_SLOT(openVCD ()), 0,-1, 1);
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("cdrom_mount"), TDEIcon::Small, 0, true), i18n ("&Audio CD"), m_audiocdmenu, -1, 7);
m_sourcemenu->popup ()->insertItem (TDEGlobal::iconLoader ()->loadIconSet (TQString ("media-optical-cdrom-mounted"), TDEIcon::Small, 0, true), i18n ("&Audio CD"), m_audiocdmenu, -1, 7);
m_audiocdmenu->insertItem (i18n ("&Open Audio CD"), TQT_TQOBJECT(this), TQT_SLOT(openAudioCD ()), 0,-1, 1);
}
@ -1828,7 +1828,7 @@ KDE_NO_CDTOR_EXPORT KMPlayerDVDSource::KMPlayerDVDSource (KMPlayerApp * a, TQPop
disks->appendChild (new Disk (disks, a, "cdda://", i18n ("CDROM - Audio Compact Disk")));
disks->appendChild (new Disk (disks, a, "vcd://", i18n ("VCD - Video Compact Disk")));
disks->appendChild (new Disk (disks, a, "dvd://", i18n ("DVD - Digital Video Disk")));
m_app->view()->playList()->addTree (disks, "listssource", "cdrom_mount", 0);
m_app->view()->playList()->addTree (disks, "listssource", "media-optical-cdrom-mounted", 0);
}
KDE_NO_CDTOR_EXPORT KMPlayerDVDSource::~KMPlayerDVDSource () {

Loading…
Cancel
Save