mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

* Get rid of ImageMode::Grid.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2014-10-05 22:51:47 +02:00
parent 5f35ba1ffd
commit d8a54fa46d
8 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -248,7 +248,7 @@ ColumnViewPreviewWidget::onCoverUpdated()
{ {
if ( m_query->track()->cover( QSize( 0, 0 ) ).isNull() ) if ( m_query->track()->cover( QSize( 0, 0 ) ).isNull() )
{ {
m_cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Grid, m_cover->size() ) ); m_cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Original, m_cover->size() ) );
return; return;
} }

6
src/libtomahawk/playlist/GridItemDelegate.cpp
View File

@@ -133,15 +133,15 @@ GridItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
{ {
if ( !item->album().isNull() ) if ( !item->album().isNull() )
{ {
m_covers.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->album(), r.size(), TomahawkUtils::Grid, false ) ) ); m_covers.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->album(), r.size(), TomahawkUtils::Original, false ) ) );
} }
else if ( !item->artist().isNull() ) else if ( !item->artist().isNull() )
{ {
m_covers.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->artist(), r.size(), TomahawkUtils::Grid, false ) ) ); m_covers.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->artist(), r.size(), TomahawkUtils::Original, false ) ) );
} }
else else
{ {
m_covers.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->query(), r.size(), TomahawkUtils::Grid, false ) ) ); m_covers.insert( index, QSharedPointer< Tomahawk::PixmapDelegateFader >( new Tomahawk::PixmapDelegateFader( item->query(), r.size(), TomahawkUtils::Original, false ) ) );
} }
NewClosure( m_covers[ index ], SIGNAL( repaintRequest() ), NewClosure( m_covers[ index ], SIGNAL( repaintRequest() ),

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

@@ -194,7 +194,7 @@ TrackDetailView::onCoverUpdated()
{ {
if ( !m_query || m_query->track()->cover( QSize( 0, 0 ) ).isNull() ) if ( !m_query || m_query->track()->cover( QSize( 0, 0 ) ).isNull() )
{ {
m_playableCover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Grid, m_playableCover->size() ) ); m_playableCover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Original, m_playableCover->size() ) );
return; return;
} }

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

@@ -55,7 +55,7 @@ PixmapDelegateFader::PixmapDelegateFader( const artist_ptr& artist, const QSize&
connect( m_artist.data(), SIGNAL( updated() ), SLOT( artistChanged() ) ); connect( m_artist.data(), SIGNAL( updated() ), SLOT( artistChanged() ) );
connect( m_artist.data(), SIGNAL( coverChanged() ), SLOT( artistChanged() ) ); connect( m_artist.data(), SIGNAL( coverChanged() ), SLOT( artistChanged() ) );
m_currentReference = TomahawkUtils::createRoundedImage( m_artist->cover( size, forceLoad ), QSize( 0, 0 ), m_mode == TomahawkUtils::Grid ? 0.00 : 0.20 ); m_currentReference = m_artist->cover( size, forceLoad );
} }
init(); init();
@@ -72,7 +72,7 @@ PixmapDelegateFader::PixmapDelegateFader( const album_ptr& album, const QSize& s
connect( m_album.data(), SIGNAL( updated() ), SLOT( albumChanged() ) ); connect( m_album.data(), SIGNAL( updated() ), SLOT( albumChanged() ) );
connect( m_album.data(), SIGNAL( coverChanged() ), SLOT( albumChanged() ) ); connect( m_album.data(), SIGNAL( coverChanged() ), SLOT( albumChanged() ) );
m_currentReference = TomahawkUtils::createRoundedImage( m_album->cover( size, forceLoad ), QSize( 0, 0 ), m_mode == TomahawkUtils::Grid ? 0.00 : 0.20 ); m_currentReference = m_album->cover( size, forceLoad );
} }
init(); init();
@@ -90,7 +90,7 @@ PixmapDelegateFader::PixmapDelegateFader( const query_ptr& track, const QSize& s
connect( m_track->track().data(), SIGNAL( updated() ), SLOT( trackChanged() ) ); connect( m_track->track().data(), SIGNAL( updated() ), SLOT( trackChanged() ) );
connect( m_track->track().data(), SIGNAL( coverChanged() ), SLOT( trackChanged() ) ); connect( m_track->track().data(), SIGNAL( coverChanged() ), SLOT( trackChanged() ) );
m_currentReference = TomahawkUtils::createRoundedImage( m_track->track()->cover( size, forceLoad ), QSize( 0, 0 ), m_mode == TomahawkUtils::Grid ? 0.00 : 0.20 ); m_currentReference = m_track->track()->cover( size, forceLoad );
} }
init(); init();
@@ -147,11 +147,11 @@ PixmapDelegateFader::setSize( const QSize& size )
else else
{ {
if ( !m_album.isNull() ) if ( !m_album.isNull() )
m_currentReference = TomahawkUtils::createRoundedImage( m_album->cover( m_size ), QSize( 0, 0 ), m_mode == TomahawkUtils::Grid ? 0.00 : 0.20 ); m_currentReference = m_album->cover( m_size );
else if ( !m_artist.isNull() ) else if ( !m_artist.isNull() )
m_currentReference = TomahawkUtils::createRoundedImage( m_artist->cover( m_size ), QSize( 0, 0 ), m_mode == TomahawkUtils::Grid ? 0.00 : 0.20 ); m_currentReference = m_artist->cover( m_size );
else if ( !m_track.isNull() ) else if ( !m_track.isNull() )
m_currentReference = TomahawkUtils::createRoundedImage( m_track->track()->cover( m_size ), QSize( 0, 0 ), m_mode == TomahawkUtils::Grid ? 0.00 : 0.20 ); m_currentReference = m_track->track()->cover( m_size );
} }
emit repaintRequest(); emit repaintRequest();
@@ -210,7 +210,7 @@ PixmapDelegateFader::setPixmap( const QPixmap& pixmap )
} }
m_oldReference = m_currentReference; m_oldReference = m_currentReference;
m_currentReference = TomahawkUtils::createRoundedImage( pixmap, QSize( 0, 0 ), m_mode == TomahawkUtils::Grid ? 0.00 : 0.20 ); m_currentReference = pixmap;
stlInstance().data()->setUpdateInterval( 20 ); stlInstance().data()->setUpdateInterval( 20 );
m_startFrame = stlInstance().data()->currentFrame(); m_startFrame = stlInstance().data()->currentFrame();

