extragear/multimedia/amarok/src

[Andrew Turner]

SVN commit 552311 by aturner:

Change behaviour of Collection Browser to more like before commit 552135:
* With Group By: Artist/Album, show compilations under the relevant artists and Various Artists
* Fix bug where if you had no non-compilation albums by an artist, they would not show up, even if you did have compilations with them on

CCMAIL: amarok at kde.org


 M  +0 -6      collectionbrowser.cpp  


--- trunk/extragear/multimedia/amarok/src/collectionbrowser.cpp #552310:552311
@@ -650,9 +650,6 @@
         qb.sortBy( q_cat1, QueryBuilder::valName );
         qb.setOptions( QueryBuilder::optRemoveDuplicates );
 
-        if( q_cat1 == QueryBuilder::tabArtist )
-            qb.setOptions( QueryBuilder::optNoCompilations );
-
         // ensure we don't get empty genres/albums/etc due to tag changes
         qb.addFilter( QueryBuilder::tabSong, QString::null );
 
@@ -919,7 +916,6 @@
             isUnknown = tmptext.isEmpty();
             if ( !static_cast<CollectionItem*>( item )->isSampler() )
             {
-		qb.setOptions( QueryBuilder::optNoCompilations );
                 if( VisYearAlbum == 1 )
                 {
                     tmptext = item->text( 0 );
@@ -977,7 +973,6 @@
 
             if( !static_cast<CollectionItem*>( item->parent() )->isSampler() )
             {
-		qb.setOptions( QueryBuilder::optNoCompilations );
                 if( VisYearAlbum == 1 )
                 {
                     tmptext = item->parent()->text( 0 );
@@ -1050,7 +1045,6 @@
 
             if ( !static_cast<CollectionItem*>( item->parent()->parent() )->isSampler() )
             {
-		qb.setOptions( QueryBuilder::optNoCompilations );
                 if (VisYearAlbum==1)
                 {
                     tmptext = item->parent()->parent()->text( 0 );