| 23741c32 | 2015-03-02 09:08:41 | Timothy Pearson |
Rename most device icons to comply with XDG standards |
||
|
M amarok/src/collectionbrowser.cpp M amarok/src/iconloader.cpp M amarok/src/magnatunebrowser/magnatunelistviewitems.cpp M amarok/src/mediabrowser.cpp M amarok/src/mediadevice/generic/genericmediadevice.cpp M amarok/src/mediadevice/ipod/ipodmediadevice.cpp |
||
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index c756c3f..c9000a1 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@@ -2711,10 +2711,10 @@
switch( cat )
{
case IdAlbum:
- icon = "cdrom_unmount";
+ icon = "media-optical-cdrom";
break;
case IdVisYearAlbum:
- icon = "cdrom_unmount";
+ icon = "media-optical-cdrom";
break;
case IdArtist:
icon = "preferences-desktop-personal";
diff --git a/amarok/src/iconloader.cpp b/amarok/src/iconloader.cpp
index d0e307e..40efd21 100644
--- a/amarok/src/iconloader.cpp
+++ b/amarok/src/iconloader.cpp
@@ -35,18 +35,18 @@
if( iconMap.empty() ) {
iconMap["add_lyrics"] = "edit_add";
iconMap["add_playlist"] = "1downarrow";
- iconMap["album"] = "cdrom_unmount";
+ iconMap["album"] = "media-optical-cdrom";
iconMap["artist"] = "preferences-desktop-personal";
iconMap["audioscrobbler"] = "audioscrobbler";
iconMap["love"] = "bookmark";
iconMap["back"] = "media-skip-backward";
- iconMap["burn"] = "cdrom_unmount";
+ iconMap["burn"] = "media-optical-cdrom";
iconMap["change_language"] = "configure";
iconMap["clock"] = "history";
iconMap["collection"] = "collection";
iconMap["configure"] = "configure";
iconMap["covermanager"] = "covermanager";
- iconMap["device"] = "usbpendrive_unmount";
+ iconMap["device"] = "media-flash-usb";
iconMap["download"] = "tdehtml_kget";
iconMap["dynamic"] = "dynamic";
iconMap["edit"] = "edit";
@@ -79,7 +79,7 @@
iconMap["refresh"] = "reload";
iconMap["remove"] = "edit-delete";
iconMap["remove_from_playlist"] = "remove";
- iconMap["repeat_album"] = "cdrom_unmount";
+ iconMap["repeat_album"] = "media-optical-cdrom";
iconMap["repeat_no"] = "go-bottom";
iconMap["repeat_playlist"] = "repeat_playlist";
iconMap["repeat_track"] = "repeat_track";
diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
index 82c2cd1..f7c3c4b 100644
--- a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
+++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
@@ -90,7 +90,7 @@
TDEListViewItem::setText( 0, album.getName() );
setDragEnabled( true );
- //setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "cdrom_unmount", TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
+ //setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "media-optical-cdrom", TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
}
diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp
index 70ea034..ea9be5e 100644
--- a/amarok/src/mediabrowser.cpp
+++ b/amarok/src/mediabrowser.cpp
@@ -233,7 +233,7 @@
// cancel
// sound
MediaItem::s_pixArtist = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "personal" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
- MediaItem::s_pixAlbum = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cdrom_unmount" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
+ MediaItem::s_pixAlbum = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "media-optical-cdrom" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixInvisible = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixStale = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
MediaItem::s_pixOrphaned = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp
index 81df830..017c58e 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@@ -944,9 +944,9 @@
menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), QUEUE );
menu.insertSeparator();
menu.insertItem( SmallIconSet( Amarok::icon( "collection" ) ), i18n( "&Copy Files to Collection..." ), DOWNLOAD );
- menu.insertItem( SmallIconSet( Amarok::icon( "cdrom_unmount" ) ), i18n( "Burn to CD as Data" ), BURN_DATACD );
+ menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdrom" ) ), i18n( "Burn to CD as Data" ), BURN_DATACD );
menu.setItemEnabled( BURN_DATACD, K3bExporter::isAvailable() );
- menu.insertItem( SmallIconSet( Amarok::icon( "cdaudio_unmount" ) ), i18n( "Burn to CD as Audio" ), BURN_AUDIOCD );
+ menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdaudio" ) ), i18n( "Burn to CD as Audio" ), BURN_AUDIOCD );
menu.setItemEnabled( BURN_AUDIOCD, K3bExporter::isAvailable() );
menu.insertSeparator();
menu.insertItem( SmallIconSet( Amarok::icon( "folder" ) ), i18n( "Add Directory" ), DIRECTORY );
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
index a47b790..ed485e7 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
@@ -2261,19 +2261,19 @@
switch( item->type() )
{
case MediaItem::ARTIST:
- menu.insertItem( SmallIconSet( Amarok::icon( "cdrom_unmount" ) ), i18n( "Burn All Tracks by This Artist" ), BURN_ARTIST );
+ menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdrom" ) ), i18n( "Burn All Tracks by This Artist" ), BURN_ARTIST );
menu.setItemEnabled( BURN_ARTIST, K3bExporter::isAvailable() );
break;
case MediaItem::ALBUM:
- menu.insertItem( SmallIconSet( Amarok::icon( "cdrom_unmount" ) ), i18n( "Burn This Album" ), BURN_ALBUM );
+ menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdrom" ) ), i18n( "Burn This Album" ), BURN_ALBUM );
menu.setItemEnabled( BURN_ALBUM, K3bExporter::isAvailable() );
break;
default:
- menu.insertItem( SmallIconSet( Amarok::icon( "cdrom_unmount" ) ), i18n( "Burn to CD as Data" ), BURN_DATACD );
+ menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdrom" ) ), i18n( "Burn to CD as Data" ), BURN_DATACD );
menu.setItemEnabled( BURN_DATACD, K3bExporter::isAvailable() );
- menu.insertItem( SmallIconSet( Amarok::icon( "cdaudio_unmount" ) ), i18n( "Burn to CD as Audio" ), BURN_AUDIOCD );
+ menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdaudio" ) ), i18n( "Burn to CD as Audio" ), BURN_AUDIOCD );
menu.setItemEnabled( BURN_AUDIOCD, K3bExporter::isAvailable() );
break;
}
|
||