Merge remote-tracking branch 'origin/KDE/4.11'

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 3ea81e4bad627d67046d10704372c976a5a57654..cc26198a0f4f333bbae4078c641fcbe5fcb6feea 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -98,6 +98,7 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
 
     m_searchBox = new DolphinSearchBox(this);
     m_searchBox->hide();
 
     m_searchBox = new DolphinSearchBox(this);
     m_searchBox->hide();

+    connect(m_searchBox, SIGNAL(activated()), this, SLOT(activate()));

     connect(m_searchBox, SIGNAL(closeRequest()), this, SLOT(closeSearchBox()));
     connect(m_searchBox, SIGNAL(searchRequest()), this, SLOT(startSearching()));
     connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus()));
     connect(m_searchBox, SIGNAL(closeRequest()), this, SLOT(closeSearchBox()));
     connect(m_searchBox, SIGNAL(searchRequest()), this, SLOT(startSearching()));
     connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus()));


@@ -195,6 +196,7 @@ KUrl DolphinViewContainer::url() const
 
 void DolphinViewContainer::setActive(bool active)
 {
 
 void DolphinViewContainer::setActive(bool active)
 {

+    m_searchBox->setActive(active);

     m_urlNavigator->setActive(active);
     m_view->setActive(active);
 
     m_urlNavigator->setActive(active);
     m_view->setActive(active);