X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fbfcbd5b952faea346823efa868ca88cb8ea1738..11289b4fc3efbc074b668d4516cd896f8ade9761:/src/infosidebarpage.cpp

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 8e6bda8e8..2c87f430d 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -79,8 +79,8 @@ QSize InfoSidebarPage::sizeHint() const
 void InfoSidebarPage::setUrl(const KUrl& url)
 {
     SidebarPage::setUrl(url);
-    if (url.isValid() && !m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash)) {
-        if (m_initialized) {
+    if (url.isValid() && !isEqualToShownUrl(url)) {
+        if (isVisible()) {
             cancelRequest();
             m_shownUrl = url;
             showItemInfo();
@@ -92,7 +92,7 @@ void InfoSidebarPage::setUrl(const KUrl& url)
 
 void InfoSidebarPage::setSelection(const KFileItemList& selection)
 {
-    if (!m_initialized) {
+    if (!isVisible()) {
         return;
     }
 
@@ -108,8 +108,10 @@ void InfoSidebarPage::setSelection(const KFileItemList& selection)
 
     const int count = selection.count();
     if (count == 0) {
-        m_shownUrl = url();
-        showItemInfo();
+        if (!isEqualToShownUrl(url())) {
+            m_shownUrl = url();
+            showItemInfo();
+        }
     } else {
         if ((count == 1) && !selection.first().url().isEmpty()) {
             m_urlCandidate = selection.first().url();
@@ -120,7 +122,7 @@ void InfoSidebarPage::setSelection(const KFileItemList& selection)
 
 void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item)
 {
-    if (!m_initialized) {
+    if (!isVisible()) {
         return;
     }
 
@@ -134,10 +136,13 @@ void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item)
             m_pendingPreview = false;
             m_infoTimer->start();
         }
-    } else if (!item.url().isEmpty()) {
-        m_urlCandidate = item.url();
-        m_fileItem = item;
-        m_infoTimer->start();
+    } else {
+        const KUrl url = item.url();
+        if (url.isValid() && !isEqualToShownUrl(url)) {
+            m_urlCandidate = item.url();
+            m_fileItem = item;
+            m_infoTimer->start();
+        }    
     }
 }
 
@@ -157,7 +162,7 @@ void InfoSidebarPage::showEvent(QShowEvent* event)
 
 void InfoSidebarPage::resizeEvent(QResizeEvent* event)
 {
-    if (m_initialized) {
+    if (isVisible()) {
         // If the text inside the name label or the info label cannot
         // get wrapped, then the maximum width of the label is increased
         // so that the width of the information sidebar gets increased.
@@ -190,6 +195,7 @@ void InfoSidebarPage::showItemInfo()
                                            KIconLoader::SizeEnormous);
         m_preview->setPixmap(icon);
         m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected",  m_selection.count()));
+        m_shownUrl = KUrl();
     } else {
         const KFileItem item = fileItem();
         const KUrl itemUrl = item.url();
@@ -411,21 +417,22 @@ void InfoSidebarPage::showMetaInfo()
 
 bool InfoSidebarPage::convertMetaInfo(const QString& key, QString& text) const
 {
-    // TODO: This code prevents that interesting meta information might be hidden
-    // and only bypasses the current problem that not all the meta information should
-    // be shown to the user. Check whether it's possible with Nepomuk to show
-    // all "user relevant" information in a readable way...
-
     struct MetaKey {
         const char* key;
-        const char* text;
+        QString text;
     };
 
     // sorted list of keys, where its data should be shown
     static const MetaKey keys[] = {
-        { "audio.album", "Album:" },
-        { "audio.artist", "Artist:" },
-        { "audio.title", "Title:" },
+        { "http://freedesktop.org/standards/xesam/1.0/core#album",       i18nc("@label", "Album:") },
+        { "http://freedesktop.org/standards/xesam/1.0/core#artist",      i18nc("@label", "Artist:") },
+        { "http://freedesktop.org/standards/xesam/1.0/core#genre",       i18nc("@label", "Genre:") },
+        { "http://freedesktop.org/standards/xesam/1.0/core#height",      i18nc("@label", "Height:") },
+        { "http://freedesktop.org/standards/xesam/1.0/core#lineCount",   i18nc("@label", "Lines:") },
+        { "http://freedesktop.org/standards/xesam/1.0/core#title",       i18nc("@label", "Title:") },
+        { "http://freedesktop.org/standards/xesam/1.0/core#type",        i18nc("@label", "Type:") },
+        { "http://freedesktop.org/standards/xesam/1.0/core#trackNumber", i18nc("@label", "Track:") },
+        { "http://freedesktop.org/standards/xesam/1.0/core#width",       i18nc("@label", "Width:") }
     };
 
     // do a binary search for the key...
@@ -470,6 +477,11 @@ bool InfoSidebarPage::showMultipleSelectionInfo() const
     return m_fileItem.isNull() && (m_selection.count() > 1);
 }
 
+bool InfoSidebarPage::isEqualToShownUrl(const KUrl& url) const
+{
+    return m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash);
+}
+
 void InfoSidebarPage::init()
 {
     const int spacing = KDialog::spacingHint();