diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dolphinviewcontainer.cpp | 15 | ||||
| -rw-r--r-- | src/dolphinviewcontainer.h | 3 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 540f38954..6deb7b846 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -288,21 +288,12 @@ void DolphinViewContainer::updateStatusBar() { m_statusBarTimestamp.start(); - // As the item count information is less important - // in comparison with other messages, it should only - // be shown if: - // - the status bar is empty or - // - shows already the item count information or - // - shows only a not very important information const QString newMessage = m_view->statusBarText(); - const QString currentMessage = m_statusBar->message(); - const bool updateStatusBarMsg = currentMessage.isEmpty() - || (currentMessage == m_statusBar->defaultText()) - || (m_statusBar->type() == DolphinStatusBar::Information); - m_statusBar->setDefaultText(newMessage); - if (updateStatusBarMsg) { + // We don't want to override errors. Other messages are only protected by + // the Statusbar itself depending on timings (see DolphinStatusBar::setMessage). + if (m_statusBar->type() != DolphinStatusBar::Error) { m_statusBar->setMessage(newMessage, DolphinStatusBar::Default); } } diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index 8ddc9d059..82b105a4a 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -139,6 +139,9 @@ private slots: * of selected files and the sum of the filesize is shown. The update * is done asynchronously, as getting the sum of the * filesizes can be an expensive operation. + * Unless a previous OperationCompletedMessage was set very shortly before + * calling this method, it will be overwritten (see DolphinStatusBar::setMessage). + * Previous ErrorMessages however are always preserved. */ void delayedStatusBarUpdate(); |