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

Rename most device icons to comply with XDG standards

Browse Source 
(cherry picked from commit 23741c32aa)
r14.0.x
Timothy Pearson 10 years ago committed by Slávek Banko
parent 3c4662fe20
commit 206b4d4cbc
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

4
amarok/src/collectionbrowser.cpp
Unescape View File

@ -2711,10 +2711,10 @@ CollectionView::iconForCategory( const int cat ) const
switch( cat ) switch( cat )
{ {
case IdAlbum: case IdAlbum:
icon = "cdrom_unmount"; icon = "media-optical-cdrom";
break; break;
case IdVisYearAlbum: case IdVisYearAlbum:
icon = "cdrom_unmount"; icon = "media-optical-cdrom";
break; break;
case IdArtist: case IdArtist:
icon = "preferences-desktop-personal"; icon = "preferences-desktop-personal";

8
amarok/src/iconloader.cpp
Unescape View File

@ -35,18 +35,18 @@ Amarok::icon( const TQString& name ) //declared in amarok.h
if( iconMap.empty() ) { if( iconMap.empty() ) {
iconMap["add_lyrics"] = "edit_add"; iconMap["add_lyrics"] = "edit_add";
iconMap["add_playlist"] = "1downarrow"; iconMap["add_playlist"] = "1downarrow";
iconMap["album"] = "cdrom_unmount"; iconMap["album"] = "media-optical-cdrom";
iconMap["artist"] = "preferences-desktop-personal"; iconMap["artist"] = "preferences-desktop-personal";
iconMap["audioscrobbler"] = "audioscrobbler"; iconMap["audioscrobbler"] = "audioscrobbler";
iconMap["love"] = "bookmark"; iconMap["love"] = "bookmark";
iconMap["back"] = "media-skip-backward"; iconMap["back"] = "media-skip-backward";
iconMap["burn"] = "cdrom_unmount"; iconMap["burn"] = "media-optical-cdrom";
iconMap["change_language"] = "configure"; iconMap["change_language"] = "configure";
iconMap["clock"] = "history"; iconMap["clock"] = "history";
iconMap["collection"] = "collection"; iconMap["collection"] = "collection";
iconMap["configure"] = "configure"; iconMap["configure"] = "configure";
iconMap["covermanager"] = "covermanager"; iconMap["covermanager"] = "covermanager";
iconMap["device"] = "usbpendrive_unmount"; iconMap["device"] = "media-flash-usb";
iconMap["download"] = "tdehtml_kget"; iconMap["download"] = "tdehtml_kget";
iconMap["dynamic"] = "dynamic"; iconMap["dynamic"] = "dynamic";
iconMap["edit"] = "edit"; iconMap["edit"] = "edit";
@ -79,7 +79,7 @@ Amarok::icon( const TQString& name ) //declared in amarok.h
iconMap["refresh"] = "reload"; iconMap["refresh"] = "reload";
iconMap["remove"] = "edit-delete"; iconMap["remove"] = "edit-delete";
iconMap["remove_from_playlist"] = "remove"; iconMap["remove_from_playlist"] = "remove";
iconMap["repeat_album"] = "cdrom_unmount"; iconMap["repeat_album"] = "media-optical-cdrom";
iconMap["repeat_no"] = "go-bottom"; iconMap["repeat_no"] = "go-bottom";
iconMap["repeat_playlist"] = "repeat_playlist"; iconMap["repeat_playlist"] = "repeat_playlist";
iconMap["repeat_track"] = "repeat_track"; iconMap["repeat_track"] = "repeat_track";

2
amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
Unescape View File

@ -90,7 +90,7 @@ MagnatuneListViewAlbumItem::MagnatuneListViewAlbumItem( MagnatuneAlbum album, TD
TDEListViewItem::setText( 0, album.getName() ); TDEListViewItem::setText( 0, album.getName() );
setDragEnabled( true ); 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 ) );
} }

2
amarok/src/mediabrowser.cpp
Unescape View File

@ -233,7 +233,7 @@ MediaBrowser::MediaBrowser( const char *name )
// cancel // cancel
// sound // sound
MediaItem::s_pixArtist = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "personal" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); 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_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_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 ) ); MediaItem::s_pixOrphaned = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "cancel" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) );

4
amarok/src/mediadevice/generic/genericmediadevice.cpp
Unescape View File

@ -944,9 +944,9 @@ GenericMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int
menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), QUEUE ); menu.insertItem( SmallIconSet( Amarok::icon( "fastforward" ) ), i18n( "&Queue Tracks" ), QUEUE );
menu.insertSeparator(); menu.insertSeparator();
menu.insertItem( SmallIconSet( Amarok::icon( "collection" ) ), i18n( "&Copy Files to Collection..." ), DOWNLOAD ); 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.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.setItemEnabled( BURN_AUDIOCD, K3bExporter::isAvailable() );
menu.insertSeparator(); menu.insertSeparator();
menu.insertItem( SmallIconSet( Amarok::icon( "folder" ) ), i18n( "Add Directory" ), DIRECTORY ); menu.insertItem( SmallIconSet( Amarok::icon( "folder" ) ), i18n( "Add Directory" ), DIRECTORY );

8
amarok/src/mediadevice/ipod/ipodmediadevice.cpp
Unescape View File

@ -2261,19 +2261,19 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int )
switch( item->type() ) switch( item->type() )
{ {
case MediaItem::ARTIST: 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() ); menu.setItemEnabled( BURN_ARTIST, K3bExporter::isAvailable() );
break; break;
case MediaItem::ALBUM: 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() ); menu.setItemEnabled( BURN_ALBUM, K3bExporter::isAvailable() );
break; break;
default: 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.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.setItemEnabled( BURN_AUDIOCD, K3bExporter::isAvailable() );
break; break;
} }

Write Preview
Loading…
Cancel
Save