mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-15 10:33:59 +02:00
Code Issues Releases Wiki Activity

Allow specifying which type of cover image is requested

Browse Source
This commit is contained in:
Leo Franchi
2012-04-06 14:55:57 -04:00
parent 58adc470ce
commit 3b21c91a97
6 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp
View File

@@ -215,7 +215,7 @@ PlaylistChartItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem&
if ( !m_pixmaps.contains( index ) ) if ( !m_pixmaps.contains( index ) )
{ {
m_pixmaps.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->query(), pixmapRect.size(), false ) ) ); m_pixmaps.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->query(), pixmapRect.size(), TomahawkUtils::ScaledCover, false ) ) );
_detail::Closure* closure = NewClosure( m_pixmaps[ index ], SIGNAL( repaintRequest() ), const_cast<PlaylistChartItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) ); _detail::Closure* closure = NewClosure( m_pixmaps[ index ], SIGNAL( repaintRequest() ), const_cast<PlaylistChartItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) );
closure->setAutoDelete( false ); closure->setAutoDelete( false );
} }

2
src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp
View File

@@ -198,7 +198,7 @@ PlaylistLargeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem&
if ( !m_pixmaps.contains( index ) ) if ( !m_pixmaps.contains( index ) )
{ {
m_pixmaps.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->query(), pixmapRect.size(), false ) ) ); m_pixmaps.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->query(), pixmapRect.size(), TomahawkUtils::ScaledCover, false ) ) );
_detail::Closure* closure = NewClosure( m_pixmaps[ index ], SIGNAL( repaintRequest() ), const_cast<PlaylistLargeItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) ); _detail::Closure* closure = NewClosure( m_pixmaps[ index ], SIGNAL( repaintRequest() ), const_cast<PlaylistLargeItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) );
closure->setAutoDelete( false ); closure->setAutoDelete( false );
} }

2
src/libtomahawk/playlist/albumitemdelegate.cpp
View File

@@ -98,7 +98,7 @@ AlbumItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
if ( !m_covers.contains( index ) ) if ( !m_covers.contains( index ) )
{ {
m_covers.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->album(), r.size() ) ) ); m_covers.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->album(), r.size(), TomahawkUtils::CoverInCase ) ) );
_detail::Closure* closure = NewClosure( m_covers[ index ], SIGNAL( repaintRequest() ), const_cast<AlbumItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) ); _detail::Closure* closure = NewClosure( m_covers[ index ], SIGNAL( repaintRequest() ), const_cast<AlbumItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) );
closure->setAutoDelete( false ); closure->setAutoDelete( false );
} }

4
src/libtomahawk/playlist/treeitemdelegate.cpp
View File

@@ -157,13 +157,13 @@ TreeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
{ {
if ( !item->album().isNull() ) if ( !item->album().isNull() )
{ {
m_pixmaps.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->album(), r.size(), false ) ) ); m_pixmaps.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->album(), r.size(), TomahawkUtils::ScaledCover, false ) ) );
_detail::Closure* closure = NewClosure( m_pixmaps[ index ], SIGNAL( repaintRequest() ), const_cast<TreeItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) ); _detail::Closure* closure = NewClosure( m_pixmaps[ index ], SIGNAL( repaintRequest() ), const_cast<TreeItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) );
closure->setAutoDelete( false ); closure->setAutoDelete( false );
} }
else if ( !item->artist().isNull() ) else if ( !item->artist().isNull() )
{ {
m_pixmaps.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->artist(), r.size(), false ) ) ); m_pixmaps.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->artist(), r.size(), TomahawkUtils::ScaledCover, false ) ) );
_detail::Closure* closure = NewClosure( m_pixmaps[ index ], SIGNAL( repaintRequest() ), const_cast<TreeItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) ); _detail::Closure* closure = NewClosure( m_pixmaps[ index ], SIGNAL( repaintRequest() ), const_cast<TreeItemDelegate*>(this), SLOT( doUpdateIndex( const QPersistentModelIndex& ) ), QPersistentModelIndex( index ) );
closure->setAutoDelete( false ); closure->setAutoDelete( false );
} }

15
src/libtomahawk/utils/PixmapDelegateFader.cpp
View File

