mediawidget: bind arrow keys to slide in media

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

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index d43b9f5205d72b92531b0b9849f652a59078d881..134c5e0567e5aa8959d9602a46ac2fe310476afb 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -6,11 +6,11 @@
 
 #include "informationpanelcontent.h"
 
 
 #include "informationpanelcontent.h"
 

-#include <KIO/JobUiDelegate>
-#include <KIO/PreviewJob>

 #include <KConfigGroup>
 #include <KConfigGroup>

+#include <KIO/PreviewJob>

 #include <KIconEffect>
 #include <KIconLoader>
 #include <KIconEffect>
 #include <KIconLoader>

+#include <KIconUtils>

 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KSeparator>
 #include <KJobWidgets>
 #include <KLocalizedString>
 #include <KSeparator>


@@ -19,49 +19,41 @@
 #include <QPainterPath>
 
 #include <QIcon>
 #include <QPainterPath>
 
 #include <QIcon>

+#include <QStyle>

 #include <QTextDocument>
 
 #include <Baloo/FileMetaDataWidget>
 
 #include <QTextDocument>
 
 #include <Baloo/FileMetaDataWidget>
 

-#include <panels/places/placesitem.h>
-#include <panels/places/placesitemmodel.h>
-
-#include <Phonon/BackendCapabilities>
-#include <Phonon/MediaObject>
-
-#include <QLabel>

 #include <QDialogButtonBox>
 #include <QDialogButtonBox>

+#include <QGesture>
+#include <QLabel>
+#include <QLinearGradient>
+#include <QPainter>
+#include <QPolygon>

 #include <QScrollArea>
 #include <QScrollArea>

+#include <QScroller>

 #include <QTextLayout>
 #include <QTimer>
 #include <QVBoxLayout>
 #include <QTextLayout>
 #include <QTimer>
 #include <QVBoxLayout>

-#include <QScroller>
-#include <QStyle>
-#include <QPainter>
-#include <QBitmap>
-#include <QLinearGradient>
-#include <QPolygon>
-#include <QGesture>

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

-#include "phononwidget.h"
+#include "mediawidget.h"

 #include "pixmapviewer.h"
 
 const int PLAY_ARROW_SIZE = 24;
 const int PLAY_ARROW_BORDER_SIZE = 2;
 
 #include "pixmapviewer.h"
 
 const int PLAY_ARROW_SIZE = 24;
 const int PLAY_ARROW_BORDER_SIZE = 2;
 

-InformationPanelContent::InformationPanelContent(QWidget* parent) :
-    QWidget(parent),
-    m_item(),
-    m_previewJob(nullptr),
-    m_outdatedPreviewTimer(nullptr),
-    m_preview(nullptr),
-    m_phononWidget(nullptr),
-    m_nameLabel(nullptr),
-    m_metaDataWidget(nullptr),
-    m_metaDataArea(nullptr),
-    m_placesItemModel(nullptr),
-    m_isVideo(false)
+InformationPanelContent::InformationPanelContent(QWidget *parent)
+    : QWidget(parent)
+    , m_item()
+    , m_previewJob(nullptr)
+    , m_outdatedPreviewTimer(nullptr)
+    , m_preview(nullptr)
+    , m_mediaWidget(nullptr)
+    , m_nameLabel(nullptr)
+    , m_metaDataWidget(nullptr)
+    , m_metaDataArea(nullptr)
+    , m_isVideo(false)

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


@@ -71,10 +63,9 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_outdatedPreviewTimer = new QTimer(this);
     m_outdatedPreviewTimer->setInterval(100);
     m_outdatedPreviewTimer->setSingleShot(true);
     m_outdatedPreviewTimer = new QTimer(this);
     m_outdatedPreviewTimer->setInterval(100);
     m_outdatedPreviewTimer->setSingleShot(true);

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

 
 

-    QVBoxLayout* layout = new QVBoxLayout(this);
+    QVBoxLayout *layout = new QVBoxLayout(this);

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


