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

List:       kde-commits
Subject:    kdeextragear-1
From:       Max Howell <max.howell () methylblue ! com>
Date:       2004-08-15 6:34:04
Message-ID: 20040815063404.83C8C9AF0 () office ! kde ! org
[Download RAW message or body]

CVS commit by mhowell: 

* pressing escape when search line edit in playlist window has focus cancels the search
* faq extension for I have a bug report entry


  M +15 -9     amarok/src/playlistwindow.cpp   1.170
  M +3 -1      doc/amarok/faq.docbook   1.12


--- kdeextragear-1/amarok/src/playlistwindow.cpp  #1.169:1.170
@@ -381,15 +381,17 @@ bool PlaylistWindow::eventFilter( QObjec
         if( o == m_lineEdit ) //the search lineedit
         {
-            //FIXME inefficient to always construct this
-            QListViewItemIterator it( m_playlist, QListViewItemIterator::Visible );
-            if( 0 == it.current() ) return FALSE;
+            typedef QListViewItemIterator It;
 
             switch( e->key() )
             {
             case Key_Down:
+                if( QListViewItem *item = *It( m_playlist, It::Visible ) )
+                {
                 m_playlist->setFocus();
-                m_playlist->setCurrentItem( it.current() );
-                it.current()->setSelected( true ); //FIXME why doesn't it do this for us?
+                    m_playlist->setCurrentItem( item );
+                    item->setSelected( true );
                 return TRUE;
+                }
+                return FALSE;
 
             case Key_PageDown:
@@ -401,6 +403,10 @@ bool PlaylistWindow::eventFilter( QObjec
             case Key_Enter:
                 m_lineEdit->clear();
-                m_playlist->activate( it.current() );
-                m_playlist->ensureItemVisible( it.current() );
+                m_playlist->activate( *It( m_playlist, It::Visible ) );
+                m_playlist->showCurrentTrack();
+                return TRUE;
+
+            case Key_Escape:
+                m_lineEdit->clear();
                 return TRUE;
 

--- kdeextragear-1/doc/amarok/faq.docbook  #1.11:1.12
@@ -277,5 +277,7 @@
 <answer>
 <para>
-Please report it at <ulink url="http://bugs.kde.org"></ulink>.
+Please report it at <ulink url="http://bugs.kde.org"></ulink>, if you have a
+list of suggestions/wishes it may be best to send them to our mailing list:
+amarok-devel@lists.sourceforge.net.
 </para>
 </answer>


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