Merge remote-tracking branch 'origin/Applications/17.12'

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

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 1164a5591c001a4dcb08edcb13f57f59d7111f7a..2e279dc620ed2c9df82642c3307632463da6de5e 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2009 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2009 by Peter Penz <peter.penz19@gmail.com>             *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -19,15 +19,27 @@
 
 #include "informationpanelcontent.h"
 
 
 #include "informationpanelcontent.h"
 

-#include <kdialog.h>
-#include <kfileitem.h>
-#include <kfileplacesmodel.h>
-#include <kio/previewjob.h>
-#include <kiconeffect.h>
-#include <kiconloader.h>
-#include <klocale.h>
-#include <kmenu.h>
-#include <kseparator.h>
+#include <KFileItem>
+#include <KIO/JobUiDelegate>
+#include <KIO/PreviewJob>
+#include <KJobWidgets>
+#include <KIconEffect>
+#include <KIconLoader>
+#include <QIcon>
+#include <KLocalizedString>
+#include <QMenu>
+#include <KSeparator>
+#include <KStringHandler>
+#include <QTextDocument>
+
+#ifndef HAVE_BALOO
+#include <KFileMetaDataWidget>
+#else
+#include <Baloo/FileMetaDataWidget>
+#endif
+
+#include <panels/places/placesitem.h>
+#include <panels/places/placesitemmodel.h>

 
 #include <Phonon/BackendCapabilities>
 #include <Phonon/MediaObject>
 
 #include <Phonon/BackendCapabilities>
 #include <Phonon/MediaObject>


@@ -36,31 +48,31 @@
 #include <QEvent>
 #include <QLabel>
 #include <QPixmap>
 #include <QEvent>
 #include <QLabel>
 #include <QPixmap>

-#include <QPointer>

 #include <QResizeEvent>
 #include <QScrollArea>
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTimer>
 #include <QVBoxLayout>
 #include <QResizeEvent>
 #include <QScrollArea>
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTimer>
 #include <QVBoxLayout>

+#include <QFontDatabase>
+#include <QStyle>

 
 #include "dolphin_informationpanelsettings.h"
 
 #include "dolphin_informationpanelsettings.h"

-#include "settings/dolphinsettings.h"
-#include "kmetadatawidget.h"
-#include "kmetadataconfigurationdialog.h"
+#include "filemetadataconfigurationdialog.h"

 #include "phononwidget.h"
 #include "pixmapviewer.h"
 
 InformationPanelContent::InformationPanelContent(QWidget* parent) :
 #include "phononwidget.h"
 #include "pixmapviewer.h"
 
 InformationPanelContent::InformationPanelContent(QWidget* parent) :

-    Panel(parent),
+    QWidget(parent),

     m_item(),
     m_item(),