@@ -83,12 +74,11 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_preview->setMinimumWidth(minPreviewWidth);
     m_preview->setMinimumHeight(KIconLoader::SizeEnormous);
 
     m_preview->setMinimumWidth(minPreviewWidth);
     m_preview->setMinimumHeight(KIconLoader::SizeEnormous);
 

-    m_phononWidget = new PhononWidget(parent);
-    m_phononWidget->hide();
-    m_phononWidget->setMinimumWidth(minPreviewWidth);
-    m_phononWidget->setAutoPlay(InformationPanelSettings::previewsAutoPlay());
-    connect(m_phononWidget, &PhononWidget::hasVideoChanged,
-            this, &InformationPanelContent::slotHasVideoChanged);
+    m_mediaWidget = new MediaWidget(parent);
+    m_mediaWidget->hide();
+    m_mediaWidget->setMinimumWidth(minPreviewWidth);
+    m_mediaWidget->setAutoPlay(InformationPanelSettings::previewsAutoPlay());
+    connect(m_mediaWidget, &MediaWidget::hasVideoChanged, this, &InformationPanelContent::slotHasVideoChanged);

 
     // name
     m_nameLabel = new QLabel(parent);
 
     // name
     m_nameLabel = new QLabel(parent);


@@ -105,45 +95,41 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
 
     m_metaDataWidget = new Baloo::FileMetaDataWidget(parent);
     m_metaDataWidget->setDateFormat(static_cast<Baloo::DateFormats>(InformationPanelSettings::dateFormat()));
 
     m_metaDataWidget = new Baloo::FileMetaDataWidget(parent);
     m_metaDataWidget->setDateFormat(static_cast<Baloo::DateFormats>(InformationPanelSettings::dateFormat()));

-    connect(m_metaDataWidget, &Baloo::FileMetaDataWidget::urlActivated,
-            this, &InformationPanelContent::urlActivated);
+    connect(m_metaDataWidget, &Baloo::FileMetaDataWidget::urlActivated, this, &InformationPanelContent::urlActivated);

     m_metaDataWidget->setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
 
     // Configuration
     m_metaDataWidget->setFont(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont));
     m_metaDataWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
 
     // Configuration

-    m_configureLabel = new QLabel(i18nc("@label::textbox",
-                                        "Select which data should be shown:"), this);
+    m_configureLabel = new QLabel(i18nc("@label::textbox", "Select which data should be shown:"), this);

     m_configureLabel->setWordWrap(true);
     m_configureLabel->setVisible(false);
 
     m_configureButtons = new QDialogButtonBox(QDialogButtonBox::Save | QDialogButtonBox::Cancel);
     m_configureButtons->setVisible(false);
     connect(m_configureButtons, &QDialogButtonBox::accepted, this, [this]() {
     m_configureLabel->setWordWrap(true);
     m_configureLabel->setVisible(false);
 
     m_configureButtons = new QDialogButtonBox(QDialogButtonBox::Save | QDialogButtonBox::Cancel);
     m_configureButtons->setVisible(false);
     connect(m_configureButtons, &QDialogButtonBox::accepted, this, [this]() {

-                m_metaDataWidget->setConfigurationMode(Baloo::ConfigurationMode::Accept);
-                m_configureButtons->setVisible(false);
-                m_configureLabel->setVisible(false);
-                Q_EMIT configurationFinished();
-            }
-    );
+        m_metaDataWidget->setConfigurationMode(Baloo::ConfigurationMode::Accept);
+        m_configureButtons->setVisible(false);
+        m_configureLabel->setVisible(false);
+        Q_EMIT configurationFinished();
+    });

     connect(m_configureButtons, &QDialogButtonBox::rejected, this, [this]() {
     connect(m_configureButtons, &QDialogButtonBox::rejected, this, [this]() {

-                m_metaDataWidget->setConfigurationMode(Baloo::ConfigurationMode::Cancel);
-                m_configureButtons->setVisible(false);
-                m_configureLabel->setVisible(false);
-                Q_EMIT configurationFinished();
-            }
-    );
+        m_metaDataWidget->setConfigurationMode(Baloo::ConfigurationMode::Cancel);
+        m_configureButtons->setVisible(false);
+        m_configureLabel->setVisible(false);
+        Q_EMIT configurationFinished();
+    });

 
     m_metaDataArea = new QScrollArea(parent);
     m_metaDataArea->setWidget(m_metaDataWidget);
     m_metaDataArea->setWidgetResizable(true);
     m_metaDataArea->setFrameShape(QFrame::NoFrame);
 
 
     m_metaDataArea = new QScrollArea(parent);
     m_metaDataArea->setWidget(m_metaDataWidget);
     m_metaDataArea->setWidgetResizable(true);
     m_metaDataArea->setFrameShape(QFrame::NoFrame);
 

