1. Also use a time out when waiting for the view's selectionChanged signal.

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 3f3eb91cd13bbfe8ee074c0005280f96bfdaa678..d3363cf646f9ad5d0e4dbb8dfd7a46b5090d50bb 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -36,7 +36,6 @@
 #include <kio/netaccess.h>
 #include <kio/previewjob.h>
 #include <kmenu.h>
-#include <kmimetyperesolver.h>
 #include <knewmenu.h>
 #include <konqmimedata.h>
 #include <kfileitemlistproperties.h>
@@ -164,6 +163,8 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
 
     // initialize status bar
     m_statusBar = new DolphinStatusBar(this, m_view);
+    connect(m_statusBar, SIGNAL(stopPressed()), this, SLOT(stopLoading()));
+
     m_statusBarTimer = new QTimer(this);
     m_statusBarTimer->setSingleShot(true);
     m_statusBarTimer->setInterval(300);
@@ -226,7 +227,7 @@ void DolphinViewContainer::refresh()
         // settings of the URL navigator and the filterbar.
         m_urlNavigator->setUrlEditable(settings->editableUrl());
         m_urlNavigator->setShowFullPath(settings->showFullPath());
-        showFilterBar(settings->filterBar());
+        setFilterBarVisible(settings->filterBar());
     }
 
     m_view->refresh();
@@ -298,11 +299,12 @@ void DolphinViewContainer::setUrl(const KUrl& newUrl)
     }
 }
 
-void DolphinViewContainer::showFilterBar(bool show)
+void DolphinViewContainer::setFilterBarVisible(bool visible)
 {
     Q_ASSERT(m_filterBar != 0);
-    if (show) {
+    if (visible) {
         m_filterBar->show();
+        m_filterBar->setFocus();
     } else {
         closeFilterBar();
     }
@@ -549,6 +551,11 @@ void DolphinViewContainer::closeSearchBox()
     setSearchModeEnabled(false);
 }
 
+void DolphinViewContainer::stopLoading()
+{
+    m_view->stopLoading();
+}
+
 bool DolphinViewContainer::isSearchUrl(const KUrl& url) const
 {
     const QString protocol = url.protocol();