Rename most device icons to comply with XDG standards

pull/1/head
Timothy Pearson 10 years ago
parent 1a380b43ae
commit 31fd238031

@ -39,7 +39,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
// let the dialog look nice // let the dialog look nice
setCaption( i18n("Add CD tracks") ); setCaption( i18n("Add CD tracks") );
setIcon( iconLoader->loadIcon("cdaudio_unmount",TDEIcon::Small) ); setIcon( iconLoader->loadIcon("media-optical-cdaudio",TDEIcon::Small) );
// the grid for all widgets in the dialog // the grid for all widgets in the dialog
TQGridLayout* gridLayout = new TQGridLayout( this, 1, 1, 11, 6, "gridLayout" ); TQGridLayout* gridLayout = new TQGridLayout( this, 1, 1, 11, 6, "gridLayout" );
@ -76,7 +76,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
); );
//artistBox->addStretch(); //artistBox->addStretch();
artistBox->addSpacing( 130 ); artistBox->addSpacing( 130 );
// pCDDB = new KPushButton( iconLoader->loadIcon("cdaudio_unmount",TDEIcon::Small), i18n("Request CDDB"), this, "pCDDB" ); // pCDDB = new KPushButton( iconLoader->loadIcon("media-optical-cdaudio",TDEIcon::Small), i18n("Request CDDB"), this, "pCDDB" );
// topGridLayout->addWidget( pCDDB, 0, 8 ); // topGridLayout->addWidget( pCDDB, 0, 8 );
// set up the second row at the top // set up the second row at the top
@ -250,7 +250,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
cAdd->insertItem( iconLoader->loadIcon("document-open",TDEIcon::Small),i18n("Add all tracks") ); cAdd->insertItem( iconLoader->loadIcon("document-open",TDEIcon::Small),i18n("Add all tracks") );
cAdd->insertItem( iconLoader->loadIcon("document-open",TDEIcon::Small),i18n("Add selected tracks") ); cAdd->insertItem( iconLoader->loadIcon("document-open",TDEIcon::Small),i18n("Add selected tracks") );
RipperPlugin* plugin = config->getCurrentRipper(); RipperPlugin* plugin = config->getCurrentRipper();
if( plugin != 0 && plugin->rip.full_disc.enabled ) cAdd->insertItem( iconLoader->loadIcon("cdaudio_unmount",TDEIcon::Small),i18n("Add full CD as one file") ); if( plugin != 0 && plugin->rip.full_disc.enabled ) cAdd->insertItem( iconLoader->loadIcon("media-optical-cdaudio",TDEIcon::Small),i18n("Add full CD as one file") );
//cAdd->setSizeMode( ComboButton::Min ); //cAdd->setSizeMode( ComboButton::Min );
controlBox->addWidget( cAdd ); controlBox->addWidget( cAdd );
connect( cAdd, TQT_SIGNAL(clicked(int)), connect( cAdd, TQT_SIGNAL(clicked(int)),

@ -126,7 +126,7 @@ void ReplayGainFileListItem::setType( Type type )
if( type == Album ) { if( type == Album ) {
setOpen( true ); setOpen( true );
setPixmap( 0, TDEGlobal::iconLoader()->loadIcon("cdrom_unmount",TDEIcon::Small) ); setPixmap( 0, TDEGlobal::iconLoader()->loadIcon("media-optical-cdrom",TDEIcon::Small) );
} }
} }

@ -153,7 +153,7 @@ soundKonverter::soundKonverter()
new TDEAction( i18n("A&dd Files ..."), "audio-x-generic", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(showFileDialog()), actionCollection(), "add_files" ); new TDEAction( i18n("A&dd Files ..."), "audio-x-generic", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(showFileDialog()), actionCollection(), "add_files" );
new TDEAction( i18n("Add &Folder ..."), "audio-x-generic", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(showDirDialog()), actionCollection(), "add_folder" ); new TDEAction( i18n("Add &Folder ..."), "audio-x-generic", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(showDirDialog()), actionCollection(), "add_folder" );
new TDEAction( i18n("Add CD &tracks ..."), "cdaudio_unmount", CTRL+Key_T, TQT_TQOBJECT(this), TQT_SLOT(showCdDialog()), actionCollection(), "add_audiocd" ); new TDEAction( i18n("Add CD &tracks ..."), "media-optical-cdaudio", CTRL+Key_T, TQT_TQOBJECT(this), TQT_SLOT(showCdDialog()), actionCollection(), "add_audiocd" );
new TDEAction( i18n("Add &URL ..."), "browser", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(showUrlDialog()), actionCollection(), "add_url" ); new TDEAction( i18n("Add &URL ..."), "browser", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(showUrlDialog()), actionCollection(), "add_url" );
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
@ -234,7 +234,7 @@ soundKonverter::soundKonverter()
cAdd->setFont( font ); cAdd->setFont( font );
cAdd->insertItem( iconLoader->loadIcon("audio-x-generic",TDEIcon::Toolbar), i18n("Add files ...") ); cAdd->insertItem( iconLoader->loadIcon("audio-x-generic",TDEIcon::Toolbar), i18n("Add files ...") );
cAdd->insertItem( iconLoader->loadIcon("folder",TDEIcon::Toolbar), i18n("Add folder ...") ); cAdd->insertItem( iconLoader->loadIcon("folder",TDEIcon::Toolbar), i18n("Add folder ...") );
cAdd->insertItem( iconLoader->loadIcon("cdaudio_unmount",TDEIcon::Toolbar), i18n("Add CD tracks ...") ); cAdd->insertItem( iconLoader->loadIcon("media-optical-cdaudio",TDEIcon::Toolbar), i18n("Add CD tracks ...") );
cAdd->insertItem( iconLoader->loadIcon("browser",TDEIcon::Toolbar), i18n("Add URL ...") ); cAdd->insertItem( iconLoader->loadIcon("browser",TDEIcon::Toolbar), i18n("Add URL ...") );
addBox->addWidget( cAdd ); addBox->addWidget( cAdd );
connect( cAdd, TQT_SIGNAL(clicked(int)), connect( cAdd, TQT_SIGNAL(clicked(int)),

Loading…
Cancel
Save