-    QWidget* viewport = m_metaDataArea->viewport();
+    QWidget *viewport = m_metaDataArea->viewport();

     QScroller::grabGesture(viewport, QScroller::TouchGesture);
     viewport->installEventFilter(this);
 
     layout->addWidget(m_preview);
     QScroller::grabGesture(viewport, QScroller::TouchGesture);
     viewport->installEventFilter(this);
 
     layout->addWidget(m_preview);

-    layout->addWidget(m_phononWidget);
+    layout->addWidget(m_mediaWidget);

     layout->addWidget(m_nameLabel);
     layout->addWidget(new KSeparator());
     layout->addWidget(m_configureLabel);
     layout->addWidget(m_nameLabel);
     layout->addWidget(new KSeparator());
     layout->addWidget(m_configureLabel);


@@ -151,8 +137,6 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     layout->addWidget(m_configureButtons);
 
     grabGesture(Qt::TapAndHoldGesture);
     layout->addWidget(m_configureButtons);
 
     grabGesture(Qt::TapAndHoldGesture);

-
-    m_placesItemModel = new PlacesItemModel(this);

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


@@ -160,7 +144,7 @@ InformationPanelContent::~InformationPanelContent()
     InformationPanelSettings::self()->save();
 }
 
     InformationPanelSettings::self()->save();
 }
 

-void InformationPanelContent::showItem(const KFileItem& item)
+void InformationPanelContent::showItem(const KFileItem &item)

 {
     // compares item entries, comparing items only compares urls
     if (m_item.entry() != item.entry()) {
 {
     // compares item entries, comparing items only compares urls
     if (m_item.entry() != item.entry()) {


@@ -189,19 +173,16 @@ void InformationPanelContent::refreshPixmapView()
 
     const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
     const QStringList plugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins());
 
     const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
     const QStringList plugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins());

-    m_previewJob = new KIO::PreviewJob(KFileItemList() << m_item,
-                                       QSize(m_preview->width(), m_preview->height()),
-                                       &plugins);
+    m_previewJob = new KIO::PreviewJob(KFileItemList() << m_item, QSize(m_preview->width(), m_preview->height()), &plugins);

     m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);
     m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);

-    m_previewJob->setIgnoreMaximumSize(m_item.isLocalFile());
+    m_previewJob->setIgnoreMaximumSize(m_item.isLocalFile() && !m_item.isSlow());
+    m_previewJob->setDevicePixelRatio(devicePixelRatioF());

     if (m_previewJob->uiDelegate()) {
         KJobWidgets::setWindow(m_previewJob, this);
     }
 
     if (m_previewJob->uiDelegate()) {
         KJobWidgets::setWindow(m_previewJob, this);
     }
 

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

 }
 
 void InformationPanelContent::refreshPreview()
 }
 
 void InformationPanelContent::refreshPreview()


