X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/ee0f3435b28908478dec8fc8bca651fa7795f139..ca5d3fde114dfdb280e46995e8a425d3ec558596:/src/dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 77149f3d5..67ea84d1b 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -36,7 +36,7 @@
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>
 #include <KMenu>
-#include <knewfilemenu.h>
+#include <KNewFileMenu>
 #include <konqmimedata.h>
 #include <konq_operations.h>
 #include <KShell>
@@ -162,7 +162,7 @@ DolphinViewContainer::~DolphinViewContainer()
 
 KUrl DolphinViewContainer::url() const
 {
-    return m_urlNavigator->locationUrl();
+    return m_view->url();
 }
 
 void DolphinViewContainer::setActive(bool active)
@@ -177,6 +177,46 @@ bool DolphinViewContainer::isActive() const
     return m_view->isActive();
 }
 
+const DolphinStatusBar* DolphinViewContainer::statusBar() const
+{
+    return m_statusBar;
+}
+
+DolphinStatusBar* DolphinViewContainer::statusBar()
+{
+    return m_statusBar;
+}
+
+const KUrlNavigator* DolphinViewContainer::urlNavigator() const
+{
+    return m_urlNavigator;
+}
+
+KUrlNavigator* DolphinViewContainer::urlNavigator()
+{
+    return m_urlNavigator;
+}
+
+const DolphinView* DolphinViewContainer::view() const
+{
+    return m_view;
+}
+
+DolphinView* DolphinViewContainer::view()
+{
+    return m_view;
+}
+
+const DolphinSearchBox* DolphinViewContainer::searchBox() const
+{
+    return m_searchBox;
+}
+
+DolphinSearchBox* DolphinViewContainer::searchBox()
+{
+    return m_searchBox;
+}
+
 void DolphinViewContainer::refresh()
 {
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
@@ -214,7 +254,7 @@ void DolphinViewContainer::setSearchModeEnabled(bool enabled)
     if (enabled) {
         KUrl url = m_urlNavigator->locationUrl();
         m_searchBox->setText(QString());
-        m_searchBox->setReadOnly(isSearchUrl(url));
+        m_searchBox->setReadOnly(isSearchUrl(url), url);
 
         // Remember the most recent non-search URL as search path
         // of the search-box, so that it can be restored
@@ -288,21 +328,12 @@ void DolphinViewContainer::updateStatusBar()
 {
     m_statusBarTimestamp.start();
 
-    // As the item count information is less important
-    // in comparison with other messages, it should only
-    // be shown if:
-    // - the status bar is empty or
-    // - shows already the item count information or
-    // - shows only a not very important information
     const QString newMessage = m_view->statusBarText();
-    const QString currentMessage = m_statusBar->message();
-    const bool updateStatusBarMsg = currentMessage.isEmpty()
-                                    || (currentMessage == m_statusBar->defaultText())
-                                    || (m_statusBar->type() == DolphinStatusBar::Information);
-
     m_statusBar->setDefaultText(newMessage);
 
-    if (updateStatusBarMsg) {
+    // We don't want to override errors. Other messages are only protected by
+    // the Statusbar itself depending on timings (see DolphinStatusBar::setMessage).
+    if (m_statusBar->type() != DolphinStatusBar::Error) {
         m_statusBar->setMessage(newMessage, DolphinStatusBar::Default);
     }
 }
@@ -503,6 +534,7 @@ void DolphinViewContainer::closeSearchBox()
 void DolphinViewContainer::stopLoading()
 {
     m_view->stopLoading();
+    m_statusBar->setProgress(100);
 }
 
 bool DolphinViewContainer::isSearchUrl(const KUrl& url) const