DolphinView: rename copySelectedItems to copySelectedItemsToClipboard

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

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 7f2ca95648120696d3f78b06bffb0f436c2dc19e..f815b4bd043bfef51a0a2d2d08c38e8486e5e8f6 100644 (file)
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -20,26 +20,24 @@
 
 #include "phononwidget.h"
 
 
 #include "phononwidget.h"
 

-#include <Phonon/Global>
+#include <KLocalizedString>
+#include <Phonon/AudioOutput>

 #include <Phonon/MediaObject>
 #include <Phonon/SeekSlider>
 #include <Phonon/MediaObject>
 #include <Phonon/SeekSlider>

-#include <Phonon/VideoPlayer>
+#include <Phonon/VideoWidget>

 
 

-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QShowEvent>
-#include <QtGui/QToolButton>
+#include <QShowEvent>
+#include <QStyle>
+#include <QToolButton>
+#include <QVBoxLayout>

 
 

-#include <kdialog.h>
-#include <kicon.h>
-#include <kurl.h>
-#include <klocale.h>
-
-class EmbeddedVideoPlayer : public Phonon::VideoPlayer
+class EmbeddedVideoPlayer : public Phonon::VideoWidget

 {
 {

+    Q_OBJECT
+

     public:
     public:

-        EmbeddedVideoPlayer(Phonon::Category category, QWidget *parent = 0) :
-            Phonon::VideoPlayer(category, parent)
+        EmbeddedVideoPlayer(QWidget *parent = nullptr) :
+            Phonon::VideoWidget(parent)

         {
         }
 
         {
         }
 


@@ -49,9 +47,9 @@ class EmbeddedVideoPlayer : public Phonon::VideoPlayer
             updateGeometry();
         }
 
             updateGeometry();
         }
 

-        virtual QSize sizeHint() const
+        QSize sizeHint() const override

         {
         {

-            return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoPlayer::sizeHint();
+            return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint();

         }
 
     private:
         }
 
     private:


@@ -60,42 +58,69 @@ class EmbeddedVideoPlayer : public Phonon::VideoPlayer
 
 PhononWidget::PhononWidget(QWidget *parent)
     : QWidget(parent),
 
 PhononWidget::PhononWidget(QWidget *parent)
     : QWidget(parent),

-    m_mode(Audio),

     m_url(),
     m_url(),

-    m_playButton(0),
-    m_stopButton(0),
-    m_topLayout(0),
-    m_audioMedia(0),
-    m_media(0),
-    m_seekSlider(0),
-    m_videoPlayer(0)
+    m_playButton(nullptr),
+    m_pauseButton(nullptr),
+    m_topLayout(nullptr),
+    m_media(nullptr),
+    m_seekSlider(nullptr),
+    m_audioOutput(nullptr),
+    m_videoPlayer(nullptr)

 {
 }
 
 {
 }
 

-void PhononWidget::setUrl(const KUrl &url)
+void PhononWidget::setUrl(const QUrl &url, MediaKind kind)

 {
     if (m_url != url) {
 {
     if (m_url != url) {

-        stop(); // emits playingStopped() signal

         m_url = url;
         m_url = url;

+        m_isVideo = kind == MediaKind::Video;
+    }
+    if (m_autoPlay) {
+        play();
+    } else {
+        stop();

     }
 }
 
     }
 }
 

-KUrl PhononWidget::url() const
+void PhononWidget::setAutoPlay(bool autoPlay)
+{
+    m_autoPlay = autoPlay;
+    if (!m_url.isEmpty() && (m_media == nullptr || m_media->state() != Phonon::State::PlayingState) && m_autoPlay && isVisible()) {
+        play();
+    }
+}
+
+QUrl PhononWidget::url() const

 {
     return m_url;
 }
 
 {
     return m_url;
 }
 

-void PhononWidget::setMode(Mode mode)
+void PhononWidget::clearUrl()
+{
+    m_url.clear();
+}
+
+void PhononWidget::togglePlayback()

 {
 {

-    if (m_mode != mode) {
-        stop(); // emits playingStopped() signal
-        m_mode = mode;
+    if (m_media && m_media->state() == Phonon::State::PlayingState) {
+        m_media->pause();
+    } else {
+        play();

     }
 }
 
     }
 }
 