-    m_pendingPreview(false),
-    m_outdatedPreviewTimer(0),
-    m_preview(0),
-    m_phononWidget(0),
-    m_nameLabel(0),
-    m_metaDataWidget(0),
-    m_metaDataArea(0)
+    m_previewJob(nullptr),
+    m_outdatedPreviewTimer(nullptr),
+    m_preview(nullptr),
+    m_phononWidget(nullptr),
+    m_nameLabel(nullptr),
+    m_metaDataWidget(nullptr),
+    m_metaDataArea(nullptr),
+    m_placesItemModel(nullptr)

 {
     parent->installEventFilter(this);
 
 {
     parent->installEventFilter(this);
 


@@ -70,11 +82,10 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_outdatedPreviewTimer = new QTimer(this);
     m_outdatedPreviewTimer->setInterval(300);
     m_outdatedPreviewTimer->setSingleShot(true);
     m_outdatedPreviewTimer = new QTimer(this);
     m_outdatedPreviewTimer->setInterval(300);
     m_outdatedPreviewTimer->setSingleShot(true);

-    connect(m_outdatedPreviewTimer, SIGNAL(timeout()),
-            this, SLOT(markOutdatedPreview()));
+    connect(m_outdatedPreviewTimer, &QTimer::timeout,
+            this, &InformationPanelContent::markOutdatedPreview);

 
 

-    QVBoxLayout* layout = new QVBoxLayout;
-    layout->setSpacing(KDialog::spacingHint());
+    QVBoxLayout* layout = new QVBoxLayout(this);

 
     // preview
     const int minPreviewWidth = KIconLoader::SizeEnormous + KIconLoader::SizeMedium;
 
     // preview
     const int minPreviewWidth = KIconLoader::SizeEnormous + KIconLoader::SizeMedium;


@@ -84,26 +95,34 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_preview->setMinimumHeight(KIconLoader::SizeEnormous);
 
     m_phononWidget = new PhononWidget(parent);
     m_preview->setMinimumHeight(KIconLoader::SizeEnormous);
 
     m_phononWidget = new PhononWidget(parent);

+    m_phononWidget->hide();

     m_phononWidget->setMinimumWidth(minPreviewWidth);
     m_phononWidget->setMinimumWidth(minPreviewWidth);

-    connect(m_phononWidget, SIGNAL(playingStarted()),
-            this, SLOT(slotPlayingStarted()));
-    connect(m_phononWidget, SIGNAL(playingStopped()),
-            this, SLOT(slotPlayingStopped()));
+    connect(m_phononWidget, &PhononWidget::hasVideoChanged,
+            this, &InformationPanelContent::slotHasVideoChanged);

 
     // name
     m_nameLabel = new QLabel(parent);
     QFont font = m_nameLabel->font();
     font.setBold(true);
     m_nameLabel->setFont(font);
 
     // name
     m_nameLabel = new QLabel(parent);
     QFont font = m_nameLabel->font();
     font.setBold(true);
     m_nameLabel->setFont(font);

+    m_nameLabel->setTextFormat(Qt::PlainText);

     m_nameLabel->setAlignment(Qt::AlignHCenter);
     m_nameLabel->setAlignment(Qt::AlignHCenter);

-    m_nameLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-
-    const bool showPreview = InformationPanelSettings::showPreview();
-    m_preview->setVisible(showPreview);
-
-    m_metaDataWidget = new KMetaDataWidget(parent);
+    m_nameLabel->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
+
+    const bool previewsShown = InformationPanelSettings::previewsShown();
+    m_preview->setVisible(previewsShown);
+
+#ifndef HAVE_BALOO
+    m_metaDataWidget = new KFileMetaDataWidget(parent);
+    connect(m_metaDataWidget, &KFileMetaDataWidget::urlActivated,
+            this, &InformationPanelContent::urlActivated);
+#else
+    m_metaDataWidget = new Baloo::FileMetaDataWidget(parent);
+    connect(m_metaDataWidget, &Baloo::FileMetaDataWidget::urlActivated,
+            this, &InformationPanelContent::urlActivated);
+#endif
+    m_metaDataWidget->setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));

     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);

-    connect(m_metaDataWidget, SIGNAL(urlActivated(KUrl)), this, SIGNAL(urlActivated(KUrl)));

 
     // Encapsulate the MetaDataWidget inside a container that has a dummy widget
     // at the bottom. This prevents that the meta data widget gets vertically stretched
 
     // Encapsulate the MetaDataWidget inside a container that has a dummy widget
     // at the bottom. This prevents that the meta data widget gets vertically stretched


@@ -113,9 +132,7 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     containerLayout->setContentsMargins(0, 0, 0, 0);
     containerLayout->setSpacing(0);
     containerLayout->addWidget(m_metaDataWidget);
     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);
 
     m_metaDataArea = new QScrollArea(parent);
     m_metaDataArea->setWidget(metaDataWidgetContainer);


