enable progress information in statusbar again (has been disabled temporary because of the DolphinView/DolphinViewContainer split)

svn path=/trunk/KDE/kdebase/apps/; revision=672937
This commit is contained in:
Peter Penz 2007-06-08 14:02:34 +00:00
parent dd70012499
commit 3a053415f9
2 changed files with 13 additions and 13 deletions

View file

@ -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();

View file

@ -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);
}