amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-30 07:03:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-03-24 20:44:38 +08:00
parent 6d809efd4b
commit d2d2e97d28
81 changed files with 215 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/macos.yml vendored
View File

@ -17,7 +17,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [macos-10.15,macos-11.0] os: [macos-10.15,macos-11.0]
qt_ver: [5.15.2] qt_ver: [6.4.3]
qt_arch: [clang_64] qt_arch: [clang_64]
env: env:
targetName: example targetName: example

7
.github/workflows/ubuntu.yml vendored
View File

@ -19,8 +19,13 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-18.04,ubuntu-20.04] os: [ubuntu-18.04,ubuntu-20.04]
qt_ver: [5.15.2] qt_ver: [6.4.3]
qt_arch: [gcc_64] qt_arch: [gcc_64]
exclude:
# Qt6.2.2 need GLIBC_2.28, ubuntu 18.04 have not.
- os: ubuntu-18.04
qt_ver: 6.4.3
qt_arch: gcc_64
env: env:
targetName: example targetName: example
steps: steps:

12
.github/workflows/windows-mingw.yml vendored
View File

@ -17,14 +17,10 @@ jobs:
strategy: strategy:
matrix: matrix:
include: include:
- qt_arch: win32_mingw81 - qt_arch: win64_mingw
qt_ver: 5.15.2 qt_ver: 6.4.3
qt_tools: "tools_mingw,8.1.0-1-202004170606,qt.tools.win32_mingw810" qt_tools: "tools_mingw,9.0.0-1-202111221309,qt.tools.win64_mingw900"
qt_tools_mingw_install: mingw810_32 qt_tools_mingw_install: mingw900_64
- qt_arch: win64_mingw81
qt_ver: 5.15.2
qt_tools: "tools_mingw,8.1.0-1-202004170606,qt.tools.win64_mingw810"
qt_tools_mingw_install: mingw810_64
env: env:
targetName: example.exe targetName: example.exe
fileName: example fileName: example

6
.github/workflows/windows.yml vendored
View File

@ -22,11 +22,7 @@ jobs:
matrix: matrix:
include: include:
# 5.15.2 参考 https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/windows_x86/desktop/qt5_5152/ # 5.15.2 参考 https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/windows_x86/desktop/qt5_5152/
- qt_ver: 5.15.2 - qt_ver: 6.4.3
qt_arch: win32_msvc2019
msvc_arch: x86
qt_arch_install: msvc2019
- qt_ver: 5.15.2
qt_arch: win64_msvc2019_64 qt_arch: win64_msvc2019_64
msvc_arch: x64 msvc_arch: x64
qt_arch_install: msvc2019_64 qt_arch_install: msvc2019_64

1
example/App.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
Window { Window {

1
example/T_Badge.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

1
example/T_Carousel.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

1
example/T_ColorPicker.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

1
example/T_Dialog.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

1
example/T_Expander.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

1
example/T_InfoBar.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

7
example/T_MediaPlayer.qml
View File

@ -2,7 +2,7 @@
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtGraphicalEffects 1.15 import Qt5Compat.GraphicalEffects
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{
@ -21,10 +21,7 @@ FluScrollablePage{
} }
FluMediaPlayer{ FluMediaPlayer{
source:{ source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"
console.debug("-------------->")
return "http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"
}
} }
} }

1
example/T_Menu.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

1
example/T_Progress.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

1
example/T_Rectangle.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

1
example/T_Slider.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

1
example/T_TextBox.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

1
example/T_Theme.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

1
example/T_ToggleSwitch.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