@@ -215,43 +196,37 @@ void InformationPanelContent::refreshPreview()
     m_preview->setCursor(Qt::ArrowCursor);
     setNameLabelText(m_item.text());
     if (InformationPanelSettings::previewsShown()) {
     m_preview->setCursor(Qt::ArrowCursor);
     setNameLabelText(m_item.text());
     if (InformationPanelSettings::previewsShown()) {

-

         const QUrl itemUrl = m_item.url();
         const bool isSearchUrl = itemUrl.scheme().contains(QLatin1String("search")) && m_item.localPath().isEmpty();
         if (isSearchUrl) {
             m_preview->show();
         const QUrl itemUrl = m_item.url();
         const bool isSearchUrl = itemUrl.scheme().contains(QLatin1String("search")) && m_item.localPath().isEmpty();
         if (isSearchUrl) {
             m_preview->show();

-            m_phononWidget->hide();
+            m_mediaWidget->hide();

 
             // in the case of a search-URL the URL is not readable for humans
             // (at least not useful to show in the Information Panel)
 
             // in the case of a search-URL the URL is not readable for humans
             // (at least not useful to show in the Information Panel)

-            m_preview->setPixmap(
-                QIcon::fromTheme(QStringLiteral("baloo")).pixmap(m_preview->height(), m_preview->width())
-            );
+            m_preview->setPixmap(QIcon::fromTheme(QStringLiteral("baloo")).pixmap(m_preview->height(), m_preview->width()));

         } else {
         } else {

-

             refreshPixmapView();
 
             const QString mimeType = m_item.mimetype();
             const bool isAnimatedImage = m_preview->isAnimatedMimeType(mimeType);
             m_isVideo = !isAnimatedImage && mimeType.startsWith(QLatin1String("video/"));
             refreshPixmapView();
 
             const QString mimeType = m_item.mimetype();
             const bool isAnimatedImage = m_preview->isAnimatedMimeType(mimeType);
             m_isVideo = !isAnimatedImage && mimeType.startsWith(QLatin1String("video/"));

-            bool usePhonon = m_isVideo || mimeType.startsWith(QLatin1String("audio/"));
+            bool useMedia = m_isVideo || mimeType.startsWith(QLatin1String("audio/"));

 
 

-            if (usePhonon) {
+            if (useMedia) {

                 // change the cursor of the preview
                 m_preview->setCursor(Qt::PointingHandCursor);
                 // change the cursor of the preview
                 m_preview->setCursor(Qt::PointingHandCursor);

-                m_preview->installEventFilter(m_phononWidget);
-                m_phononWidget->show();
+                m_preview->installEventFilter(m_mediaWidget);
+
+                m_mediaWidget->show();

 
                 // if the video is playing, has been paused or stopped
 
                 // if the video is playing, has been paused or stopped

-                // we don't need to update the preview/phonon widget states
+                // we don't need to update the preview/media widget states

                 // unless the previewed file has changed,
                 // or the setting previewshown has changed
                 // unless the previewed file has changed,
                 // or the setting previewshown has changed

-                if ((m_phononWidget->state() != Phonon::State::PlayingState &&
-                     m_phononWidget->state() != Phonon::State::PausedState &&
-                     m_phononWidget->state() != Phonon::State::StoppedState) ||
-                        m_item.targetUrl() != m_phononWidget->url() ||
-                        (!m_preview->isVisible() &&! m_phononWidget->isVisible())) {
-
+                if ((m_mediaWidget->state() != QMediaPlayer::PlayingState && m_mediaWidget->state() != QMediaPlayer::PausedState
+                     && m_mediaWidget->state() != QMediaPlayer::StoppedState)
+                    || m_item.targetUrl() != m_mediaWidget->url() || (!m_preview->isVisible() && !m_mediaWidget->isVisible())) {

                     if (InformationPanelSettings::previewsAutoPlay() && m_isVideo) {
                         // hides the preview now to avoid flickering when the autoplay video starts
                         m_preview->hide();
                     if (InformationPanelSettings::previewsAutoPlay() && m_isVideo) {
                         // hides the preview now to avoid flickering when the autoplay video starts
                         m_preview->hide();


@@ -260,24 +235,24 @@ void InformationPanelContent::refreshPreview()
                         m_preview->show();
                     }
 
                         m_preview->show();
                     }
 

-                    m_phononWidget->setUrl(m_item.targetUrl(), m_isVideo ? PhononWidget::MediaKind::Video : PhononWidget::MediaKind::Audio);
+                    m_mediaWidget->setUrl(m_item.targetUrl(), m_isVideo ? MediaWidget::MediaKind::Video : MediaWidget::MediaKind::Audio);

                     adjustWidgetSizes(parentWidget()->width());
                 }
             } else {
                 if (isAnimatedImage) {
                     m_preview->setAnimatedImageFileName(itemUrl.toLocalFile());
                 }
                     adjustWidgetSizes(parentWidget()->width());
                 }
             } else {
                 if (isAnimatedImage) {
                     m_preview->setAnimatedImageFileName(itemUrl.toLocalFile());
                 }

-                // When we don't need it, hide the phonon widget first to avoid flickering
-                m_phononWidget->hide();
+                // When we don't need it, hide the media widget first to avoid flickering
+                m_mediaWidget->hide();

                 m_preview->show();
                 m_preview->show();

-                m_preview->removeEventFilter(m_phononWidget);
-                m_phononWidget->clearUrl();
+                m_preview->removeEventFilter(m_mediaWidget);
+                m_mediaWidget->clearUrl();

             }
         }
     } else {
         m_preview->stopAnimatedImage();
         m_preview->hide();
             }
         }
     } else {
         m_preview->stopAnimatedImage();
         m_preview->hide();

-        m_phononWidget->hide();
+        m_mediaWidget->hide();

     }
 }
 
     }
 }
 