-PhononWidget::Mode PhononWidget::mode() const
+bool PhononWidget::eventFilter(QObject *object, QEvent *event)

 {
 {

-    return m_mode;
+    Q_UNUSED(object)
+    if (event->type() == QEvent::MouseButtonPress) {
+        const QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
+        if (mouseEvent->button() == Qt::LeftButton) {
+            // toggle playback
+            togglePlayback();
+            return true;
+        }
+    }
+    return false;

 }
 
 void PhononWidget::setVideoSize(const QSize& size)
 }
 
 void PhononWidget::setVideoSize(const QSize& size)


@@ -118,40 +143,45 @@ void PhononWidget::showEvent(QShowEvent *event)
         return;
     }
 
         return;
     }
 

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

         m_topLayout = new QVBoxLayout(this);
         m_topLayout = new QVBoxLayout(this);

-        m_topLayout->setMargin(0);
-        m_topLayout->setSpacing(KDialog::spacingHint());
-        QHBoxLayout *controlsLayout = new QHBoxLayout(this);
-        controlsLayout->setMargin(0);
+        m_topLayout->setContentsMargins(0, 0, 0, 0);
+
+        QHBoxLayout *controlsLayout = new QHBoxLayout();
+        controlsLayout->setContentsMargins(0, 0, 0, 0);

         controlsLayout->setSpacing(0);
 
         m_playButton = new QToolButton(this);
         controlsLayout->setSpacing(0);
 
         m_playButton = new QToolButton(this);

-        m_stopButton = new QToolButton(this);
+        m_pauseButton = new QToolButton(this);

         m_seekSlider = new Phonon::SeekSlider(this);
 
         controlsLayout->addWidget(m_playButton);
         m_seekSlider = new Phonon::SeekSlider(this);
 
         controlsLayout->addWidget(m_playButton);

-        controlsLayout->addWidget(m_stopButton);
+        controlsLayout->addWidget(m_pauseButton);

         controlsLayout->addWidget(m_seekSlider);
 
         m_topLayout->addLayout(controlsLayout);
 
         controlsLayout->addWidget(m_seekSlider);
 
         m_topLayout->addLayout(controlsLayout);
 

-        m_playButton->setToolTip(i18n("play"));
-        m_playButton->setIconSize(QSize(16, 16));
-        m_playButton->setIcon(KIcon("media-playback-start"));
-        connect(m_playButton, SIGNAL(clicked()), this, SLOT(play()));
+        const int smallIconSize = style()->pixelMetric(QStyle::PM_SmallIconSize);
+        const QSize buttonSize(smallIconSize, smallIconSize);

 
 

-        m_stopButton->setToolTip(i18n("stop"));
-        m_stopButton->setIconSize(QSize(16, 16));
-        m_stopButton->setIcon(KIcon("media-playback-stop"));
-        m_stopButton->hide();
-        connect(m_stopButton, SIGNAL(clicked()), this, SLOT(stop()));
+        m_playButton->setToolTip(i18n("play"));
+        m_playButton->setIconSize(buttonSize);
+        m_playButton->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-start")));
+        m_playButton->setAutoRaise(true);
+        connect(m_playButton, &QToolButton::clicked, this, &PhononWidget::play);
+
+        m_pauseButton->setToolTip(i18n("pause"));
+        m_pauseButton->setIconSize(buttonSize);
+        m_pauseButton->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-pause")));
+        m_pauseButton->setAutoRaise(true);
+        m_pauseButton->hide();
+        connect(m_pauseButton, &QToolButton::clicked, this, &PhononWidget::togglePlayback);

 
         m_seekSlider->setIconVisible(false);
 
         // Creating an audio player or video player instance might take up to
         // 2 seconds when doing it the first time. To prevent that the user
 
         m_seekSlider->setIconVisible(false);
 
         // Creating an audio player or video player instance might take up to
         // 2 seconds when doing it the first time. To prevent that the user