@@ -125,42 +142,42 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     QWidget* viewport = m_metaDataArea->viewport();
     viewport->installEventFilter(this);
 
     QWidget* viewport = m_metaDataArea->viewport();
     viewport->installEventFilter(this);
 

-    QPalette palette = viewport->palette();
-    palette.setColor(viewport->backgroundRole(), QColor(Qt::transparent));
-    viewport->setPalette(palette);
-

     layout->addWidget(m_preview);
     layout->addWidget(m_phononWidget);
     layout->addWidget(m_nameLabel);
     layout->addWidget(new KSeparator());
     layout->addWidget(m_metaDataArea);
     layout->addWidget(m_preview);
     layout->addWidget(m_phononWidget);
     layout->addWidget(m_nameLabel);
     layout->addWidget(new KSeparator());
     layout->addWidget(m_metaDataArea);

-    parent->setLayout(layout);
+
+    m_placesItemModel = new PlacesItemModel(this);

 }
 
 InformationPanelContent::~InformationPanelContent()
 {
 }
 
 InformationPanelContent::~InformationPanelContent()
 {

-    InformationPanelSettings::self()->writeConfig();
+    InformationPanelSettings::self()->save();

 }
 
 void InformationPanelContent::showItem(const KFileItem& item)
 {
 }
 
 void InformationPanelContent::showItem(const KFileItem& item)
 {

-    m_pendingPreview = false;
+    // If there is a preview job, kill it to prevent that we have jobs for
+    // multiple items running, and thus a race condition (bug 250787).
+    if (m_previewJob) {
+        m_previewJob->kill();
+    }

 
 

-    const KUrl itemUrl = item.url();
-    const bool isNepomukSearchUrl = itemUrl.protocol().startsWith("nepomuk") && item.nepomukUri().isEmpty();
+    const QUrl itemUrl = item.url();
+    const bool isSearchUrl = itemUrl.scheme().contains(QStringLiteral("search")) && item.localPath().isEmpty();

     if (!applyPlace(itemUrl)) {
     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;
             // (at least not useful to show in the Information Panel)
             KIconLoader iconLoader;

-            QPixmap icon = iconLoader.loadIcon("nepomuk",
+            QPixmap icon = iconLoader.loadIcon(QStringLiteral("nepomuk"),

                                                KIconLoader::NoGroup,
                                                KIconLoader::SizeEnormous);
             m_preview->setPixmap(icon);
                                                KIconLoader::NoGroup,
                                                KIconLoader::SizeEnormous);
             m_preview->setPixmap(icon);

-            setNameLabelText(QString());

         } else {
             // try to get a preview pixmap from the item...
         } else {
             // try to get a preview pixmap from the item...

-            m_pendingPreview = true;

 
             // Mark the currently shown preview as outdated. This is done
             // with a small delay to prevent a flickering when the next preview
 
             // Mark the currently shown preview as outdated. This is done
             // with a small delay to prevent a flickering when the next preview


@@ -171,45 +188,32 @@ void InformationPanelContent::showItem(const KFileItem& item)
                 m_outdatedPreviewTimer->start();
             }
 
                 m_outdatedPreviewTimer->start();
             }
 

-            KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << item,
-                                                    m_preview->width(),
-                                                    m_preview->height(),
-                                                    0,
-                                                    0,
-                                                    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_previewJob = new KIO::PreviewJob(KFileItemList() << item, QSize(m_preview->width(), m_preview->height()));
+            m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);
+            m_previewJob->setIgnoreMaximumSize(item.isLocalFile());
+            if (m_previewJob->uiDelegate()) {
+                KJobWidgets::setWindow(m_previewJob, this);
+            }

 
 

-            setNameLabelText(item.text());
+            connect(m_previewJob.data(), &KIO::PreviewJob::gotPreview,
+                    this, &InformationPanelContent::showPreview);
+            connect(m_previewJob.data(), &KIO::PreviewJob::failed,
+                    this, &InformationPanelContent::showIcon);

         }
     }
 
         }
     }
 