@@ -295,7 +270,7 @@ void InformationPanelContent::refreshMetaData()
     m_metaDataWidget->setItems(KFileItemList() << m_item);
 }
 
     m_metaDataWidget->setItems(KFileItemList() << m_item);
 }
 

-void InformationPanelContent::showItems(const KFileItemList& items)
+void InformationPanelContent::showItems(const KFileItemList &items)

 {
     // 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 there is a preview job, kill it to prevent that we have jobs for
     // multiple items running, and thus a race condition (bug 250787).


@@ -305,23 +280,21 @@ void InformationPanelContent::showItems(const KFileItemList& items)
 
     m_preview->stopAnimatedImage();
 
 
     m_preview->stopAnimatedImage();
 

-    m_preview->setPixmap(
-        QIcon::fromTheme(QStringLiteral("dialog-information")).pixmap(m_preview->height(), m_preview->width())
-    );
+    m_preview->setPixmap(QIcon::fromTheme(QStringLiteral("dialog-information")).pixmap(m_preview->height(), m_preview->width()));

     setNameLabelText(i18ncp("@label", "%1 item selected", "%1 items selected", items.count()));
 
     m_metaDataWidget->setItems(items);
 
     setNameLabelText(i18ncp("@label", "%1 item selected", "%1 items selected", items.count()));
 
     m_metaDataWidget->setItems(items);
 

-    m_phononWidget->hide();
+    m_mediaWidget->hide();

 
     m_item = KFileItem();
 }
 
 
     m_item = KFileItem();
 }
 

-bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
+bool InformationPanelContent::eventFilter(QObject *obj, QEvent *event)

 {
     switch (event->type()) {
     case QEvent::Resize: {
 {
     switch (event->type()) {
     case QEvent::Resize: {

-        QResizeEvent* resizeEvent = static_cast<QResizeEvent*>(event);
+        QResizeEvent *resizeEvent = static_cast<QResizeEvent *>(event);

         if (obj == m_metaDataArea->viewport()) {
             // The size of the meta text area has changed. Adjust the fixed
             // width in a way that no horizontal scrollbar needs to be shown.
         if (obj == m_metaDataArea->viewport()) {
             // The size of the meta text area has changed. Adjust the fixed
             // width in a way that no horizontal scrollbar needs to be shown.


@@ -347,22 +320,22 @@ bool InformationPanelContent::eventFilter(QObject* obj, QEvent* event)
     return QWidget::eventFilter(obj, event);
 }
 
     return QWidget::eventFilter(obj, event);
 }
 

-bool InformationPanelContent::event(QEvent* event)
+bool InformationPanelContent::event(QEvent *event)

 {
     if (event->type() == QEvent::Gesture) {
 {
     if (event->type() == QEvent::Gesture) {

-        gestureEvent(static_cast<QGestureEvent*>(event));
+        gestureEvent(static_cast<QGestureEvent *>(event));

         return true;
     }
     return QWidget::event(event);
 }
 
         return true;
     }
     return QWidget::event(event);
 }
 

-bool InformationPanelContent::gestureEvent(QGestureEvent* event)
+bool InformationPanelContent::gestureEvent(QGestureEvent *event)

 {
     if (!underMouse()) {
         return false;
     }
 
 {
     if (!underMouse()) {
         return false;
     }
 

-    QTapAndHoldGesture* tap = static_cast<QTapAndHoldGesture*>(event->gesture(Qt::TapAndHoldGesture));
+    QTapAndHoldGesture *tap = static_cast<QTapAndHoldGesture *>(event->gesture(Qt::TapAndHoldGesture));

 
     if (tap) {
         if (tap->state() == Qt::GestureFinished) {
 
     if (tap) {
         if (tap->state() == Qt::GestureFinished) {


@@ -374,39 +347,56 @@ bool InformationPanelContent::gestureEvent(QGestureEvent* event)
     return false;
 }
 
     return false;
 }
 

-void InformationPanelContent::showIcon(const KFileItem& item)
+void InformationPanelContent::showIcon(const KFileItem &item)

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

-    QPixmap pixmap = QIcon::fromTheme(item.iconName()).pixmap(m_preview->height(), m_preview->width());
-    KIconLoader::global()->drawOverlays(item.overlays(), pixmap, KIconLoader::Desktop);
+    QIcon icon = QIcon::fromTheme(item.iconName());
+    QPixmap pixmap = KIconUtils::addOverlays(icon, item.overlays()).pixmap(m_preview->size(), devicePixelRatioF());
+    pixmap.setDevicePixelRatio(devicePixelRatioF());

     m_preview->setPixmap(pixmap);
 }
 
     m_preview->setPixmap(pixmap);
 }
 

-void InformationPanelContent::showPreview(const KFileItem& item,
-                                          const QPixmap& pixmap)
+void InformationPanelContent::showPreview(const KFileItem &item, const QPixmap &pixmap)

 {
     m_outdatedPreviewTimer->stop();
 
     QPixmap p = pixmap;
 {
     m_outdatedPreviewTimer->stop();
 
     QPixmap p = pixmap;

-    KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);
+    if (!item.overlays().isEmpty()) {
+        // Avoid scaling the images that are smaller than the preview size, to be consistent when there is no overlays
+        if (pixmap.height() < m_preview->height() && pixmap.width() < m_preview->width()) {
+            p = QPixmap(m_preview->size() * devicePixelRatioF());
+            p.fill(Qt::transparent);
+            p.setDevicePixelRatio(devicePixelRatioF());
+
+            QPainter painter(&p);
+            painter.drawPixmap(QPointF{m_preview->width() / 2.0 - pixmap.width() / pixmap.devicePixelRatioF() / 2,
+                                       m_preview->height() / 2.0 - pixmap.height() / pixmap.devicePixelRatioF() / 2}
+                                   .toPoint(),
+                               pixmap);
+        }
+        p = KIconUtils::addOverlays(p, item.overlays()).pixmap(m_preview->size(), devicePixelRatioF());
+        p.setDevicePixelRatio(devicePixelRatioF());
+    }

 
     if (m_isVideo) {
 
     if (m_isVideo) {

-        // adds a play arrow
+        // adds a play arrow overlay
+
+        auto maxDim = qMax(p.width(), p.height());
+        auto arrowSize = qMax(PLAY_ARROW_SIZE, maxDim / 8);

 
         // compute relative pixel positions
 
         // compute relative pixel positions

-        const int zeroX = static_cast<int>(p.width() / 2 - PLAY_ARROW_SIZE / 2 / devicePixelRatio());
-        const int zeroY = static_cast<int>(p.height() / 2 - PLAY_ARROW_SIZE / 2 / devicePixelRatio());
+        const int zeroX = static_cast<int>((p.width() / 2 - arrowSize / 2) / p.devicePixelRatio());
+        const int zeroY = static_cast<int>((p.height() / 2 - arrowSize / 2) / p.devicePixelRatio());

 
         QPolygon arrow;
         arrow << QPoint(zeroX, zeroY);
 
         QPolygon arrow;
         arrow << QPoint(zeroX, zeroY);

-        arrow << QPoint(zeroX, zeroY + PLAY_ARROW_SIZE);
-        arrow << QPoint(zeroX + PLAY_ARROW_SIZE, zeroY + PLAY_ARROW_SIZE / 2);
+        arrow << QPoint(zeroX, zeroY + arrowSize);
+        arrow << QPoint(zeroX + arrowSize, zeroY + arrowSize / 2);

 
         QPainterPath path;
         path.addPolygon(arrow);
 
 
         QPainterPath path;
         path.addPolygon(arrow);
 

-        QLinearGradient gradient(QPointF(zeroX, zeroY),
-                                 QPointF(zeroX + PLAY_ARROW_SIZE,zeroY + PLAY_ARROW_SIZE));
+        QLinearGradient gradient(QPointF(zeroX, zeroY + arrowSize / 2), QPointF(zeroX + arrowSize, zeroY + arrowSize / 2));

 
         QColor whiteColor = Qt::white;
         QColor blackColor = Qt::black;
 
         QColor whiteColor = Qt::white;
         QColor blackColor = Qt::black;


@@ -436,10 +426,8 @@ void InformationPanelContent::markOutdatedPreview()
         // use it until the preview is done
         showIcon(m_item);
     } else {
         // use it until the preview is done
         showIcon(m_item);
     } else {

-        KIconEffect *iconEffect = KIconLoader::global()->iconEffect();
-        QPixmap disabledPixmap = iconEffect->apply(m_preview->pixmap(),
-                                                   KIconLoader::Desktop,
-                                                   KIconLoader::DisabledState);
+        QPixmap disabledPixmap = m_preview->pixmap();
+        KIconEffect::toDisabled(disabledPixmap);

         m_preview->setPixmap(disabledPixmap);
     }
 }
         m_preview->setPixmap(disabledPixmap);
     }
 }


@@ -459,11 +447,12 @@ void InformationPanelContent::slotHasVideoChanged(bool hasVideo)
     }
 }
 
     }
 }
 

-void InformationPanelContent::setPreviewAutoPlay(bool autoPlay) {
-    m_phononWidget->setAutoPlay(autoPlay);
+void InformationPanelContent::setPreviewAutoPlay(bool autoPlay)
+{
+    m_mediaWidget->setAutoPlay(autoPlay);

 }
 
 }
 

-void InformationPanelContent::setNameLabelText(const QString& text)
+void InformationPanelContent::setNameLabelText(const QString &text)

 {
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 {
     QTextOption textOption;
     textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);


@@ -482,7 +471,7 @@ void InformationPanelContent::setNameLabelText(const QString& text)
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_nameLabel->width());
     QTextLine line = textLayout.createLine();
     while (line.isValid()) {
         line.setLineWidth(m_nameLabel->width());

-        wrappedText += processedText.midRef(line.textStart(), line.textLength());
+        wrappedText += QStringView(processedText).mid(line.textStart(), line.textLength());

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


@@ -511,9 +500,10 @@ void InformationPanelContent::adjustWidgetSizes(int width)
     // try to increase the preview as large as possible
     m_preview->setSizeHint(QSize(maxWidth, maxWidth));
 
     // try to increase the preview as large as possible
     m_preview->setSizeHint(QSize(maxWidth, maxWidth));
 

-    if (m_phononWidget->isVisible()) {
+    if (m_mediaWidget->isVisible()) {

         // assure that the size of the video player is the same as the preview size
         // assure that the size of the video player is the same as the preview size

-        m_phononWidget->setVideoSize(QSize(maxWidth, maxWidth));
+        m_mediaWidget->setVideoSize(QSize(maxWidth, maxWidth));

     }
 }
 
     }
 }
 

+#include "moc_informationpanelcontent.cpp"