turn off the filter when closing the filterbar by CTRL+I

BUG: 177948

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

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index a70055b5ff3322242a51efb4b7bcc9d9382bbd46..8b3def9f3a899b3ff126e9f5e8daa87b2a9329e4 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -214,6 +214,16 @@ bool DolphinViewContainer::isFilterBarVisible() const
     return m_filterBar->isVisible();
 }
 
     return m_filterBar->isVisible();
 }
 

+void DolphinViewContainer::showFilterBar(bool show)
+{
+    Q_ASSERT(m_filterBar != 0);
+    if (show) {
+        m_filterBar->show();
+    } else {
+        closeFilterBar();
+    }
+}
+

 bool DolphinViewContainer::isUrlEditable() const
 {
     return m_urlNavigator->isUrlEditable();
 bool DolphinViewContainer::isUrlEditable() const
 {
     return m_urlNavigator->isUrlEditable();


@@ -299,12 +309,6 @@ void DolphinViewContainer::closeFilterBar()
     emit showFilterBarChanged(false);
 }
 
     emit showFilterBarChanged(false);
 }
 

-void DolphinViewContainer::showFilterBar(bool show)
-{
-    Q_ASSERT(m_filterBar != 0);
-    m_filterBar->setVisible(show);
-}
-

 void DolphinViewContainer::updateStatusBar()
 {
     // As the item count information is less important
 void DolphinViewContainer::updateStatusBar()
 {
     // As the item count information is less important