-    if (m_metaDataWidget != 0) {
-        if (isNepomukSearchUrl) {
-            m_metaDataWidget->hide();
-        } else {
-            m_metaDataWidget->show();
-            m_metaDataWidget->setItem(item);
-        }
+    if (m_metaDataWidget) {
+        m_metaDataWidget->show();
+        m_metaDataWidget->setItems(KFileItemList() << item);

     }
 
     }
 

-    if (InformationPanelSettings::showPreview()) {
+    if (InformationPanelSettings::previewsShown()) {

         const QString mimeType = item.mimetype();
         const QString mimeType = item.mimetype();

-        const bool usePhonon = Phonon::BackendCapabilities::isMimeTypeAvailable(mimeType) &&
-                               (mimeType != "image/png");  // TODO: workaround, as Phonon
-                                                           // thinks it supports PNG images
+        const bool usePhonon = mimeType.startsWith(QLatin1String("audio/")) || mimeType.startsWith(QLatin1String("video/"));

         if (usePhonon) {
             m_phononWidget->show();
         if (usePhonon) {
             m_phononWidget->show();

-            PhononWidget::Mode mode = mimeType.startsWith(QLatin1String("video"))
-                                      ? PhononWidget::Video
-                                      : PhononWidget::Audio;
-            m_phononWidget->setMode(mode);
-            m_phononWidget->setUrl(item.url());
-            if ((mode == PhononWidget::Video) && m_preview->isVisible()) {
+            m_phononWidget->setUrl(item.targetUrl());
+            if (m_preview->isVisible()) {

                 m_phononWidget->setVideoSize(m_preview->size());
             }
         } else {
                 m_phononWidget->setVideoSize(m_preview->size());
             }
         } else {


@@ -225,16 +229,20 @@ void InformationPanelContent::showItem(const KFileItem& item)
 
 void InformationPanelContent::showItems(const KFileItemList& items)
 {
 
 void InformationPanelContent::showItems(const KFileItemList& items)
 {

-    m_pendingPreview = false;
+    // If there is a preview job, kill it to prevent that we have jobs for
+    // multiple items running, and thus a race condition (bug 250787).
+    if (m_previewJob) {
+        m_previewJob->kill();
+    }

 
     KIconLoader iconLoader;
 
     KIconLoader iconLoader;

-    QPixmap icon = iconLoader.loadIcon("dialog-information",
+    QPixmap icon = iconLoader.loadIcon(QStringLiteral("dialog-information"),

                                        KIconLoader::NoGroup,
                                        KIconLoader::SizeEnormous);
     m_preview->setPixmap(icon);
                                        KIconLoader::NoGroup,
                                        KIconLoader::SizeEnormous);
     m_preview->setPixmap(icon);

-    setNameLabelText(i18ncp("@info", "%1 item selected", "%1 items selected", items.count()));
+    setNameLabelText(i18ncp("@label", "%1 item selected", "%1 items selected", items.count()));

 
 

-    if (m_metaDataWidget != 0) {
+    if (m_metaDataWidget) {

         m_metaDataWidget->setItems(items);
     }
 
         m_metaDataWidget->setItems(items);
     }
 


@@ -262,100 +270,107 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
         adjustWidgetSizes(parentWidget()->width());
         break;
 
         adjustWidgetSizes(parentWidget()->width());
         break;
 

+    case QEvent::FontChange:
+        m_metaDataWidget->setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
+        break;
+

     default:
         break;
     }
 
     default:
         break;
     }
 

-    return Panel::eventFilter(obj, event);
+    return QWidget::eventFilter(obj, event);

 }
 
 }
 

-void InformationPanelContent::configureSettings()
+void InformationPanelContent::configureSettings(const QList<QAction*>& customContextMenuActions)

 {
 {

-    KMenu popup(this);
+    QMenu popup(this);

 
     QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview"));
 
     QAction* previewAction = popup.addAction(i18nc("@action:inmenu", "Preview"));

-    previewAction->setIcon(KIcon("view-preview"));
+    previewAction->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));

     previewAction->setCheckable(true);
     previewAction->setCheckable(true);

-    previewAction->setChecked(InformationPanelSettings::showPreview());
+    previewAction->setChecked(InformationPanelSettings::previewsShown());

 
     QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));
 
     QAction* configureAction = popup.addAction(i18nc("@action:inmenu", "Configure..."));

