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

* Fixed info.png's size.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-08-04 06:34:36 +02:00
parent 4a34b97e8c
commit 18628defa4
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/globalactionmanager.cpp
View File

@@ -688,15 +688,17 @@ GlobalActionManager::showPlaylist()
} }
void void
GlobalActionManager::waitingForResolved( bool success ) GlobalActionManager::waitingForResolved( bool /* success */ )
{ {
if( m_waitingToPlay.data() != sender() ) if ( m_waitingToPlay.data() != sender() )
{ {
m_waitingToPlay.clear(); m_waitingToPlay.clear();
return; return;
} }
if( !m_waitingToPlay.isNull() && m_waitingToPlay->playable() ) { // play it! if ( !m_waitingToPlay.isNull() && m_waitingToPlay->playable() )
{
// play it!
// AudioEngine::instance()->playItem( AudioEngine::instance()->playlist(), m_waitingToPlay->results().first() ); // AudioEngine::instance()->playItem( AudioEngine::instance()->playlist(), m_waitingToPlay->results().first() );
AudioEngine::instance()->play(); AudioEngine::instance()->play();

5
src/libtomahawk/playlist/playlistitemdelegate.cpp
View File

@@ -47,7 +47,7 @@ PlaylistItemDelegate::PlaylistItemDelegate( TrackView* parent, TrackProxyModel*
, m_model( proxy ) , m_model( proxy )
{ {
m_nowPlayingIcon = QPixmap( PLAYING_ICON ); m_nowPlayingIcon = QPixmap( PLAYING_ICON );
m_arrowIcon = QPixmap( ARROW_ICON ).scaled( 14, 14, Qt::KeepAspectRatio, Qt::SmoothTransformation ); m_arrowIcon = QPixmap( ARROW_ICON );
m_topOption = QTextOption( Qt::AlignTop ); m_topOption = QTextOption( Qt::AlignTop );
m_topOption.setWrapMode( QTextOption::NoWrap ); m_topOption.setWrapMode( QTextOption::NoWrap );
@@ -251,6 +251,9 @@ PlaylistItemDelegate::paintDetailed( QPainter* painter, const QStyleOptionViewIt
{ {
opt.rect.setWidth( opt.rect.width() - 16 ); opt.rect.setWidth( opt.rect.width() - 16 );
QRect arrowRect( opt.rect.x() + opt.rect.width(), opt.rect.y() + 1, opt.rect.height() - 2, opt.rect.height() - 2 ); QRect arrowRect( opt.rect.x() + opt.rect.width(), opt.rect.y() + 1, opt.rect.height() - 2, opt.rect.height() - 2 );
if ( m_arrowIcon.height() != arrowRect.height() )
m_arrowIcon = m_arrowIcon.scaled( arrowRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation );
painter->drawPixmap( arrowRect, m_arrowIcon ); painter->drawPixmap( arrowRect, m_arrowIcon );
} }

2
src/libtomahawk/playlist/playlistitemdelegate.h
View File

@@ -56,7 +56,7 @@ private:
mutable QHash< qint64, QPixmap > m_cache; mutable QHash< qint64, QPixmap > m_cache;
QPixmap m_nowPlayingIcon; QPixmap m_nowPlayingIcon;
QPixmap m_arrowIcon; mutable QPixmap m_arrowIcon;
QTextOption m_topOption; QTextOption m_topOption;
QTextOption m_centerOption; QTextOption m_centerOption;