From 2a27cbde0d9e87d447038c55b0b7cf54756fe8d0 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Fri, 11 Nov 2011 15:29:48 -0500
Subject: [PATCH] Draw the author name as well as avatar in recent playlists

---
 src/libtomahawk/widgets/welcomewidget.cpp | 59 +++++++++++++----------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp
index 804d14d16..4824e0b19 100644
--- a/src/libtomahawk/widgets/welcomewidget.cpp
+++ b/src/libtomahawk/widgets/welcomewidget.cpp
@@ -271,31 +271,6 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
 
     painter->drawPixmap( pixmapRect, icon );
 
-    QString descText;
-    if ( type == RecentlyPlayedPlaylistsModel::Station )
-    {
-        descText = index.data( RecentlyPlayedPlaylistsModel::DynamicPlaylistRole ).value< Tomahawk::dynplaylist_ptr >()->generator()->sentenceSummary();
-    } else
-    {
-        descText = index.data( RecentlyPlayedPlaylistsModel::ArtistRole ).toString();
-    }
-    QColor c = painter->pen().color();
-    painter->setPen( QColor( Qt::gray ).darker() );
-    QFont font2 = font;
-    font2.setPointSize( font2.pointSize() - 1 );
-    painter->setFont( font2 );
-
-    QRect rectText = option.rect.adjusted( 66, 20, -100, -8 );
-#ifdef Q_WS_MAC
-    rectText.adjust( 0, 1, 0, 0 );
-#elif defined Q_WS_WIN
-    rectText.adjust( 0, 2, 0, 0 );
-#endif
-
-    painter->drawText( rectText, descText );
-    painter->setPen( c );
-    painter->setFont( font );
-
     if ( type != RecentlyPlayedPlaylistsModel::Station )
     {
         painter->save();
@@ -324,6 +299,40 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
     QRect r( option.rect.width() - avatar.width() - 10, option.rect.top() + option.rect.height()/2 - avatar.height()/2, avatar.width(), avatar.height() );
     painter->drawPixmap( r, avatar );
 
+    QString author = index.data( RecentlyPlayedPlaylistsModel::PlaylistRole ).value< Tomahawk::playlist_ptr >()->author()->friendlyName();
+    if ( author.contains( "@" ) )
+        author = author.mid( 0, author.indexOf( '@' ) );
+
+    const int w = painter->fontMetrics().width( author );
+    QRect avatarNameRect( opt.rect.width() - 10 - w, r.bottom(), w, opt.rect.bottom() - r.bottom() );
+    painter->drawText( avatarNameRect, author, QTextOption( Qt::AlignCenter ) );
+
+    const int leftEdge = opt.rect.width() - qMin( avatarNameRect.left(), r.left() );
+    QString descText;
+    if ( type == RecentlyPlayedPlaylistsModel::Station )
+    {
+        descText = index.data( RecentlyPlayedPlaylistsModel::DynamicPlaylistRole ).value< Tomahawk::dynplaylist_ptr >()->generator()->sentenceSummary();
+    } else
+    {
+        descText = index.data( RecentlyPlayedPlaylistsModel::ArtistRole ).toString();
+    }
+    QColor c = painter->pen().color();
+    painter->setPen( QColor( Qt::gray ).darker() );
+    QFont font2 = font;
+    font2.setPointSize( font2.pointSize() - 1 );
+    painter->setFont( font2 );
+
+    QRect rectText = option.rect.adjusted( 66, 20, -leftEdge - 10, -8 );
+#ifdef Q_WS_MAC
+    rectText.adjust( 0, 1, 0, 0 );
+#elif defined Q_WS_WIN
+    rectText.adjust( 0, 2, 0, 0 );
+#endif
+
+    painter->drawText( rectText, descText );
+    painter->setPen( c );
+    painter->setFont( font );
+
     painter->setFont( boldFont );
     painter->drawText( option.rect.adjusted( 56, 6, -100, -option.rect.height() + 20 ), index.data().toString() );