From c3b3dc904e8979497a085fc5b4164a413d29c149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Tue, 13 Jun 2023 22:00:15 +0800 Subject: [PATCH] update --- example/CMakeLists.txt | 2 +- example/qml/App.qml | 1 - example/qml/global/ItemsOriginal.qml | 16 -- example/qml/page/T_MediaPlayer.qml | 62 ------ example/qml/window/MediaWindow.qml | 30 --- src/CMakeLists.txt | 4 +- .../FluentUI/Controls/FluMediaPlayer.qml | 202 ------------------ .../FluentUI/Controls/FluWindowResize.qml | 144 ------------- 8 files changed, 3 insertions(+), 458 deletions(-) delete mode 100644 example/qml/page/T_MediaPlayer.qml delete mode 100644 example/qml/window/MediaWindow.qml delete mode 100644 src/imports/FluentUI/Controls/FluMediaPlayer.qml delete mode 100644 src/imports/FluentUI/Controls/FluWindowResize.qml diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 37e3306d..c065a210 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -20,7 +20,7 @@ endif() file(TO_CMAKE_PATH "/" PATH_SEPARATOR) #设置版本号 -add_definitions(-DVERSION=1,3,3,0) +add_definitions(-DVERSION=1,3,4,0) find_package(Qt6 REQUIRED COMPONENTS Quick REQUIRED) diff --git a/example/qml/App.qml b/example/qml/App.qml index 42b7ad5a..8bddd670 100644 --- a/example/qml/App.qml +++ b/example/qml/App.qml @@ -13,7 +13,6 @@ Window { "/":"qrc:/example/qml/window/MainWindow.qml", "/about":"qrc:/example/qml/window/AboutWindow.qml", "/login":"qrc:/example/qml/window/LoginWindow.qml", - "/media":"qrc:/example/qml/window/MediaWindow.qml", "/singleTaskWindow":"qrc:/example/qml/window/SingleTaskWindow.qml", "/standardWindow":"qrc:/example/qml/window/StandardWindow.qml", "/singleInstanceWindow":"qrc:/example/qml/window/SingleInstanceWindow.qml" diff --git a/example/qml/global/ItemsOriginal.qml b/example/qml/global/ItemsOriginal.qml index 73d4b23e..dab41ca2 100644 --- a/example/qml/global/ItemsOriginal.qml +++ b/example/qml/global/ItemsOriginal.qml @@ -279,22 +279,6 @@ FluObject{ } } - FluPaneItemExpander{ - title:lang.media - icon:FluentIcons.Media - FluPaneItem{ - title:"MediaPlayer" - image:"qrc:/example/res/image/control/MediaPlayerElement.png" - recentlyAdded:true - order:0 - desc:"A control to display video and image content." - onTap:{ - navigationView.push("qrc:/example/qml/page/T_MediaPlayer.qml") - } - } - - } - FluPaneItemExpander{ title:lang.other icon:FluentIcons.Shop diff --git a/example/qml/page/T_MediaPlayer.qml b/example/qml/page/T_MediaPlayer.qml deleted file mode 100644 index b831f184..00000000 --- a/example/qml/page/T_MediaPlayer.qml +++ /dev/null @@ -1,62 +0,0 @@ -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts -import QtQuick.Window -import FluentUI -import "qrc:///example/qml/component" - -FluScrollablePage{ - - title:"MediaPlayer" - - onVisibleChanged: { - if(visible){ - player.play() - }else{ - player.pause() - } - } - FluArea{ - Layout.fillWidth: true - height: 320 - Layout.topMargin: 20 - paddings: 10 - ColumnLayout{ - anchors{ - verticalCenter: parent.verticalCenter - left:parent.left - } - FluMediaPlayer{ - id:player - source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4" - } - } - } - CodeExpander{ - Layout.fillWidth: true - Layout.topMargin: -1 - code:'FluMediaPlayer{ - id:player - source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4" -} -' - } - FluArea{ - Layout.fillWidth: true - height: 68 - Layout.topMargin: 20 - paddings: 10 - FluButton{ - text:"跳转到视频播放器窗口" - anchors.verticalCenter: parent.verticalCenter - onClicked:{ - FluApp.navigate("/media",{source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"}) - } - } - } - - - - -} - diff --git a/example/qml/window/MediaWindow.qml b/example/qml/window/MediaWindow.qml deleted file mode 100644 index 1bc4bdfd..00000000 --- a/example/qml/window/MediaWindow.qml +++ /dev/null @@ -1,30 +0,0 @@ -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts -import FluentUI -import "qrc:///example/qml/component" - -CustomWindow { - - title:"视频播放器" - width: 640 - height: 480 - minimumWidth: 640 - minimumHeight: 480 - - onInitArgument: - (argument)=>{ - player.source = argument.source - } - - FluMediaPlayer{ - id:player - anchors{ - left: parent.left - right: parent.right - top: parent.top - bottom: parent.bottom - } - } - -} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e8065ca9..9156feca 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -13,9 +13,9 @@ endif() set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI) #设置版本号 -add_definitions(-DVERSION=1,3,3,0) +add_definitions(-DVERSION=1,3,4,0) -find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml ShaderTools) +find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml) #遍历所有Cpp文件 file(GLOB_RECURSE CPP_FILES *.cpp *.h) diff --git a/src/imports/FluentUI/Controls/FluMediaPlayer.qml b/src/imports/FluentUI/Controls/FluMediaPlayer.qml deleted file mode 100644 index 38f05433..00000000 --- a/src/imports/FluentUI/Controls/FluMediaPlayer.qml +++ /dev/null @@ -1,202 +0,0 @@ -import QtQuick -import QtQuick.Controls -import QtMultimedia -import FluentUI - -Rectangle { - property url source - property bool showControl: false - property real volume: 30 - id:control - width: 480 - height: 270 - color: FluColors.Black - clip: true - MouseArea{ - anchors.fill: parent - preventStealing: true - onClicked: { - showControl = !showControl - } - } - MediaPlayer { - id: mediaplayer - property bool autoSeek:true - source: control.source - videoOutput: video_output - audioOutput: AudioOutput{ - id:audio_output - } - onErrorStringChanged: - (error)=> { - console.debug(errorString) - } - onPositionChanged: { - if(autoSeek){ - slider.seek(mediaplayer.position*slider.maxValue/mediaplayer.duration) - } - } - onMediaStatusChanged: - (status)=> { - if(status===2){ - slider.maxValue = mediaplayer.duration - showControl = true - mediaplayer.play() - } - } - } - onSourceChanged: { - slider.seek(0) - } - VideoOutput { - id:video_output - anchors.fill: parent - } - Item{ - height: 100 - y:showControl ? control.height - 110 : control.height - anchors{ - horizontalCenter: parent.horizontalCenter - } - width: 460 - opacity: showControl - MouseArea{ - anchors.fill: parent - } - Behavior on opacity{ - NumberAnimation{ - duration: 150 - } - } - Behavior on y{ - NumberAnimation{ - duration: 150 - } - } - Rectangle{ - anchors.fill: parent - color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97) - radius: 5 - } - - FluSlider{ - id:slider - size:parent.width-20 - y:20 - anchors.horizontalCenter: parent.horizontalCenter - tipEnabled:false - onPressed: { - mediaplayer.autoSeek = false - mediaplayer.pause() - } - value:mediaplayer.position - onReleased: { - mediaplayer.autoSeek = true - mediaplayer.play() - } - onValueChanged: { - if(mediaplayer.autoSeek == false){ - mediaplayer.position = value*mediaplayer.duration/slider.maxValue - } - } - onLineClickFunc:function(val){ - mediaplayer.position = val*mediaplayer.duration/slider.maxValue - } - } - FluText{ - id:start_time - anchors{ - top: slider.bottom - topMargin: 10 - left: slider.left - } - text: formatDuration(slider.value*mediaplayer.duration/slider.maxValue) - } - FluText{ - id:end_time - anchors{ - top: slider.bottom - right: slider.right - topMargin: 10 - } - text: formatDuration(mediaplayer.duration) - } - Row{ - spacing: 10 - anchors{ - horizontalCenter: parent.horizontalCenter - bottom: parent.bottom - bottomMargin: 10 - } - FluIconButton{ - iconSize: 17 - iconSource: FluentIcons.SkipBack10 - onClicked: { - mediaplayer.position = Math.max(mediaplayer.position-10*1000,0) - } - } - FluIconButton{ - iconSize: 15 - iconSource: mediaplayer.playbackState === MediaPlayer.PlayingState ? FluentIcons.Pause : FluentIcons.Play - onClicked: { - if(mediaplayer.playbackState === MediaPlayer.PlayingState){ - mediaplayer.pause() - }else{ - mediaplayer.play() - } - } - } - FluIconButton{ - iconSize: 17 - iconSource: FluentIcons.SkipForward30 - onClicked: { - mediaplayer.position = Math.min(mediaplayer.position+30*1000,mediaplayer.duration) - } - } - } - FluIconButton{ - id:btn_volume - iconSize: 17 - iconSource: audio_output.muted ? FluentIcons.Mute : FluentIcons.Volume - anchors{ - left: parent.left - leftMargin: 5 - bottom: parent.bottom - bottomMargin: 10 - } - onClicked: { - audio_output.muted = !audio_output.muted - } - } - FluSlider{ - id:slider_volume - size: 80 - dotSize: 20 - value:30 - anchors{ - left:btn_volume.right - verticalCenter: btn_volume.verticalCenter - leftMargin: 10 - } - onValueChanged:{ - audio_output.volume = value/100 - } - } - } - function formatDuration(duration) { - const seconds = Math.floor(duration / 1000); - const hours = Math.floor(seconds / 3600); - const minutes = Math.floor((seconds % 3600) / 60); - const remainingSeconds = seconds % 60; - return `${pad(hours)}:${pad(minutes)}:${pad(remainingSeconds)}`; - } - function pad(value) { - return value.toString().padStart(2, '0'); - } - function pause(){ - mediaplayer.pause() - } - function play(){ - mediaplayer.play() - } -} diff --git a/src/imports/FluentUI/Controls/FluWindowResize.qml b/src/imports/FluentUI/Controls/FluWindowResize.qml deleted file mode 100644 index e2a0f85b..00000000 --- a/src/imports/FluentUI/Controls/FluWindowResize.qml +++ /dev/null @@ -1,144 +0,0 @@ -import QtQuick -import QtQuick.Controls -import QtQuick.Window -import FluentUI - -MouseArea { - - property int border: 4 - property var window: Window.window - property bool fixedSize: { - if(window == null) - return true - if(window.visibility === Window.Maximized || window.visibility === Window.FullScreen){ - return true - } - return (window.minimumWidth === window.maximumWidth && window.minimumHeight === window.maximumHeight) - } - - anchors.fill: parent - acceptedButtons: Qt.LeftButton - hoverEnabled: true - preventStealing: true - propagateComposedEvents: true - z: -65535 - - onPressed : - (mouse)=> { - if (fixedSize) { - return; - } - - let e = 0; - if (ptInRect(0,0,border,border, mouse.x, mouse.y)) { - e = Qt.TopEdge | Qt.LeftEdge; - window.startSystemResize(e); - return; - } - - if (ptInRect(border,0,window.width-border*2,border, mouse.x, mouse.y)) { - e = Qt.TopEdge; - window.startSystemResize(e); - return; - } - - if (ptInRect(window.width-border,0,border,border, mouse.x, mouse.y)) { - e = Qt.TopEdge | Qt.RightEdge; - window.startSystemResize(e); - return; - } - - if (ptInRect(window.width-border,border,border,window.height-border*2, mouse.x, mouse.y)) { - e = Qt.RightEdge; - window.startSystemResize(e); - return; - } - - if (ptInRect(window.width-border,window.height-border,border,border, mouse.x, mouse.y)) { - e = Qt.BottomEdge | Qt.RightEdge; - window.startSystemResize(e); - return; - } - - if (ptInRect(border,window.height-border,window.width-border*2,border, mouse.x, mouse.y)) { - e = Qt.BottomEdge; - window.startSystemResize(e); - return; - } - - if (ptInRect(0,window.height-border,border,border, mouse.x, mouse.y)) { - e = Qt.BottomEdge | Qt.LeftEdge; - window.startSystemResize(e); - return; - } - - if (ptInRect(0,border,border , window.height-border*2, mouse.x, mouse.y)) { - e = Qt.LeftEdge; - window.startSystemResize(e); - return; - } - } - - onPositionChanged: - (mouse)=> { - if (fixedSize) { - cursorShape = Qt.ArrowCursor; - return; - } - if (ptInRect(0,0,border,border, mouse.x, mouse.y)) { - cursorShape = Qt.SizeFDiagCursor; - return; - } - - if (ptInRect(border,0,window.width-border*2,border, mouse.x, mouse.y)) { - cursorShape = Qt.SizeVerCursor; - return; - } - - if (ptInRect(window.width-border,0,border,border, mouse.x, mouse.y)) { - cursorShape = Qt.SizeBDiagCursor; - return; - } - - if (ptInRect(window.width-border,border,border,window.height-border*2, mouse.x, mouse.y)) { - cursorShape = Qt.SizeHorCursor; - return; - } - - if (ptInRect(window.width-border,window.height-border,border,border, mouse.x, mouse.y)) { - cursorShape = Qt.SizeFDiagCursor; - return; - } - - if (ptInRect(border,window.height-border,window.width-border*2,border, mouse.x, mouse.y)) { - cursorShape = Qt.SizeVerCursor; - return; - } - - if (ptInRect(0,window.height-border,border,border, mouse.x, mouse.y)) { - cursorShape = Qt.SizeBDiagCursor; - return; - } - - if (ptInRect(0,border,border, window.height-border*2, mouse.x, mouse.y)) { - cursorShape = Qt.SizeHorCursor; - return; - } - - cursorShape = Qt.ArrowCursor; - } - - onExited: { - cursorShape = Qt.ArrowCursor; - } - - function ptInRect(rcx,rcy,rcwidth,rcheight, x, y) - { - if ((rcx <= x && x <= (rcx + rcwidth)) && - (rcy <= y && y <= (rcy + rcheight))) { - return true; - } - return false; - } - -}