1
example/T_Tooltip.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0
FluScrollablePage{ FluScrollablePage{

2
example/example.pro
View File

@ -1,4 +1,4 @@
QT += quick concurrent network multimedia QT += quick quickcontrols2 concurrent network multimedia
CONFIG += c++11 CONFIG += c++11
DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT

2
example/main.cpp
View File

@ -3,6 +3,7 @@
#include <QQmlContext> #include <QQmlContext>
#include <QDir> #include <QDir>
#include <QQuickWindow> #include <QQuickWindow>
#include <QQuickStyle>
#include <QProcess> #include <QProcess>
#include "ChatController.h" #include "ChatController.h"
@ -19,6 +20,7 @@ int main(int argc, char *argv[])
QCoreApplication::setApplicationName("FluentUI"); QCoreApplication::setApplicationName("FluentUI");
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
// QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software); // QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
QQuickStyle::setStyle("Basic");
QGuiApplication app(argc, argv); QGuiApplication app(argc, argv);
QQmlApplicationEngine engine; QQmlApplicationEngine engine;

11
example/page/ChatPage.qml
View File

@ -1,9 +1,8 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
import Controller 1.0 import Controller
import QtQuick.Dialogs 1.3
FluWindow { FluWindow {

1
example/page/MainPage.qml
View File

@ -2,7 +2,6 @@
import QtQuick.Window 2.15 import QtQuick.Window 2.15
import QtQuick.Controls 2.15 import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtGraphicalEffects 1.15
import FluentUI 1.0 import FluentUI 1.0

2
src/FramelessView_win.cpp
View File

@ -4,6 +4,8 @@
#include <QScreen> #include <QScreen>
#include <QWindow> #include <QWindow>
#include <FluTheme.h> #include <FluTheme.h>
#pragma comment(lib, "User32.lib")
#include <windows.h>
class FramelessViewPrivate class FramelessViewPrivate
{ {

6
src/colorpicker/ColorPicker.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Controls 2.15 import QtQuick.Controls
import "content" import "content"
Rectangle { Rectangle {

2
src/colorpicker/content/Checkerboard.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15 import QtQuick
Grid { Grid {
id: root id: root
property int cellSide: 5 property int cellSide: 5

2
src/colorpicker/content/ColorSlider.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15 import QtQuick
Item { Item {
property int cursorHeight: 7 property int cursorHeight: 7

2
src/colorpicker/content/NumberBox.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15 import QtQuick
Row { Row {
property alias caption: captionBox.text property alias caption: captionBox.text

2
src/colorpicker/content/PanelBorder.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15 import QtQuick
Rectangle { Rectangle {
width : 40; height : 15; radius: 2 width : 40; height : 15; radius: 2

14
src/colorpicker/content/SBPicker.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15 import QtQuick
Item { Item {
id: root id: root
@ -50,20 +50,12 @@ Item {
y: r y: r
function handleMouse(mouse) { function handleMouse(mouse) {
if (mouse.buttons & Qt.LeftButton) { if (mouse.buttons & Qt.LeftButton) {
pickerCursor.x = Math.max(0,Math.min(mouse.x - r,width-2*r)); pickerCursor.x = Math.max(0,Math.min(mouse.x - r,width-2*r));
pickerCursor.y = Math.max(0,Math.min(mouse.y - r,height-2*r)); pickerCursor.y = Math.max(0,Math.min(mouse.y - r,height-2*r));
// pickerCursor.x = Math.max(-r,Math.min(mouse.x - r,width+r));
// pickerCursor.y = Math.max(-r,Math.min(mouse.y - r,height+r));
// pickerCursor.x = Math.max(0, Math.min(width, mouse.x) - 2 * r);
// pickerCursor.y = Math.max(0, Math.min(height, mouse.y) - 2 * r);
} }
} }
onPositionChanged: handleMouse(mouse) onPositionChanged:(mouse)=> handleMouse(mouse)
onPressed: handleMouse(mouse) onPressed:(mouse)=> handleMouse(mouse)
} }
} }

15
src/controls/FluAppBar.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Window 2.15 import QtQuick.Window
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import FluentUI 1.0 import FluentUI
Rectangle{ Rectangle{
@ -15,11 +15,10 @@ Rectangle{
} }
visible: FluTheme.isFrameless visible: FluTheme.isFrameless
height: visible ? 34 : 0 height: visible ? 34 : 0
width: { width: {
if(parent==null) if(root.parent)
return 200 return root.parent.width
return parent.width return 200
} }
z: 65535 z: 65535
clip: true clip: true

4
src/controls/FluArea.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick
import FluentUI 1.0 import FluentUI
Rectangle { Rectangle {
radius: 4 radius: 4

6
src/controls/FluAutoSuggestBox.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
TextField{ TextField{

2
src/controls/FluBadge.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15 import QtQuick
Rectangle{ Rectangle{

6
src/controls/FluButton.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
Button { Button {

10
src/controls/FluCalendarPicker.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Window 2.15 import QtQuick.Window
import FluentUI 1.0 import FluentUI
Rectangle { Rectangle {

6
src/controls/FluCalendarView.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
Item { Item {

6
src/controls/FluCarousel.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
Item { Item {

8
src/controls/FluCheckBox.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import FluentUI 1.0 import FluentUI
Button { Button {

10
src/controls/FluColorPicker.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Window 2.15 import QtQuick.Window
import FluentUI 1.0 import FluentUI
Button{ Button{

2
src/controls/FluColorView.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15 import QtQuick
import "../colorpicker" import "../colorpicker"
Item { Item {

4
src/controls/FluComboBox.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick
import FluentUI 1.0 import FluentUI
Item { Item {

8
src/controls/FluContentDialog.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtQuick.Window 2.15 import QtQuick.Window
Popup { Popup {
id: popup id: popup

10
src/controls/FluContentPage.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Window 2.15 import QtQuick.Window
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
Item { Item {

10
src/controls/FluDatePicker.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Window 2.15 import QtQuick.Window
import FluentUI 1.0 import FluentUI
Rectangle { Rectangle {

4
src/controls/FluDivider.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick
import FluentUI 1.0 import FluentUI
Rectangle { Rectangle {

8
src/controls/FluDropDownButton.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtQuick.Window 2.15 import QtQuick.Window
import FluentUI 1.0 import FluentUI
Button { Button {

4
src/controls/FluExpander.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick
import FluentUI 1.0 import FluentUI
Item { Item {

6
src/controls/FluFilledButton.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
Button { Button {
id: control id: control

6
src/controls/FluFocusRectangle.qml
View File

@ -1,12 +1,12 @@
import QtQuick 2.15 import QtQuick
import FluentUI 1.0 import FluentUI
Item { Item {
id:root id:root
anchors.fill: parent anchors.fill: parent
anchors.margins: -3 anchors.margins: -3
property var radius: 4 property int radius: 4
Rectangle{ Rectangle{
width: root.width width: root.width

2
src/controls/FluIcon.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15 import QtQuick
Text { Text {

6
src/controls/FluIconButton.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
Button { Button {

5
src/controls/FluInfoBar.qml
View File

@ -1,5 +1,6 @@
import QtQuick 2.15 import QtQuick
import FluentUI 1.0 import QtQuick.Controls
import FluentUI
FluObject { FluObject {
id:infoBar id:infoBar

30
src/controls/FluMediaPlayer.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtMultimedia 5.15 import QtMultimedia
import QtGraphicalEffects 1.15 import Qt5Compat.GraphicalEffects
import FluentUI 1.0 import FluentUI
Item { Item {
id:control id:control
@ -20,30 +20,30 @@ Item {
MediaPlayer { MediaPlayer {
id: mediaplayer id: mediaplayer
property bool autoSeek:true property bool autoSeek:true
autoPlay: true
source: control.source source: control.source
onError: { videoOutput: video_output
console.debug(error) onErrorOccurred: {
} }
onPositionChanged: { onPositionChanged: {
if(autoSeek){ if(autoSeek){
slider.seek(mediaplayer.position*slider.maxValue/mediaplayer.duration) slider.seek(mediaplayer.position*slider.maxValue/mediaplayer.duration)
} }
} }
onStatusChanged: { onMediaStatusChanged: {
if(status===6){ if(mediaStatus===6){
slider.maxValue = mediaplayer.duration slider.maxValue = mediaplayer.duration
} }
} }
} }
onSourceChanged: { onSourceChanged: {
slider.seek(0) slider.seek(0)
mediaplayer.play()
} }
VideoOutput { VideoOutput {
id:video_output
anchors.fill: parent anchors.fill: parent
source: mediaplayer
} }
Item{ Item{
@ -78,7 +78,7 @@ Item {
mediaplayer.autoSeek = false mediaplayer.autoSeek = false
} }
onReleased: { onReleased: {
mediaplayer.seek(value*mediaplayer.duration/slider.maxValue) mediaplayer.position = value*mediaplayer.duration/slider.maxValue
mediaplayer.autoSeek = true mediaplayer.autoSeek = true
} }
} }
@ -106,14 +106,14 @@ Item {
FluIconButton{ FluIconButton{
iconSize: 15 iconSize: 15
iconSource: mediaplayer.playbackState === Audio.PlayingState ? FluentIcons.Pause : FluentIcons.Play iconSource: mediaplayer.playbackState === MediaPlayer.PlayingState ? FluentIcons.Pause : FluentIcons.Play
anchors{ anchors{
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
bottom: parent.bottom bottom: parent.bottom
bottomMargin: 10 bottomMargin: 10
} }
onClicked: { onClicked: {
if(mediaplayer.playbackState === Audio.PlayingState){ if(mediaplayer.playbackState === MediaPlayer.PlayingState){
mediaplayer.pause() mediaplayer.pause()
}else{ }else{
mediaplayer.play() mediaplayer.play()

8
src/controls/FluMenu.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtGraphicalEffects 1.15 import Qt5Compat.GraphicalEffects
Menu { Menu {
id: popup id: popup

4
src/controls/FluMenuItem.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
Item { Item {

6
src/controls/FluMultiLineTextBox.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
TextArea{ TextArea{

11
src/controls/FluNavigationView.qml
View File

@ -1,9 +1,8 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Window 2.15 import QtQuick.Window
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import FluentUI
import FluentUI 1.0
Item { Item {

4
src/controls/FluObject.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls
QtObject { QtObject {
id:flu_object; id:flu_object;
default property list<QtObject> children; default property list<QtObject> children;
} }

3
src/controls/FluPaneItem.qml
View File

@ -1,4 +1,5 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls
QtObject { QtObject {
property string title property string title

3
src/controls/FluPaneItemHeader.qml
View File

@ -1,4 +1,5 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls
QtObject { QtObject {
property string title property string title

3
src/controls/FluPaneItemSeparator.qml
View File

@ -1,4 +1,5 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls
QtObject { QtObject {

8
src/controls/FluProgressBar.qml
View File

@ -1,12 +1,12 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
FluRectangle { FluRectangle {
id: control id: control
width: 150 width: 150
height: 5 height: 5
radius: [3,3,3,3] radius: [2.5,2.5,2.5,2.5]
clip: true clip: true
color: FluTheme.isDark ? Qt.rgba(41/255,41/255,41/255,1) : Qt.rgba(214/255,214/255,214/255,1) color: FluTheme.isDark ? Qt.rgba(41/255,41/255,41/255,1) : Qt.rgba(214/255,214/255,214/255,1)
property real progress: 0.5 property real progress: 0.5
@ -24,7 +24,7 @@ FluRectangle {
Rectangle{ Rectangle{
id:bar id:bar
radius: 3 radius: 2.5
width: control.width*progress width: control.width*progress
height: control.height height: control.height
color:FluTheme.isDark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark color:FluTheme.isDark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark

5
src/controls/FluProgressRing.qml
View File

@ -1,6 +1,5 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
Rectangle { Rectangle {
id: control id: control

8
src/controls/FluRadioButton.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import FluentUI 1.0 import FluentUI
Button { Button {

6
src/controls/FluRectangle.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtGraphicalEffects 1.15 import Qt5Compat.GraphicalEffects
Item{ Item{
id:root id:root

6
src/controls/FluScrollBar.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
ScrollBar { ScrollBar {

10
src/controls/FluScrollablePage.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Window 2.15 import QtQuick.Window
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
Item { Item {

2
src/controls/FluShadow.qml
View File

@ -1,4 +1,4 @@
import QtQuick 2.15 import QtQuick
Item { Item {
id:root id:root

22
src/controls/FluSlider.qml
View File

@ -1,12 +1,10 @@
import QtQuick 2.12 import QtQuick
import QtQuick.Controls 2.12 import QtQuick.Controls
import QtGraphicalEffects 1.15
Item{ Item{
id:root id:root
property int lineSize: 4
property int size: 180 property int size: 180
property int dotSize: 24 property int dotSize: 24
@ -38,19 +36,18 @@ Item{
seek(0) seek(0)
} }
FluRectangle { Rectangle {
id: control id: control
width: isHorizontal ? size : root.lineSize width: isHorizontal ? size : 4
height: isHorizontal ? root.lineSize : size height: isHorizontal ? 4 : size
radius: [3,3,3,3] radius: 2
clip: true
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color:FluTheme.isDark ? Qt.rgba(162/255,162/255,162/255,1) : Qt.rgba(138/255,138/255,138/255,1) color:FluTheme.isDark ? Qt.rgba(162/255,162/255,162/255,1) : Qt.rgba(138/255,138/255,138/255,1)
Rectangle{ Rectangle{
id:rect id:rect
radius: 3 radius: 2.5
width: isHorizontal ? control.width*(value/maxValue) : control.width width: isHorizontal ? control.width*(value/maxValue) : 5
height: isHorizontal ? control.height : control.height*(value/maxValue) height: isHorizontal ? 5 : control.height*(value/maxValue)
color:FluTheme.isDark ? FluTheme.primaryColor.lighter :FluTheme.primaryColor.dark color:FluTheme.isDark ? FluTheme.primaryColor.lighter :FluTheme.primaryColor.dark
} }
} }
@ -112,7 +109,6 @@ Item{
} }
function seek(position){ function seek(position){
console.debug(position)
if(isHorizontal){ if(isHorizontal){
dot.x =position/maxValue*control.width - dotSize/2 dot.x =position/maxValue*control.width - dotSize/2
root.value = Qt.binding(function(){ root.value = Qt.binding(function(){

4
src/controls/FluText.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick
import FluentUI 1.0 import FluentUI
Text { Text {

6
src/controls/FluTextBox.qml
View File

@ -1,6 +1,6 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
TextField{ TextField{

4
src/controls/FluTextBoxBackground.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick
import QtGraphicalEffects 1.15 import Qt5Compat.GraphicalEffects
Rectangle{ Rectangle{
id:content id:content

10
src/controls/FluTimePicker.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Window 2.15 import QtQuick.Window
import FluentUI 1.0 import FluentUI
Rectangle { Rectangle {

8
src/controls/FluToggleSwitch.qml
View File

@ -1,7 +1,7 @@
import QtQuick 2.0 import QtQuick
import QtQuick.Controls 2.0 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
import QtQuick.Layouts 1.15 import QtQuick.Layouts
Button { Button {

7
src/controls/FluTooltip.qml
View File

@ -1,7 +1,6 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Controls 2.15 import QtQuick.Controls
import QtGraphicalEffects 1.15 import FluentUI
import FluentUI 1.0
ToolTip { ToolTip {
id:tool_tip id:tool_tip

11
src/controls/FluTreeView.qml
View File

@ -1,9 +1,8 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Window 2.15 import QtQuick.Window
import QtQuick.Layouts 1.15 import QtQuick.Layouts
import QtQuick.Controls 2.15 import QtQuick.Controls
import FluentUI 1.0 import FluentUI
import QtGraphicalEffects 1.15
Item { Item {
id:root id:root

18
src/controls/FluWindow.qml
View File

@ -1,8 +1,8 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Window 2.15 import QtQuick.Controls
import QtQuick.Layouts 1.15 import QtQuick.Window
import FluentUI 1.0 import QtQuick.Layouts
import QtGraphicalEffects 1.15 import FluentUI
Item { Item {
@ -127,19 +127,19 @@ Item {
root: root root: root
} }
function showSuccess(text,duration,moremsg){ function showSuccess(text,duration=1000,moremsg){
infoBar.showSuccess(text,duration,moremsg); infoBar.showSuccess(text,duration,moremsg);
} }
function showInfo(text,duration,moremsg){ function showInfo(text,duration=1000,moremsg){
infoBar.showInfo(text,duration,moremsg); infoBar.showInfo(text,duration,moremsg);
} }
function showWarning(text,duration,moremsg){ function showWarning(text,duration=1000,moremsg){
infoBar.showWarning(text,duration,moremsg); infoBar.showWarning(text,duration,moremsg);
} }
function showError(text,duration,moremsg){ function showError(text,duration=1000,moremsg){
infoBar.showError(text,duration,moremsg); infoBar.showError(text,duration,moremsg);
} }

4
src/controls/FluWindowResize.qml
View File

@ -1,5 +1,5 @@
import QtQuick 2.15 import QtQuick
import QtQuick.Window 2.15 import QtQuick.Window
MouseArea { MouseArea {

7
src/controls/TFpsMonitor.qml
View File

@ -1,8 +1,7 @@
import QtQuick 2.15 import QtQuick
import FluentUI 1.0 import QtQuick.Controls
import FluentUI
/*! TODO */
Item { Item {
id: toou2d_fps id: toou2d_fps
width: contentItemLoader.width + 5; width: contentItemLoader.width + 5;