From kde-bugs-dist  Mon May 16 11:19:20 2005
From: Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date: Mon, 16 May 2005 11:19:20 +0000
To: kde-bugs-dist
Subject: [Bug 105696] [usability] changing search-status should not remove
Message-Id: <20050516111920.8752.qmail () ktown ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-bugs-dist&m=111624236800370

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
         
http://bugs.kde.org/show_bug.cgi?id=105696         
frank.osterfeld kdemail net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From frank.osterfeld kdemail net  2005-05-16 13:19 -------
SVN commit 414566 by osterfeld:

follow the behavior of other search bars and reset filters when selecting another node
BUG: 105696


 M  +2 -0      trunk/KDE/kdepim/akregator/src/akregator_view.cpp  
 M  +7 -4      trunk/KDE/kdepim/akregator/src/searchbar.cpp  
 M  +1 -0      trunk/KDE/kdepim/akregator/src/searchbar.h  


--- trunk/KDE/kdepim/akregator/src/akregator_view.cpp #414565:414566
 @ -714,6 +714,8  @
 
     m_tabs->showPage(m_mainTab);
 
+    m_searchBar->slotClearSearch();
+    
     if (m_viewMode == CombinedView)
         m_articleViewer->slotShowNode(node);
     else
--- trunk/KDE/kdepim/akregator/src/searchbar.cpp #414565:414566
 @ -132,10 +132,13  @
                 
 void SearchBar::slotClearSearch()
 {
-    d->searchLine->clear();
-    d->searchCombo->setCurrentItem(0);
-    d->timer.stop();
-    slotActivateSearch();
+    if (status() != 0 || !d->searchLine->text().isEmpty())
+    {
+        d->searchLine->clear();
+        d->searchCombo->setCurrentItem(0);
+        d->timer.stop();
+        slotActivateSearch();
+    }
 }
 
 void SearchBar::slotSetStatus(int status)
--- trunk/KDE/kdepim/akregator/src/searchbar.h #414565:414566
 @ -50,6 +50,7  @
         int delay() const;
 
     signals:
+        /** emitted when the text and status filters were updated. Params are textfilter, statusfilter */
         void signalSearch(const ArticleFilter&, const ArticleFilter&);
 
     public slots: