From d8d95399cd5674287623b9ef35ad04a1583cb713 Mon Sep 17 00:00:00 2001 From: zhuzihcu Date: Fri, 24 Mar 2023 15:21:47 +0800 Subject: [PATCH] update --- example/T_MediaPlayer.qml | 32 ++++++++++++++++++++++++++++++++ example/example.pro | 2 +- example/page/AboutPage.qml | 2 +- example/page/MainPage.qml | 11 +++++++++++ example/qml.qrc | 1 + src/Fluent.cpp | 6 +----- src/FluentUI.pro | 2 +- src/controls/FluMediaPlayer.qml | 28 ++++++++++++++++++++++++++++ src/res.qrc | 1 + 9 files changed, 77 insertions(+), 8 deletions(-) create mode 100644 example/T_MediaPlayer.qml create mode 100644 src/controls/FluMediaPlayer.qml diff --git a/example/T_MediaPlayer.qml b/example/T_MediaPlayer.qml new file mode 100644 index 00000000..d9ef52c2 --- /dev/null +++ b/example/T_MediaPlayer.qml @@ -0,0 +1,32 @@ +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Window 2.15 +import QtGraphicalEffects 1.15 +import FluentUI 1.0 + +FluScrollablePage{ + + title:"ColorPicker" + + FluArea{ + width: parent.width + height: 280 + Layout.topMargin: 20 + paddings: 10 + ColumnLayout{ + anchors{ + verticalCenter: parent.verticalCenter + left:parent.left + } + + FluMediaPlayer{ + + } + + } + } + + +} + diff --git a/example/example.pro b/example/example.pro index bfd48012..e06f4a6e 100644 --- a/example/example.pro +++ b/example/example.pro @@ -1,4 +1,4 @@ -QT += quick concurrent network +QT += quick concurrent network multimedia CONFIG += c++11 DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT diff --git a/example/page/AboutPage.qml b/example/page/AboutPage.qml index 235300b1..9b23f2ee 100644 --- a/example/page/AboutPage.qml +++ b/example/page/AboutPage.qml @@ -35,7 +35,7 @@ FluWindow { fontStyle: FluText.Title } FluText{ - text:"v1.1.3" + text:"v1.1.4" fontStyle: FluText.Body Layout.alignment: Qt.AlignBottom } diff --git a/example/page/MainPage.qml b/example/page/MainPage.qml index f9c9c334..bd83d731 100644 --- a/example/page/MainPage.qml +++ b/example/page/MainPage.qml @@ -200,6 +200,17 @@ FluWindow { } } + FluPaneItemHeader{ + title:"Media" + } + + FluPaneItem{ + title:"MediaPlayer" + onTap:{ + nav_view.push("qrc:/T_MediaPlayer.qml") + } + } + } FluObject{ diff --git a/example/qml.qrc b/example/qml.qrc index 23f2ed6c..2f04bfcf 100644 --- a/example/qml.qrc +++ b/example/qml.qrc @@ -44,5 +44,6 @@ T_CalendarPicker.qml T_ColorPicker.qml T_Carousel.qml + T_MediaPlayer.qml diff --git a/src/Fluent.cpp b/src/Fluent.cpp index 4c8af0e4..97a366fe 100644 --- a/src/Fluent.cpp +++ b/src/Fluent.cpp @@ -32,26 +32,22 @@ void Fluent::registerTypes(const char *uri){ qmlRegisterType(uri,major,minor,"WindowHelper"); qmlRegisterType(uri,major,minor,"FluColorSet"); - qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluArea.qml"),uri,major,minor,"FluArea"); - qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluBadge.qml"),uri,major,minor,"FluBadge"); + qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluMediaPlayer.qml"),uri,major,minor,"FluMediaPlayer"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluContentPage.qml"),uri,major,minor,"FluContentPage"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluScrollablePage.qml"),uri,major,minor,"FluScrollablePage"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPaneItemHeader.qml"),uri,major,minor,"FluPaneItemHeader"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPaneItem.qml"),uri,major,minor,"FluPaneItem"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPaneItemSeparator.qml"),uri,major,minor,"FluPaneItemSeparator"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluNavigationView.qml"),uri,major,minor,"FluNavigationView"); - qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluCalendarPicker.qml"),uri,major,minor,"FluCalendarPicker"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluCalendarView.qml"),uri,major,minor,"FluCalendarView"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluDatePicker.qml"),uri,major,minor,"FluDatePicker"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTimePicker.qml"),uri,major,minor,"FluTimePicker"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluColorView.qml"),uri,major,minor,"FluColorView"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluColorPicker.qml"),uri,major,minor,"FluColorPicker"); - qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluCarousel.qml"),uri,major,minor,"FluCarousel"); - qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluAutoSuggestBox.qml"),uri,major,minor,"FluAutoSuggestBox"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluExpander.qml"),uri,major,minor,"FluExpander"); qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTreeView.qml"),uri,major,minor,"FluTreeView"); diff --git a/src/FluentUI.pro b/src/FluentUI.pro index ffe10367..109d6c8a 100644 --- a/src/FluentUI.pro +++ b/src/FluentUI.pro @@ -1,4 +1,4 @@ -QT += qml quick svg +QT += qml quick svg multimedia network CONFIG += plugin c++11 TEMPLATE = lib TARGET = FluentUI diff --git a/src/controls/FluMediaPlayer.qml b/src/controls/FluMediaPlayer.qml new file mode 100644 index 00000000..79fe4659 --- /dev/null +++ b/src/controls/FluMediaPlayer.qml @@ -0,0 +1,28 @@ +import QtQuick 2.15 +import QtMultimedia 5.9 + +Item { + width: 320 + height: 240 + + MediaPlayer { + id: mediaplayer + source: "http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4" + } + + + VideoOutput { + anchors.fill: parent + source: mediaplayer + } + + MouseArea { + anchors.fill: parent + onPressed: { + console.debug("------>") + mediaplayer.play() + } + } + +} + diff --git a/src/res.qrc b/src/res.qrc index 17ceafb7..b1b89fce 100644 --- a/src/res.qrc +++ b/src/res.qrc @@ -57,5 +57,6 @@ colorpicker/content/NumberBox.qml colorpicker/content/PanelBorder.qml colorpicker/content/SBPicker.qml + controls/FluMediaPlayer.qml