From 9a67ea2074862dfb31b8271d292d1300d67fa659 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Tue, 16 Apr 2013 12:41:54 +0200
Subject: [PATCH] * Double-click expands artists & albums. We now show an info
 button for those items.

---
 src/libtomahawk/playlist/TreeItemDelegate.cpp | 42 ++++++++++++-------
 src/libtomahawk/playlist/TreeView.cpp         |  4 +-
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/libtomahawk/playlist/TreeItemDelegate.cpp b/src/libtomahawk/playlist/TreeItemDelegate.cpp
index 4cc3c4dc7..fd1a3e4f8 100644
--- a/src/libtomahawk/playlist/TreeItemDelegate.cpp
+++ b/src/libtomahawk/playlist/TreeItemDelegate.cpp
@@ -186,6 +186,18 @@ TreeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
         opt.palette.setColor( QPalette::Text, opt.palette.color( QPalette::HighlightedText ) );
     }
 
+    if ( m_hoveringOver == index.sibling( index.row(), 0 )
+        && m_view->header()->visualIndex( index.column() ) == m_view->header()->count() - 1
+        && !index.data().toString().isEmpty() )
+    {
+        QRect arrowRect( m_view->viewport()->width() - option.rect.height(), option.rect.y() + 1, option.rect.height() - 2, option.rect.height() - 2 );
+
+        QPixmap infoIcon = TomahawkUtils::defaultPixmap( TomahawkUtils::InfoIcon, TomahawkUtils::Original, arrowRect.size() );
+        painter->drawPixmap( arrowRect, infoIcon );
+
+        m_infoButtonRects[ index.sibling( index.row(), 0 ) ] = arrowRect;
+    }
+
     if ( index.column() > 0 )
         return;
 
@@ -213,7 +225,6 @@ TreeItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
     }
 
     const QPixmap cover = m_pixmaps[ index ]->currentPixmap();
-
     painter->drawPixmap( r, cover );
 
     r = option.rect.adjusted( option.rect.height(), 6, -4, -option.rect.height() + 22 );
@@ -244,9 +255,9 @@ TreeItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
         return false;
 
     bool hoveringInfo = false;
-    if ( m_infoButtonRects.contains( index ) )
+    if ( m_infoButtonRects.contains( index.sibling( index.row(), 0 ) ) )
     {
-        const QRect infoRect = m_infoButtonRects[ index ];
+        const QRect infoRect = m_infoButtonRects[ index.sibling( index.row(), 0 ) ];
         const QMouseEvent* ev = static_cast< QMouseEvent* >( event );
         hoveringInfo = infoRect.contains( ev->pos() );
     }
@@ -260,9 +271,9 @@ TreeItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
 
         if ( m_hoveringOver != index || ( !hoveringInfo && m_hoveringOver.isValid() ) )
         {
-            emit updateIndex( m_hoveringOver );
-            m_hoveringOver = index;
-            emit updateIndex( index );
+            emit updateIndex( m_hoveringOver.sibling( index.row(), m_view->header()->logicalIndex( m_view->header()->count() ) ) );
+            m_hoveringOver = index.sibling( index.row(), 0 );
+            emit updateIndex( index.sibling( index.row(), m_view->header()->logicalIndex( m_view->header()->count() ) ) );
         }
 
         event->accept();
@@ -280,16 +291,17 @@ TreeItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const Q
             if ( !item )
                 return false;
 
-            switch ( index.column() )
+            if ( item->query() )
             {
-                case 0:
-                {
-                    ViewManager::instance()->show( item->query()->displayQuery() );
-                    break;
-                }
-
-                default:
-                    break;
+                ViewManager::instance()->show( item->query()->displayQuery() );
+            }
+            else if ( item->artist() )
+            {
+                ViewManager::instance()->show( item->artist() );
+            }
+            else if ( item->album() )
+            {
+                ViewManager::instance()->show( item->album() );
             }
 
             event->accept();
diff --git a/src/libtomahawk/playlist/TreeView.cpp b/src/libtomahawk/playlist/TreeView.cpp
index 5d3d716e3..657a2efab 100644
--- a/src/libtomahawk/playlist/TreeView.cpp
+++ b/src/libtomahawk/playlist/TreeView.cpp
@@ -234,7 +234,7 @@ TreeView::onItemActivated( const QModelIndex& index )
     PlayableItem* item = m_model->itemFromIndex( m_proxyModel->mapToSource( index ) );
     if ( item )
     {
-        if ( !item->artist().isNull() )
+/*        if ( !item->artist().isNull() )
         {
             ViewManager::instance()->show( item->artist() );
         }
@@ -242,7 +242,7 @@ TreeView::onItemActivated( const QModelIndex& index )
         {
             ViewManager::instance()->show( item->album() );
         }
-        else if ( !item->result().isNull() && item->result()->isOnline() )
+        else */ if ( !item->result().isNull() && item->result()->isOnline() )
         {
             AudioEngine::instance()->playItem( m_proxyModel->playlistInterface(), item->result() );
         }