enable hovering information in the status bar again (has been disabled temporary because of the DolphinView/DolphinViewContainer split)

svn path=/trunk/KDE/kdebase/apps/; revision=672931

3 files changed, 22 insertions, 4 deletions

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 617764335..d33dfa2a8 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -815,16 +815,12 @@ void DolphinView::showHoverInformation(const QModelIndex& index)
 
     const KFileItem* item = fileItem(index);
     if (item != 0) {
-        // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-        //m_statusBar->setMessage(item->getStatusBarInfo(), DolphinStatusBar::Default);
         emit requestItemInfo(item->url());
     }
 }
 
 void DolphinView::clearHoverInformation()
 {
-    // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-    //m_statusBar->clear();
     emit requestItemInfo(KUrl());
 }
 
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 3c687c8d2..d792287b5 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -139,6 +139,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
             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_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             m_view, SLOT(setUrl(const KUrl&)));
@@ -319,6 +321,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);
diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index f6ab8d1c1..1d1a0a389 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -156,6 +156,12 @@ private slots:
      */
     void updateItemCount();
 
+    /**
+     * Shows the item information for the URL \a url inside the statusbar. If the
+     * URL is empty, the default statusbar information is shown.
+     */
+    void showItemInfo(const KUrl& url);
+
     /** Shows the information \a msg inside the statusbar. */
     void showInfoMessage(const QString& msg);