Unify the search interface for non-indexed and indexed folders

[dolphin.git] / src / panels / information / informationpanelcontent.cpp

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 8e79e104aa7b2f4c8d3c74abb9ddc761fe11a21f..31128bafeb784339d8083345787501552cfdf189 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -30,6 +30,7 @@
 #include <klocale.h>
 #include <kmenu.h>
 #include <kseparator.h>
+#include <kstringhandler.h>
 
 #include <Phonon/BackendCapabilities>
 #include <Phonon/MediaObject>
@@ -41,6 +42,7 @@
 #include <QPointer>
 #include <QResizeEvent>
 #include <QScrollArea>
+#include <QTextDocument>
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTimer>
@@ -74,7 +76,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     connect(m_outdatedPreviewTimer, SIGNAL(timeout()),
             this, SLOT(markOutdatedPreview()));
 
-    QVBoxLayout* layout = new QVBoxLayout;
+    QVBoxLayout* layout = new QVBoxLayout(this);
     layout->setSpacing(KDialog::spacingHint());
 
     // preview
@@ -115,9 +117,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     containerLayout->setContentsMargins(0, 0, 0, 0);
     containerLayout->setSpacing(0);
     containerLayout->addWidget(m_metaDataWidget);
-    QWidget* stretchWidget = new QWidget(metaDataWidgetContainer);
-    stretchWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
-    containerLayout->addWidget(stretchWidget);
+    containerLayout->addStretch();
 
     m_metaDataArea = new QScrollArea(parent);
     m_metaDataArea->setWidget(metaDataWidgetContainer);
@@ -136,7 +136,6 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     layout->addWidget(m_nameLabel);
     layout->addWidget(new KSeparator());
     layout->addWidget(m_metaDataArea);
-    parent->setLayout(layout);
 }
 
 InformationPanelContent::~InformationPanelContent()
@@ -149,17 +148,17 @@ void InformationPanelContent::showItem(const KFileItem& item)
     m_pendingPreview = false;
 
     const KUrl itemUrl = item.url();
-    const bool isNepomukSearchUrl = itemUrl.protocol().startsWith("nepomuk") && item.nepomukUri().isEmpty();
+    const bool isSearchUrl = itemUrl.protocol().contains("search") && item.nepomukUri().isEmpty();
     if (!applyPlace(itemUrl)) {
-        if (isNepomukSearchUrl) {
-            // in the case of a Nepomuk query-URL the URL is not readable for humans
+        setNameLabelText(item.text());
+        if (isSearchUrl) {
+            // in the case of a search-URL the URL is not readable for humans
             // (at least not useful to show in the Information Panel)
             KIconLoader iconLoader;
             QPixmap icon = iconLoader.loadIcon("nepomuk",
                                                KIconLoader::NoGroup,
                                                KIconLoader::SizeEnormous);
             m_preview->setPixmap(icon);
-            setNameLabelText(QString());
         } else {
             // try to get a preview pixmap from the item...
             m_pendingPreview = true;
@@ -185,18 +184,12 @@ void InformationPanelContent::showItem(const KFileItem& item)
                     this, SLOT(showPreview(const KFileItem&, const QPixmap&)));
             connect(job, SIGNAL(failed(const KFileItem&)),
                     this, SLOT(showIcon(const KFileItem&)));
-
-            setNameLabelText(item.text());
         }
     }
 
     if (m_metaDataWidget != 0) {
-        if (isNepomukSearchUrl) {
-            m_metaDataWidget->hide();
-        } else {
-            m_metaDataWidget->show();
-            m_metaDataWidget->setItems(KFileItemList() << item);
-        }
+        m_metaDataWidget->show();
+        m_metaDataWidget->setItems(KFileItemList() << item);
     }
 
     if (InformationPanelSettings::showPreview()) {
@@ -297,7 +290,7 @@ void InformationPanelContent::configureSettings()
     } else if (action == configureAction) {
         FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog();
         dialog->setDescription(i18nc("@label::textbox",
-                                     "Select which data should be shown in the tooltip."));
+                                     "Select which data should be shown in the information panel."));
         dialog->setItems(m_metaDataWidget->items());
         dialog->setAttribute(Qt::WA_DeleteOnClose);
         dialog->show();
@@ -377,19 +370,21 @@ void InformationPanelContent::setNameLabelText(const QString& text)
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 
-    QTextLayout textLayout(text);
+    const QString processedText = Qt::mightBeRichText(text) ? text : KStringHandler::preProcessWrap(text);
+
+    QTextLayout textLayout(processedText);
     textLayout.setFont(m_nameLabel->font());
     textLayout.setTextOption(textOption);
 
     QString wrappedText;
-    wrappedText.reserve(text.length());
+    wrappedText.reserve(processedText.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());
+        wrappedText += processedText.mid(line.textStart(), line.textLength());
 
         line = textLayout.createLine();
         if (line.isValid()) {