move the search-button from the toolbar into the configurator widget

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 356ff274ee7cfd612ba98e8827d88a8d11b46206..7bb4b7bec3bfbfbf2474cd8ab5b4b5a4d8dea999 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -44,12 +44,12 @@
 #include <kshell.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
+#include <kurlnavigator.h>
 #include <krun.h>
 
 #include "dolphinmodel.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"
-#include "dolphinstatusbar.h"
 #include "dolphinmainwindow.h"
 #include "dolphindirlister.h"
 #include "dolphinsortfilterproxymodel.h"
@@ -58,7 +58,7 @@
 #include "dolphincontextmenu.h"
 #include "draganddrophelper.h"
 #include "filterbar.h"
-#include "kurlnavigator.h"
+#include "statusbar/dolphinstatusbar.h"
 #include "viewproperties.h"
 #include "settings/dolphinsettings.h"
 #include "dolphin_generalsettings.h"
@@ -67,7 +67,6 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
                                            QWidget* parent,
                                            const KUrl& url) :
     QWidget(parent),
-    m_showProgress(false),
     m_isFolderWritable(false),
     m_mainWindow(mainWindow),
     m_topLayout(0),
@@ -128,11 +127,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     connect(m_dirLister, SIGNAL(urlIsFileError(const KUrl&)),
             this, SLOT(openFile(const KUrl&)));
 
-    m_view = new DolphinView(this,
-                             url,
-                             m_dirLister,
-                             m_dolphinModel,
-                             m_proxyModel);
+    m_view = new DolphinView(this, url, m_proxyModel);
     connect(m_view, SIGNAL(urlChanged(const KUrl&)),
             m_urlNavigator, SLOT(setUrl(const KUrl&)));
     connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)),
@@ -287,33 +282,20 @@ void DolphinViewContainer::updateStatusBar()
 
 void DolphinViewContainer::updateProgress(int percent)
 {
-    if (!m_showProgress) {
-        // Only show the directory loading progress if the status bar does
-        // not contain another progress information. This means that
-        // the directory loading progress information has the lowest priority.
-        const QString progressText(m_statusBar->progressText());
-        const QString loadingText(i18nc("@info:progress", "Loading folder..."));
-        m_showProgress = progressText.isEmpty() || (progressText == loadingText);
-        if (m_showProgress) {
-            m_statusBar->setProgressText(loadingText);
-            m_statusBar->setProgress(0);
-        }
-    }
-
-    if (m_showProgress) {
-        m_statusBar->setProgress(percent);
+    if (m_statusBar->progressText().isEmpty()) {
+        m_statusBar->setProgressText(i18nc("@info:progress", "Loading folder..."));
     }
+    m_statusBar->setProgress(percent);
 }
 
 void DolphinViewContainer::slotDirListerCompleted()
 {
-    if (m_showProgress) {
+    if (!m_statusBar->progressText().isEmpty()) {
         m_statusBar->setProgressText(QString());
         m_statusBar->setProgress(100);
-        m_showProgress = false;
     }
 
-    delayedStatusBarUpdate();
+    updateStatusBar();
     QMetaObject::invokeMethod(this, "restoreContentsPos", Qt::QueuedConnection);
 
     // Enable the 'File'->'Create New...' menu only if the directory
@@ -335,7 +317,13 @@ void DolphinViewContainer::slotDirListerCompleted()
 void DolphinViewContainer::showItemInfo(const KFileItem& item)
 {
     if (item.isNull()) {
-        m_statusBar->clear();
+        // Only clear the status bar if unimportant messages are shown.
+        // This prevents that information- or error-messages get hidden
+        // by moving the mouse above the viewport or when closing the
+        // context menu.
+        if (m_statusBar->type() == DolphinStatusBar::Default) {
+            m_statusBar->clear();
+        }
     } else {
         m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default);
     }