remove kde4_automoc()

[dolphin.git] / src / infosidebarpage.cpp

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 2ae3c4e1fbe9e79f41eda60a3213cf4d36ac9e99..83602ef7759273b50eaa0a2fdbfe8904e31a36c2 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -19,7 +19,7 @@
 
 #include "infosidebarpage.h"
 
-#include "config-nepomuk.h"
+#include <config-nepomuk.h>
 
 #include <kfileplacesmodel.h>
 #include <klocale.h>
@@ -117,13 +117,16 @@ void InfoSidebarPage::setSelection(const KFileItemList& selection)
     m_timer->start(TimerDelay);
 }
 
-void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url)
+void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item)
 {
     cancelRequest();
 
-    if (!url.isEmpty() && (selection().size() <= 1)) {
-        m_urlCandidate = url;
-        m_timer->start(TimerDelay);
+    if (!item.isNull() && (selection().size() <= 1)) {
+        const KUrl url = item.url();
+        if (!url.isEmpty()) {
+            m_urlCandidate = url;
+            m_timer->start(TimerDelay);
+        }
     }
 }
 
@@ -160,12 +163,15 @@ void InfoSidebarPage::showItemInfo()
     const KFileItemList& selectedItems = selection();
 
     KUrl file;
-    const int itemCount = selectedItems.count();
-    if (selectedItems.count() == 0) {
+    if (selectedItems.isEmpty()) {
         file = m_shownUrl;
     } else {
         file = selectedItems[0]->url();
     }
+    if (!file.isValid()) {
+        return;
+    }
+    const int itemCount = selectedItems.count();
     if (itemCount > 1) {
         KIconLoader iconLoader;
         QPixmap icon = iconLoader.loadIcon("exec",
@@ -266,17 +272,17 @@ void InfoSidebarPage::showMetaInfo()
         fileItem.refresh();
 
         if (fileItem.isDir()) {
-            addInfoLine(text, i18n("Type:"), i18n("Folder"));
+            addInfoLine(text, i18nc("@label", "Type:"), i18nc("@info", "Folder"));
         } else {
-            addInfoLine(text, i18n("Type:"), fileItem.mimeComment());
+            addInfoLine(text, i18nc("@label", "Type:"), fileItem.mimeComment());
 
             QString sizeText(KIO::convertSize(fileItem.size()));
-            addInfoLine(text, i18n("Size:"), sizeText);
-            addInfoLine(text, i18n("Modified:"), fileItem.timeString());
+            addInfoLine(text, i18nc("@label", "Size:"), sizeText);
+            addInfoLine(text, i18nc("@label", "Modified:"), fileItem.timeString());
 
-            // TODO: deactivate showing additional meta information, as the system
-            // hangs when retrieving the meta information of a zipped file
-            /*const KFileMetaInfo metaInfo(fileItem.url());
+            // TODO: See convertMetaInfo below, find a way to display only interesting information
+            // in a readable way
+            const KFileMetaInfo metaInfo(fileItem.url());
             if (metaInfo.isValid()) {
                 const QHash<QString, KFileMetaInfoItem>& items = metaInfo.items();
                 QHash<QString, KFileMetaInfoItem>::const_iterator it = items.constBegin();
@@ -290,7 +296,7 @@ void InfoSidebarPage::showMetaInfo()
                     }
                     ++it;
                 }
-            }*/
+            }
         }
 
         if (MetaDataWidget::metaDataAvailable()) {
@@ -307,7 +313,7 @@ void InfoSidebarPage::showMetaInfo()
             // item->size() does not return the size of the content : not very instinctive for users
             totalSize += item->size();
         }
-        addInfoLine(text, i18n("Total size:"), KIO::convertSize(totalSize));
+        addInfoLine(text, i18nc("@label", "Total size:"), KIO::convertSize(totalSize));
     }
     m_infoLabel->setText(text);
 }