Add click to play/pause feature on previews for audio/video

Test Plan:
In dolphin, click on a video or audio preview in the information panel.
The video or audio preview starts

Reviewers: elvisangelaccio, #dolphin, ngraham

Reviewed By: elvisangelaccio, #dolphin, ngraham

Subscribers: alexde, anthonyfieroni, ngraham, kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D22183

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 363ad818d3dcbc1c027cfa7d935987d41427757e..d54ed66b6f5171f1b18874eb82e4265310731f75 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -46,11 +46,18 @@
 #include <QTimer>
 #include <QVBoxLayout>
 #include <QStyle>
 #include <QTimer>
 #include <QVBoxLayout>
 #include <QStyle>

+#include <QPainter>
+#include <QBitmap>
+#include <QLinearGradient>
+#include <QPolygon>

 
 #include "dolphin_informationpanelsettings.h"
 #include "phononwidget.h"
 #include "pixmapviewer.h"
 
 
 #include "dolphin_informationpanelsettings.h"
 #include "phononwidget.h"
 #include "pixmapviewer.h"
 

+const int PLAY_ARROW_SIZE = 24;
+const int PLAY_ARROW_BORDER_SIZE = 2;
+

 InformationPanelContent::InformationPanelContent(QWidget* parent) :
     QWidget(parent),
     m_item(),
 InformationPanelContent::InformationPanelContent(QWidget* parent) :
     QWidget(parent),
     m_item(),


@@ -61,7 +68,8 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
     m_nameLabel(nullptr),
     m_metaDataWidget(nullptr),
     m_metaDataArea(nullptr),
     m_nameLabel(nullptr),
     m_metaDataWidget(nullptr),
     m_metaDataArea(nullptr),

-    m_placesItemModel(nullptr)
+    m_placesItemModel(nullptr),
+    m_isVideo(false)

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


@@ -166,6 +174,41 @@ void InformationPanelContent::showItem(const KFileItem& item)
     refreshPreview();
 }
 
     refreshPreview();
 }
 

+void InformationPanelContent::refreshPixmapView()
+{
+    // 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();
+    }
+
+    // try to get a preview pixmap from the item...
+
+    // Mark the currently shown preview as outdated. This is done
+    // with a small delay to prevent a flickering when the next preview
+    // can be shown within a short timeframe. This timer is not started
+    // for directories, as directory previews might fail and return the
+    // same icon.
+    if (!m_item.isDir()) {
+        m_outdatedPreviewTimer->start();
+    }
+
+    QStringList plugins = KIO::PreviewJob::availablePlugins();
+    m_previewJob = new KIO::PreviewJob(KFileItemList() << m_item,
+                                       QSize(m_preview->width(), m_preview->height()),
+                                       &plugins);
+    m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);
+    m_previewJob->setIgnoreMaximumSize(m_item.isLocalFile());
+    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);
+}
+

 void InformationPanelContent::refreshPreview()
 {
     // If there is a preview job, kill it to prevent that we have jobs for
 void InformationPanelContent::refreshPreview()
 {
     // If there is a preview job, kill it to prevent that we have jobs for


@@ -174,6 +217,8 @@ void InformationPanelContent::refreshPreview()
         m_previewJob->kill();
     }
 
         m_previewJob->kill();
     }
 