-        // interface gets noticable blocked, the creation is delayed until
+        // interface gets noticeable blocked, the creation is delayed until

         // the play button has been pressed (see PhononWidget::play()).
     }
 }
         // the play button has been pressed (see PhononWidget::play()).
     }
 }


@@ -170,11 +200,11 @@ 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_pauseButton->show();

         break;
     default:
         break;
     default:

-        m_stopButton->hide();
+        m_pauseButton->hide();

         m_playButton->show();
         break;
     }
         m_playButton->show();
         break;
     }


@@ -183,59 +213,68 @@ void PhononWidget::stateChanged(Phonon::State newstate)
 
 void PhononWidget::play()
 {
 
 void PhononWidget::play()
 {

-    switch (m_mode) {
-    case Audio:
-        if (m_audioMedia == 0) {
-            m_audioMedia = Phonon::createPlayer(Phonon::MusicCategory, m_url);
-            m_audioMedia->setParent(this);
-        }
-        m_media = m_audioMedia;
-        m_media->setCurrentSource(m_url);
-        break;
+    if (!m_media) {
+        m_media = new Phonon::MediaObject(this);
+        connect(m_media, &Phonon::MediaObject::stateChanged,
+                this, &PhononWidget::stateChanged);
+        connect(m_media, &Phonon::MediaObject::finished,
+                this, &PhononWidget::finished);
+        m_seekSlider->setMediaObject(m_media);
+    }

 
 

-    case Video:
-        if (m_videoPlayer == 0) {
-            m_videoPlayer = new EmbeddedVideoPlayer(Phonon::VideoCategory, this);
-            m_topLayout->insertWidget(0, m_videoPlayer);
-        }
+    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);

         applyVideoSize();
         applyVideoSize();

-        m_videoPlayer->show();
-        m_videoPlayer->play(m_url);
-        m_media = m_videoPlayer->mediaObject();
-        break;
+    }

 
 

-    default:
-        break;
+    if (!m_audioOutput) {
+        m_audioOutput = new Phonon::AudioOutput(Phonon::MusicCategory, this);
+        Phonon::createPath(m_media, m_audioOutput);

     }
 
     }
 

-    Q_ASSERT(m_media != 0);
-    connect(m_media, SIGNAL(stateChanged(Phonon::State, Phonon::State)),
-            this, SLOT(stateChanged(Phonon::State)));
-    m_seekSlider->setMediaObject(m_media);
+    if (m_isVideo) {
+        emit hasVideoChanged(true);
+    }

 
 

-    emit playingStarted();
+    if (m_url != m_media->currentSource().url()) {
+        m_media->setCurrentSource(m_url);
+    }
+    m_media->play();
+
+    m_videoPlayer->setVisible(m_isVideo);

 }
 
 }
 

-void PhononWidget::stop()
+void PhononWidget::finished()

 {
 {

-    if (m_media != 0) {
-        m_media->stop();
-        disconnect(m_media, SIGNAL(stateChanged(Phonon::State, Phonon::State)),
-                   this, SLOT(stateChanged(Phonon::State)));
-        emit playingStopped();
-
-        m_stopButton->hide();
-        m_playButton->show();
+    if (m_isVideo) {
+        m_videoPlayer->hide();
+        emit hasVideoChanged(false);

     }
     }

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

 
 

-    if (m_videoPlayer != 0) {
+void PhononWidget::stop()
+{
+    if (m_media) {
+        m_media->stop();

         m_videoPlayer->hide();
         m_videoPlayer->hide();

+        emit hasVideoChanged(false);

     }
 }
 
 void PhononWidget::applyVideoSize()
 {
     }
 }
 
 void PhononWidget::applyVideoSize()
 {

-    if ((m_videoPlayer != 0) && m_videoSize.isValid()) {
+    if ((m_videoPlayer) && m_videoSize.isValid()) {

         m_videoPlayer->setSizeHint(m_videoSize);
     }
 }
         m_videoPlayer->setSizeHint(m_videoSize);
     }
 }

+
+#include "phononwidget.moc"