@@ -26,9 +26,10 @@ using namespace Tomahawk;
#define COVER_FADEIN 1000 #define COVER_FADEIN 1000
PixmapDelegateFader::PixmapDelegateFader( const artist_ptr& artist, const QSize& size, bool forceLoad ) PixmapDelegateFader::PixmapDelegateFader( const artist_ptr& artist, const QSize& size, TomahawkUtils::ImageMode mode, bool forceLoad )
: m_artist( artist ) : m_artist( artist )
, m_size( size ) , m_size( size )
, m_mode( mode )
{ {
if ( !m_artist.isNull() ) if ( !m_artist.isNull() )
{ {
@@ -39,9 +40,10 @@ PixmapDelegateFader::PixmapDelegateFader( const artist_ptr& artist, const QSize&
init(); init();
} }
PixmapDelegateFader::PixmapDelegateFader( const album_ptr& album, const QSize& size, bool forceLoad ) PixmapDelegateFader::PixmapDelegateFader( const album_ptr& album, const QSize& size, TomahawkUtils::ImageMode mode, bool forceLoad )
: m_album( album ) : m_album( album )
, m_size( size ) , m_size( size )
, m_mode( mode )
{ {
if ( !m_album.isNull() ) if ( !m_album.isNull() )
{ {
@@ -53,9 +55,10 @@ PixmapDelegateFader::PixmapDelegateFader( const album_ptr& album, const QSize& s
} }
PixmapDelegateFader::PixmapDelegateFader( const query_ptr& track, const QSize& size, bool forceLoad ) PixmapDelegateFader::PixmapDelegateFader( const query_ptr& track, const QSize& size, TomahawkUtils::ImageMode mode, bool forceLoad )
: m_track( track ) : m_track( track )
, m_size( size ) , m_size( size )
, m_mode( mode )
{ {
if ( !m_track.isNull() ) if ( !m_track.isNull() )
{ {
@@ -90,11 +93,11 @@ PixmapDelegateFader::init()
{ {
// No cover loaded yet, use default and don't fade in // No cover loaded yet, use default and don't fade in
if ( !m_album.isNull() ) if ( !m_album.isNull() )
m_current = m_currentReference = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::CoverInCase, m_size ); m_current = m_currentReference = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, m_mode, m_size );
else if ( !m_artist.isNull() ) else if ( !m_artist.isNull() )
m_current = m_currentReference = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, TomahawkUtils::CoverInCase, m_size ); m_current = m_currentReference = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, m_mode, m_size );
else if ( !m_track.isNull() ) else if ( !m_track.isNull() )
m_current = m_currentReference = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::CoverInCase, m_size ); m_current = m_currentReference = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, m_mode, m_size );
return; return;
} }

7
src/libtomahawk/utils/PixmapDelegateFader.h
View File

@@ -40,9 +40,9 @@ class PixmapDelegateFader : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
PixmapDelegateFader( const artist_ptr& artist, const QSize& size, bool forceLoad = true ); PixmapDelegateFader( const artist_ptr& artist, const QSize& size, TomahawkUtils::ImageMode mode = TomahawkUtils::Original, bool forceLoad = true );
PixmapDelegateFader( const album_ptr& album, const QSize& size, bool forceLoad = true ); PixmapDelegateFader( const album_ptr& album, const QSize& size, TomahawkUtils::ImageMode mode = TomahawkUtils::Original, bool forceLoad = true );
PixmapDelegateFader( const query_ptr& track, const QSize& size, bool forceLoad = true ); PixmapDelegateFader( const query_ptr& track, const QSize& size, TomahawkUtils::ImageMode mode = TomahawkUtils::Original, bool forceLoad = true );
virtual ~PixmapDelegateFader(); virtual ~PixmapDelegateFader();
@@ -67,6 +67,7 @@ private:
album_ptr m_album; album_ptr m_album;
query_ptr m_track; query_ptr m_track;
QSize m_size; QSize m_size;
TomahawkUtils::ImageMode m_mode;
QQueue<QPixmap> m_pixmapQueue; QQueue<QPixmap> m_pixmapQueue;
QTimeLine m_crossfadeTimeline; QTimeLine m_crossfadeTimeline;