SVN_SILENT made messages (.desktop file)

[dolphin.git] / src / infosidebarpage.cpp

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 2c87f430d9ef21f94b71da57a782507107a69611..de9be116442c469432c17d5cff30ee4ad19a7cd0 100644 (file)
--- 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>
 
@@ -142,7 +144,7 @@ void InfoSidebarPage::requestDelayedItemInfo(const KFileItem& item)
             m_urlCandidate = item.url();
             m_fileItem = item;
             m_infoTimer->start();
-        }    
+        }
     }
 }
 
@@ -194,7 +196,7 @@ 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();
@@ -213,16 +215,15 @@ void InfoSidebarPage::showItemInfo()
                                                     m_preview->height(),
                                                     0,
                                                     0,
-                                                    true,
-                                                    false);
-            job->setIgnoreMaximumSize(true);
+                                                    false,
+                                                    true);
 
             connect(job, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
                     this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
             connect(job, SIGNAL(failed(const KFileItem&)),
                     this, SLOT(showIcon(const KFileItem&)));
 
-            m_nameLabel->setText(itemUrl.fileName());
+            setNameLabelText(itemUrl.fileName());
         }
     }
 
@@ -337,7 +338,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;
         }
@@ -482,6 +483,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();
@@ -510,7 +540,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