Merge remote branch 'origin/master' into dynamic

Conflicts:
	src/libtomahawk/artist.cpp
	src/libtomahawk/artist.h
	src/playlist/playlistmanager.cpp
	src/playlist/playlistmodel.cpp

src/libtomahawk/album.h

@@ -30,8 +30,9 @@ public:
     Tomahawk::collection_ptr collection() const { return m_collection; }
     QList<Tomahawk::query_ptr> tracks();
 
-    virtual int unfilteredTrackCount() const { return m_queries.count(); }
     virtual int trackCount() const { return m_queries.count(); }
+    virtual int unfilteredTrackCount() const { return m_queries.count(); }
+
     virtual Tomahawk::result_ptr siblingItem( int itemsAway );
 
     virtual PlaylistInterface::RepeatMode repeatMode() const { return PlaylistInterface::NoRepeat; }

src/libtomahawk/artist.cpp

@@ -30,9 +30,11 @@ Artist::get( unsigned int id, const QString& name, const Tomahawk::collection_pt
 
 
 Artist::Artist( unsigned int id, const QString& name, const Tomahawk::collection_ptr& collection )
-    : m_id( id )
+    : PlaylistInterface( this )
+    , m_id( id )
     , m_name( name )
     , m_collection( collection )
+    , m_currentTrack( 0 )
 {
 }
 
@@ -42,3 +44,48 @@ Artist::collection() const
 {
 	return m_collection;
 }
+
+void
+Artist::onTracksAdded( const QList<Tomahawk::query_ptr>& tracks, const Tomahawk::collection_ptr& collection )
+{
+    qDebug() << Q_FUNC_INFO;
+
+    m_queries << tracks;
+    emit tracksAdded( tracks, collection );
+}
+
+
+Tomahawk::result_ptr
+Artist::siblingItem( int itemsAway )
+{
+    int p = m_currentTrack;
+    p += itemsAway;
+
+    if ( p < 0 )
+        return Tomahawk::result_ptr();
+
+    if ( p >= m_queries.count() )
+        return Tomahawk::result_ptr();
+
+    m_currentTrack = p;
+    return m_queries.at( p )->results().first();
+}
+
+
+QList<Tomahawk::query_ptr>
+Artist::tracks()
+{
+    if ( m_queries.isEmpty() )
+    {
+        DatabaseCommand_AllTracks* cmd = new DatabaseCommand_AllTracks( m_collection );
+        cmd->setArtist( this );
+        cmd->setSortOrder( DatabaseCommand_AllTracks::Album );
+
+        connect( cmd, SIGNAL( tracks( QList<Tomahawk::query_ptr>, Tomahawk::collection_ptr ) ),
+                        SLOT( onTracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::collection_ptr ) ) );
+
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+    }
+
+    return m_queries;
+}

src/libtomahawk/artist.h

@@ -5,33 +5,62 @@
 #include <QSharedPointer>
 
 #include "typedefs.h"
