mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 16:31:21 +00:00
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:
parent
dd70012499
commit
3a053415f9
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue