From 93a1d2825457bfd0e4990e3d9316cef42a1cc4cc Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 26 Jun 2019 16:28:37 +0900 Subject: [PATCH] Adjusted to new normalized device icon names in tdelibs. Signed-off-by: Michele Calgaro --- src/cdopener.cpp | 6 +++--- src/replaygainfilelist.cpp | 2 +- src/soundkonverter.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cdopener.cpp b/src/cdopener.cpp index afadaa5..00964ec 100644 --- a/src/cdopener.cpp +++ b/src/cdopener.cpp @@ -39,7 +39,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin // let the dialog look nice setCaption( i18n("Add CD tracks") ); - setIcon( iconLoader->loadIcon("media-optical-cdaudio",TDEIcon::Small) ); + setIcon( iconLoader->loadIcon("media-optical-cdaudio-unmounted",TDEIcon::Small) ); // the grid for all widgets in the dialog 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->addSpacing( 130 ); -// pCDDB = new KPushButton( iconLoader->loadIcon("media-optical-cdaudio",TDEIcon::Small), i18n("Request CDDB"), this, "pCDDB" ); +// pCDDB = new KPushButton( iconLoader->loadIcon("media-optical-cdaudio-unmounted",TDEIcon::Small), i18n("Request CDDB"), this, "pCDDB" ); // topGridLayout->addWidget( pCDDB, 0, 8 ); // 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 selected tracks") ); RipperPlugin* plugin = config->getCurrentRipper(); - if( plugin != 0 && plugin->rip.full_disc.enabled ) cAdd->insertItem( iconLoader->loadIcon("media-optical-cdaudio",TDEIcon::Small),i18n("Add full CD as one file") ); + if( plugin != 0 && plugin->rip.full_disc.enabled ) cAdd->insertItem( iconLoader->loadIcon("media-optical-cdaudio-unmounted",TDEIcon::Small),i18n("Add full CD as one file") ); //cAdd->setSizeMode( ComboButton::Min ); controlBox->addWidget( cAdd ); connect( cAdd, TQT_SIGNAL(clicked(int)), diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp index 53a5187..7749baf 100644 --- a/src/replaygainfilelist.cpp +++ b/src/replaygainfilelist.cpp @@ -126,7 +126,7 @@ void ReplayGainFileListItem::setType( Type type ) if( type == Album ) { setOpen( true ); - setPixmap( 0, TDEGlobal::iconLoader()->loadIcon("media-optical-cdrom",TDEIcon::Small) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon("media-optical-cdrom-unmounted",TDEIcon::Small) ); } } diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp index 5e905dd..d6267a0 100644 --- a/src/soundkonverter.cpp +++ b/src/soundkonverter.cpp @@ -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("Add &Folder ..."), "audio-x-generic", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(showDirDialog()), actionCollection(), "add_folder" ); - 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 CD &tracks ..."), "media-optical-cdaudio-unmounted", 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" ); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); @@ -234,7 +234,7 @@ soundKonverter::soundKonverter() cAdd->setFont( font ); 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("media-optical-cdaudio",TDEIcon::Toolbar), i18n("Add CD tracks ...") ); + cAdd->insertItem( iconLoader->loadIcon("media-optical-cdaudio-unmounted",TDEIcon::Toolbar), i18n("Add CD tracks ...") ); cAdd->insertItem( iconLoader->loadIcon("browser",TDEIcon::Toolbar), i18n("Add URL ...") ); addBox->addWidget( cAdd ); connect( cAdd, TQT_SIGNAL(clicked(int)),