assure that no expensive operations are done when the Information Panel has been...

[dolphin.git] / src / infosidebarpage.cpp

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 9fc2286f1f172cd4e67e76ccebb53e9435c966b1..2c87f430d9ef21f94b71da57a782507107a69611 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -80,7 +80,7 @@ void InfoSidebarPage::setUrl(const KUrl& url)
 {
     SidebarPage::setUrl(url);
     if (url.isValid() && !isEqualToShownUrl(url)) {
-        if (m_initialized) {
+        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;
     }
 
@@ -122,7 +122,7 @@ void InfoSidebarPage::setSelection(const KFileItemList& selection)
 
 void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item)
 {
-    if (!m_initialized) {
+    if (!isVisible()) {
         return;
     }
 
@@ -162,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.
@@ -195,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();
@@ -416,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...