+    m_preview->setCursor(Qt::ArrowCursor);
+    bool usePhonon = false;

     setNameLabelText(m_item.text());
     if (InformationPanelSettings::previewsShown()) {
 
     setNameLabelText(m_item.text());
     if (InformationPanelSettings::previewsShown()) {
 


@@ -188,53 +233,46 @@ void InformationPanelContent::refreshPreview()
                 QIcon::fromTheme(QStringLiteral("nepomuk")).pixmap(KIconLoader::SizeEnormous, KIconLoader::SizeEnormous)
             );
         } else {
                 QIcon::fromTheme(QStringLiteral("nepomuk")).pixmap(KIconLoader::SizeEnormous, KIconLoader::SizeEnormous)
             );
         } else {

-            // try to get a preview pixmap from the item...
-
-            // Mark the currently shown preview as outdated. This is done
-            // with a small delay to prevent a flickering when the next preview
-            // can be shown within a short timeframe. This timer is not started
-            // for directories, as directory previews might fail and return the
-            // same icon.
-            if (!m_item.isDir()) {
-                m_outdatedPreviewTimer->start();
-            }

 
 

-            QStringList plugins = KIO::PreviewJob::availablePlugins();
-            m_previewJob = new KIO::PreviewJob(KFileItemList() << m_item,
-                                               QSize(m_preview->width(), m_preview->height()),
-                                               &plugins);
-            m_previewJob->setScaleType(KIO::PreviewJob::Unscaled);
-            m_previewJob->setIgnoreMaximumSize(m_item.isLocalFile());
-            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);
+            refreshPixmapView();

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

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

 
             if (usePhonon) {
 
             if (usePhonon) {

-
-                if (InformationPanelSettings::previewsAutoPlay() && isVideo) {
-                    // hides the preview now to avoid flickering when the autoplay video starts
-                    m_preview->hide();
-                } else {
-                    // the video won't play before the preview is displayed
-                    m_preview->show();
+                // change the cursor of the preview
+                m_preview->setCursor(Qt::PointingHandCursor);
+                m_preview->installEventFilter(m_phononWidget);
+
+                // if the video is playing, has been paused or stopped
+                // we don't need to update the preview/phonon widget states
+                // 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 (InformationPanelSettings::previewsAutoPlay() && m_isVideo) {
+                        // hides the preview now to avoid flickering when the autoplay video starts
+                        m_preview->hide();
+                    } else {
+                        // the video won't play before the preview is displayed
+                        m_preview->show();
+                    }
+
+                    m_phononWidget->show();
+                    m_phononWidget->setUrl(m_item.targetUrl(), m_isVideo ? PhononWidget::MediaKind::Video : PhononWidget::MediaKind::Audio);
+                    adjustWidgetSizes(parentWidget()->width());

                 }
                 }

-
-                m_phononWidget->show();
-                m_phononWidget->setUrl(m_item.targetUrl(), isVideo ? PhononWidget::MediaKind::Video : PhononWidget::MediaKind::Audio);
-                m_phononWidget->setVideoSize(m_preview->size());

             } else {
                 // When we don't need it, hide the phonon widget first to avoid flickering
                 m_phononWidget->hide();
                 m_preview->show();
             } else {
                 // When we don't need it, hide the phonon widget first to avoid flickering
                 m_phononWidget->hide();
                 m_preview->show();

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

             }
         }
     } else {
             }
         }
     } else {


@@ -319,10 +357,46 @@ void InformationPanelContent::showPreview(const KFileItem& item,
                                           const QPixmap& pixmap)
 {
     m_outdatedPreviewTimer->stop();
                                           const QPixmap& pixmap)
 {
     m_outdatedPreviewTimer->stop();

-    Q_UNUSED(item);
+    Q_UNUSED(item)

 
     QPixmap p = pixmap;
     KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);
 
     QPixmap p = pixmap;
     KIconLoader::global()->drawOverlays(item.overlays(), p, KIconLoader::Desktop);

+
+    if (m_isVideo) {
+        // adds a play arrow
+
+        // 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());
+
+        QPolygon arrow;
+        arrow << QPoint(zeroX, zeroY);
+        arrow << QPoint(zeroX, zeroY + PLAY_ARROW_SIZE);
+        arrow << QPoint(zeroX + PLAY_ARROW_SIZE, zeroY + PLAY_ARROW_SIZE / 2);
+
+        QPainterPath path;
+        path.addPolygon(arrow);
+
+        QLinearGradient gradient(QPointF(zeroX, zeroY),
+                                 QPointF(zeroX + PLAY_ARROW_SIZE,zeroY + PLAY_ARROW_SIZE));
+
+        QColor whiteColor = Qt::white;
+        QColor blackColor = Qt::black;
+        gradient.setColorAt(0, whiteColor);
+        gradient.setColorAt(1, blackColor);
+
+        QBrush brush(gradient);
+
+        QPainter painter(&p);
+
+        QPen pen(blackColor, PLAY_ARROW_BORDER_SIZE, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
+        painter.setPen(pen);
+
+        painter.setRenderHint(QPainter::Antialiasing);
+        painter.drawPolygon(arrow);
+        painter.fillPath(path, brush);
+    }
+

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


@@ -343,6 +417,11 @@ KFileItemList InformationPanelContent::items()
 void InformationPanelContent::slotHasVideoChanged(bool hasVideo)
 {
     m_preview->setVisible(InformationPanelSettings::previewsShown() && !hasVideo);
 void InformationPanelContent::slotHasVideoChanged(bool hasVideo)
 {
     m_preview->setVisible(InformationPanelSettings::previewsShown() && !hasVideo);

+    if (m_preview->isVisible() && m_preview->size().width() != m_preview->pixmap().size().width()) {
+        // in case the information panel has been resized when the preview was not displayed
+        // we need to refresh its content
+        refreshPixmapView();
+    }

 }
 
 void InformationPanelContent::setPreviewAutoPlay(bool autoPlay) {
 }
 
 void InformationPanelContent::setPreviewAutoPlay(bool autoPlay) {

diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index 0d838b26882d30baa1d734e905adf92f87ec89f4..8daeb95b0c16479da827fde7ff58bd2610b5af10 100644 (file)
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -139,6 +139,11 @@ private:
      */
     void adjustWidgetSizes(int width);
 
      */
     void adjustWidgetSizes(int width);
 

+    /**
+     * Refreshes the image in the PixmapViewer
+     */
+    void refreshPixmapView();
+

 private:
     KFileItem m_item;
 
 private:
     KFileItem m_item;
 


@@ -154,6 +159,7 @@ private:
     QDialogButtonBox* m_configureButtons;
 
     PlacesItemModel* m_placesItemModel;
     QDialogButtonBox* m_configureButtons;
 
     PlacesItemModel* m_placesItemModel;

+    bool m_isVideo;

 };
 
 #endif // INFORMATIONPANELCONTENT_H
 };
 
 #endif // INFORMATIONPANELCONTENT_H

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 4ea2e6666aaaf8b0a703cf4033af9df3f459d860..e301df2703139ec24fd94b363aac708a8cd52fa7 100644 (file)
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -95,6 +95,29 @@ QUrl PhononWidget::url() const
     return m_url;
 }
 
     return m_url;
 }
 