1
src/libtomahawk/utils/TomahawkUtils.h
View File

@@ -133,7 +133,6 @@ namespace TomahawkUtils
{ {
Original, Original,
CoverInCase, CoverInCase,
Grid,
DropShadow, DropShadow,
RoundedCorners RoundedCorners
}; };

11
src/libtomahawk/utils/TomahawkUtilsGui.cpp
View File

@@ -489,23 +489,16 @@ defaultPixmap( ImageType type, ImageMode mode, const QSize& size )
case DefaultAlbumCover: case DefaultAlbumCover:
if ( mode == CoverInCase ) if ( mode == CoverInCase )
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/no-album-art-placeholder.svg", size ); pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/no-album-art-placeholder.svg", size );
else if ( mode == Grid )
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/album-placeholder-grid.svg", size );
else else
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/album-placeholder-grid.svg", size ); pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/album-placeholder-grid.svg", size );
break; break;
case DefaultArtistImage: case DefaultArtistImage:
if ( mode == Grid ) pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/artist-placeholder-grid.svg", size );
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/artist-placeholder-grid.svg", size );
else
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/artist-placeholder-grid.svg", size );
break; break;
case DefaultTrackImage: case DefaultTrackImage:
if ( mode == Grid ) if ( mode == RoundedCorners )
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/track-placeholder-grid.svg", size );
else if ( mode == RoundedCorners )
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/track-placeholder-grid.svg", size, TomahawkUtils::RoundedCorners ); pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/track-placeholder-grid.svg", size, TomahawkUtils::RoundedCorners );
else else
pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/track-placeholder-grid.svg", size ); pixmap = ImageRegistry::instance()->pixmap( RESPATH "images/track-placeholder-grid.svg", size );

2
src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.cpp
View File

@@ -395,7 +395,7 @@ ArtistInfoWidget::onArtistImageUpdated()
const QSize coverSize = QSize( ui->cover->width(), ui->cover->width() ); const QSize coverSize = QSize( ui->cover->width(), ui->cover->width() );
if ( !m_artist || m_artist->cover( QSize( 0, 0 ) ).isNull() ) if ( !m_artist || m_artist->cover( QSize( 0, 0 ) ).isNull() )
{ {
ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, TomahawkUtils::Grid, coverSize ) ); ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultArtistImage, TomahawkUtils::Original, coverSize ) );
} }
else else
{ {

2
src/libtomahawk/widgets/infowidgets/TrackInfoWidget.cpp
View File

@@ -55,7 +55,7 @@ TrackInfoWidget::TrackInfoWidget( const Tomahawk::query_ptr& query, QWidget* par
ui->lineBelow->setStyleSheet( QString( "QFrame { border: 1px solid black; }" ) ); ui->lineBelow->setStyleSheet( QString( "QFrame { border: 1px solid black; }" ) );
m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Original, QSize( 48, 48 ) ); m_pixmap = TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Original, QSize( 48, 48 ) );
ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Grid, ui->cover->size() ) ); ui->cover->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultTrackImage, TomahawkUtils::Original, ui->cover->size() ) );
ui->cover->setShowText( false ); ui->cover->setShowText( false );
QHBoxLayout* l = new QHBoxLayout( ui->statsWidget ); QHBoxLayout* l = new QHBoxLayout( ui->statsWidget );