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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src
From:       Giovanni Venturi <gventuri73 () tiscali ! it>
Date:       2007-01-06 15:53:33
Message-ID: 1168098813.044579.15785.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 620553 by gianni:

With this commit I made visible an interesting function in Amarok
that was implemented but quite "hidden". Now you can filter
the collection titles with a dialog that help you choosing
the wanted parameters for the filter, for example now look for
a title in your collection that has length of 3 minutes is quite simple.
BUG:139292


 M  +2 -1      Makefile.am  
 M  +13 -0     collectionbrowser.cpp  
 M  +1 -0      collectionbrowser.h  
 A             editcollectionfilterdialog.cpp   [License: no copyright]
 A             editcollectionfilterdialog.h   [License: no copyright]
 M  +1 -0      main.cpp  


--- trunk/extragear/multimedia/amarok/src/Makefile.am #620552:620553
@@ -146,7 +146,8 @@
     tracktooltip.cpp \
     transferdialog.cpp \
     xmlloader.cpp \
-    xspfplaylist.cpp
+    xspfplaylist.cpp \
+    editcollectionfilterdialog.cpp
 
 libamarok_la_LIBADD = \
     $(top_builddir)/amarok/src/amarokcore/libamarokcore.la \
--- trunk/extragear/multimedia/amarok/src/collectionbrowser.cpp #620552:620553
@@ -29,6 +29,7 @@
 #include "tagdialog.h"
 #include "threadweaver.h"
 #include "qstringx.h"
+#include "editcollectionfilterdialog.h"
 
 #include <taglib/tfile.h>   //TagLib::File::isWritable
 
@@ -64,6 +65,7 @@
 #include <ktoolbarbutton.h> //ctor
 #include <kurldrag.h>       //dragObject()
 #include <kio/job.h>
+#include <kpushbutton.h>
 
 extern "C"
 {
@@ -101,13 +103,16 @@
         button       = new KToolBarButton( "locationbar_erase", 0, searchToolBar );
         m_searchEdit = new ClickLineEdit( i18n( "Enter search terms here" ), \
searchToolBar );  m_searchEdit->installEventFilter( this );
+        KPushButton *filterButton = new KPushButton("...", searchToolBar, "filter");
         searchToolBar->setStretchableWidget( m_searchEdit );
 
         m_searchEdit->setFrame( QFrame::Sunken );
         connect( button, SIGNAL( clicked() ), SLOT( slotClearFilter() ) );
+        connect( filterButton, SIGNAL( clicked() ), SLOT( slotEditFilter() ) );
 
         QToolTip::add( button, i18n( "Clear search field" ) );
         QToolTip::add( m_searchEdit, i18n( "Enter space-separated terms to search in \
the collection" ) ); +        QToolTip::add( filterButton, i18n( "Click here to setup \
the collection filter" ) );  } //</Search LineEdit>
 
 
@@ -277,6 +282,14 @@
 }
 
 void
+CollectionBrowser::slotEditFilter() //SLOT
+{
+    EditCollectionFilterDialog *cod = new EditCollectionFilterDialog( this, \
m_searchEdit->text() ); +    if (cod->exec())
+      m_searchEdit->setText(cod->filter());
+}
+
+void
 CollectionBrowser::setupDirs()  //SLOT
 {
     m_view->setupDirs();
--- trunk/extragear/multimedia/amarok/src/collectionbrowser.h #620552:620553
@@ -75,6 +75,7 @@
         void slotClearFilter();
         void slotSetFilterTimeout();
         void slotSetFilter();
+        void slotEditFilter();
 
     private:
         void layoutToolbar();
--- trunk/extragear/multimedia/amarok/src/main.cpp #620552:620553
@@ -72,6 +72,7 @@
     aboutData.addCredit( "Derek Nelson", I18N_NOOP( "graphics, splash-screen" ), \
                "admrla@gmail.com" );
     aboutData.addCredit( "Enrico Ros", I18N_NOOP( "Analyzers, Context Browser and \
                systray eye-candy" ), "eros.kde@email.it" );
     aboutData.addCredit( "Gérard Dürrmeyer", I18N_NOOP( "icons and image work" ), \
"gerard@randomtree.com" ); +    aboutData.addCredit( "Giovanni Venturi", I18N_NOOP( \
                "dialog to filter the collection titles" ), "giovanni@ksniffer.org" \
                );
     aboutData.addCredit( "Greg Meyer", I18N_NOOP( "Live CD, Bug squashing \
(oggb4mp3)" ), "greg@gkmweb.com" );  aboutData.addCredit( "Harald Sitter", I18N_NOOP( \
"handbook enhancements, translations, bug fixes, screenshots, roKymoter \
                (apachelogger)" ), "harald.sitter@kdemail.net" );
     aboutData.addCredit( "Jarkko Lehti", I18N_NOOP( "Tester, IRC channel operator, \
whipping" ), "grue@iki.fi" );


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