+
+#include "playlistinterface.h"
+
 #include "dllmacro.h"
 
 namespace Tomahawk
 {
 
-class DLLEXPORT Artist : public QObject
+class DLLEXPORT Artist : public QObject, public PlaylistInterface
 {
 Q_OBJECT
 
 public:
     static artist_ptr get( unsigned int id, const QString& name, const Tomahawk::collection_ptr& collection );
-	Artist();
     Artist( unsigned int id, const QString& name, const Tomahawk::collection_ptr& collection );
-	virtual ~Artist();
+
+    Artist();
+    virtual ~Artist();
     
     unsigned int id() const { return m_id; }
     QString name() const { return m_name; }
 
 	Tomahawk::collection_ptr collection() const;
 
-//    QList<Tomahawk::query_ptr> tracks();
-//    virtual int trackCount() const { return 0; }
+    QList<Tomahawk::query_ptr> tracks();
+
+    virtual int trackCount() const { return 0; }
+    virtual int unfilteredTrackCount() const { return m_queries.count(); }
+
+    virtual Tomahawk::result_ptr siblingItem( int itemsAway );
+
+    virtual PlaylistInterface::RepeatMode repeatMode() const { return PlaylistInterface::NoRepeat; }
+    virtual bool shuffled() const { return false; }
+
+    virtual void setRepeatMode( PlaylistInterface::RepeatMode ) {}
+    virtual void setShuffled( bool ) {}
+
+    virtual void setFilter( const QString& pattern ) {}
+
+signals:
+    void repeatModeChanged( PlaylistInterface::RepeatMode mode );
+    void shuffleModeChanged( bool enabled );
+
+    void tracksAdded( const QList<Tomahawk::query_ptr>& tracks, const Tomahawk::collection_ptr& );
+    void trackCountChanged( unsigned int tracks );
+    void sourceTrackCountChanged( unsigned int tracks );
+
+private slots:
+    void onTracksAdded( const QList<Tomahawk::query_ptr>& tracks, const Tomahawk::collection_ptr& collection );
 
 private:
     unsigned int m_id;
     QString m_name;
 
+    QList<Tomahawk::query_ptr> m_queries;
+    unsigned int m_currentTrack;
     Tomahawk::collection_ptr m_collection;
 };
 

src/libtomahawk/database/databasecommand_alltracks.cpp

@@ -18,6 +18,10 @@ DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi )
         case 0:
             break;
 
+        case Album:
+            m_orderToken = "album.name, file_join.albumpos";
+            break;
+
         case ModificationTime:
             m_orderToken = "file.mtime";
             break;
@@ -37,9 +41,10 @@ DatabaseCommand_AllTracks::exec( DatabaseImpl* dbi )
             "AND file_join.artist = artist.id "
             "AND file_join.track = track.id "
             "AND file.source %1 "
-            "%2 "
-            "%3 %4 %5"
+            "%2 %3 "
+            "%4 %5 %6"
             ).arg( m_collection->source()->isLocal() ? "IS NULL" : QString( "= %1" ).arg( m_collection->source()->id() ) )
+             .arg( !m_artist ? QString() : QString( "AND artist.id = %1" ).arg( m_artist->id() ) )
              .arg( !m_album ? QString() : QString( "AND album.id = %1" ).arg( m_album->id() ) )
              .arg( m_sortOrder > 0 ? QString( "ORDER BY %1" ).arg( m_orderToken ) : QString() )
              .arg( m_sortDescending ? "DESC" : QString() )

src/libtomahawk/database/databasecommand_alltracks.h

@@ -17,13 +17,15 @@ Q_OBJECT
 public:
     enum SortOrder {
         None = 0,
-        ModificationTime = 1,
-        AlbumPosition = 2
+        Album = 1,
+        ModificationTime = 2,
+        AlbumPosition = 3
     };
 
     explicit DatabaseCommand_AllTracks( const Tomahawk::collection_ptr& collection, QObject* parent = 0 )
         : DatabaseCommand( parent )
         , m_collection( collection )
+        , m_artist( 0 )
         , m_album( 0 )
         , m_amount( 0 )
         , m_sortOrder( DatabaseCommand_AllTracks::None )
@@ -35,7 +37,9 @@ public:
     virtual bool doesMutates() const { return false; }
     virtual QString commandname() const { return "alltracks"; }
 
+    void setArtist( Tomahawk::Artist* artist ) { m_artist = artist; }
     void setAlbum( Tomahawk::Album* album ) { m_album = album; }
+
     void setLimit( unsigned int amount ) { m_amount = amount; }
     void setSortOrder( DatabaseCommand_AllTracks::SortOrder order ) { m_sortOrder = order; }
     void setSortDescending( bool descending ) { m_sortDescending = descending; }
@@ -46,7 +50,10 @@ signals:
 
 private:
     Tomahawk::collection_ptr m_collection;
+
+    Tomahawk::Artist* m_artist;
     Tomahawk::Album* m_album;
+
     unsigned int m_amount;
     DatabaseCommand_AllTracks::SortOrder m_sortOrder;
     bool m_sortDescending;

src/libtomahawk/playlistinterface.h

