b3e0959f | 2019-07-09 04:30:04 | Michele Calgaro |
Adjusted to new normalized device icon names in tdelibs. Signed-off-by: Michele Calgaro <michele.calgaro@...> |
||
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 |
||
amarok/src/collectionbrowser.cppdiff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp index 93826fe..3ca7023 100644 --- a/amarok/src/collectionbrowser.cpp +++ b/amarok/src/collectionbrowser.cpp @@ -2709,10 +2709,10 @@ switch( cat ) { case IdAlbum: - icon = "media-optical-cdrom"; + icon = "media-optical-cdrom-unmounted"; break; case IdVisYearAlbum: - icon = "media-optical-cdrom"; + icon = "media-optical-cdrom-unmounted"; break; case IdArtist: icon = "preferences-desktop-personal"; amarok/src/iconloader.cppdiff --git a/amarok/src/iconloader.cpp b/amarok/src/iconloader.cpp index 40efd21..3030516 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"] = "media-optical-cdrom"; + iconMap["album"] = "media-optical-cdrom-unmounted"; iconMap["artist"] = "preferences-desktop-personal"; iconMap["audioscrobbler"] = "audioscrobbler"; iconMap["love"] = "bookmark"; iconMap["back"] = "media-skip-backward"; - iconMap["burn"] = "media-optical-cdrom"; + iconMap["burn"] = "media-optical-cdrom-unmounted"; iconMap["change_language"] = "configure"; iconMap["clock"] = "history"; iconMap["collection"] = "collection"; iconMap["configure"] = "configure"; iconMap["covermanager"] = "covermanager"; - iconMap["device"] = "media-flash-usb"; + iconMap["device"] = "media-flash-usb-unmounted"; 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"] = "media-optical-cdrom"; + iconMap["repeat_album"] = "media-optical-cdrom-unmounted"; iconMap["repeat_no"] = "go-bottom"; iconMap["repeat_playlist"] = "repeat_playlist"; iconMap["repeat_track"] = "repeat_track"; amarok/src/magnatunebrowser/magnatunelistviewitems.cppdiff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp index f7c3c4b..73320b1 100644 --- a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp +++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp @@ -27,8 +27,6 @@ #include <tqdatetime.h> - - MagnatuneListViewArtistItem::MagnatuneListViewArtistItem( MagnatuneArtist artist, TDEListView * parent ) : TDEListViewItem( parent ), MagnatuneArtist( artist ) { @@ -45,7 +43,6 @@ void MagnatuneListViewArtistItem::setOpen( bool o ) { - if ( o && !childCount() ) { listView()->setUpdatesEnabled( false ); @@ -61,8 +58,6 @@ TDEListViewItem::setOpen( o ); invalidateHeight(); listView()->repaintContents(); - - } @@ -72,33 +67,18 @@ TDEListViewItem::setup(); } - - - - - - - - - - - - MagnatuneListViewAlbumItem::MagnatuneListViewAlbumItem( MagnatuneAlbum album, TDEListViewItem * parent ) : TDEListViewItem( parent ), MagnatuneAlbum( album ) { TDEListViewItem::setText( 0, album.getName() ); setDragEnabled( true ); - //setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "media-optical-cdrom", TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); - - + //setPixmap(0, TDEGlobal::iconLoader()->loadIcon( "media-optical-cdrom-unmounted", TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); } MagnatuneListViewAlbumItem::~ MagnatuneListViewAlbumItem( ) { } - void MagnatuneListViewAlbumItem::setOpen( bool o ) { @@ -119,8 +99,6 @@ TDEListViewItem::setOpen( o ); invalidateHeight(); listView()->repaintContents(); - - } void MagnatuneListViewAlbumItem::setup( ) @@ -129,28 +107,13 @@ TDEListViewItem::setup(); } - - - - - - - - - - - - MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, TDEListViewItem * parent ) : TDEListViewItem( parent ), MagnatuneTrack( track ) { - int trackNumber = track.getTrackNumber(); TQString trackNumberString = TQString::number( trackNumber ); if (trackNumber < 10) trackNumberString = '0' + trackNumberString; - - TDEListViewItem::setText( 0, trackNumberString + " - " + track.getName() ); @@ -172,9 +135,3 @@ MagnatuneListViewTrackItem::~ MagnatuneListViewTrackItem( ) { } - - - - - - amarok/src/mediabrowser.cppdiff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp index ea9be5e..7a8c21b 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( "media-optical-cdrom" ), TDEIcon::Toolbar, TDEIcon::SizeSmall ) ); + MediaItem::s_pixAlbum = new TQPixmap(iconLoader.loadIcon( Amarok::icon( "media-optical-cdrom-unmounted" ), 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 ) ); amarok/src/mediadevice/generic/genericmediadevice.cppdiff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp index 585d534..e64bace 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( "media-optical-cdrom" ) ), i18n( "Burn to CD as Data" ), BURN_DATACD ); + menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdrom-unmounted" ) ), i18n( "Burn to CD as Data" ), BURN_DATACD ); menu.setItemEnabled( BURN_DATACD, K3bExporter::isAvailable() ); - menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdaudio" ) ), i18n( "Burn to CD as Audio" ), BURN_AUDIOCD ); + menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdaudio-unmounted" ) ), 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 ); amarok/src/mediadevice/ipod/ipodmediadevice.cppdiff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp index ed485e7..1e947dc 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( "media-optical-cdrom" ) ), i18n( "Burn All Tracks by This Artist" ), BURN_ARTIST ); + menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdrom-unmounted" ) ), i18n( "Burn All Tracks by This Artist" ), BURN_ARTIST ); menu.setItemEnabled( BURN_ARTIST, K3bExporter::isAvailable() ); break; case MediaItem::ALBUM: - menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdrom" ) ), i18n( "Burn This Album" ), BURN_ALBUM ); + menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdrom-unmounted" ) ), i18n( "Burn This Album" ), BURN_ALBUM ); menu.setItemEnabled( BURN_ALBUM, K3bExporter::isAvailable() ); break; default: - menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdrom" ) ), i18n( "Burn to CD as Data" ), BURN_DATACD ); + menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdrom-unmounted" ) ), i18n( "Burn to CD as Data" ), BURN_DATACD ); menu.setItemEnabled( BURN_DATACD, K3bExporter::isAvailable() ); - menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdaudio" ) ), i18n( "Burn to CD as Audio" ), BURN_AUDIOCD ); + menu.insertItem( SmallIconSet( Amarok::icon( "media-optical-cdaudio-unmounted" ) ), i18n( "Burn to CD as Audio" ), BURN_AUDIOCD ); menu.setItemEnabled( BURN_AUDIOCD, K3bExporter::isAvailable() ); break; } |