TDE
/
kaffeine
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename most device icons to comply with XDG standards

Browse Source
pull/1/head
Timothy Pearson 10 years ago
parent 419e900e1a
commit e7327f33f2
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

14
kaffeine/src/input/disc/disc.cpp
Unescape View File

@ -113,7 +113,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
h1->addWidget( ripBtn ); h1->addWidget( ripBtn );
vb->addLayout( h1 ); vb->addLayout( h1 );
cdBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("cdaudio_unmount", TDEIcon::Toolbar) ); cdBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("media-optical-cdaudio", TDEIcon::Toolbar) );
ripBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", TDEIcon::Toolbar) ); ripBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", TDEIcon::Toolbar) );
connect( cdBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startCD()) ); connect( cdBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startCD()) );
@ -205,13 +205,13 @@ void Disc::getTargets( TQStringList &uiNames, TQStringList &iconNames, TQStringL
iconNames.append( "kilogram" ); iconNames.append( "kilogram" );
targetNames.append( "DISC_RIP" ); targetNames.append( "DISC_RIP" );
uiNames.append( i18n("Play Audio CD") ); uiNames.append( i18n("Play Audio CD") );
iconNames.append( "cdaudio_unmount" ); iconNames.append( "media-optical-cdaudio" );
targetNames.append( "DISC_CDDA" ); targetNames.append( "DISC_CDDA" );
uiNames.append( i18n("Play DVD") ); uiNames.append( i18n("Play DVD") );
iconNames.append( "dvd_unmount" ); iconNames.append( "media-optical-dvd" );
targetNames.append( "DISC_DVD" ); targetNames.append( "DISC_DVD" );
uiNames.append( i18n("Play VCD") ); uiNames.append( i18n("Play VCD") );
iconNames.append( "cdrom_unmount" ); iconNames.append( "media-optical-cdrom" );
targetNames.append( "DISC_VCD" ); targetNames.append( "DISC_VCD" );
} }
@ -266,9 +266,9 @@ TQWidget* Disc::inputMainWidget()
void Disc::setupActions() void Disc::setupActions()
{ {
new TDEAction(i18n("Open &DVD"), "dvd_unmount", 0, this, TQT_SLOT(startDVD()), actionCollection(), "file_open_dvd"); new TDEAction(i18n("Open &DVD"), "media-optical-dvd", 0, this, TQT_SLOT(startDVD()), actionCollection(), "file_open_dvd");
new TDEAction(i18n("Open &VCD"), "cdrom_unmount", 0, this, TQT_SLOT(startVCD()), actionCollection(), "file_open_vcd"); new TDEAction(i18n("Open &VCD"), "media-optical-cdrom", 0, this, TQT_SLOT(startVCD()), actionCollection(), "file_open_vcd");
new TDEAction(i18n("Open &Audio-CD"), "cdaudio_unmount", 0, this, TQT_SLOT(startCD()), actionCollection(), "file_open_audiocd"); new TDEAction(i18n("Open &Audio-CD"), "media-optical-cdaudio", 0, this, TQT_SLOT(startCD()), actionCollection(), "file_open_audiocd");
} }
void Disc::playerStopped() void Disc::playerStopped()

2
kaffeine/src/input/dvb/dvbconfig.cpp
Unescape View File

@ -827,7 +827,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
} }
page = addPage(i18n("Recording"),i18n("DVB Recording Options"), page = addPage(i18n("Recording"),i18n("DVB Recording Options"),
TDEGlobal::instance()->iconLoader()->loadIcon( "hdd_unmount", TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); TDEGlobal::instance()->iconLoader()->loadIcon( "drive-harddisk", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
vb = new TQVBoxLayout( page, 6, 6 ); vb = new TQVBoxLayout( page, 6, 6 );
gb = new TQGroupBox( "", page ); gb = new TQGroupBox( "", page );
grid = new TQGridLayout( gb, 1, 1, 20, 6 ); grid = new TQGridLayout( gb, 1, 1, 20, 6 );

2
kaffeine/src/kaffeine.cpp
Unescape View File

@ -193,7 +193,7 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
guiFactory()->addClient( m_playlist ); guiFactory()->addClient( m_playlist );
cddisc = new Disc( stack, TQT_TQOBJECT(this) ); cddisc = new Disc( stack, TQT_TQOBJECT(this) );
inplug->add( cddisc, TDEGlobal::iconLoader()->loadIcon("cdrom_unmount", TDEIcon::Small), i18n( "Audio CD") ); inplug->add( cddisc, TDEGlobal::iconLoader()->loadIcon("media-optical-cdrom", TDEIcon::Small), i18n( "Audio CD") );
guiFactory()->addClient( cddisc ); guiFactory()->addClient( cddisc );
connect(m_playlist, TQT_SIGNAL(signalRequestForDVD(const TQString&)), cddisc, TQT_SLOT(startDVD(const TQString&))); connect(m_playlist, TQT_SIGNAL(signalRequestForDVD(const TQString&)), cddisc, TQT_SLOT(startDVD(const TQString&)));

2
kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
Unescape View File

@ -71,7 +71,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1); layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
//Media page //Media page
frame = addPage(i18n("Media"), i18n("Media Options"), TDEGlobal::iconLoader()->loadIcon("cdrom_unmount", TDEIcon::Panel, frame = addPage(i18n("Media"), i18n("Media Options"), TDEGlobal::iconLoader()->loadIcon("media-optical-cdrom", TDEIcon::Panel,
TDEIcon::SizeMedium)); TDEIcon::SizeMedium));
layout = new TQGridLayout(frame, 10, 2); layout = new TQGridLayout(frame, 10, 2);
layout->setMargin(10); layout->setMargin(10);

4
kaffeine/src/player-parts/xine-part/xineconfig.cpp
Unescape View File

@ -256,13 +256,13 @@ XineConfig::XineConfig(const xine_t* const xine) :
else if (*it == "video") else if (*it == "video")
icon = "video-x-generic"; icon = "video-x-generic";
else if (*it == "vcd") else if (*it == "vcd")
icon = "cdrom_unmount"; icon = "media-optical-cdrom";
else if (*it == "input") else if (*it == "input")
icon = "connect_established"; icon = "connect_established";
else if (*it == "effects") else if (*it == "effects")
icon = "wizard"; icon = "wizard";
else if (*it == "media") else if (*it == "media")
icon = "cdrom_unmount"; icon = "media-optical-cdrom";
else if (*it == "subtitles") else if (*it == "subtitles")
icon = "application-x-font-snf"; icon = "application-x-font-snf";
else if (*it == "osd") else if (*it == "osd")

Write Preview
Loading…
Cancel
Save