@@ -13,7 +13,7 @@ class DLLEXPORT PlaylistInterface
 public:
     enum RepeatMode { NoRepeat, RepeatOne, RepeatAll };
 
-    PlaylistInterface( QObject* parent ) : m_widget( 0 ), m_object( parent ) {}
+    PlaylistInterface( QObject* parent = 0 ) : m_widget( 0 ), m_object( parent ) {}
     virtual ~PlaylistInterface() {}
 
     virtual int unfilteredTrackCount() const = 0;

src/playlist/playlistmanager.cpp

@@ -154,11 +154,12 @@ PlaylistManager::show( const Tomahawk::album_ptr& album )
     qDebug() << Q_FUNC_INFO << &album << album.data();
     unlinkPlaylist();
 
-    m_playlistModel->loadAlbum( album );
+    m_playlistModel->appendAlbum( album );
     m_stack->setCurrentWidget( m_playlistView );
     
     m_currentInterface = m_playlistView->proxyModel();
 
+
     m_superCollectionVisible = false;
     m_statsAvailable = false;
     m_modesAvailable = false;

src/playlist/playlistmodel.cpp

@@ -95,22 +95,11 @@ PlaylistModel::loadPlaylist( const Tomahawk::playlist_ptr& playlist )
 
 
 void
-PlaylistModel::loadAlbum( const Tomahawk::album_ptr& album )
+PlaylistModel::appendAlbum( const Tomahawk::album_ptr& album )
 {
     if ( album.isNull() )
         return;
 
-    if ( rowCount( QModelIndex() ) )
-    {
-        emit beginRemoveRows( QModelIndex(), 0, rowCount( QModelIndex() ) - 1 );
-        delete m_rootItem;
-        emit endRemoveRows();
-        m_rootItem = new PlItem( 0, this );
-    }
-
-    m_playlist.clear();
-    setReadOnly( false );
-
     connect( album.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::collection_ptr ) ),
                              SLOT( onTracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::collection_ptr ) ) );
 
@@ -118,6 +107,19 @@ PlaylistModel::loadAlbum( const Tomahawk::album_ptr& album )
 }
 
 
+void
+PlaylistModel::appendArtist( const Tomahawk::artist_ptr& artist )
+{
+    if ( artist.isNull() )
+        return;
+
+    connect( artist.data(), SIGNAL( tracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::collection_ptr ) ),
+                              SLOT( onTracksAdded( QList<Tomahawk::query_ptr>, Tomahawk::collection_ptr ) ) );
+
+    onTracksAdded( artist->tracks(), artist->collection() );
+}
+
+
 void
 PlaylistModel::loadHistory( const Tomahawk::source_ptr& source, unsigned int amount )
 {

src/playlist/playlistmodel.h

@@ -31,10 +31,12 @@ public:
     virtual bool dropMimeData( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent );
 
     void loadPlaylist( const Tomahawk::playlist_ptr& playlist );
-    void loadAlbum( const Tomahawk::album_ptr& album );
     void loadHistory( const Tomahawk::source_ptr& source, unsigned int amount = 100 );
 
     void appendTrack( const Tomahawk::query_ptr& query );
+    void appendAlbum( const Tomahawk::album_ptr& album );
+    void appendArtist( const Tomahawk::artist_ptr& artist );
+
     void insertTrack( unsigned int row, const Tomahawk::query_ptr& query );
 
     virtual void removeIndex( const QModelIndex& index, bool moreToCome = false );

src/utils/querylabel.cpp

@@ -296,8 +296,14 @@ QueryLabel::paintEvent( QPaintEvent* event )
     p.save();
     p.setRenderHint( QPainter::Antialiasing );
 
-    if ( elidedText == s && m_hoverArea.width() )
+    if ( m_hoverArea.width() )
     {
+        if ( elidedText != s )
+        {
+            m_hoverArea.setLeft( 0 );
+            m_hoverArea.setRight( fontMetrics().width( elidedText ) + contentsMargins().left() * 2 );
+        }
+
         p.setPen( palette().mid().color() );
         p.setBrush( palette().highlight() );
         p.drawRoundedRect( m_hoverArea, 4.0, 4.0 );