mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-09 07:36:48 +02:00
Code Issues Releases Wiki Activity

* Style cleanup.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-06-26 05:01:18 +02:00
parent 03695c2bc4
commit 3a5acb721c
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libtomahawk/jobview/JobStatusDelegate.cpp
View File

@@ -26,8 +26,10 @@
#include <QListView> #include <QListView>
#define ROW_HEIGHT 20 #define ROW_HEIGHT 20
#define ICON_PADDING 1 #define ICON_PADDING 2
#define PADDING 2 #define PADDING 2
JobStatusDelegate::JobStatusDelegate( QObject* parent ) JobStatusDelegate::JobStatusDelegate( QObject* parent )
: QStyledItemDelegate ( parent ) : QStyledItemDelegate ( parent )
, m_parentView( qobject_cast< QListView* >( parent ) ) , m_parentView( qobject_cast< QListView* >( parent ) )
@@ -35,6 +37,7 @@ JobStatusDelegate::JobStatusDelegate( QObject* parent )
Q_ASSERT( m_parentView ); Q_ASSERT( m_parentView );
} }
JobStatusDelegate::~JobStatusDelegate() JobStatusDelegate::~JobStatusDelegate()
{ {
@@ -55,7 +58,7 @@ JobStatusDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
// painter->drawLine( opt.rect.topLeft(), opt.rect.topRight() ); // painter->drawLine( opt.rect.topLeft(), opt.rect.topRight() );
painter->setRenderHint( QPainter::Antialiasing ); painter->setRenderHint( QPainter::Antialiasing );
QRect iconRect( ICON_PADDING, ICON_PADDING + opt.rect.y(), ROW_HEIGHT - 2*ICON_PADDING, ROW_HEIGHT - 2*ICON_PADDING ); QRect iconRect( ICON_PADDING, ICON_PADDING + opt.rect.y(), ROW_HEIGHT - 2 * ICON_PADDING, ROW_HEIGHT - 2 * ICON_PADDING );
if ( allowMultiLine ) if ( allowMultiLine )
iconRect.moveTop( opt.rect.top() + opt.rect.height() / 2 - iconRect.height() / 2); iconRect.moveTop( opt.rect.top() + opt.rect.height() / 2 - iconRect.height() / 2);
QPixmap p = index.data( Qt::DecorationRole ).value< QPixmap >(); QPixmap p = index.data( Qt::DecorationRole ).value< QPixmap >();
@@ -71,22 +74,24 @@ JobStatusDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
if ( !rCol.isEmpty() ) if ( !rCol.isEmpty() )
{ {
const int w = fm.width( rCol ); const int w = fm.width( rCol );
const QRect rRect( opt.rect.right() - PADDING - w, PADDING + opt.rect.y(), w, opt.rect.height() - 2*PADDING ); const QRect rRect( opt.rect.right() - PADDING - w, PADDING + opt.rect.y(), w, opt.rect.height() - 2 * PADDING );
painter->drawText( rRect, Qt::AlignCenter, rCol ); painter->drawText( rRect, Qt::AlignCenter, rCol );
rightEdge = rRect.left(); rightEdge = rRect.left();
} }
const int mainW = rightEdge - 3*PADDING - iconRect.right(); const int mainW = rightEdge - 3 * PADDING - iconRect.right();
QString mainText = index.data( Qt::DisplayRole ).toString(); QString mainText = index.data( Qt::DisplayRole ).toString();
QTextOption to( Qt::AlignLeft | Qt::AlignVCenter ); QTextOption to( Qt::AlignLeft | Qt::AlignVCenter );
if ( !allowMultiLine ) if ( !allowMultiLine )
mainText = fm.elidedText( mainText, Qt::ElideRight, mainW ); mainText = fm.elidedText( mainText, Qt::ElideRight, mainW );
else else
to.setWrapMode( QTextOption::WrapAtWordBoundaryOrAnywhere ); to.setWrapMode( QTextOption::WrapAtWordBoundaryOrAnywhere );
painter->drawText( QRect( iconRect.right() + 2*PADDING, PADDING + opt.rect.y(), mainW, opt.rect.height() - 2*PADDING ), mainText, to );
painter->drawText( QRect( iconRect.right() + 4 * PADDING, PADDING + opt.rect.y(), mainW, opt.rect.height() - 2 * PADDING ), mainText, to );
} }
QSize QSize
JobStatusDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const JobStatusDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
{ {
@@ -102,11 +107,11 @@ JobStatusDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelInd
initStyleOption( &opt, index ); initStyleOption( &opt, index );
const QString text = index.data( Qt::DisplayRole ).toString(); const QString text = index.data( Qt::DisplayRole ).toString();
const int leftEdge = ICON_PADDING + ROW_HEIGHT + 2*PADDING; const int leftEdge = ICON_PADDING + ROW_HEIGHT + 2 * PADDING;
const QRect rect = opt.fontMetrics.boundingRect( leftEdge, opt.rect.top(), m_parentView->width() - leftEdge, 200, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, text ); const QRect rect = opt.fontMetrics.boundingRect( leftEdge, opt.rect.top(), m_parentView->width() - leftEdge, 200, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, text );
m_cachedMultiLineHeights.insert( index, rect.height() + 4*PADDING ); m_cachedMultiLineHeights.insert( index, rect.height() + 4 * PADDING );
return QSize( QStyledItemDelegate::sizeHint ( option, index ).width(), rect.height() + 4*PADDING ); return QSize( QStyledItemDelegate::sizeHint ( option, index ).width(), rect.height() + 4 * PADDING );
} }

