X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5926d0fddd94d25a5546eee82a6dd8f072196b83..d511752c9de4d9adc30a15ddf9bf89efc1924a7b:/src/dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 6e5b00af2..c53b77818 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&)),
@@ -279,10 +279,10 @@ void DolphinViewContainer::updateProgress(int percent)
         // 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..."));
+        const QString loadingText(i18nc("@info:progress", "Loading folder..."));
+        m_showProgress = progressText.isEmpty() || (progressText == loadingText);
         if (m_showProgress) {
-            m_statusBar->setProgressText(i18n("Loading folder..."));
+            m_statusBar->setProgressText(loadingText);
             m_statusBar->setProgress(0);
         }
     }
@@ -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);
     }
 }
 
@@ -387,7 +382,7 @@ QString DolphinViewContainer::selectionStatusBarText() const
     }
 
     if (folderCount > 0) {
-        text = i18np("1 Folder selected", "%1 Folders selected", folderCount);
+        text = i18ncp("@info:status", "1 Folder selected", "%1 Folders selected", folderCount);
         if (fileCount > 0) {
             text += ", ";
         }
@@ -395,7 +390,7 @@ QString DolphinViewContainer::selectionStatusBarText() const
 
     if (fileCount > 0) {
         const QString sizeText(KIO::convertSize(byteSize));
-        text += i18np("1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);
+        text += i18ncp("@info:status", "1 File selected (%2)", "%1 Files selected (%2)", fileCount, sizeText);
     }
 
     return text;