From 5b1aa81d1d86f218292bb92d143c898bd2eea68a Mon Sep 17 00:00:00 2001 From: Jason Herskowitz Date: Sun, 18 Mar 2012 18:30:13 -0400 Subject: [PATCH] Make track title primary info in track charts and top loved and lighten text of secondary info. Muesli, like? --- src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp | 6 +++--- src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp index 3449230f1..9c13106f4 100644 --- a/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp +++ b/src/libtomahawk/playlist/PlaylistChartItemDelegate.cpp @@ -187,7 +187,7 @@ PlaylistChartItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& QFont smallBoldFont = opt.font; smallBoldFont.setPixelSize( 12 ); - smallBoldFont.setWeight( 80 ); + smallBoldFont.setWeight( 60 ); QFont durationFont = opt.font; durationFont.setPixelSize( 12 ); @@ -236,11 +236,11 @@ PlaylistChartItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& QRect rightRect = r.adjusted( r.width() - 40, 0, 0, 0 ); painter->setFont( boldFont ); - QString text = painter->fontMetrics().elidedText( artist, Qt::ElideRight, leftRect.width() ); + QString text = painter->fontMetrics().elidedText( track, Qt::ElideRight, leftRect.width() ); painter->drawText( leftRect, text, m_topOption ); painter->setFont( smallBoldFont ); - text = painter->fontMetrics().elidedText( track, Qt::ElideRight, leftRect.width() ); + text = painter->fontMetrics().elidedText( artist, Qt::ElideRight, leftRect.width() ); painter->drawText( index.row() >= 10 ? leftRect : leftRect.adjusted( 0, painter->fontMetrics().height() + 6, 0, 0 ), text, index.row() >= 10 ? m_bottomOption : m_topOption ); if ( duration > 0 ) diff --git a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp index f1c036456..404fb1bf7 100644 --- a/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp +++ b/src/libtomahawk/playlist/PlaylistLargeItemDelegate.cpp @@ -223,7 +223,7 @@ PlaylistLargeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& QFont smallBoldFont = opt.font; smallBoldFont.setPixelSize( 12 ); smallBoldFont.setBold( true ); - smallBoldFont.setWeight( 80 ); + smallBoldFont.setWeight( 60 ); QFont smallFont = opt.font; smallFont.setPixelSize( 10 ); @@ -233,14 +233,15 @@ PlaylistLargeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& QRect rightRect = r.adjusted( r.width() - 40, 0, 0, 0 ); painter->setFont( boldFont ); - QString text = painter->fontMetrics().elidedText( artist, Qt::ElideRight, leftRect.width() ); + QString text = painter->fontMetrics().elidedText( track, Qt::ElideRight, leftRect.width() ); painter->drawText( leftRect, text, m_topOption ); painter->setFont( smallBoldFont ); - text = painter->fontMetrics().elidedText( track, Qt::ElideRight, leftRect.width() ); + text = painter->fontMetrics().elidedText( artist, Qt::ElideRight, leftRect.width() ); painter->drawText( leftRect.adjusted( 0, 19, 0, 0 ), text, m_topOption ); painter->setFont( smallFont ); + painter->setPen( Qt::gray ); QTextDocument textDoc; textDoc.setHtml( lowerText ); textDoc.setDocumentMargin( 0 );