-    configureAction->setIcon(KIcon("configure"));
+    configureAction->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
+
+    popup.addSeparator();
+    foreach (QAction* action, customContextMenuActions) {
+        popup.addAction(action);
+    }

 
     // Open the popup and adjust the settings for the
     // selected action.
     QAction* action = popup.exec(QCursor::pos());
 
     // Open the popup and adjust the settings for the
     // selected action.
     QAction* action = popup.exec(QCursor::pos());

-    if (action == 0) {
+    if (!action) {

         return;
     }
 
     const bool isChecked = action->isChecked();
     if (action == previewAction) {
         m_preview->setVisible(isChecked);
         return;
     }
 
     const bool isChecked = action->isChecked();
     if (action == previewAction) {
         m_preview->setVisible(isChecked);

-        InformationPanelSettings::setShowPreview(isChecked);
+        InformationPanelSettings::setPreviewsShown(isChecked);

     } else if (action == configureAction) {
     } else if (action == configureAction) {

-        QPointer<KMetaDataConfigurationDialog> dialog = new KMetaDataConfigurationDialog(m_metaDataWidget, this, Qt::Dialog);
+        FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog(this);

         dialog->setDescription(i18nc("@label::textbox",
         dialog->setDescription(i18nc("@label::textbox",

-                               "Configure which data should be shown in the Information Panel."));
-        dialog->exec();
-        delete dialog;
-    }
-
-    if (!m_item.isNull() && m_item.nepomukUri().isValid()) {
-        showItem(m_item);
+                                     "Select which data should be shown in the information panel:"));
+        dialog->setItems(m_metaDataWidget->items());
+        dialog->setAttribute(Qt::WA_DeleteOnClose);
+        dialog->show();
+        connect(dialog, &FileMetaDataConfigurationDialog::destroyed, this, &InformationPanelContent::refreshMetaData);

     }
 }
 
 void InformationPanelContent::showIcon(const KFileItem& item)
 {
     m_outdatedPreviewTimer->stop();
     }
 }
 
 void InformationPanelContent::showIcon(const KFileItem& item)
 {
     m_outdatedPreviewTimer->stop();

-    m_pendingPreview = false;
-    if (!applyPlace(item.url())) {
-        m_preview->setPixmap(item.pixmap(KIconLoader::SizeEnormous));
+    if (!applyPlace(item.targetUrl())) {
+        const QPixmap icon = KIconLoader::global()->loadIcon(item.iconName(), KIconLoader::Desktop,
+                                                             KIconLoader::SizeEnormous, KIconLoader::DefaultState,
+                                                             item.overlays());
+        m_preview->setPixmap(icon);

     }
 }
 
 void InformationPanelContent::showPreview(const KFileItem& item,
     }
 }
 
 void InformationPanelContent::showPreview(const KFileItem& item,

-                                  const QPixmap& pixmap)
+                                          const QPixmap& pixmap)

 {
     m_outdatedPreviewTimer->stop();
 {
     m_outdatedPreviewTimer->stop();

-

     Q_UNUSED(item);
     Q_UNUSED(item);

-    if (m_pendingPreview) {
-        m_preview->setPixmap(pixmap);
-        m_pendingPreview = false;
-    }
+
+    QPixmap p = pixmap;
+    KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);
+    m_preview->setPixmap(p);

 }
 
 void InformationPanelContent::markOutdatedPreview()
 {
 }
 
 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);
 }
 
     m_preview->setPixmap(disabledPixmap);
 }
 

