update

.github/workflows/macos.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-10.15,macos-11.0]
+        os: [macos-11.0]
         qt_ver: [5.15.2]
         qt_arch: [clang_64]
     env:

.github/workflows/ubuntu.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04,ubuntu-20.04]
+        os: [ubuntu-20.04]
         qt_ver: [5.15.2]
         qt_arch: [gcc_64]
     env:

.github/workflows/windows-mingw.yml

@@ -1,87 +0,0 @@
-name: Windows MinGW
-on: 
-  push:
-    paths:
-      - '*.pro'
-      - 'src/**'
-      - '.github/workflows/windows-mingw.yml'
-  pull_request:
-    paths:
-      - '*.pro'
-      - 'src/**'
-      - '.github/workflows/windows-mingw.yml' 
-jobs:
-  build:
-    name: Build
-    runs-on: windows-2019
-    strategy:
-      matrix:
-        include:
-          - qt_arch: win32_mingw81
-            qt_ver: 5.15.2
-            qt_tools: "tools_mingw,8.1.0-1-202004170606,qt.tools.win32_mingw810"
-            qt_tools_mingw_install: mingw810_32
-          - 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:
-      targetName: example.exe
-      fileName: example
-    steps:
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v2
-        with:
-          version: ${{ matrix.qt_ver }}
-          aqtversion: '==2.0.5'
-          arch: ${{ matrix.qt_arch }}
-          tools: ${{ matrix.qt_tools }}
-          cached: 'false'
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
-      - name: Qt 5 environment configuration
-        if: ${{ startsWith( matrix.qt_ver, 5 ) }}
-        shell: pwsh
-        run: |
-          Write-Output "${{ env.Qt5_DIR }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          Write-Output "${{ env.Qt5_DIR }}/../../Tools/${{ matrix.qt_tools_mingw_install }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      - name: Qt 6 environment configuration
-        if: ${{ startsWith( matrix.qt_ver, 6 ) }}
-        shell: pwsh
-        run: |
-          Write-Output "${{ env.Qt6_DIR }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          Write-Output "${{ env.Qt6_DIR }}/../../Tools/${{ matrix.qt_tools_mingw_install }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      - name: where is qmake & where is mingw32-make
-        shell: pwsh
-        run: |
-          Get-Command -Name 'qmake' | Format-List
-          Get-Command -Name 'mingw32-make' | Format-List
-      - name: mingw-build
-        id: build
-        shell: cmd
-        run: |
-          qmake
-          mingw32-make
-      - name: package
-        id: package      
-        env:
-          archiveName: ${{ env.fileName }}-${{ matrix.qt_ver }}-${{ matrix.qt_arch }}
-        shell: pwsh
-        run: |
-          & scripts\windows-mingw-publish.ps1 ${env:archiveName} ${env:targetName}
-           $name = ${env:archiveName}
-           echo "::set-output name=packageName::$name"       
-      - uses: actions/upload-artifact@v2
-        with:
-          name: ${{ steps.package.outputs.packageName }}
-          path: ${{ steps.package.outputs.packageName }}
-      - name: uploadRelease
-        if: startsWith(github.event.ref, 'refs/tags/')
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.package.outputs.packageName }}.zip
-          asset_name: ${{ steps.package.outputs.packageName }}.zip
-          tag: ${{ github.ref }}
-          overwrite: true 

.github/workflows/windows.yml

@@ -67,7 +67,7 @@ jobs:
       - name: package
         id: package      
         env:
-          archiveName: ${{ env.fileName }}-${{ matrix.qt_ver }}-${{ matrix.qt_arch }}
+          archiveName: ${{ env.fileName }}-${{ matrix.qt_arch }}-${{ matrix.qt_ver }}
           msvcArch: ${{ matrix.msvc_arch }}          
         shell: pwsh
         run: |

README.md

@@ -91,4 +91,7 @@
 
 ## 多窗口路由跳转
 
-![](doc/preview/multiwindow.png)
+![](doc/preview/multiwindow.png)
+
+### ⚡ Visitor count
+![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)

example/App.qml

