[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-1/amarok [BROKEN EMAIL]
From:       Christian Muehlhaeuser <chris () chris ! de>
Date:       2004-11-16 4:35:12
Message-ID: 20041116043512.10E2816CFB () office ! kde ! org
[Download RAW message or body]

CVS commit by muesli: 

* Fixing some CollectionBrowser regressions, which I just introduced with \
QueryBuilder.


  M +3 -4      TODO   1.534
  M +4 -3      src/collectionbrowser.cpp   1.235


--- kdeextragear-1/amarok/TODO  #1.533:1.534
@@ -9,4 +9,6 @@
 SHORT-TERM (URGENT):
 
+          <muesli> Emitted signal "scoreChanged" (CollectionEmitter) doesnt reach \
Playlist anymore. +
           <markey> Make CoverManager thumbnail generation threaded.
 
@@ -16,5 +18,5 @@
                    (those with text) lose their texts.
 
-          <muesli> Take care of KToolbars in Context/Collection for palette changes
+          <muesli> Take care of KToolbars in Context/Collection for palette changes.
 
           <mxcl>   With one track in pls and repeat and random mode on, amaroK \
crashes at track end. @@ -33,7 +35,4 @@
   FIX 134 <markey> Ctrl-C in Playlist for copying title doesn't work, because the \
event gets eaten by another widget.  
-          <mxcl>   Only show Various Artists when sorting by artist then album, it \
                doesn't make sense in any
-                   other situation! Also can we file it under V please?
-
 MID-TERM:
 

--- kdeextragear-1/amarok/src/collectionbrowser.cpp  #1.234:1.235
@@ -340,9 +340,10 @@ CollectionView::renderView( )  //SLOT
 
     qb.addReturnValue( m_cat1, QueryBuilder::valName );
-    qb.addFilter( m_cat1 | m_cat2 | m_cat3 | QueryBuilder::tabSong , m_filter );
+    qb.addFilter( m_cat1 | m_cat2 | m_cat3 | QueryBuilder::tabSong, m_filter );
     qb.sortBy( m_cat1, QueryBuilder::valName );
+    qb.setOptions( QueryBuilder::optRemoveDuplicates );
 
     if ( m_cat1 == QueryBuilder::tabArtist )
-        qb.setOptions( QueryBuilder::optNoCompilations | \
QueryBuilder::optRemoveDuplicates ); +        qb.setOptions( \
QueryBuilder::optNoCompilations );  
     values = qb.run();
@@ -439,5 +440,5 @@ CollectionView::slotExpand( QListViewIte
     QueryBuilder qb;
 
-    qb.addFilter( m_cat1 | m_cat2 | m_cat3 | QueryBuilder::tabSong , m_filter );
+    qb.addFilter( m_cat1 | m_cat2 | m_cat3 | QueryBuilder::tabSong, m_filter );
     qb.setOptions( QueryBuilder::optRemoveDuplicates );
 


[prev in list] [next in list] [prev in thread] [next in thread]