Plugins::Player: add hide tool bar

Author: KangLin

Plugins/Player/DlgPlayer.cpp

@@ -83,6 +83,12 @@ CDlgPlayer::CDlgPlayer(CParameterPlayer *pPara, QWidget *parent)
     m_pRecordUI = new CParameterRecordUI(ui->tabWidget);
     m_pRecordUI->SetParameter(&m_pParameters->m_Record);
     ui->tabWidget->addTab(m_pRecordUI, m_pRecordUI->windowIcon(), m_pRecordUI->windowTitle());
+
+#ifndef HAVE_QVideoWidget
+    ui->lbHideToolBar->hide();
+    ui->spHideToolBar->hide();
+#endif
+    ui->spHideToolBar->setValue(m_pParameters->GetHideToolBar());
 }
 
 CDlgPlayer::~CDlgPlayer()
@@ -132,6 +138,8 @@ void CDlgPlayer::accept()
         break;
     }
 
+    m_pParameters->SetHideToolBar(ui->spHideToolBar->value());
+
     m_pParameters->SetSubtitle(ui->cbEnableSubtitle->isChecked());
     m_pParameters->SetEnableAudioInput(ui->gbAudioInput->isChecked());
     m_pParameters->SetAudioInput(ui->cmbAudioInput->currentIndex());

Plugins/Player/DlgPlayer.ui

@@ -54,7 +54,83 @@
          </item>
         </layout>
        </item>
+       <item row="1" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QComboBox" name="cmbType"/>
+         </item>
+         <item>
+          <widget class="QComboBox" name="cmbCamera">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="leUrl"/>
+         </item>
+         <item>
+          <widget class="QPushButton" name="pbUrlBrowse">
+           <property name="text">
+            <string>Browse</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="2" column="0">
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="QLabel" name="lbHideToolBar">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>Hide play toolbar when full Screen(0: disable)</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="spHideToolBar">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="suffix">
+            <string>S</string>
+           </property>
+           <property name="maximum">
+            <number>999</number>
+           </property>
+           <property name="value">
+            <number>60</number>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
        <item row="3" column="0">
+        <widget class="QCheckBox" name="cbEnableSubtitle">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Enable subtitle</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0">
         <layout class="QHBoxLayout" name="horizontalLayout_11">
          <item>
           <widget class="QGroupBox" name="gbAudioInput">
@@ -141,34 +217,7 @@
          </item>
         </layout>
        </item>
-       <item row="1" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QComboBox" name="cmbType"/>
-         </item>
-         <item>
-          <widget class="QComboBox" name="cmbCamera">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLineEdit" name="leUrl"/>
-         </item>
-         <item>
-          <widget class="QPushButton" name="pbUrlBrowse">
-           <property name="text">
-            <string>Browse</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="4" column="0">
+       <item row="5" column="0">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Orientation::Vertical</enum>
@@ -181,13 +230,6 @@
          </property>
         </spacer>
        </item>
-       <item row="2" column="0">
-        <widget class="QCheckBox" name="cbEnableSubtitle">
-         <property name="text">
-          <string>Enable subtitle</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
     </widget>

Plugins/Player/FrmPlayer.cpp

@@ -48,11 +48,13 @@ CFrmPlayer::CFrmPlayer(QWidget *parent) : QWidget(parent)
     , m_pVideoItem(nullptr)
 #endif
     , m_pToolBar(nullptr)
+    , tm_ToolBar(this)
     , m_pbVideo(Qt::Horizontal, this)
     , m_pbVolume(Qt::Horizontal, this)
     , m_bMoveVideo(false)
     , m_pParameter(nullptr)
     , m_pLabel(nullptr)
