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

Adjusted to new normalized device icon names in tdelibs.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/4/head
Michele Calgaro 6 years ago committed by TDE Gitea
parent 6be9ab69ad
commit b3e0959ffd
6 changed files with 14 additions and 57 deletions
Show Stats Download Patch File Download Diff File

4
amarok/src/collectionbrowser.cpp
Unescape Escape View File

@ -2709,10 +2709,10 @@ CollectionView::iconForCategory( const int cat ) const
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";

8
amarok/src/iconloader.cpp
Unescape Escape View File

@ -35,18 +35,18 @@ Amarok::icon( const TQString& name ) //declared in amarok.h
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 @@ Amarok::icon( const TQString& name ) //declared in amarok.h
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";

45
amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
Unescape Escape View File

@ -27,8 +27,6 @@
#include <tqdatetime.h>
MagnatuneListViewArtistItem::MagnatuneListViewArtistItem( MagnatuneArtist artist, TDEListView * parent )
: TDEListViewItem( parent ), MagnatuneArtist( artist )
{
@ -45,7 +43,6 @@ MagnatuneListViewArtistItem::~ MagnatuneListViewArtistItem( )
void MagnatuneListViewArtistItem::setOpen( bool o )
{
if ( o && !childCount() ) {
listView()->setUpdatesEnabled( false );
@ -61,8 +58,6 @@ void MagnatuneListViewArtistItem::setOpen( bool o )
TDEListViewItem::setOpen( o );
invalidateHeight();
listView()->repaintContents();
}
@ -72,34 +67,19 @@ void MagnatuneListViewArtistItem::setup()
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 @@ void MagnatuneListViewAlbumItem::setOpen( bool o )
TDEListViewItem::setOpen( o );
invalidateHeight();
listView()->repaintContents();
}
void MagnatuneListViewAlbumItem::setup( )
@ -129,29 +107,14 @@ void MagnatuneListViewAlbumItem::setup( )
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() );
debug() << "track duration: " << TQString::number( track.getDuration() ) << endl;
@ -172,9 +135,3 @@ MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, TD
MagnatuneListViewTrackItem::~ MagnatuneListViewTrackItem( )
{
}

2
amarok/src/mediabrowser.cpp
Unescape Escape View File

@ -233,7 +233,7 @@ MediaBrowser::MediaBrowser( const char *name )
// 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 ) );

4
amarok/src/mediadevice/generic/genericmediadevice.cpp
Unescape Escape 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.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 );

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

@ -2261,19 +2261,19 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int )
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;
}

Write Preview
Loading…
Cancel
Save