-void InformationPanelContent::slotPlayingStarted()
+void InformationPanelContent::slotHasVideoChanged(bool hasVideo)

 {
 {

-    m_preview->setVisible(m_phononWidget->mode() != PhononWidget::Video);
+    m_preview->setVisible(!hasVideo);

 }
 
 }
 

-void InformationPanelContent::slotPlayingStopped()
+void InformationPanelContent::refreshMetaData()

 {
 {

-    m_preview->setVisible(true);
+    if (!m_item.isNull()) {
+        showItem(m_item);
+    }

 }
 
 }
 

-bool InformationPanelContent::applyPlace(const KUrl& url)
+bool InformationPanelContent::applyPlace(const QUrl& url)

 {
 {

-    KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
-    int count = placesModel->rowCount();
-
+    const int count = m_placesItemModel->count();

     for (int i = 0; i < count; ++i) {
     for (int i = 0; i < count; ++i) {

-        QModelIndex index = placesModel->index(i, 0);
-
-        if (url.equals(placesModel->url(index), KUrl::CompareWithoutTrailingSlash)) {
-            setNameLabelText(placesModel->text(index));
-            m_preview->setPixmap(placesModel->icon(index).pixmap(128, 128));
+        const PlacesItem* item = m_placesItemModel->placesItem(i);
+        if (item->url().matches(url, QUrl::StripTrailingSlash)) {
+            setNameLabelText(item->text());
+            m_preview->setPixmap(QIcon::fromTheme(item->icon()).pixmap(128, 128));

             return true;
         }
     }
             return true;
         }
     }


@@ -368,19 +383,21 @@ void InformationPanelContent::setNameLabelText(const QString& text)
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 
     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;
     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());
 
     // 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.midRef(line.textStart(), line.textLength());

 
         line = textLayout.createLine();
         if (line.isValid()) {
 
         line = textLayout.createLine();
         if (line.isValid()) {


@@ -399,22 +416,21 @@ void InformationPanelContent::adjustWidgetSizes(int width)
     // so that the width of the information panel gets increased.
     // To prevent this, the maximum width is adjusted to
     // the current width of the panel.
     // so that the width of the information panel gets increased.
     // To prevent this, the maximum width is adjusted to
     // the current width of the panel.

-    const int maxWidth = width - KDialog::spacingHint() * 4;
+    const int maxWidth = width - style()->layoutSpacing(QSizePolicy::DefaultType, QSizePolicy::DefaultType, Qt::Horizontal) * 4;

     m_nameLabel->setMaximumWidth(maxWidth);
 
     // The metadata widget also contains a text widget which may return
     // a large preferred width.
     m_nameLabel->setMaximumWidth(maxWidth);
 
     // The metadata widget also contains a text widget which may return
     // a large preferred width.

-    if (m_metaDataWidget != 0) {
+    if (m_metaDataWidget) {

         m_metaDataWidget->setMaximumWidth(maxWidth);
     }
 
     // try to increase the preview as large as possible
     m_preview->setSizeHint(QSize(maxWidth, maxWidth));
 
         m_metaDataWidget->setMaximumWidth(maxWidth);
     }
 
     // try to increase the preview as large as possible
     m_preview->setSizeHint(QSize(maxWidth, maxWidth));
 

-    if (m_phononWidget->isVisible() && (m_phononWidget->mode() == PhononWidget::Video)) {
+    if (m_phononWidget->isVisible()) {

         // assure that the size of the video player is the same as the preview size
         m_phononWidget->setVideoSize(QSize(maxWidth, maxWidth));
     }
 }
 
         // assure that the size of the video player is the same as the preview size
         m_phononWidget->setVideoSize(QSize(maxWidth, maxWidth));
     }
 }
 

-#include "informationpanelcontent.moc"