enable progress information in statusbar again (has been disabled temporary because...

svn path=/trunk/KDE/kdebase/apps/; revision=672937

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index d33dfa2a8efe492fc90040a7b0dc060cf1433a68..0154453b6090933e9aa7f6fa10b16088a6c94246 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -554,19 +554,6 @@ void DolphinView::startDirLister(const KUrl& url, bool reload)
         return;
     }
 
-    // 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.
-
-    // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-    //const QString progressText(m_statusBar->progressText());
-    //m_showProgress = progressText.isEmpty() ||
-    //                 (progressText == i18n("Loading folder..."));
-    //if (m_showProgress) {
-    //    m_statusBar->setProgressText(i18n("Loading folder..."));
-    //    m_statusBar->setProgress(0);
-    //}
-
     m_cutItemsCache.clear();
     m_blockContentsMovedSignal = true;
     m_dirLister->stop();

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index d792287b51c51e3e83eee059c88136fc87ae1dfe..8eab3efaced4842127aff7f16a403eb5ce1f9f8f 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -286,6 +286,19 @@ DolphinMainWindow* DolphinViewContainer::mainWindow() const
 
 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());
+        m_showProgress = progressText.isEmpty() ||
+                        (progressText == i18n("Loading folder..."));
+        if (m_showProgress) {
+            m_statusBar->setProgressText(i18n("Loading folder..."));
+            m_statusBar->setProgress(0);
+        }
+    }
+
     if (m_showProgress) {
         m_statusBar->setProgress(percent);
     }