X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ced9de5b82046d6eb6f6b828fa9bbc874bbea857..780327f7d3652d4964933533ff6a856bb8aaea22:/src/dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index b2c8605d8..44d4ee36f 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -106,6 +106,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
 
     m_view = new DolphinView(url, this);
     connect(m_view, SIGNAL(urlChanged(KUrl)),                   m_urlNavigator, SLOT(setUrl(KUrl)));
+    connect(m_view, SIGNAL(urlChanged(KUrl)),                   m_messageWidget, SLOT(hide()));
     connect(m_view, SIGNAL(writeStateChanged(bool)),            this, SIGNAL(writeStateChanged(bool)));
     connect(m_view, SIGNAL(requestItemInfo(KFileItem)),         this, SLOT(showItemInfo(KFileItem)));
     connect(m_view, SIGNAL(itemActivated(KFileItem)),           this, SLOT(slotItemActivated(KFileItem)));
@@ -158,8 +159,10 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
             this, SLOT(setNameFilter(QString)));
     connect(m_filterBar, SIGNAL(closeRequest()),
             this, SLOT(closeFilterBar()));
+    connect(m_filterBar, SIGNAL(focusViewRequest()),
+            this, SLOT(requestFocus()));
     connect(m_view, SIGNAL(urlChanged(KUrl)),
-            m_filterBar, SLOT(clear()));
+            m_filterBar, SLOT(slotUrlChanged()));
 
     m_topLayout->addWidget(m_urlNavigator);
     m_topLayout->addWidget(m_searchBox);
@@ -533,8 +536,7 @@ void DolphinViewContainer::showItemInfo(const KFileItem& item)
 
 void DolphinViewContainer::closeFilterBar()
 {
-    m_filterBar->hide();
-    m_filterBar->clear();
+    m_filterBar->closeFilterBar();
     m_view->setFocus();
     emit showFilterBarChanged(false);
 }