X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7de3ccbf54ee3a2f7c751a2ba5352d3122d5126e..148282e2d856b47ceb191eeef4c834118c8cdffd:/src/infosidebarpage.cpp

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 9fc2286f1..64d5d44c2 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -40,6 +40,8 @@
 #include <QPainter>
 #include <QPixmap>
 #include <QResizeEvent>
+#include <QTextLayout>
+#include <QTextLine>
 #include <QTimer>
 #include <QVBoxLayout>
 
@@ -80,7 +82,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 +94,7 @@ void InfoSidebarPage::setUrl(const KUrl& url)
 
 void InfoSidebarPage::setSelection(const KFileItemList& selection)
 {
-    if (!m_initialized) {
+    if (!isVisible()) {
         return;
     }
 
@@ -122,7 +124,7 @@ void InfoSidebarPage::setSelection(const KFileItemList& selection)
 
 void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item)
 {
-    if (!m_initialized) {
+    if (!isVisible()) {
         return;
     }
 
@@ -162,7 +164,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.
@@ -194,7 +196,8 @@ void InfoSidebarPage::showItemInfo()
                                            KIconLoader::NoGroup,
                                            KIconLoader::SizeEnormous);
         m_preview->setPixmap(icon);
-        m_nameLabel->setText(i18ncp("@info", "%1 item selected", "%1 items selected",  m_selection.count()));
+        setNameLabelText(i18ncp("@info", "%1 item selected", "%1 items selected",  m_selection.count()));
+        m_shownUrl = KUrl();
     } else {
         const KFileItem item = fileItem();
         const KUrl itemUrl = item.url();
@@ -221,7 +224,7 @@ void InfoSidebarPage::showItemInfo()
             connect(job, SIGNAL(failed(const KFileItem&)),
                     this, SLOT(showIcon(const KFileItem&)));
 
-            m_nameLabel->setText(itemUrl.fileName());
+            setNameLabelText(itemUrl.fileName());
         }
     }
 
@@ -336,7 +339,7 @@ bool InfoSidebarPage::applyPlace(const KUrl& url)
         QModelIndex index = placesModel->index(i, 0);
 
         if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) {
-            m_nameLabel->setText(placesModel->text(index));
+            setNameLabelText(placesModel->text(index));
             m_preview->setPixmap(placesModel->icon(index).pixmap(128, 128));
             return true;
         }
@@ -416,21 +419,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...
@@ -480,6 +484,35 @@ bool InfoSidebarPage::isEqualToShownUrl(const KUrl& url) const
     return m_shownUrl.equals(url, KUrl::CompareWithoutTrailingSlash);
 }
 
+void InfoSidebarPage::setNameLabelText(const QString& text)
+{
+    QTextOption textOption;
+    textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
+    
+    QTextLayout textLayout(text);
+    textLayout.setFont(m_nameLabel->font());
+    textLayout.setTextOption(textOption);
+    
+    QString wrappedText;
+    wrappedText.reserve(text.length());
+    
+    // wrap the text to fit into the width of m_nameLabel
+    textLayout.beginLayout();
+    QTextLine line = textLayout.createLine();
+    while (line.isValid()) {
+        line.setLineWidth(m_nameLabel->width());
+        wrappedText += text.mid(line.textStart(), line.textLength());
+        
+        line = textLayout.createLine();
+        if (line.isValid()) {
+            wrappedText += QChar::LineSeparator;
+        }
+    }    
+    textLayout.endLayout();
+
+    m_nameLabel->setText(wrappedText);
+}
+
 void InfoSidebarPage::init()
 {
     const int spacing = KDialog::spacingHint();
@@ -508,7 +541,6 @@ void InfoSidebarPage::init()
     font.setBold(true);
     m_nameLabel->setFont(font);
     m_nameLabel->setAlignment(Qt::AlignHCenter);
-    m_nameLabel->setWordWrap(true);
     m_nameLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
 
     // preview