diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinview.cpp | 13 | ||||
| -rw-r--r-- | src/dolphinviewcontainer.cpp | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index d33dfa2a8..0154453b6 100644 --- 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 d792287b5..8eab3efac 100644 --- 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); } |