+    , m_bFullScreen(false)
 {
     bool check = false;
 
@@ -67,11 +69,17 @@ CFrmPlayer::CFrmPlayer(QWidget *parent) : QWidget(parent)
     m_pVideoWidget = new QVideoWidget(this);
     m_pVideoWidget->setFocusPolicy(Qt::WheelFocus);
     m_pVideoWidget->installEventFilter(this);
+    m_pVideoWidget->setMouseTracking(true);
+    // ← 遍历内部子对象也装过滤器 + 开 tracking
+    for (QObject *o : m_pVideoWidget->findChildren<QObject*>()) {
+        o->installEventFilter(this);
+        if (auto *w = qobject_cast<QWidget*>(o))
+            w->setMouseTracking(true);
+    }
     pLayout->addWidget(m_pVideoWidget);
 #else
     // 创建场景和视频项
     QGraphicsScene *pScene = new QGraphicsScene(this);
-    pScene->installEventFilter(this);
     m_pVideoItem = new QGraphicsVideoItem;
     pScene->addItem(m_pVideoItem);
     // 创建视图并添加到布局
@@ -81,6 +89,9 @@ CFrmPlayer::CFrmPlayer(QWidget *parent) : QWidget(parent)
     m_pGraphicsView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     m_pGraphicsView->setFrameStyle(0);
     m_pGraphicsView->setBackgroundBrush(Qt::black);
+    m_pGraphicsView->setMouseTracking(true);
+    m_pGraphicsView->viewport()->setMouseTracking(true);
+    m_pGraphicsView->viewport()->installEventFilter(this);
     // 关视频尺寸变化时，重新 fitInView
     connect(m_pVideoItem, &QGraphicsVideoItem::nativeSizeChanged,
             this, [this](const QSizeF &size) {
@@ -262,15 +273,44 @@ void CFrmPlayer::slotPositionChanged(qint64 pos, qint64 duration)
     }
 }
 
+//! [Full Screen]
+int CFrmPlayer::OnFullScreen(bool bFull)
+{
+    int nRet = 0;
+    m_bFullScreen = bFull;
+    if(bFull) {
+        m_Margins = layout()->contentsMargins();
+        layout()->setContentsMargins(QMargins());
+    } else {
+        layout()->setContentsMargins(m_Margins);
+    }
+    if(m_pToolBar && m_bFullScreen)
+        m_pToolBar->hide();
+    return nRet;
+}
+//! [Full Screen]
+
 void CFrmPlayer::focusInEvent(QFocusEvent *event)
 {
     qDebug(log) << Q_FUNC_INFO << event << this;
+    Q_UNUSED(event)
     emit sigViewerFocusIn(this);
 }
 
 void CFrmPlayer::focusOutEvent(QFocusEvent *event)
 {
     qDebug(log) << Q_FUNC_INFO << event << this;
+    Q_UNUSED(event)
+}
+
+void CFrmPlayer::mouseMoveEvent(QMouseEvent *event)
+{
+    //qDebug(log) << Q_FUNC_INFO;
+    Q_UNUSED(event)
+    if(m_pToolBar && m_pToolBar->isHidden()) {
+        m_pToolBar->show();
+        StartTimer();
+    }
 }
 
 void CFrmPlayer::slotStart(bool bStart)
@@ -289,6 +329,7 @@ void CFrmPlayer::slotStart(bool bStart)
         m_paRecordPause->setEnabled(true);
         m_paRecordPause->setChecked(false);
 #endif
+        StartTimer();
     } else {
         p->setIcon(QIcon::fromTheme("media-playback-start"));
         p->setText(tr("Start"));
@@ -301,19 +342,44 @@ void CFrmPlayer::slotStart(bool bStart)
         m_paRecordPause->setEnabled(false);
         m_paRecordPause->setChecked(false);
 #endif
+        tm_ToolBar.stop();
+        m_pToolBar->show();
+    }
+}
+
+void CFrmPlayer::slotTimeOut()
+{
+    if(!m_pToolBar)
+        return;
+    m_pToolBar->hide();
+}
+
+void CFrmPlayer::StartTimer()
+{
+    if(m_pParameter && m_pParameter->GetHideToolBar() <= 0
+        || !m_bFullScreen)
+        return;
+    if(m_paStart->isChecked()) {
+        tm_ToolBar.stop();
+        tm_ToolBar.singleShot(m_pParameter->GetHideToolBar() * 1000,
+                              this, SLOT(slotTimeOut()));
     }
 }
 
 bool CFrmPlayer::eventFilter(QObject *watched, QEvent *event)
 {
 //qDebug(log) << Q_FUNC_INFO << event;
 #ifdef WITH_QVideoWidget
-    if(m_pVideoWidget == watched)
+    if(m_pVideoWidget == watched
+        || m_pVideoWidget->isAncestorOf(qobject_cast<QWidget*>(watched)))
     {
         switch(event->type()){
-        case QEvent::MouseMove:
+        case QEvent::MouseMove: {
             qDebug(log) << "Mouse move";
-            break;
+            QMouseEvent* e = (QMouseEvent*)event;
+            mouseMoveEvent(e);
+            return true;
+        }
         case QEvent::MouseButtonRelease:
             m_paPause->trigger();
             break;
@@ -351,6 +417,19 @@ bool CFrmPlayer::eventFilter(QObject *watched, QEvent *event)
         }
         return true;
     }
+#else
+    if(m_pGraphicsView->viewport() == watched) {
+        switch(event->type()){
+        case QEvent::MouseMove: {
+            qDebug(log) << "Mouse move";
+            QMouseEvent* e = (QMouseEvent*)event;
+            mouseMoveEvent(e);
+            return true;
+        }
+        default:
+            break;
+        }
+    }
 #endif
     return false; // 让 widget 自己继续处理
 }
