From 3734167a14a4d551de492bdef0183877530d701c Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Fri, 10 Apr 2015 05:58:30 +0200
Subject: [PATCH] Introduce Locker style for PlayableProxyModel.

---
 src/libtomahawk/playlist/PlayableModel.cpp    |  2 +-
 .../playlist/PlayableProxyModel.cpp           | 21 +++++++++++++------
 src/libtomahawk/playlist/PlayableProxyModel.h |  2 +-
 .../playlist/PlaylistItemDelegate.cpp         |  6 ++++--
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/libtomahawk/playlist/PlayableModel.cpp b/src/libtomahawk/playlist/PlayableModel.cpp
index b80777811..990b220fd 100644
--- a/src/libtomahawk/playlist/PlayableModel.cpp
+++ b/src/libtomahawk/playlist/PlayableModel.cpp
@@ -120,7 +120,7 @@ PlayableModel::columnCount( const QModelIndex& parent ) const
 {
     Q_UNUSED( parent );
 
-    return 12;
+    return 13;
 }
 
 
diff --git a/src/libtomahawk/playlist/PlayableProxyModel.cpp b/src/libtomahawk/playlist/PlayableProxyModel.cpp
index 1ea7cb728..036aca842 100644
--- a/src/libtomahawk/playlist/PlayableProxyModel.cpp
+++ b/src/libtomahawk/playlist/PlayableProxyModel.cpp
@@ -49,8 +49,9 @@ PlayableProxyModel::PlayableProxyModel( QObject* parent )
     PlayableProxyModel::setSourcePlayableModel( NULL );
 
     m_headerStyle[ Fancy ]      << PlayableModel::Name;
-    m_headerStyle[ Detailed ]   << PlayableModel::Artist << PlayableModel::Track << PlayableModel::Composer << PlayableModel::Album << PlayableModel::Download << PlayableModel::AlbumPos << PlayableModel::Duration << PlayableModel::Bitrate << PlayableModel::Age << PlayableModel::Year << PlayableModel::Filesize << PlayableModel::Origin << PlayableModel::Score;
-    m_headerStyle[ Collection ] << PlayableModel::Name << PlayableModel::Composer << PlayableModel::Duration << PlayableModel::Bitrate << PlayableModel::Age << PlayableModel::Year << PlayableModel::Filesize << PlayableModel::Origin;
+    m_headerStyle[ Detailed ]   << PlayableModel::Artist << PlayableModel::Track << PlayableModel::Composer << PlayableModel::Album << PlayableModel::AlbumPos << PlayableModel::Duration << PlayableModel::Bitrate << PlayableModel::Age << PlayableModel::Year << PlayableModel::Filesize << PlayableModel::Origin << PlayableModel::Score;
+    m_headerStyle[ Collection ] << PlayableModel::Artist << PlayableModel::Track << PlayableModel::Composer << PlayableModel::Album << PlayableModel::AlbumPos << PlayableModel::Duration << PlayableModel::Bitrate << PlayableModel::Age << PlayableModel::Year << PlayableModel::Filesize;
+    m_headerStyle[ Locker ]     << PlayableModel::Artist << PlayableModel::Track << PlayableModel::Composer << PlayableModel::Album << PlayableModel::Download << PlayableModel::AlbumPos << PlayableModel::Duration << PlayableModel::Bitrate << PlayableModel::Age << PlayableModel::Year << PlayableModel::Filesize;
 }
 
 
@@ -607,12 +608,16 @@ PlayableProxyModel::columnCount( const QModelIndex& parent ) const
             break;
 
         case Collection:
-            return 8;
+            return 10;
+            break;
+
+        case Locker:
+            return 11;
             break;
 
         case Detailed:
         default:
-            return 13;
+            return 12;
             break;
     }
 }
@@ -669,12 +674,16 @@ PlayableProxyModel::columnWeights() const
             break;
 
         case Collection:
-            w << 0.42 << 0.12 << 0.07 << 0.07 << 0.07 << 0.07 << 0.07; // << 0.11;
+            w << 0.16 << 0.17 << 0.15 << 0.15 << 0.06 << 0.06 << 0.06 << 0.06 << 0.06; // << 0.07;
+            break;
+
+        case Locker:
+            w << 0.14 << 0.15 << 0.12 << 0.12 << 0.12 << 0.06 << 0.06 << 0.06 << 0.06 << 0.06; // << 0.05;
             break;
 
         case Detailed:
         default:
-            w << 0.12 << 0.12 << 0.12 << 0.12 << 0.06 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.09; // << 0.03;
+            w << 0.15 << 0.16 << 0.13 << 0.13 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.05 << 0.08; // << 0.05;
             break;
     }
 
diff --git a/src/libtomahawk/playlist/PlayableProxyModel.h b/src/libtomahawk/playlist/PlayableProxyModel.h
index 82c63f85f..00c65e0c9 100644
--- a/src/libtomahawk/playlist/PlayableProxyModel.h
+++ b/src/libtomahawk/playlist/PlayableProxyModel.h
@@ -47,7 +47,7 @@ Q_OBJECT
 
 public:
     enum PlayableItemStyle
-    { Detailed = 0, Fancy = 1, Collection = 2 };
+    { Detailed = 0, Fancy = 1, Collection = 2, Locker = 3 };
 
     enum PlayableProxyModelRole
     { StyleRole = Qt::UserRole + 1, TypeRole };
diff --git a/src/libtomahawk/playlist/PlaylistItemDelegate.cpp b/src/libtomahawk/playlist/PlaylistItemDelegate.cpp
index 6166bc2ce..f25f441c7 100644
--- a/src/libtomahawk/playlist/PlaylistItemDelegate.cpp
+++ b/src/libtomahawk/playlist/PlaylistItemDelegate.cpp
@@ -102,7 +102,7 @@ PlaylistItemDelegate::sizeHint( const QStyleOptionViewItem& option, const QModel
     QSize size = QStyledItemDelegate::sizeHint( option, index );
 
     {
-        if ( m_model->style() == PlayableProxyModel::Detailed )
+        if ( m_model->style() != PlayableProxyModel::Fancy )
         {
             int rowHeight = option.fontMetrics.height() * 1.6;
             size.setHeight( rowHeight );
@@ -217,6 +217,8 @@ PlaylistItemDelegate::paint( QPainter* painter, const QStyleOptionViewItem& opti
     const int style = index.data( PlayableProxyModel::StyleRole ).toInt();
     switch ( style )
     {
+        case PlayableProxyModel::Collection:
+        case PlayableProxyModel::Locker:
         case PlayableProxyModel::Detailed:
             paintDetailed( painter, option, index );
             break;
@@ -855,7 +857,7 @@ PlaylistItemDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, con
         }
         else if ( hoveringInfo )
         {
-            if ( m_model->style() != PlayableProxyModel::Detailed )
+            if ( m_model->style() == PlayableProxyModel::Fancy )
             {
                 if ( item->query() )
                     ViewManager::instance()->show( item->query()->track()->toQuery() );