- Automatically show the filter-panel when a searching is done

- Remove filter-prototypes that conflict with the filterpanel


svn path=/trunk/KDE/kdebase/apps/; revision=1190445

1 files changed, 8 insertions, 0 deletions

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index da7466947..c19d074c6 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -230,6 +230,10 @@ bool DolphinViewContainer::isFilterBarVisible() const
 
 void DolphinViewContainer::setSearchModeEnabled(bool enabled)
 {
+    if (enabled == isSearchModeEnabled()) {
+        return;
+    }
+
     m_searchBox->setVisible(enabled);
     m_urlNavigator->setVisible(!enabled);
 
@@ -250,6 +254,8 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
             }
         }
     }
+
+    emit searchModeChanged(enabled);
 }
 
 bool DolphinViewContainer::isSearchModeEnabled() const
@@ -435,10 +441,12 @@ void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
             if (!m_searchBox->isVisible()) {
                 m_searchBox->setVisible(true);
                 m_urlNavigator->setVisible(false);
+                emit searchModeChanged(true);
             }
         } else if (!m_urlNavigator->isVisible()) {
             m_urlNavigator->setVisible(true);
             m_searchBox->setVisible(false);
+            emit searchModeChanged(false);
         }
 
         m_view->setUrl(url);