fix: 影院加界面开关处理“全屏时显示倒计时”，开关默认为关

影院加界面开关处理“全屏时显示倒计时”，开关默认为关 Task: https://pms.uniontech.com/task-view-369309.html Log: 影院加界面开关处理“全屏时显示倒计时”，开关默认为关
linuxdeepin · Dec 4, 2024 · 15ae994 · 15ae994
1 parent 1eb1cdc
commit 15ae994
Show file tree

Hide file tree

Showing 14 changed files with 829 additions and 736 deletions.
diff --git a/assets/resources/data/GstSettings.json b/assets/resources/data/GstSettings.json
@@ -83,6 +83,13 @@
                             "type": "checkbox",
                             "default": false
                         },
+                        {
+                            "key": "showTimeFullScreen",
+                            "name": "",
+                            "type": "checkbox",
+                            "text": "Display countdown in full screen mode",
+                            "default": "false"
+                        },
                         {
                             "key": "emptylist",
                             "name": "",

diff --git a/assets/resources/data/lowEffectSettings.json b/assets/resources/data/lowEffectSettings.json
@@ -83,6 +83,13 @@
                             "type": "checkbox",
                             "default": false
                         },
+                        {
+                            "key": "showTimeFullScreen",
+                            "name": "",
+                            "type": "checkbox",
+                            "text": "Display countdown in full screen mode",
+                            "default": "false"
+                        },
                         {
                             "key": "emptylist",
                             "name": "",

diff --git a/assets/resources/data/settings.json b/assets/resources/data/settings.json
@@ -83,6 +83,13 @@
                             "type": "checkbox",
                             "default": false
                         },
