diff options
Diffstat (limited to 'src/dolphinviewcontainer.cpp')
| -rw-r--r-- | src/dolphinviewcontainer.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index ae6953aad..7bb4b7bec 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -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), @@ -283,30 +282,17 @@ 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; } updateStatusBar(); |