@@ -367,4 +446,4 @@ void CFrmPlayer::UpdateGraphicsVideoGeometry()
     m_pGraphicsView->setSceneRect(m_pVideoItem->boundingRect());
     m_pGraphicsView->fitInView(m_pVideoItem, Qt::KeepAspectRatio);
 }
-#endif
+#endif

Plugins/Player/FrmPlayer.h

@@ -8,6 +8,8 @@
 #include <QSlider>
 #include <QProgressBar>
 #include <QLabel>
+#include <QTimer>
+#include <QMargins>
 #include "ParameterPlayer.h"
 
 #if !defined(Q_OS_LINUX) || defined(Q_OS_ANDROID)
@@ -46,6 +48,7 @@ class CFrmPlayer : public QWidget
 
 public Q_SLOTS:
     void slotPositionChanged(qint64 pos, qint64 duration);
+
 Q_SIGNALS:
     void sigChangePosition(qint64 pos);
     /*!
@@ -58,11 +61,17 @@ public Q_SLOTS:
 protected:
     virtual void focusInEvent(QFocusEvent *event) override;
     virtual void focusOutEvent(QFocusEvent *event) override;
+    virtual void mouseMoveEvent(QMouseEvent *event) override;
+
+    //! Full Screen
+    Q_INVOKABLE int OnFullScreen(bool bFull);
 
 private Q_SLOTS:
     void slotAudioMuted(bool bMuted);
     void slotAduioVolume(int volume);
     void slotStart(bool bStart);
+    void slotTimeOut();
+    void StartTimer();
 
 private:
 #ifdef WITH_QVideoWidget
@@ -73,11 +82,14 @@ private Q_SLOTS:
     void UpdateGraphicsVideoGeometry();
 #endif
     QToolBar* m_pToolBar;
+    QTimer tm_ToolBar;
     QSlider m_pbVideo;
     bool m_bMoveVideo;
     QSlider m_pbVolume;
     CParameterPlayer* m_pParameter;
     QLabel* m_pLabel;
+    bool m_bFullScreen;
+    QMargins m_Margins;
 };
 
 #endif // FRMPLAYER_H

Plugins/Player/OperatePlayer.cpp

@@ -34,6 +34,7 @@ int COperatePlayer::Initial()
 
     bool check = false;
 #if HAVE_QVideoWidget
+    m_Player.SetParameter(&m_Parameters);
     check = connect(&m_Player, SIGNAL(sigViewerFocusIn(QWidget*)),
                     this, SIGNAL(sigViewerFocusIn(QWidget*)));
     Q_ASSERT(check);
@@ -168,7 +169,7 @@ int COperatePlayer::InitialMenu()
 #endif
     m_Menu.addAction(m_pScreenShot);
     m_Menu.addSeparator();
-    m_Menu.addAction(m_pActiveSettings);
+    m_Menu.addAction(GetActionSettings());
 #endif
     return nRet;
 }