@@ -10,7 +10,8 @@ Window {
     color: "#00000000"
     Component.onCompleted: {
         FluApp.init(app,properties)
-        FluTheme.isDark = false
+        FluTheme.frameless = ("windows" === Qt.platform.os)
+        FluTheme.dark = false
         FluApp.routes = {
             "/":"qrc:/page/MainPage.qml",
             "/about":"qrc:/page/AboutPage.qml",

example/Info.plist

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+	<key>CFBundleExecutable</key>
+	<string>example</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.zhuzichu.example</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.13</string>
+	<key>NOTE</key>
+	<string>This file was generated by Qt/QMake.</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSSupportsAutomaticGraphicsSwitching</key>
+	<true/>
+</dict>
+</plist>

example/T_Awesome.qml

@@ -8,6 +8,10 @@ FluContentPage {
 
     title:"Awesome"
 
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+
     FluTextBox{
         id:text_box
         placeholderText: "请输入关键字"

example/T_Badge.qml

@@ -9,6 +9,9 @@ FluScrollablePage{
 
     title:"Badge"
 
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluArea{
         width: parent.width

example/T_Buttons.qml

@@ -9,11 +9,47 @@ FluScrollablePage{
 
     spacing: 20
 
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+
     FluText{
         Layout.topMargin: 20
         text:"支持Tab键切换焦点，空格键执行点击事件"
     }
 
+    FluArea{
+        width: parent.width
+        height: 68
+        paddings: 10
+
+        FluTextButton{
+            disabled:text_button_switch.selected
+            text:"Text Button"
+            onClicked: {
+                console.debug(Screen.devicePixelRatio)
+                showInfo("点击Text Button")
+            }
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:text_button_switch
+                Layout.alignment: Qt.AlignRight
+                text:"Disabled"
+            }
+        }
+    }
+
     FluArea{
         width: parent.width
         height: 68

example/T_CalendarPicker.qml

@@ -0,0 +1,38 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import FluentUI 1.0
+
+FluScrollablePage{
+
+    title:"CalendarPicker"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 350
+        paddings: 10
+        FluCalendarView{
+        }
+    }
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 80
+        paddings: 10
+        ColumnLayout{
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluCalendarPicker{
+            }
+        }
+    }
+
+}

example/T_Carousel.qml

@@ -8,6 +8,9 @@ import FluentUI 1.0
 FluScrollablePage{
 
     title:"Carousel"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluArea{
         width: parent.width

example/T_CheckBox.qml

@@ -0,0 +1,19 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import QtQuick.Controls 2.15
+import FluentUI 1.0
+
+FluScrollablePage{
+
+    title:"CheckBox"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+
+    FluCheckBox{
+        Layout.topMargin: 20
+        Layout.leftMargin: 10
+        Layout.bottomMargin: 20
+    }
+}

example/T_ColorPicker.qml

@@ -0,0 +1,60 @@
+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"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+
+    FluArea{
+        width: parent.width
+        height: 280
+        Layout.topMargin: 20
+        paddings: 10
+        ColumnLayout{
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left:parent.left
+            }
+            FluText{
+                text:"此颜色组件是Github上的开源项目"
+            }
+            FluTextButton{
+                leftPadding: 0
+                rightPadding: 0
+                text:"https://github.com/rshest/qml-colorpicker"
+                onClicked: {
+                    Qt.openUrlExternally(text)
+                }
+            }
+            FluColorView{
+
+            }
+        }
+    }
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 60
+        paddings: 10
+
+        RowLayout{
+            FluText{
+                text:"点击选择颜色->"
+                Layout.alignment: Qt.AlignVCenter
+            }
+            FluColorPicker{
+
+            }
+        }
+    }
+
+}
+

example/T_DatePicker.qml

@@ -7,7 +7,9 @@ import FluentUI 1.0
 FluScrollablePage{
 
     title:"TimePicker"
-
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluArea{
         width: parent.width

example/T_Dialog.qml

@@ -6,7 +6,11 @@ import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{
+
     title:"Dialog"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluContentDialog{
         id:dialog

example/T_Expander.qml

@@ -6,7 +6,11 @@ import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{
+
     title:"Expander"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluExpander{
         headerText:"打开一个单选框"

example/T_Home.qml

@@ -0,0 +1,295 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import QtQuick.Controls 2.15
+import FluentUI 1.0
+
+FluScrollablePage{
+
+
+    leftPadding:10
+    rightPadding:0
+    bottomPadding:20
+
+    ListModel{
+        id:model_header
+        ListElement{
+            icon:"qrc:/res/image/ic_home_github.png"
+            title:"FluentUI GitHub"
+            desc:"The latest FluentUI controls and styles for your applications."
+            url:"https://github.com/zhuzichu520/FluentUI"
+        }
+
+    }
+
+    Item{
+        Layout.fillWidth: true
+        height: 320
+        Image {
+            fillMode:Image.PreserveAspectCrop
+            anchors.fill: parent
+            verticalAlignment: Qt.AlignTop
+            source: "qrc:/res/image/bg_home_header.png"
+        }
+        Rectangle{
+            anchors.fill: parent
+            gradient: Gradient{
+                GradientStop { position: 0.8; color: FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(1,1,1,0) }
+                GradientStop { position: 1.0; color: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1) }
+            }
+        }
+        FluText{
+            text:"FluentUI Gallery"
+            fontStyle: FluText.TitleLarge
+            anchors{
+                top: parent.top
+                left: parent.left
+                topMargin: 20
+                leftMargin: 20
+            }
+        }
+
+        ListView{
+            anchors{
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+            }
+            orientation: ListView.Horizontal
+            boundsBehavior: ListView.StopAtBounds
+            height: 240
+            model: model_header
+            header: Item{height: 10;width: 10}
+            footer: Item{height: 10;width: 10}
+            ScrollBar.horizontal: FluScrollBar{
+                id: scrollbar_header
+            }
+            clip: false
+            delegate:Item{
+                width: 220
+                height: 240
+                FluArea{
+                    radius: 8
+                    width: 200
+                    height: 220
+                    anchors.centerIn: parent
+                    Rectangle{
+                        anchors.fill: parent
+                        radius: 8
+                        color:{
+                            if(FluTheme.dark){
+                                if(item_mouse.containsMouse){
+                                    return Qt.rgba(1,1,1,0.03)
+                                }
+                                return Qt.rgba(0,0,0,0)
+                            }else{
+                                if(item_mouse.containsMouse){
+                                    return Qt.rgba(0,0,0,0.03)
+                                }
+                                return Qt.rgba(0,0,0,0)
+                            }
+                        }
+                    }
+
+                    ColumnLayout{
+                        Image {
+                            Layout.topMargin: 20
+                            Layout.leftMargin: 20
+                            Layout.preferredWidth: 50
+                            Layout.preferredHeight: 50
+                            source: model.icon
+                        }
+                        FluText{
+                            text: model.title
+                            fontStyle: FluText.BodyLarge
+                            Layout.topMargin: 20
+                            Layout.leftMargin: 20
+                        }
+                        FluText{
+                            text: model.desc
+                            Layout.topMargin: 5
+                            Layout.preferredWidth: 160
+                            Layout.leftMargin: 20
+                            color: FluColors.Grey100
+                            font.pixelSize: 12
+                            wrapMode: Text.WrapAnywhere
+                        }
+                    }
+                    FluIcon{
+                        iconSource: FluentIcons.OpenInNewWindow
+                        iconSize: 15
+                        anchors{
+                            bottom: parent.bottom
+                            right: parent.right
+                            rightMargin: 10
+                            bottomMargin: 10
+                        }
+                    }
+                    MouseArea{
+                        id:item_mouse
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        onWheel: {
+                            if (wheel.angleDelta.y > 0) scrollbar_header.decrease()
+                            else scrollbar_header.increase()
+                        }
+                        onClicked: {
+                            Qt.openUrlExternally(model.url)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    ListModel{
+        id:model_added
+        ListElement{
+            title:"TabView"
+            icon:"qrc:/res/image/control/TabView.png"
+            desc:"A control that displays a collection of tabs thatcan be used to display several documents."
+        }
+        ListElement{
+            title:"MediaPlayer"
+            icon:"qrc:/res/image/control/MediaPlayerElement.png"
+            desc:"A control to display video and image content"
+        }
+    }
+
+    ListModel{
+        id:model_update
+        ListElement{
+            title:"Buttons"
+            icon:"qrc:/res/image/control/Button.png"
+             desc:"A control that responds to user input and raisesa Click event."
+        }
+        ListElement{
+            title:"InfoBar"
+            icon:"qrc:/res/image/control/InfoBar.png"
+             desc:"An inline message to display app-wide statuschange information."
+        }
+        ListElement{
+            title:"Slider"
+            icon:"qrc:/res/image/control/Slider.png"
+             desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack."
+        }
+        ListElement{
+            title:"CheckBox"
+            icon:"qrc:/res/image/control/Checkbox.png"
+             desc:"A control that a user can select or clear."
+        }
+    }
+
+    Component{
+        id:com_item
+        Item{
+            width: 320
+            height: 120
+            FluArea{
+                radius: 8
+                width: 300
+                height: 100
+                anchors.centerIn: parent
+                Rectangle{
+                    anchors.fill: parent
+                    radius: 8
+                    color:{
+                        if(FluTheme.dark){
+                            if(item_mouse.containsMouse){
+                                return Qt.rgba(1,1,1,0.03)
+                            }
+                            return Qt.rgba(0,0,0,0)
+                        }else{
+                            if(item_mouse.containsMouse){
+                                return Qt.rgba(0,0,0,0.03)
+                            }
+                            return Qt.rgba(0,0,0,0)
+                        }
+                    }
+                }
+                Image{
+                    id:item_icon
+                    height: 40
+                    width: 40
+                    source: model.icon
+                    anchors{
+                        left: parent.left
+                        leftMargin: 20
+                        verticalCenter: parent.verticalCenter
+                    }
+                }
+
+                FluText{
+                    id:item_title
+                    text:model.title
+                    fontStyle: FluText.Subtitle
+                    anchors{
+                        left: item_icon.right
+                        leftMargin: 20
+                        top: item_icon.top
+                    }
+                }
+
+                FluText{
+                    id:item_desc
+                    text:model.desc
+                    color:FluColors.Grey100
+                    wrapMode: Text.WrapAnywhere
+                    elide: Text.ElideRight
+                    maximumLineCount: 2
+                    anchors{
+                        left: item_title.left
+                        right: parent.right
+                        rightMargin: 20
+                        top: item_title.bottom
+                        topMargin: 5
+                    }
+                }
+
+                MouseArea{
+                    id:item_mouse
+                    anchors.fill: parent
+                    hoverEnabled: true
+                    onClicked: {
+                        rootwindow.startPageByTitle(model.title)
+                    }
+                }
+            }
+        }
+    }
+
+    FluText{
+        text: "Recently added samples"
+        fontStyle: FluText.TitleLarge
+        Layout.topMargin: 20
+        Layout.leftMargin: 20
+    }
+
+    GridView{
+        Layout.fillWidth: true
+        implicitHeight: contentHeight
+        cellHeight: 120
+        cellWidth: 320
+        boundsBehavior: GridView.StopAtBounds
+        model:model_added
+        delegate: com_item
+    }
+
+    FluText{
+        text: "Recently updated samples"
+        fontStyle: FluText.TitleLarge
+        Layout.topMargin: 20
+        Layout.leftMargin: 20
+    }
+
+    GridView{
+        Layout.fillWidth: true
+        implicitHeight: contentHeight
+        cellHeight: 120
+        cellWidth: 320
+        boundsBehavior: GridView.StopAtBounds
+        model: model_update
+        delegate: com_item
+    }
+
+}

example/T_InfoBar.qml

@@ -6,7 +6,11 @@ import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{
+
     title:"InfoBar"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluButton{
         text:"Info"

example/T_MediaPlayer.qml

@@ -0,0 +1,46 @@
+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:"MediaPlayer"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+
+    onVisibleChanged: {
+        if(visible){
+            player.play()
+        }else{
+            player.pause()
+        }
+    }
+
+    FluArea{
+        width: parent.width
+        height: 320
+        Layout.topMargin: 20
+        paddings: 10
+        ColumnLayout{
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left:parent.left
+            }
+
+            FluMediaPlayer{
+                id:player
+//                source:"http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4"
+                source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"
+//                source:"http://video.chinanews.com/flv/2019/04/23/400/111773_web.mp4"
+            }
+
+        }
+    }
+
+
+}
+

example/T_Menu.qml

@@ -8,11 +8,13 @@ import FluentUI 1.0
 FluScrollablePage{
 
     title:"Menu"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluButton{
         text:"左击菜单"
         Layout.topMargin: 20
-        Layout.leftMargin: 15
         onClicked:{
             menu.popup()
         }
@@ -22,7 +24,6 @@ FluScrollablePage{
     FluButton{
         text:"右击菜单"
         Layout.topMargin: 20
-        Layout.leftMargin: 15
         onClicked: {
             showSuccess("请按鼠标右击")
         }

example/T_MultiWindow.qml

@@ -7,6 +7,9 @@ import FluentUI 1.0
 FluScrollablePage{
 
     title:"MultiWindow"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     property string password: ""
 

example/T_Progress.qml

@@ -6,7 +6,11 @@ import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{
+
     title:"Progress"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluProgressBar{
         Layout.topMargin: 20

example/T_Rectangle.qml

@@ -6,7 +6,11 @@ import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{
+
     title:"Rectangle"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     RowLayout{
         Layout.topMargin: 20

example/T_Slider.qml

@@ -2,22 +2,25 @@
 import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
 import FluentUI 1.0
 
 FluScrollablePage{
 
     title:"Slider"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluSlider{
         Layout.topMargin: 20
-        Layout.leftMargin: 15
         value: 50
+        Layout.leftMargin: 10
     }
     FluSlider{
         orientation:FluSlider.Vertical
         Layout.topMargin: 20
-        Layout.leftMargin: 15
+        Layout.leftMargin: 10
+        Layout.bottomMargin: 20
         value: 50
     }
 }

example/T_TabView.qml

@@ -0,0 +1,44 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import FluentUI 1.0
+
+FluScrollablePage{
+
+    title:"TabView"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+
+    Component{
+        id:com_page
+        Rectangle{
+            anchors.fill: parent
+            color: argument
+        }
+    }
+
+    Component.onCompleted: {
+        var colors = [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]
+        for(var i =0;i<colors.length;i++){
+            tab_view.appendTab("","Document "+i,com_page,colors[i].dark)
+        }
+    }
+
+    FluArea{
+        width: parent.width
+        Layout.topMargin: 20
+        height: 400
+        paddings: 10
+
+
+        FluTabView{
+            id:tab_view
+        }
+
+
+    }
+
+
+}

example/T_TextBox.qml

@@ -8,6 +8,9 @@ import FluentUI 1.0
 FluScrollablePage{
 
     title:"TextBox"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluTextBox{
         Layout.topMargin: 20

example/T_Theme.qml

@@ -8,22 +8,25 @@ import FluentUI 1.0
 FluScrollablePage{
 
     title:"Theme"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     RowLayout{
         Layout.topMargin: 20
         Repeater{
             model: [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]
-            delegate:  Rectangle{
+            delegate:  FluRectangle{
                 width: 42
                 height: 42
-                radius: 4
+                radius: [4,4,4,4]
                 color: mouse_item.containsMouse ? Qt.lighter(modelData.normal,1.1) : modelData.normal
                 FluIcon {
                     anchors.centerIn: parent
                     iconSource: FluentIcons.AcceptMedium
                     iconSize: 15
                     visible: modelData === FluTheme.primaryColor
-                    color: FluTheme.isDark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
+                    color: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
                 }
                 MouseArea{
                     id:mouse_item
@@ -41,19 +44,9 @@ FluScrollablePage{
         Layout.topMargin: 20
     }
     FluToggleSwitch{
-        selected: FluTheme.isDark
+        selected: FluTheme.dark
         clickFunc:function(){
-            FluTheme.isDark = !FluTheme.isDark
-        }
-    }
-    FluText{
-        text:"无边框"
-        Layout.topMargin: 20
-    }
-    FluToggleSwitch{
-        selected: FluTheme.isFrameless
-        clickFunc:function(){
-            FluTheme.isFrameless = !FluTheme.isFrameless
+            FluTheme.dark = !FluTheme.dark
         }
     }
     FluText{
@@ -61,9 +54,9 @@ FluScrollablePage{
         Layout.topMargin: 20
     }
     FluToggleSwitch{
-        selected: FluTheme.isNativeText
+        selected: FluTheme.nativeText
         clickFunc:function(){
-            FluTheme.isNativeText = !FluTheme.isNativeText
+            FluTheme.nativeText = !FluTheme.nativeText
         }
     }
 }

example/T_TimePicker.qml

@@ -7,7 +7,9 @@ import FluentUI 1.0
 FluScrollablePage{
 
     title:"TimePicker"
-
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluArea{
         width: parent.width

example/T_ToggleSwitch.qml

@@ -8,6 +8,9 @@ import FluentUI 1.0
 FluScrollablePage{
 
     title:"ToggleSwitch"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluToggleSwitch{
         Layout.topMargin: 20

example/T_Tooltip.qml

@@ -8,6 +8,9 @@ import FluentUI 1.0
 FluScrollablePage{
 
     title:"Tooltip"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     FluText{
         Layout.topMargin: 20

example/T_TreeView.qml

@@ -7,6 +7,9 @@ import FluentUI 1.0
 FluContentPage {
 
     title:"TreeView"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
 
     function randomName() {
         var names = ["张三", "李四", "王五", "赵六", "钱七", "孙八", "周九", "吴十"]

example/T_Typography.qml

@@ -7,6 +7,13 @@ FluContentPage {
 
     title: "Typography"
     property int textSize: 13
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+
+    Component.onCompleted: {
+        slider.seek(31)
+    }
 
     ScrollView{
         clip: true
@@ -68,17 +75,17 @@ FluContentPage {
 
 
     FluSlider{
+        id:slider
         orientation:FluSlider.Vertical
         anchors{
             right: parent.right
-            rightMargin: 30
+            rightMargin: 45
             top: parent.top
             topMargin: 30
         }
         onValueChanged:{
             textSize = value/100*16+8
         }
-        value: 31
     }
 
 }

example/example.pro

@@ -1,8 +1,10 @@
-QT += quick concurrent network
+QT += quick concurrent network multimedia
 CONFIG += c++11
-
 DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT
 
+HEADERS += \
+    ChatController.h
+
 SOURCES += \
         ChatController.cpp \
         main.cpp
@@ -11,15 +13,9 @@ RESOURCES += qml.qrc
 
 RC_ICONS = favicon.ico
 
-#qnx: target.path = /tmp/$${TARGET}/bin
-#else: unix:!android: target.path = /opt/$${TARGET}/bin
-#!isEmpty(target.path): INSTALLS += target
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
 QML_DESIGNER_IMPORT_PATH =
+
 CONFIG(debug,debug|release) {
     DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../bin/debug)
 } else {
@@ -27,7 +23,6 @@ CONFIG(debug,debug|release) {
 }
 
 win32 {
-
 contains(QT_ARCH, i386) {
     COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x86/*.dll) $$DESTDIR
     contains(QMAKE_CC, cl) {
@@ -43,9 +38,12 @@ contains(QT_ARCH, i386) {
         QMAKE_PRE_LINK += $$QMAKE_COPY $$COPYDLL
     }
 }
-
 }
 
+qnx: target.path = /tmp/$${TARGET}/bin
+else: unix:!android: target.path = /opt/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target
 
-HEADERS += \
-    ChatController.h
+mac: {
+    QMAKE_INFO_PLIST = Info.plist
+}

example/page/AboutPage.qml

@@ -1,4 +1,5 @@
 import QtQuick 2.15
+import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import FluentUI 1.0
 
@@ -34,7 +35,7 @@ FluWindow {
                 fontStyle: FluText.Title
             }
             FluText{
-                text:"v1.1.1"
+                text:"v1.1.5"
                 fontStyle: FluText.Body
                 Layout.alignment: Qt.AlignBottom
             }
@@ -69,7 +70,6 @@ FluWindow {
                 }
             }
         }
-
         RowLayout{
             spacing: 14
             Layout.topMargin: 20
@@ -78,22 +78,17 @@ FluWindow {
                 id:text_info
                 text:"如果该项目对你有作用，就请点击上方链接给一个免费的star吧！"
                 ColorAnimation {
-                        id: animation
-                        target: text_info
-                        property: "color"
-                        from: "red"
-                        to: "blue"
-                        duration: 1000
-                        running: true
-                        loops: Animation.Infinite
-                        easing.type: Easing.InOutQuad
-                    }
+                    id: animation
+                    target: text_info
+                    property: "color"
+                    from: "red"
+                    to: "blue"
+                    duration: 1000
+                    running: true
+                    loops: Animation.Infinite
+                    easing.type: Easing.InOutQuad
+                }
             }
         }
-
-
     }
-
-
-
 }

example/page/ChatPage.qml

@@ -57,7 +57,7 @@ FluWindow {
             selectedTextColor: Qt.rgba(51,153,255,1)
             color:FluColors.Black
             selectionColor: {
-                if(FluTheme.isDark){
+                if(FluTheme.dark){
                     return FluTheme.primaryColor.lighter
                 }else{
                     return FluTheme.primaryColor.dark
@@ -82,7 +82,7 @@ FluWindow {
             bottom: layout_bottom.top
             margins: 10
         }
-        color: FluTheme.isDark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(245/255,245/255,245/255,1)
+        color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(245/255,245/255,245/255,1)
         ListView{
             id:list_message
             anchors.fill: parent

example/page/MainPage.qml

@@ -8,20 +8,29 @@ import FluentUI 1.0
 
 FluWindow {
     id:rootwindow
-    width: 860
-    height: 600
+    width: 1000
+    height: 640
     title: "FluentUI"
-    minimumWidth: 500
+    minimumWidth: 520
     minimumHeight: 400
 
     FluAppBar{
         id:appbar
-        title: "FluentUI"
+        z:10
+        showDark: true
     }
 
     FluObject{
         id:original_items
 
+        FluPaneItem{
+            title:"Home"
+            icon:FluentIcons.Home
+            onTap:{
+                nav_view.push("qrc:/T_Home.qml")
+            }
+        }
+
         FluPaneItemHeader{
             title:"Inputs"
         }
@@ -40,6 +49,13 @@ FluWindow {
             }
         }
 
+        FluPaneItem{
+            title:"CheckBox"
+            onTap:{
+                nav_view.push("qrc:/T_CheckBox.qml")
+            }
+        }
+
         FluPaneItem{
             title:"ToggleSwitch"
             onTap:{
@@ -72,6 +88,20 @@ FluWindow {
             }
         }
 
+        FluPaneItem{
+            title:"CalendarPicker"
+            onTap:{
+                nav_view.push("qrc:/T_CalendarPicker.qml")
+            }
+        }
+
+        FluPaneItem{
+            title:"ColorPicker"
+            onTap:{
+                nav_view.push("qrc:/T_ColorPicker.qml")
+            }
+        }
+
         FluPaneItemHeader{
             title:"Surface"
         }
@@ -147,6 +177,13 @@ FluWindow {
             title:"Navigation"
         }
 
+        FluPaneItem{
+            title:"TabView"
+            onTap:{
+                nav_view.push("qrc:/T_TabView.qml")
+            }
+        }
+
         FluPaneItem{
             title:"TreeView"
             onTap:{
@@ -186,6 +223,17 @@ FluWindow {
             }
         }
 
+        FluPaneItemHeader{
+            title:"Media"
+        }
+
+        FluPaneItem{
+            title:"MediaPlayer"
+            onTap:{
+                nav_view.push("qrc:/T_MediaPlayer.qml")
+            }
+        }
+
     }
 
     FluObject{
@@ -205,54 +253,22 @@ FluWindow {
         }
     }
 
-
     FluNavigationView{
         id:nav_view
-        anchors{
-            top: appbar.bottom
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        items:original_items
+        anchors.fill: parent
+        items: original_items
         footerItems:footer_items
-
-        actions:[
-            Image {
-                width: 30
-                height: 30
-                Layout.preferredWidth: 30
-                Layout.preferredHeight: 30
-                sourceSize: Qt.size(60,60)
-                source: "qrc:/res/image/logo_openai.png"
-                Layout.rightMargin: 5
-                MouseArea{
-                    anchors.fill: parent
-                    cursorShape: Qt.PointingHandCursor
-                    onClicked: {
-                        FluApp.navigate("/chat")
-                    }
-                }
-            },
-            FluText{
-                text:"夜间模式"
-                fontStyle: FluText.Body
-            },
-            FluToggleSwitch{
-                selected: FluTheme.isDark
-                clickFunc:function(){
-                    FluTheme.isDark = !FluTheme.isDark
-                }
-            }
-        ]
-
+        logo: "qrc:/res/image/favicon.ico"
+        z: 11
         Component.onCompleted: {
-            nav_view.setCurrentIndex(1)
-            nav_view.push("qrc:/T_Buttons.qml")
+            nav_view.setCurrentIndex(0)
+            nav_view.push("qrc:/T_Home.qml")
         }
-
-
     }
 
+    function startPageByTitle(title){
+        console.debug(title)
+        nav_view.startPageByTitle(title)
+    }
 
 }

example/qml.qrc

@@ -34,7 +34,6 @@
         <file>T_DatePicker.qml</file>
         <file>T_MultiWindow.qml</file>
         <file>T_Menu.qml</file>
-        <file>T_Carousel.qml</file>
         <file>res/image/banner_1.jpg</file>
         <file>res/image/banner_2.jpg</file>
         <file>res/image/banner_3.jpg</file>
@@ -42,5 +41,113 @@
         <file>page/ChatPage.qml</file>
         <file>T_Tooltip.qml</file>
         <file>T_Badge.qml</file>
+        <file>T_CalendarPicker.qml</file>
+        <file>T_ColorPicker.qml</file>
+        <file>T_Carousel.qml</file>
+        <file>T_MediaPlayer.qml</file>
+        <file>T_TabView.qml</file>
+        <file>res/image/favicon.ico</file>
+        <file>T_Home.qml</file>
+        <file>res/image/bg_home_header.png</file>
+        <file>res/image/ic_home_github.png</file>
+        <file>res/image/control/Acrylic.png</file>
+        <file>res/image/control/AnimatedIcon.png</file>
+        <file>res/image/control/AnimatedVisualPlayer.png</file>
+        <file>res/image/control/AnimationInterop.png</file>
+        <file>res/image/control/AppBarButton.png</file>
+        <file>res/image/control/AppBarSeparator.png</file>
+        <file>res/image/control/AppBarToggleButton.png</file>
+        <file>res/image/control/AutomationProperties.png</file>
+        <file>res/image/control/AutoSuggestBox.png</file>
+        <file>res/image/control/Border.png</file>
+        <file>res/image/control/BreadcrumbBar.png</file>
+        <file>res/image/control/Button.png</file>
+        <file>res/image/control/CalendarDatePicker.png</file>
+        <file>res/image/control/CalendarView.png</file>
+        <file>res/image/control/Canvas.png</file>
+        <file>res/image/control/Checkbox.png</file>
+        <file>res/image/control/Clipboard.png</file>
+        <file>res/image/control/ColorPaletteResources.png</file>
+        <file>res/image/control/ColorPicker.png</file>
+        <file>res/image/control/ComboBox.png</file>
+        <file>res/image/control/CommandBar.png</file>
+        <file>res/image/control/CommandBarFlyout.png</file>
+        <file>res/image/control/CompactSizing.png</file>
+        <file>res/image/control/ConnectedAnimation.png</file>
+        <file>res/image/control/ContentDialog.png</file>
+        <file>res/image/control/CreateMultipleWindows.png</file>
+        <file>res/image/control/DataGrid.png</file>
+        <file>res/image/control/DatePicker.png</file>
+        <file>res/image/control/DropDownButton.png</file>
+        <file>res/image/control/EasingFunction.png</file>
+        <file>res/image/control/Expander.png</file>
+        <file>res/image/control/FilePicker.png</file>
+        <file>res/image/control/FlipView.png</file>
+        <file>res/image/control/Flyout.png</file>
+        <file>res/image/control/Grid.png</file>
+        <file>res/image/control/GridView.png</file>
+        <file>res/image/control/HyperlinkButton.png</file>
+        <file>res/image/control/IconElement.png</file>
+        <file>res/image/control/Image.png</file>
+        <file>res/image/control/ImplicitTransition.png</file>
+        <file>res/image/control/InfoBadge.png</file>
+        <file>res/image/control/InfoBar.png</file>
+        <file>res/image/control/InkCanvas.png</file>
+        <file>res/image/control/InkToolbar.png</file>
+        <file>res/image/control/InputValidation.png</file>
+        <file>res/image/control/ItemsRepeater.png</file>
+        <file>res/image/control/Line.png</file>
+        <file>res/image/control/ListBox.png</file>
+        <file>res/image/control/ListView.png</file>
+        <file>res/image/control/MediaPlayerElement.png</file>
+        <file>res/image/control/MenuBar.png</file>
+        <file>res/image/control/MenuFlyout.png</file>
+        <file>res/image/control/NavigationView.png</file>
+        <file>res/image/control/NumberBox.png</file>
+        <file>res/image/control/PageTransition.png</file>
+        <file>res/image/control/ParallaxView.png</file>
+        <file>res/image/control/PasswordBox.png</file>
+        <file>res/image/control/PersonPicture.png</file>
+        <file>res/image/control/PipsPager.png</file>
+        <file>res/image/control/Pivot.png</file>
+        <file>res/image/control/ProgressBar.png</file>
+        <file>res/image/control/ProgressRing.png</file>
+        <file>res/image/control/PullToRefresh.png</file>
+        <file>res/image/control/RadialGradientBrush.png</file>
+        <file>res/image/control/RadioButton.png</file>
+        <file>res/image/control/RadioButtons.png</file>
+        <file>res/image/control/RatingControl.png</file>
+        <file>res/image/control/RelativePanel.png</file>
+        <file>res/image/control/RepeatButton.png</file>
+        <file>res/image/control/RevealFocus.png</file>
+        <file>res/image/control/RichEditBox.png</file>
+        <file>res/image/control/RichTextBlock.png</file>
+        <file>res/image/control/ScrollViewer.png</file>
+        <file>res/image/control/SemanticZoom.png</file>
+        <file>res/image/control/Shape.png</file>
+        <file>res/image/control/Slider.png</file>
+        <file>res/image/control/Sound.png</file>
+        <file>res/image/control/SplitButton.png</file>
+        <file>res/image/control/SplitView.png</file>
+        <file>res/image/control/StackPanel.png</file>
+        <file>res/image/control/StandardUICommand.png</file>
+        <file>res/image/control/SwipeControl.png</file>
+        <file>res/image/control/TabView.png</file>
+        <file>res/image/control/TeachingTip.png</file>
+        <file>res/image/control/TextBlock.png</file>
+        <file>res/image/control/TextBox.png</file>
+        <file>res/image/control/ThemeTransition.png</file>
+        <file>res/image/control/TimePicker.png</file>
+        <file>res/image/control/TitleBar.png</file>
+        <file>res/image/control/ToggleButton.png</file>
+        <file>res/image/control/ToggleSplitButton.png</file>
+        <file>res/image/control/ToggleSwitch.png</file>
+        <file>res/image/control/ToolTip.png</file>
+        <file>res/image/control/TreeView.png</file>
+        <file>res/image/control/VariableSizedWrapGrid.png</file>
+        <file>res/image/control/Viewbox.png</file>
+        <file>res/image/control/WebView.png</file>
+        <file>res/image/control/XamlUICommand.png</file>
+        <file>T_CheckBox.qml</file>
     </qresource>
 </RCC>