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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src
From:       Maximilian Kossick <maximilian.kossick () googlemail ! com>
Date:       2006-10-16 13:59:46
Message-ID: 1161007186.415906.29323.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 596020 by mkossick:

fixes smartplaylists that are using last play or first play and is before or is \
                after.
BUG: 135705

 M  +12 -3     playlistbrowseritem.cpp  


--- trunk/extragear/multimedia/amarok/src/playlistbrowseritem.cpp #596019:596020
@@ -3122,6 +3122,7 @@
     static QStringList composers;
     static QStringList albums;
     static QStringList years;
+    static QStringList labels;
 
     //Delete all children before
     QListViewItem *child, *next;
@@ -3191,6 +3192,14 @@
                                                  "(*ExpandString*)", *it)  );
             }
         }
+        if ( field == i18n("Label") ) {
+            if (labels.isEmpty() ) {
+                labels = CollectionDB::instance()->labelList();
+            }
+            foreach( labels ) {
+                m_after = new SmartPlaylist( item, m_after, i18n( "%1" ).arg( *it ), \
expand.text().replace("(*ExpandString*)", *it)  ); +            }
+        }
     }
 
 }
@@ -3265,7 +3274,7 @@
                 else {
                     dt1.setTime_t( filters[0].toInt() );
                     // truncate to midnight
-                    if ( condition == i18n( "is greater than" ) ) 
+                    if ( condition == i18n( "is after" ) ) 
                         dt1.setTime( QTime().addSecs(-1) );  // 11:59:59 pm
                     else
                         dt1.setTime( QTime() );
@@ -3299,9 +3308,9 @@
             }
             else if ( condition == i18n( "ends with" ) )
                 qb.addFilter( table, value, filters[0], QueryBuilder::modeEndMatch \
                );
-            else if ( condition == i18n( "is greater than") )
+            else if ( condition == i18n( "is greater than") || condition == i18n( \
                "is after" ) )
                 qb.addNumericFilter( table, value, filters[0], \
                QueryBuilder::modeGreater );
-            else if ( condition == i18n( "is smaller than") )
+            else if ( condition == i18n( "is smaller than") || condition == i18n( \
                "is before" ) )
                 qb.addNumericFilter( table, value, filters[0], \
QueryBuilder::modeLess );  else if ( condition == i18n( "is between" )
                       || condition == i18n( "is in the last" ) )


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