enable hovering information in the status bar again (has been disabled temporary...

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

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 6177643358409d56371d5c59c91a2ef5e591511a..d33dfa2a8efe492fc90040a7b0dc060cf1433a68 100644 (file)
--- 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) {
 
     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()
 {
         emit requestItemInfo(item->url());
     }
 }
 
 void DolphinView::clearHoverInformation()
 {

-    // TODO: temporary deactivated due to DolphinView/DolphinViewController split
-    //m_statusBar->clear();

     emit requestItemInfo(KUrl());
 }
 
     emit requestItemInfo(KUrl());
 }
 

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 3c687c8d250ff11969d36d28805e515a991c3c3c..d792287b51c51e3e83eee059c88136fc87ae1dfe 100644 (file)
--- 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&)));
             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&)));
 
     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()));
 }
 
     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);
 void DolphinViewContainer::showInfoMessage(const QString& msg)
 {
     m_statusBar->setMessage(msg, DolphinStatusBar::Information);

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index f6ab8d1c15f5519f07bc993d6acce8e3a3cd5bf6..1d1a0a389d8dc5bf575b012dbc81a236bb287f1c 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -156,6 +156,12 @@ private slots:
      */
     void updateItemCount();
 
      */
     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);
 
     /** Shows the information \a msg inside the statusbar. */
     void showInfoMessage(const QString& msg);