11
src/libtomahawk/jobview/JobStatusView.cpp
View File

@@ -101,13 +101,12 @@ JobStatusView::setModel( JobStatusModel* m )
void void
JobStatusView::customDelegateJobInserted( int row, JobStatusItem* item ) JobStatusView::customDelegateJobInserted( int row, JobStatusItem* item )
{ {
tLog() << Q_FUNC_INFO << "item is " << item << ", row is " << row; tLog() << Q_FUNC_INFO << "item is" << item << ", row is" << row;
if ( !item ) if ( !item )
return; return;
tLog() << Q_FUNC_INFO << "telling item to create delegate";
item->createDelegate( m_view ); item->createDelegate( m_view );
tLog() << Q_FUNC_INFO << "item delegate is " << item->customDelegate(); tLog() << Q_FUNC_INFO << "item delegate is" << item->customDelegate();
m_view->setItemDelegateForRow( row, item->customDelegate() ); m_view->setItemDelegateForRow( row, item->customDelegate() );
AclJobDelegate* delegate = qobject_cast< AclJobDelegate* >( item->customDelegate() ); AclJobDelegate* delegate = qobject_cast< AclJobDelegate* >( item->customDelegate() );
if ( delegate ) if ( delegate )
@@ -127,7 +126,7 @@ JobStatusView::customDelegateJobInserted( int row, JobStatusItem* item )
void void
JobStatusView::customDelegateJobRemoved( int row ) JobStatusView::customDelegateJobRemoved( int row )
{ {
tLog() << Q_FUNC_INFO << "row is " << row; tLog() << Q_FUNC_INFO << "row is" << row;
} }
@@ -138,12 +137,12 @@ JobStatusView::refreshDelegates()
int count = m_model->rowCount(); int count = m_model->rowCount();
for ( int i = 0; i < count; i++ ) for ( int i = 0; i < count; i++ )
{ {
tLog() << Q_FUNC_INFO << "checking row " << i; tLog() << Q_FUNC_INFO << "checking row" << i;
QModelIndex index = m_model->index( i ); QModelIndex index = m_model->index( i );
QVariant itemVar = index.data( JobStatusModel::JobDataRole ); QVariant itemVar = index.data( JobStatusModel::JobDataRole );
if ( !itemVar.canConvert< JobStatusItem* >() || !itemVar.value< JobStatusItem* >() ) if ( !itemVar.canConvert< JobStatusItem* >() || !itemVar.value< JobStatusItem* >() )
{ {
tLog() << Q_FUNC_INFO << "unable to fetch JobStatusItem* at row " << i; tLog() << Q_FUNC_INFO << "unable to fetch JobStatusItem* at row" << i;
continue; continue;
} }
JobStatusItem* item = itemVar.value< JobStatusItem* >(); JobStatusItem* item = itemVar.value< JobStatusItem* >();

1
src/sourcetree/items/PlaylistItems.cpp
View File

@@ -102,6 +102,7 @@ PlaylistItem::IDValue() const
return m_playlist->createdOn(); return m_playlist->createdOn();
} }
bool bool
PlaylistItem::isBeingPlayed() const PlaylistItem::isBeingPlayed() const
{ {