Change default Dolphin toolbar layout

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

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 1c9c21cd39b844846df0c4291cfbf6a49ec17231..4ea2e6666aaaf8b0a703cf4033af9df3f459d860 100644 (file)
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -20,27 +20,23 @@
 
 #include "phononwidget.h"
 
 
 #include "phononwidget.h"
 

+#include <KIconLoader>
+#include <KLocalizedString>

 #include <Phonon/AudioOutput>
 #include <Phonon/AudioOutput>

-#include <Phonon/Global>

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

-#include <QVBoxLayout>
-#include <QHBoxLayout>

 #include <QShowEvent>
 #include <QToolButton>
 #include <QShowEvent>
 #include <QToolButton>

-
-#include <KDialog>
-#include <QIcon>
-#include <KIconLoader>
-#include <QUrl>
-#include <KLocalizedString>
+#include <QVBoxLayout>

 
 class EmbeddedVideoPlayer : public Phonon::VideoWidget
 {
 
 class EmbeddedVideoPlayer : public Phonon::VideoWidget
 {

+    Q_OBJECT
+

     public:
     public:

-        EmbeddedVideoPlayer(QWidget *parent = 0) :
+        EmbeddedVideoPlayer(QWidget *parent = nullptr) :

             Phonon::VideoWidget(parent)
         {
         }
             Phonon::VideoWidget(parent)
         {
         }


@@ -51,7 +47,7 @@ class EmbeddedVideoPlayer : public Phonon::VideoWidget
             updateGeometry();
         }
 
             updateGeometry();
         }
 

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

         {
             return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint();
         }
         {
             return m_sizeHint.isValid() ? m_sizeHint : Phonon::VideoWidget::sizeHint();
         }


@@ -63,21 +59,34 @@ class EmbeddedVideoPlayer : public Phonon::VideoWidget
 PhononWidget::PhononWidget(QWidget *parent)
     : QWidget(parent),
     m_url(),
 PhononWidget::PhononWidget(QWidget *parent)
     : QWidget(parent),
     m_url(),

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

 {
 }
 
 {
 }
 

-void PhononWidget::setUrl(const QUrl &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();
+    }
+}
+
+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();

     }
 }
 
     }
 }
 


@@ -108,10 +117,10 @@ void PhononWidget::showEvent(QShowEvent *event)
 
     if (!m_topLayout) {
         m_topLayout = new QVBoxLayout(this);
 
     if (!m_topLayout) {
         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);


@@ -129,13 +138,13 @@ void PhononWidget::showEvent(QShowEvent *event)
 
         m_playButton->setToolTip(i18n("play"));
         m_playButton->setIconSize(buttonSize);
 
         m_playButton->setToolTip(i18n("play"));
         m_playButton->setIconSize(buttonSize);

-        m_playButton->setIcon(QIcon::fromTheme("media-playback-start"));
+        m_playButton->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-start")));

         m_playButton->setAutoRaise(true);
         connect(m_playButton, &QToolButton::clicked, this, &PhononWidget::play);
 
         m_stopButton->setToolTip(i18n("stop"));
         m_stopButton->setIconSize(buttonSize);
         m_playButton->setAutoRaise(true);
         connect(m_playButton, &QToolButton::clicked, this, &PhononWidget::play);
 
         m_stopButton->setToolTip(i18n("stop"));
         m_stopButton->setIconSize(buttonSize);

-        m_stopButton->setIcon(QIcon::fromTheme("media-playback-stop"));
+        m_stopButton->setIcon(QIcon::fromTheme(QStringLiteral("media-playback-stop")));

         m_stopButton->setAutoRaise(true);
         m_stopButton->hide();
         connect(m_stopButton, &QToolButton::clicked, this, &PhononWidget::stop);
         m_stopButton->setAutoRaise(true);
         m_stopButton->hide();
         connect(m_stopButton, &QToolButton::clicked, this, &PhononWidget::stop);


@@ -180,13 +189,14 @@ void PhononWidget::play()
         m_media = new Phonon::MediaObject(this);
         connect(m_media, &Phonon::MediaObject::stateChanged,
                 this, &PhononWidget::stateChanged);
         m_media = new Phonon::MediaObject(this);
         connect(m_media, &Phonon::MediaObject::stateChanged,
                 this, &PhononWidget::stateChanged);

-        connect(m_media, &Phonon::MediaObject::hasVideoChanged,
-                this, &PhononWidget::slotHasVideoChanged);
+        connect(m_media, &Phonon::MediaObject::finished,
+                this, &PhononWidget::finished);

         m_seekSlider->setMediaObject(m_media);
     }
 
     if (!m_videoPlayer) {
         m_videoPlayer = new EmbeddedVideoPlayer(this);
         m_seekSlider->setMediaObject(m_media);
     }
 
     if (!m_videoPlayer) {
         m_videoPlayer = new EmbeddedVideoPlayer(this);

+        m_videoPlayer->installEventFilter(this);

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


@@ -197,35 +207,32 @@ void PhononWidget::play()
         Phonon::createPath(m_media, m_audioOutput);
     }
 
         Phonon::createPath(m_media, m_audioOutput);
     }
 

-    emit hasVideoChanged(false);
+    if (m_isVideo) {
+        emit hasVideoChanged(true);
+    }

 
 

-    m_media->setCurrentSource(m_url);
-    m_media->hasVideo();
+    if (m_url != m_media->currentSource().url()) {
+        m_media->setCurrentSource(m_url);
+    }

     m_media->play();
     m_media->play();

+
+    m_videoPlayer->setVisible(m_isVideo);

 }
 
 }
 

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

 {
 {

-    if (m_media) {
-        m_media->stop();
-
-        m_stopButton->hide();
-        m_playButton->show();
-    }
-
-    if (m_videoPlayer) {
+    if (m_isVideo) {

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

+        emit hasVideoChanged(false);

     }
     }

-
-    emit hasVideoChanged(false);

 }
 
 }
 

-void PhononWidget::slotHasVideoChanged(bool hasVideo)
+void PhononWidget::stop()

 {
 {

-    emit hasVideoChanged(hasVideo);
-
-    if (hasVideo) {
-        m_videoPlayer->show();
+    if (m_media) {
+        m_media->stop();
+        m_videoPlayer->hide();
+        emit hasVideoChanged(false);

     }
 }
 
     }
 }
 


@@ -235,3 +242,5 @@ void PhononWidget::applyVideoSize()
         m_videoPlayer->setSizeHint(m_videoSize);
     }
 }
         m_videoPlayer->setSizeHint(m_videoSize);
     }
 }

+
+#include "phononwidget.moc"