+void PhononWidget::clearUrl()
+{
+    m_url.clear();
+}
+
+bool PhononWidget::eventFilter(QObject *object, QEvent *event)
+{
+    Q_UNUSED(object)
+    if (event->type() == QEvent::MouseButtonPress) {
+        const QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
+        if (mouseEvent->button() == Qt::LeftButton) {
+            // toggle playback
+            if (m_media && m_media->state() == Phonon::State::PlayingState) {
+                m_media->pause();
+            } else {
+                play();
+            }
+            return true;
+        }
+    }
+    return false;
+}
+

 void PhononWidget::setVideoSize(const QSize& size)
 {
     if (m_videoSize != size) {
 void PhononWidget::setVideoSize(const QSize& size)
 {
     if (m_videoSize != size) {


@@ -172,8 +195,8 @@ void PhononWidget::stateChanged(Phonon::State newstate)
     switch (newstate) {
     case Phonon::PlayingState:
     case Phonon::BufferingState:
     switch (newstate) {
     case Phonon::PlayingState:
     case Phonon::BufferingState:

-        m_stopButton->show();

         m_playButton->hide();
         m_playButton->hide();

+        m_stopButton->show();

         break;
     default:
         m_stopButton->hide();
         break;
     default:
         m_stopButton->hide();


@@ -196,6 +219,7 @@ void PhononWidget::play()
 
     if (!m_videoPlayer) {
         m_videoPlayer = new EmbeddedVideoPlayer(this);
 
     if (!m_videoPlayer) {
         m_videoPlayer = new EmbeddedVideoPlayer(this);

+        m_videoPlayer->setCursor(Qt::PointingHandCursor);

         m_videoPlayer->installEventFilter(this);
         m_topLayout->insertWidget(0, m_videoPlayer);
         Phonon::createPath(m_media, m_videoPlayer);
         m_videoPlayer->installEventFilter(this);
         m_topLayout->insertWidget(0, m_videoPlayer);
         Phonon::createPath(m_media, m_videoPlayer);


@@ -227,6 +251,11 @@ void PhononWidget::finished()
     }
 }
 
     }
 }
 

+Phonon::State PhononWidget::state() const
+{
+    return m_media == nullptr ? Phonon::State::StoppedState : m_media->state();
+}
+

 void PhononWidget::stop()
 {
     if (m_media) {
 void PhononWidget::stop()
 {
     if (m_media) {

diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h
index b9e7d4f05ac4f87c0fe823d396c1418973b5b4c8..90a1d1e5ac6bcf5f030bac505f24b63fa9c868f4 100644 (file)
--- a/src/panels/information/phononwidget.h
+++ b/src/panels/information/phononwidget.h
@@ -53,11 +53,14 @@ class PhononWidget : public QWidget
 
         void setUrl(const QUrl &url, MediaKind kind);
         QUrl url() const;
 
         void setUrl(const QUrl &url, MediaKind kind);
         QUrl url() const;

+        void clearUrl();

 
         void setVideoSize(const QSize& size);
         QSize videoSize() const;
 
         void setVideoSize(const QSize& size);
         QSize videoSize() const;

+        Phonon::State state() const;

 
         void setAutoPlay(bool autoPlay);
 
         void setAutoPlay(bool autoPlay);

+        bool eventFilter(QObject *object, QEvent *event) override;

 
     signals:
         /**
 
     signals:
         /**