added signals errorMessage(const QString&) and infoMessage(const QString&) for the...

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 3c687c8d250ff11969d36d28805e515a991c3c3c..a2a899beae926b9cc8082cf8a378ccdfffb77544 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -131,14 +131,19 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
                              m_dirLister,
                              m_dirModel,
                              m_proxyModel,
-                             mode,
-                             showHiddenFiles);
+                             mode);
     connect(m_view, SIGNAL(urlChanged(const KUrl&)),
             m_urlNavigator, SLOT(setUrl(const KUrl&)));
     connect(m_view, SIGNAL(requestContextMenu(KFileItem*, const KUrl&)),
             this, SLOT(openContextMenu(KFileItem*, const KUrl&)));
     connect(m_view, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
             m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
+    connect(m_view, SIGNAL(requestItemInfo(const KUrl&)),
+            this, SLOT(showItemInfo(const KUrl&)));
+    connect(m_view, SIGNAL(errorMessage(const QString&)),
+            this, SLOT(showErrorMessage(const QString&)));
+    connect(m_view, SIGNAL(infoMessage(const QString&)),
+            this, SLOT(showInfoMessage(const QString&)));
 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             m_view, SLOT(setUrl(const KUrl&)));
@@ -284,6 +289,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);
     }
@@ -319,6 +337,20 @@ void DolphinViewContainer::updateItemCount()
     QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
 }
 
+void DolphinViewContainer::showItemInfo(const KUrl& url)
+{
+    if (url.isEmpty()) {
+        m_statusBar->clear();
+        return;
+    }
+
+    const QModelIndex index = m_dirModel->indexForUrl(url);
+    const KFileItem* item = m_dirModel->itemForIndex(index);
+    if (item != 0) {
+        m_statusBar->setMessage(item->getStatusBarInfo(), DolphinStatusBar::Default);
+    }
+}
+
 void DolphinViewContainer::showInfoMessage(const QString& msg)
 {
     m_statusBar->setMessage(msg, DolphinStatusBar::Information);