+                        {
+                            "key": "showTimeFullScreen",
+                            "name": "",
+                            "type": "checkbox",
+                            "text": "Display countdown in full screen mode",
+                            "default": "false"
+                        },
                         {
                             "key": "emptylist",
                             "name": "",

diff --git a/src/backends/mpv/mpv_glwidget.cpp b/src/backends/mpv/mpv_glwidget.cpp
@@ -867,6 +867,8 @@ namespace dmr {
 #ifdef __x86_64__
             QWidget *topWidget = topLevelWidget();
             if(topWidget && (topWidget->isFullScreen())) {//全屏状态播放时更新显示进度
+                QVariant varShow = topWidget->property("showTimeFullScreen");
+                if(!varShow.isValid() || !varShow.toBool()) return;
                 QString time_text = QTime::currentTime().toString("hh:mm");
                 QRect rectTime = QRect(rect().width() - 90, 0, 90, 40);
                 QPainter painter;

diff --git a/src/common/dmr_settings.cpp b/src/common/dmr_settings.cpp
@@ -64,6 +64,8 @@ Settings::Settings()
             emit hwaccelModeChanged(key, value);
         else if (key.startsWith("base.play.mute"))
             emit baseMuteChanged(key, value);
+        else if (key.startsWith("base.play.showTimeFullScreen"))
+            emit showTimeFullScreenChanged(key, value);
         else if (key.startsWith("base."))
             emit baseChanged(key, value);
         else if (key.startsWith("subtitle."))
@@ -106,6 +108,8 @@ Settings::Settings()
 QString Settings::flag2key(Settings::Flag f)
 {
     switch (f) {
+    case Settings::Flag::ShowTimeFullScreen:
+        return "showTimeFullScreen";
     case Settings::Flag::ClearWhenQuit:
         return "emptylist";
 #ifndef __aarch64__

diff --git a/src/common/dmr_settings.h b/src/common/dmr_settings.h
@@ -68,7 +68,13 @@ class Settings: public QObject
      * @param 配置的值
      */
     void hwaccelModeChanged(const QString &, const QVariant &);
-
+    /**
+     * @brief base.play.hwaccel配置值变化后发送的信号
+     * @param base.play.hwaccel下的某一配置
+     * @param 配置的值
+     */
+    void showTimeFullScreenChanged(const QString &, const QVariant &);
+
 public:
     enum Flag {
         ClearWhenQuit,
@@ -78,6 +84,7 @@ class Settings: public QObject
         PreviewOnMouseover,
         MultipleInstance,
         PauseOnMinimize,
+        ShowTimeFullScreen,
     };
     /**
      * @brief 获取类单列对象

diff --git a/src/common/mainwindow.cpp b/src/common/mainwindow.cpp
@@ -941,10 +941,24 @@ MainWindow::MainWindow(QWidget *parent)
     m_pPopupWid = new MessageWindow(this);
     m_pPopupWid->hide();
     defaultplaymodeinit();
-
+    m_bShowTime = Settings::get().internalOption("showTimeFullScreen").toBool();
+    setProperty("showTimeFullScreen", Settings::get().internalOption("showTimeFullScreen"));
     connect(&Settings::get(), &Settings::defaultplaymodechanged, this, &MainWindow::slotdefaultplaymodechanged);
     connect(&Settings::get(), &Settings::setDecodeModel, this, &MainWindow::onSetDecodeModel,Qt::DirectConnection);
     connect(&Settings::get(), &Settings::refreshDecode, this, &MainWindow::onRefreshDecode,Qt::DirectConnection);
+    connect(&Settings::get(), &Settings::showTimeFullScreenChanged, this, [&](const QString &key, const QVariant &value) {
+        if(value.isValid()) {
+            m_bShowTime = value.toBool();
+            setProperty("showTimeFullScreen", value);
+            //The X86 platform draws on GiWidget, and the MIPS platform does not need to draw
+            if (CompositingManager::get().platform() == Platform::Arm64 || CompositingManager::get().platform() == Platform::Alpha) {
+                if(m_pEngine && (m_pEngine->state() != PlayerEngine::Idle) && isFullScreen()) {
+                    m_pProgIndicator->setVisible(value.toBool());
+                    m_pFullScreenTimeLable->setVisible(value.toBool());
+                }
+            }
+        }
+    },Qt::DirectConnection);
     connect(m_pEngine, &PlayerEngine::onlineStateChanged, this, &MainWindow::checkOnlineState);
     connect(&OnlineSubtitle::get(), &OnlineSubtitle::onlineSubtitleStateChanged, this, &MainWindow::checkOnlineSubtitle);
     connect(m_pEngine, &PlayerEngine::mpvErrorLogsChanged, this, &MainWindow::checkErrorMpvLogsChanged);
@@ -1152,7 +1166,9 @@ void MainWindow::onWindowStateChanged()
 
     //The X86 platform draws on GiWidget, and the MIPS platform does not need to draw
     if (CompositingManager::get().platform() == Platform::Arm64 || CompositingManager::get().platform() == Platform::Alpha) {
-        m_pProgIndicator->setVisible(isFullScreen() && m_pEngine && m_pEngine->state() != PlayerEngine::Idle);
+        if(m_bShowTime) {
+            m_pProgIndicator->setVisible(isFullScreen() && m_pEngine && m_pEngine->state() != PlayerEngine::Idle);
+        }
     }
 
 #ifndef USE_DXCB
@@ -2126,7 +2142,9 @@ void MainWindow::requestAction(ActionFactory::ActionKind actionKind, bool bFromU
                         QRect deskRect = QApplication::desktop()->availableGeometry();
                         pixelsWidth = qMax(117, pixelsWidth);
                         m_pFullScreenTimeLable->setGeometry(deskRect.width() - pixelsWidth - 60, 40, pixelsWidth + 60, 36);
-                        m_pFullScreenTimeLable->show();
+                        if(m_bShowTime) {
+                            m_pFullScreenTimeLable->show();
+                        }
                     }
                 }
             }
@@ -4347,7 +4365,9 @@ void MainWindow::toggleUIMode()
                     QRect deskRect = QApplication::desktop()->availableGeometry();
                     pixelsWidth = qMax(117, pixelsWidth);
                     m_pFullScreenTimeLable->setGeometry(deskRect.width() - pixelsWidth - 60, 40, pixelsWidth + 60, 36);
-                    m_pFullScreenTimeLable->show();
+                    if(m_bShowTime) {
+                        m_pFullScreenTimeLable->show();
+                    }
                 }
             }
             setFocus();

diff --git a/src/common/mainwindow.h b/src/common/mainwindow.h
@@ -590,6 +590,7 @@ protected slots:
     bool m_bHaveFile;                                 ///导入是否包含文件（用于导入文件或文件夹）
     bool m_bMaxByScreenRemoved {false};
     QRect m_mwdRect;
+    bool m_bShowTime {false};                         ///全屏显示影片时间信息
 };
 };
 

diff --git a/src/common/platform/platform_mainwindow.cpp b/src/common/platform/platform_mainwindow.cpp
@@ -771,8 +771,10 @@ Platform_MainWindow::Platform_MainWindow(QWidget *parent)
                     int pixelsWidth = m_pToolbox->getfullscreentimeLabel()->width() + m_pToolbox->getfullscreentimeLabelend()->width();
                     pixelsWidth = qMax(117, pixelsWidth);
                     m_pFullScreenTimeLable->setGeometry(screenGeo.width() + screenGeo.x() - pixelsWidth - 60, 40 + screenGeo.y(), pixelsWidth + 60, 36);
-                    m_pFullScreenTimeLable->show();
-                    m_pProgIndicator->setVisible(true);
+                    if(m_bShowTime) {
+                        m_pFullScreenTimeLable->show();
+                        m_pProgIndicator->setVisible(true);
+                    }
                     QTimer::singleShot(200, [ = ]() {
                         activateWindow();    // show other window make mainwindow deactivate
                         setFocus();
@@ -987,10 +989,22 @@ Platform_MainWindow::Platform_MainWindow(QWidget *parent)
     m_pPopupWid = new Platform_MessageWindow(this);
     m_pPopupWid->hide();
     defaultplaymodeinit();
-
+    m_bShowTime = Settings::get().internalOption("showTimeFullScreen").toBool();
     connect(&Settings::get(), &Settings::defaultplaymodechanged, this, &Platform_MainWindow::slotdefaultplaymodechanged);
     connect(&Settings::get(), &Settings::setDecodeModel, this, &Platform_MainWindow::onSetDecodeModel,Qt::DirectConnection);
     connect(&Settings::get(), &Settings::refreshDecode, this, &Platform_MainWindow::onRefreshDecode,Qt::DirectConnection);
+    connect(&Settings::get(), &Settings::showTimeFullScreenChanged, this, [&](const QString &key, const QVariant &value) {
+        if(value.isValid()) {
+            m_bShowTime = value.toBool();
+            //The X86 platform draws on GiWidget, and the MIPS platform does not need to draw
+            if (CompositingManager::get().platform() != Platform::Mips) {
+                if(m_pEngine && (m_pEngine->state() != PlayerEngine::Idle) && isFullScreen()) {
+                    m_pProgIndicator->setVisible(value.toBool());
+                    m_pFullScreenTimeLable->setVisible(value.toBool());
+                }
+            }
+        }
+    },Qt::DirectConnection);
     connect(m_pEngine, &PlayerEngine::onlineStateChanged, this, &Platform_MainWindow::checkOnlineState);
     connect(&OnlineSubtitle::get(), &OnlineSubtitle::onlineSubtitleStateChanged, this, &Platform_MainWindow::checkOnlineSubtitle);
     connect(m_pEngine, &PlayerEngine::mpvErrorLogsChanged, this, &Platform_MainWindow::checkErrorMpvLogsChanged);
@@ -1161,7 +1175,9 @@ void Platform_MainWindow::onWindowStateChanged()
         m_pTitlebar->setVisible(false);
     }
     if (CompositingManager::get().platform() != Platform::Mips)
-        m_pProgIndicator->setVisible(isFullScreen() && m_pEngine && m_pEngine->state() != PlayerEngine::Idle);
+        if(m_bShowTime) {
+            m_pProgIndicator->setVisible(isFullScreen() && m_pEngine && m_pEngine->state() != PlayerEngine::Idle);
+        }
 
 #ifndef USE_DXCB
     m_pTitlebar->move(0, 0);
@@ -2096,7 +2112,9 @@ void Platform_MainWindow::requestAction(ActionFactory::ActionKind actionKind, bo
                         int pixelsWidth = m_pToolbox->getfullscreentimeLabel()->width() + m_pToolbox->getfullscreentimeLabelend()->width();
                         pixelsWidth = qMax(117, pixelsWidth);
                         m_pFullScreenTimeLable->setGeometry(screenGeo.width() + screenGeo.x() - pixelsWidth - 60, 40 + screenGeo.y(), pixelsWidth + 60, 36);
-                        m_pFullScreenTimeLable->show();
+                        if(m_bShowTime) {
+                            m_pFullScreenTimeLable->show();
+                        }
                     }
                 }
             }

diff --git a/src/common/platform/platform_mainwindow.h b/src/common/platform/platform_mainwindow.h
@@ -586,6 +586,7 @@ protected slots:
     bool m_bIsWM {true};                              ///是否开启窗口特效
     bool m_bMaximized;                                ///全屏前最大化窗口记录
     bool m_bLocked{true};
+    bool m_bShowTime {false};                         ///全屏显示影片时间信息
 };
 };
 

diff --git a/src/common/settings_translation.cpp b/src/common/settings_translation.cpp
@@ -7,6 +7,7 @@
 
 void GenerateSettingTranslate()
 {
+    auto base_play_showTimeFullScreenText = QObject::tr("Display countdown in full screen mode");
     auto base_play_addsimilarText = QObject::tr("Auto add similar files to play");
     auto base_play_emptylistText = QObject::tr("Clear playlist when exit");
     auto base_play_showthumbnailmode = QObject::tr("Show thumbnails in progress bar");