mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-05 21:57:41 +02:00
Code Issues Releases Wiki Activity

* Use new default artist placeholder image.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-08-01 02:27:12 +02:00
parent d0858efd7d
commit 243997b06e
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources.qrc
View File

@@ -8,6 +8,7 @@
<file>./data/images/loved.png</file> <file>./data/images/loved.png</file>
<file>./data/images/not-loved.png</file> <file>./data/images/not-loved.png</file>
<file>./data/images/no-album-art-placeholder.png</file> <file>./data/images/no-album-art-placeholder.png</file>
<file>./data/images/no-artist-image-placeholder.png</file>
<file>./data/images/now-playing-panel.png</file> <file>./data/images/now-playing-panel.png</file>
<file>./data/images/now-playing-speaker.png</file> <file>./data/images/now-playing-speaker.png</file>
<file>./data/images/pause-pressed.png</file> <file>./data/images/pause-pressed.png</file>

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

@@ -40,7 +40,8 @@ TreeItemDelegate::TreeItemDelegate( ArtistView* parent, TreeProxyModel* proxy )
, m_model( proxy ) , m_model( proxy )
{ {
m_nowPlayingIcon = QPixmap( RESPATH "images/now-playing-speaker.png" ); m_nowPlayingIcon = QPixmap( RESPATH "images/now-playing-speaker.png" );
m_defaultCover = QPixmap( RESPATH "images/no-album-art-placeholder.png" ); m_defaultAlbumCover = QPixmap( RESPATH "images/no-album-art-placeholder.png" );
m_defaultArtistImage = QPixmap( RESPATH "images/no-artist-image-placeholder.png" );
} }
@@ -134,7 +135,15 @@ TreeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
// painter->drawPixmap( r, QPixmap( RESPATH "images/cover-shadow.png" ) ); // painter->drawPixmap( r, QPixmap( RESPATH "images/cover-shadow.png" ) );
QPixmap scover; QPixmap scover;
QPixmap cover = item->cover.isNull() ? m_defaultCover : item->cover; QPixmap cover = item->cover;
if ( cover.isNull() )
{
if ( !item->artist().isNull() )
cover = m_defaultArtistImage;
else
cover = m_defaultAlbumCover;
}
if ( m_cache.contains( cover.cacheKey() ) ) if ( m_cache.contains( cover.cacheKey() ) )
{ {
scover = m_cache.value( cover.cacheKey() ); scover = m_cache.value( cover.cacheKey() );

3
src/libtomahawk/playlist/treeitemdelegate.h
View File

@@ -46,7 +46,8 @@ private:
mutable QHash< qint64, QPixmap > m_cache; mutable QHash< qint64, QPixmap > m_cache;
QPixmap m_nowPlayingIcon; QPixmap m_nowPlayingIcon;
QPixmap m_defaultCover; QPixmap m_defaultAlbumCover;
QPixmap m_defaultArtistImage;
}; };
#endif // TREEITEMDELEGATE_H #endif // TREEITEMDELEGATE_H