From d89f43f66bb323a612c2f7de09d5969e437845e0 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 2 Jul 2007 17:24:54 +0000 Subject: Change signature of requestItemInfo signal, to avoid fileitem -> url -> index -> fileitem roundtrip in dolphin, and to match the BrowserExtension mouseOverInfo() signal. Started to implement more of the part (e.g. spinning wheel in konq). svn path=/trunk/KDE/kdebase/apps/; revision=682440 --- src/dolphinviewcontainer.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/dolphinviewcontainer.cpp') diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 6e5b00af2..568cba93a 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -133,8 +133,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&))); connect(m_view, SIGNAL(contentsMoved(int, int)), this, SLOT(saveContentsPos(int, int))); - connect(m_view, SIGNAL(requestItemInfo(const KUrl&)), - this, SLOT(showItemInfo(const KUrl&))); + connect(m_view, SIGNAL(requestItemInfo(KFileItem)), + this, SLOT(showItemInfo(KFileItem))); connect(m_view, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&))); connect(m_view, SIGNAL(infoMessage(const QString&)), @@ -322,17 +322,12 @@ void DolphinViewContainer::updateItemCount() QTimer::singleShot(100, this, SLOT(restoreContentsPos())); } -void DolphinViewContainer::showItemInfo(const KUrl& url) +void DolphinViewContainer::showItemInfo(const KFileItem& item) { - if (url.isEmpty()) { + if (item.isNull()) { 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); + } else { + m_statusBar->setMessage(item.getStatusBarInfo(), DolphinStatusBar::Default); } } -- cgit v1.3