The &-shortcut from another action is not set until the action has been shown at...

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

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 73f2626c470f8b8d2b0911f1cc28be3eb1da3642..b6a41ca3d211c12d13b4f36b1e9854e2c347d946 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>
@@ -53,7 +55,7 @@
 #include "pixmapviewer.h"
 
 InformationPanelContent::InformationPanelContent(QWidget* parent) :
-    Panel(parent),
+    QWidget(parent),
     m_item(),
     m_pendingPreview(false),
     m_outdatedPreviewTimer(0),
@@ -85,6 +87,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_preview->setMinimumHeight(KIconLoader::SizeEnormous);
 
     m_phononWidget = new PhononWidget(parent);
+    m_phononWidget->hide();
     m_phononWidget->setMinimumWidth(minPreviewWidth);
     connect(m_phononWidget, SIGNAL(playingStarted()),
             this, SLOT(slotPlayingStarted()));
@@ -146,17 +149,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;
@@ -182,18 +185,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()) {
@@ -265,7 +262,7 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
         break;
     }
 
-    return Panel::eventFilter(obj, event);
+    return QWidget::eventFilter(obj, event);
 }
 
 void InformationPanelContent::configureSettings()
@@ -327,10 +324,10 @@ void InformationPanelContent::showPreview(const KFileItem& item,
 
 void InformationPanelContent::markOutdatedPreview()
 {
-    KIconEffect iconEffect;
-    QPixmap disabledPixmap = iconEffect.apply(m_preview->pixmap(),
-                                              KIconLoader::Desktop,
-                                              KIconLoader::DisabledState);
+    KIconEffect *iconEffect = KIconLoader::global()->iconEffect();
+    QPixmap disabledPixmap = iconEffect->apply(m_preview->pixmap(),
+                                               KIconLoader::Desktop,
+                                               KIconLoader::DisabledState);
     m_preview->setPixmap(disabledPixmap);
 }
 
@@ -374,19 +371,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()) {