update

Imporve FluContentDialog and add relative example.

.github/workflows/macos.yml

@@ -16,24 +16,25 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11.0]
-        qt_ver: [5.15.2]
+        os: [macos-12]
+        qt_ver: [6.4.3]
         qt_arch: [clang_64]
     env:
       targetName: example
     steps:
-      # macos 11.0 默认环境变了,要指定
-      - name: prepare env
-        if: ${{ matrix.os == 'macos-11.0' }}
-        run: |
-          softwareupdate --all --install --force
-          sudo xcode-select --print-path
-          sudo xcode-select --switch /Library/Developer/CommandLineTools       
+      - name: '⚙️ Cache Qt'
+        id: cache-qt
+        uses: actions/cache@v3
+        with:
+          path: ${{ runner.workspace }}/Qt
+          key: ${{runner.os}}-qtcachedir-${{ matrix.qt_ver }}
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
-          cached: 'false'
+          cache: ${{steps.cache-qt.outputs.cache-hit}}
+          arch: ${{ matrix.qt_arch }}
+          modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1
@@ -58,6 +59,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: bin/release/${{ env.targetName }}.dmg
-          asset_name: ${{ env.targetName }}_${{ matrix.os }}_${{ matrix.qt_ver }}.dmg
+          asset_name: ${{ env.targetName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.dmg
           tag: ${{ github.ref }}
           overwrite: true

.github/workflows/ubuntu.yml

@@ -19,18 +19,26 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        qt_ver: [5.15.2]
+        qt_ver: [6.4.3]
         qt_arch: [gcc_64]
     env:
       targetName: example
     steps:
+      - name: '⚙️ Cache Qt'
+        id: cache-qt
+        uses: actions/cache@v3
+        with:
+          path: ${{ runner.workspace }}/Qt
+          key: ${{runner.os}}-qtcachedir-${{ matrix.qt_ver }}
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
-          cached: 'false'
+          cache: ${{steps.cache-qt.outputs.cache-hit}}
+          arch: ${{ matrix.qt_arch }}
+          modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
       - name: ubuntu install GL library
-        run: sudo apt-get install -y libglew-dev libglfw3-dev qml-module-qtquick-controls qml-module-qtquick-controls2
+        run: sudo apt-get install -y libxkbcommon-x11-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-sync-dev  libxcb-render-util0-dev libxcb-shm0-dev
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1
@@ -42,6 +50,8 @@ jobs:
         uses: miurahr/install-linuxdeploy-action@v1
         with:
           plugins: qt appimage
+      - name: Check if svg file exists
+        run: if [ ! -f "${targetName}.svg" ]; then echo "File not found, creating..."; touch ${targetName}.svg; fi
       # 打包
       - name: package
         run: |
@@ -62,6 +72,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ env.targetName }}.AppImage
-          asset_name: ${{ env.targetName }}_${{ matrix.os }}_${{ matrix.qt_ver }}.AppImage
+          asset_name: ${{ env.targetName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.AppImage
           tag: ${{ github.ref }}
           overwrite: true

.github/workflows/windows-mingw.yml

@@ -0,0 +1,76 @@
+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-2022
+    strategy:
+      matrix:
+        include:
+          - qt_arch: win64_mingw
+            qt_ver: 6.4.3
+            qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900"
+            qt_tools_mingw_install: mingw900_64
+    env:
+      targetName: example.exe
+      fileName: example
+    steps:
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: ${{ matrix.qt_ver }}
+          arch: ${{ matrix.qt_arch }}
+          cache: ${{steps.cache-qt.outputs.cache-hit}}
+          modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+      - name: Qt6 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_arch }}-${{ matrix.qt_ver }}
+        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: ${{ env.fileName }}_${{  github.ref_name }}_${{  matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.zip
+          tag: ${{ github.ref }}
+          overwrite: true 

.github/workflows/windows.yml

@@ -16,17 +16,13 @@ jobs:
     name: Build
     # 运行平台， windows-latest目前是windows server 2019 
     # 参考文档 https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md
-    runs-on: windows-2019
+    runs-on: ${{ matrix.os }}
     strategy:
       # 矩阵配置
       matrix:
+        os: [windows-2019]
         include:
-          # 5.15.2 参考 https://mirrors.cloud.tencent.com/qt/online/qtsdkrepository/windows_x86/desktop/qt5_5152/
-          - qt_ver: 5.15.2
-            qt_arch: win32_msvc2019
-            msvc_arch: x86
-            qt_arch_install: msvc2019
-          - qt_ver: 5.15.2          
+          - qt_ver: 6.4.3          
             qt_arch: win64_msvc2019_64
             msvc_arch: x64
             qt_arch_install: msvc2019_64          
@@ -35,18 +31,21 @@ jobs:
       fileName: example
     # 步骤
     steps:
+      - name: '⚙️ Cache Qt'
+        id: cache-qt
+        uses: actions/cache@v3
+        with:
+          path: ${{ runner.workspace }}\Qt
+          key: ${{runner.os}}-qtcachedir-${{ matrix.qt_ver }}
       # 安装Qt
       - name: Install Qt
         # 使用外部action。这个action专门用来安装Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
         with:
-          # Version of Qt to install
           version: ${{ matrix.qt_ver }}
-          # Target platform for build
-          # target: ${{ matrix.qt_target }}
           arch: ${{ matrix.qt_arch }}
-          cached: 'false'
-          aqtversion: '==2.0.5'          
+          cache: ${{steps.cache-qt.outputs.cache-hit}}
+          modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
       # 拉取代码
       - uses: actions/checkout@v2
         with:
@@ -88,6 +87,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.package.outputs.packageName }}.zip
-          asset_name: ${{ steps.package.outputs.packageName }}.zip
+          asset_name: ${{ env.fileName }}_${{  github.ref_name }}_${{  matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.zip
           tag: ${{ github.ref }}
           overwrite: true 

.gitignore

@@ -32,4 +32,5 @@ target_wrapper.*
 CMakeLists.txt.user*
 
 src/build-preset/plugins.qmltypes
-bin
+bin
+.DS_Store

CMakeLists.txt

@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.16)
+project(FluentUI VERSION 0.1 LANGUAGES CXX)
+
+add_subdirectory(src)
+add_subdirectory(example)

License

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 zhuzichu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -2,7 +2,7 @@
 
 ## 简介
 
-这是一个漂亮的Fluent组件库，使用QML插件开发的
+这是一个漂亮的Fluent组件库，使用QML插件开发的。main分支是Qt6.4.3，如果需要qt5的请切换至qt5分支
 
 ## 编译状态
 | [Windows][win-link]| [Ubuntu][ubuntu-link]|[MacOS][macos-link]|
@@ -62,12 +62,18 @@
 |FluDatePicker|日期选择器||
 |FluMenu|菜单Popup||
 |FluNavigationView|响应式导航布局||
+|FluScrollbar|滚动条||
+|FluToggleButton|开关按钮||
+|FluPagination|分页组件||
+|FluTableView|表格组件||
+|FluMediaPlayer|播放器||
+|FluFlipView|FlipView||
 
 # 部分效果预览
 
-## 一个聊天Demo，调用了ChatGPT的接口
+## 首页
 
-![](doc/preview/chatgpt.png)
+![](doc/preview/home.png)
 
 ## 各种Button按钮
 
@@ -77,6 +83,10 @@
 
 ![](doc/preview/theme.png)
 
+## TableView表格组件
+
+![](doc/preview/tableview.png)
+
 ## FluTreeView树组件
 
 ![](doc/preview/treeview.png)
@@ -85,13 +95,5 @@
 
 ![](doc/preview/carousel.png)
 
-## InfoBar提示框组件
-
-![](doc/preview/infobar.png)
-
-## 多窗口路由跳转
-
-![](doc/preview/multiwindow.png)
-
 ### ⚡ Visitor count
-![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)
+![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)

example/App.qml

@@ -1,25 +1,26 @@
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
 
 Window {
     id:app
-    color: "#00000000"
     Component.onCompleted: {
-        FluApp.init(app,properties)
+        FluApp.init(app)
         FluTheme.frameless = ("windows" === Qt.platform.os)
-        FluTheme.dark = false
+        FluTheme.darkMode = FluDarkMode.System
         FluApp.routes = {
             "/":"qrc:/page/MainPage.qml",
             "/about":"qrc:/page/AboutPage.qml",
             "/login":"qrc:/page/LoginPage.qml",
             "/chat":"qrc:/page/ChatPage.qml",
+            "/media":"qrc:/page/MediaPage.qml",
+            "/singleTaskWindow":"qrc:/page/SingleTaskWindow.qml",
+            "/standardWindow":"qrc:/page/StandardWindow.qml",
+            "/singleInstanceWindow":"qrc:/page/SingleInstanceWindow.qml"
         }
         FluApp.initialRoute = "/"
         FluApp.run()
     }
-
 }

example/AppInfo.cpp

@@ -0,0 +1,25 @@
+#include "AppInfo.h"
+#include "lang/En.h"
+#include "lang/Zh.h"
+
+
+AppInfo::AppInfo(QObject *parent)
+    : QObject{parent}
+{
+    version("1.2.6");
+    lang(new En());
+}
+
+void AppInfo::changeLang(const QString& locale){
+    if(_lang){
+        _lang->deleteLater();
+    }
+    if(locale=="Zh"){
+        lang(new Zh());
+    }else if(locale=="En"){
+        lang(new En());
+    }else {
+        lang(new En());
+    }
+
+}

example/AppInfo.h

@@ -0,0 +1,18 @@
+#ifndef APPINFO_H
+#define APPINFO_H
+
+#include <QObject>
+#include "lang/Lang.h"
+#include "stdafx.h"
+
+class AppInfo : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY_AUTO(QString,version)
+    Q_PROPERTY_AUTO(Lang*,lang)
+public:
+    explicit AppInfo(QObject *parent = nullptr);
+    Q_INVOKABLE void changeLang(const QString& locale);
+};
+
+#endif // APPINFO_H

example/CMakeLists.txt

@@ -0,0 +1,87 @@
+cmake_minimum_required(VERSION 3.16)
+project(example)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(CMAKE_CXX_STANDARD 17)
+
+file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(platform 64)
+else()
+  set(platform 32)
+endif()
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin/debug)
+else()
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin/release)
+endif()
+
+find_package(Qt6 COMPONENTS Core Quick QuickControls2 Concurrent Network Multimedia REQUIRED)
+
+set(SOURCES
+    ChatController.cpp
+	AppInfo.cpp 
+    main.cpp
+)
+
+set(HEADERS
+    ChatController.h
+	AppInfo.h
+)
+
+set(RESOURCES
+    qml.qrc
+)
+
+set(RC_ICONS
+    favicon.ico
+)
+
+qt_add_resources(QT_RESOURCES ${RESOURCES})
+
+add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS} ${QT_RESOURCES} ${RC_ICONS})
+
+if(WIN32)
+    if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+        set(DLLPATH ${CMAKE_CURRENT_SOURCE_DIR}/../third/msvc/*.dll)
+    else()
+        set(DLLPATH ${CMAKE_CURRENT_SOURCE_DIR}/../third/mingw/*.dll)
+    endif()
+    string(REPLACE "/" ${PATH_SEPARATOR} DLLPATH "${DLLPATH}")
+    file(GLOB DLL_FILES ${DLLPATH})
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+        ${DLL_FILES}
+        ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+    )
+endif()
+
+target_compile_definitions(${PROJECT_NAME} PRIVATE
+    QT_DEPRECATED_WARNINGS
+    QT_NO_WARNING_OUTPUT
+)
+
+target_link_libraries(${PROJECT_NAME} PRIVATE
+    Qt6::Core
+    Qt6::Quick
+    Qt6::QuickControls2
+    Qt6::Concurrent
+    Qt6::Network
+    Qt6::Multimedia
+)
+
+if(WIN32)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE UNICODE WIN32 _WINDOWS)
+    target_link_libraries(${PROJECT_NAME} PRIVATE dwmapi user32)
+endif()
+
+if(APPLE)
+    set_target_properties(${PROJECT_NAME} PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST Info.plist
+    )
+endif()

example/T_Awesome.qml

@@ -1,8 +1,8 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
 
 FluContentPage {
 
@@ -67,7 +67,6 @@ FluContentPage {
                 width:parent.width
                 wrapMode: Text.WrapAnywhere
                 text: modelData.name
-
                 horizontalAlignment: Text.AlignHCenter
             }
         }

example/T_Badge.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -12,9 +12,10 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 106
         paddings: 10
@@ -100,5 +101,20 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'Rectangle{
+    width: 40
+    height: 40
+    radius: 8
+    color: Qt.rgba(191/255,191/255,191/255,1)
+    FluBadge{
+        count: 100
+        isDot: false
+        color: Qt.rgba(82/255,196/255,26/255,1)
+    }
+}'
+    }
 
 }

example/T_Buttons.qml

@@ -1,17 +1,18 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Controls.Basic
+import FluentUI
+import "./component"
 
 FluScrollablePage{
     title:"Buttons"
 
-    spacing: 20
-
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluText{
         Layout.topMargin: 20
@@ -19,15 +20,15 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
         paddings: 10
+        Layout.topMargin: 20
 
         FluTextButton{
             disabled:text_button_switch.selected
             text:"Text Button"
             onClicked: {
-                console.debug(Screen.devicePixelRatio)
                 showInfo("点击Text Button")
             }
             anchors{
@@ -49,11 +50,22 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluTextButton{
+    text:"Text Button"
+    onClicked: {
+
+    }
+}'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
         paddings: 10
+        Layout.topMargin: 20
 
         FluButton{
             disabled:button_switch.selected
@@ -80,10 +92,21 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluButton{
+    text:"Standard Button"
+    onClicked: {
+
+    }
+}'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
+        Layout.topMargin: 20
         paddings: 10
 
         FluFilledButton{
@@ -111,13 +134,65 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluFilledButton{
+    text:"Filled Button"
+    onClicked: {
+
+    }
+}'
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        Layout.topMargin: 20
+        paddings: 10
+
+        FluToggleButton{
+            disabled:toggle_button_switch.selected
+            text:"Toggle Button"
+            onClicked: {
+               selected = !selected
+            }
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:toggle_button_switch
+                Layout.alignment: Qt.AlignRight
+                text:"Disabled"
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluToggleButton{
+    text:"Toggle Button"
+    onClicked: {
+        selected = !selected
+    }
+}'
+    }
 
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
         paddings: 10
-
+        Layout.topMargin: 20
         FluIconButton{
             iconSource:FluentIcons.ChromeCloseContrast
             disabled:icon_button_switch.selected
@@ -144,12 +219,22 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluIconButton{
+    iconSource:FluentIcons.ChromeCloseContrast
+    onClicked: {
+
+    }
+}'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
         paddings: 10
-
+        Layout.topMargin: 20
         FluDropDownButton{
             disabled:drop_down_button_switch.selected
             text:"DropDownButton"
@@ -185,12 +270,33 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluDropDownButton{
+    text:"DropDownButton"
+    items:[
+        FluMenuItem{
+            text:"Menu_1"
+        },
+        FluMenuItem{
+            text:"Menu_2"
+        },
+        FluMenuItem{
+            text:"Menu_3"
+        },
+        FluMenuItem{
+            text:"Menu_4"
+        }
+    ]
+}'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 100
         paddings: 10
-
+        Layout.topMargin: 20
         ColumnLayout{
             spacing: 8
             anchors{
@@ -226,13 +332,24 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluRadioButton{
+    selected:true
+    text:"Text Button"
+    onClicked: {
+
+    }
+}'
+    }
 
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 68
         paddings: 10
-
+        Layout.topMargin: 20
         FluCheckBox{
             disabled:check_box_switch.selected
             text:"Check Box"
@@ -241,8 +358,6 @@ FluScrollablePage{
                 left: parent.left
             }
         }
-
-
         Row{
             spacing: 5
             anchors{
@@ -256,6 +371,11 @@ FluScrollablePage{
             }
         }
     }
-
-
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluCheckBox{
+    text:"Check Box"
+}'
+    }
 }

example/T_CalendarPicker.qml

@@ -1,8 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,18 +11,26 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 350
         paddings: 10
         FluCalendarView{
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluCalendarView{
+
+}'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10
@@ -34,5 +43,12 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluCalendarPicker{
+
+}'
+    }
 
 }

example/T_Carousel.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,9 +11,10 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 370
         paddings: 10
         Layout.topMargin: 20
@@ -36,4 +37,15 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluCarousel{
+    width: 400
+    height: 300
+    Component.onCompleted: {
+        setData([{url:"qrc:/res/image/banner_1.jpg"},{url:"qrc:/res/image/banner_2.jpg"},{url:"qrc:/res/image/banner_3.jpg"}])
+    }
+}'
+    }
 }

example/T_CheckBox.qml

@@ -1,8 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,10 +11,29 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluCheckBox{
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
         Layout.topMargin: 20
-        Layout.leftMargin: 10
-        Layout.bottomMargin: 20
+        Row{
+            spacing: 30
+            anchors.verticalCenter: parent.verticalCenter
+            FluCheckBox{
+            }
+            FluCheckBox{
+                text:"Text"
+            }
+        }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluCheckBox{
+    text:"Text"
+}'
+    }
+
 }

example/T_ColorPicker.qml

@@ -1,9 +1,9 @@
-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
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,9 +11,10 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 280
         Layout.topMargin: 20
         paddings: 10
@@ -38,9 +39,16 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluColorView{
+
+}'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 60
         paddings: 10
@@ -55,6 +63,13 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluColorPicker{
+
+}'
+    }
 
 }
 

example/T_DatePicker.qml

@@ -1,8 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,44 +11,43 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10
-
         ColumnLayout{
-
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-
             FluText{
                 text:"showYear=true"
             }
-
             FluDatePicker{
             }
-
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluDatePicker{
 
+}'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10
-
         ColumnLayout{
-
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-
             FluText{
                 text:"showYear=false"
             }
@@ -56,8 +56,14 @@ FluScrollablePage{
                 showYear:false
 
             }
-
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluDatePicker{
+    showYear:false
+}'
+    }
 
 }

example/T_Dialog.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,11 +11,47 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
+        Layout.topMargin: 20
+        FluButton{
+            anchors.verticalCenter: parent.verticalCenter
+            Layout.topMargin: 20
+            text:"Show Double Button Dialog"
+            onClicked: {
+                double_btn_dialog.open()
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluContentDialog{
+    id:dialog
+    title:"友情提示"
+    message:"确定要退出程序么？"
+    negativeText:"取消"
+    buttonFlags: FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
+    onNegativeClicked:{
+        showSuccess("点击取消按钮")
+    }
+    positiveText:"确定"
+    onPositiveClicked:{
+        showSuccess("点击确定按钮")
+    }
+    }
+    dialog.open()'
+    }
 
     FluContentDialog{
-        id:dialog
+        id:double_btn_dialog
         title:"友情提示"
         message:"确定要退出程序么？"
+        buttonFlags: FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
         negativeText:"取消"
         onNegativeClicked:{
             showSuccess("点击取消按钮")
@@ -26,11 +62,61 @@ FluScrollablePage{
         }
     }
 
-    FluButton{
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
         Layout.topMargin: 20
-        text:"Show Dialog"
-        onClicked: {
-            dialog.open()
+        FluButton{
+            anchors.verticalCenter: parent.verticalCenter
+            Layout.topMargin: 20
+            text:"Show Triple Button Dialog"
+            onClicked: {
+                triple_btn_dialog.open()
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluContentDialog{
+    id:dialog
+    title:"友情提示"
+    message:"确定要退出程序么？"
+    negativeText:"取消"
+    buttonFlags: FluContentDialog.NeutralButton | FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
+    negativeText:"取消"
+    onNegativeClicked:{
+        showSuccess("点击取消按钮")
+    }
+    positiveText:"确定"
+    onPositiveClicked:{
+        showSuccess("点击确定按钮")
+    }
+    neutralText:"最小化"
+    onNeutralClicked:{
+        showSuccess("点击最小化按钮")
+        }
+    }
+    dialog.open()'
+    }
+
+    FluContentDialog{
+        id:triple_btn_dialog
+        title:"友情提示"
+        message:"确定要退出程序么？"
+        buttonFlags: FluContentDialog.NeutralButton | FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
+        negativeText:"取消"
+        onNegativeClicked:{
+            showSuccess("点击取消按钮")
+        }
+        positiveText:"确定"
+        onPositiveClicked:{
+            showSuccess("点击确定按钮")
+        }
+        neutralText:"最小化"
+        onNeutralClicked:{
+            showSuccess("点击最小化按钮")
         }
     }
 }

example/T_Expander.qml

@@ -1,9 +1,9 @@
-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
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,29 +11,68 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluExpander{
-        headerText:"打开一个单选框"
+    FluArea{
+        Layout.fillWidth: true
+        height: layout_column.height+20
+        paddings: 10
         Layout.topMargin: 20
-        Item{
-            anchors.fill: parent
-            ColumnLayout{
-                spacing: 8
-                anchors{
-                    top: parent.top
-                    left: parent.left
-                    topMargin: 15
-                    leftMargin: 15
+        Column{
+            id:layout_column
+            spacing: 15
+            anchors{
+                top:parent.top
+                left:parent.left
+            }
+
+            FluExpander{
+                headerText:"打开一个单选框"
+                Layout.topMargin: 20
+                Item{
+                    anchors.fill: parent
+                    ColumnLayout{
+                        spacing: 8
+                        anchors{
+                            top: parent.top
+                            left: parent.left
+                            topMargin: 15
+                            leftMargin: 15
+                        }
+                        Repeater{
+                            id:repeater
+                            property int selecIndex : 0
+                            model: 3
+                            delegate:  FluRadioButton{
+                                selected : repeater.selecIndex===index
+                                text:"Radio Button_"+index
+                                onClicked:{
+                                    repeater.selecIndex = index
+                                }
+                            }
+                        }
+                    }
                 }
-                Repeater{
-                    id:repeater
-                    property int selecIndex : 0
-                    model: 3
-                    delegate:  FluRadioButton{
-                        selected : repeater.selecIndex===index
-                        text:"Radio Button_"+index
-                        onClicked:{
-                            repeater.selecIndex = index
+            }
+
+            FluExpander{
+                Layout.topMargin: 20
+                headerText:"打开一个滑动文本框"
+                Item{
+                    anchors.fill: parent
+                    Flickable{
+                        id:scrollview
+                        width: parent.width
+                        height: parent.height
+                        contentWidth: width
+                        contentHeight: text_info.height
+                        ScrollBar.vertical: FluScrollBar {}
+                        FluText{
+                            id:text_info
+                            width: scrollview.width
+                            wrapMode: Text.WrapAnywhere
+                            padding: 14
+                            text:"先帝创业未半而中道崩殂，今天下三分，益州疲弊，此诚危急存亡之秋也。然侍卫之臣不懈于内，忠志之士忘身于外者，盖追先帝之殊遇，欲报之于陛下也。诚宜开张圣听，以光先帝遗德，恢弘志士之气，不宜妄自菲薄，引喻失义，以塞忠谏之路也。宫中府中，俱为一体；陟罚臧否，不宜异同。若有作奸犯科及为忠善者，宜付有司论其刑赏，以昭陛下平明之理，不宜偏私，使内外异法也。侍中、侍郎郭攸之、费祎、董允等，此皆良实，志虑忠纯，是以先帝简拔以遗陛下。愚以为宫中之事，事无大小，悉以咨之，然后施行，必能裨补阙漏，有所广益。将军向宠，性行淑均，晓畅军事，试用于昔日，先帝称之曰能，是以众议举宠为督。愚以为营中之事，悉以咨之，必能使行阵和睦，优劣得所。亲贤臣，远小人，此先汉所以兴隆也；亲小人，远贤臣，此后汉所以倾颓也。先帝在时，每与臣论此事，未尝不叹息痛恨于桓、灵也。侍中、尚书、长史、参军，此悉贞良死节之臣，愿陛下亲之信之，则汉室之隆，可计日而待也。臣本布衣，躬耕于南阳，苟全性命于乱世，不求闻达于诸侯。先帝不以臣卑鄙，猥自枉屈，三顾臣于草庐之中，咨臣以当世之事，由是感激，遂许先帝以驱驰。后值倾覆，受任于败军之际，奉命于危难之间，尔来二十有一年矣。先帝知臣谨慎，故临崩寄臣以大事也。受命以来，夙夜忧叹，恐托付不效，以伤先帝之明；故五月渡泸，深入不毛。今南方已定，兵甲已足，当奖率三军，北定中原，庶竭驽钝，攘除奸凶，兴复汉室，还于旧都。此臣所以报先帝而忠陛下之职分也。至于斟酌损益，进尽忠言，则攸之、祎、允之任也。愿陛下托臣以讨贼兴复之效，不效，则治臣之罪，以告先帝之灵。若无兴德之言，则责攸之、祎、允等之慢，以彰其咎；陛下亦宜自谋，以咨诹善道，察纳雅言，深追先帝遗诏。臣不胜受恩感激。今当远离，临表涕零，不知所言。"
                         }
                     }
                 }
@@ -41,24 +80,30 @@ FluScrollablePage{
         }
     }
 
-    FluExpander{
-        Layout.topMargin: 20
-        headerText:"打开一个滑动文本框"
-        Item{
-            anchors.fill: parent
-            ScrollView{
-                id:scrollview
-                width: parent.width
-                height: parent.height
-                contentWidth: parent.width
-                FluText{
-                    id:test
-                    width: scrollview.width
-                    wrapMode: Text.WrapAnywhere
-                    padding: 14
-                    text:"先帝创业未半而中道崩殂，今天下三分，益州疲弊，此诚危急存亡之秋也。然侍卫之臣不懈于内，忠志之士忘身于外者，盖追先帝之殊遇，欲报之于陛下也。诚宜开张圣听，以光先帝遗德，恢弘志士之气，不宜妄自菲薄，引喻失义，以塞忠谏之路也。宫中府中，俱为一体；陟罚臧否，不宜异同。若有作奸犯科及为忠善者，宜付有司论其刑赏，以昭陛下平明之理，不宜偏私，使内外异法也。侍中、侍郎郭攸之、费祎、董允等，此皆良实，志虑忠纯，是以先帝简拔以遗陛下。愚以为宫中之事，事无大小，悉以咨之，然后施行，必能裨补阙漏，有所广益。将军向宠，性行淑均，晓畅军事，试用于昔日，先帝称之曰能，是以众议举宠为督。愚以为营中之事，悉以咨之，必能使行阵和睦，优劣得所。亲贤臣，远小人，此先汉所以兴隆也；亲小人，远贤臣，此后汉所以倾颓也。先帝在时，每与臣论此事，未尝不叹息痛恨于桓、灵也。侍中、尚书、长史、参军，此悉贞良死节之臣，愿陛下亲之信之，则汉室之隆，可计日而待也。臣本布衣，躬耕于南阳，苟全性命于乱世，不求闻达于诸侯。先帝不以臣卑鄙，猥自枉屈，三顾臣于草庐之中，咨臣以当世之事，由是感激，遂许先帝以驱驰。后值倾覆，受任于败军之际，奉命于危难之间，尔来二十有一年矣。先帝知臣谨慎，故临崩寄臣以大事也。受命以来，夙夜忧叹，恐托付不效，以伤先帝之明；故五月渡泸，深入不毛。今南方已定，兵甲已足，当奖率三军，北定中原，庶竭驽钝，攘除奸凶，兴复汉室，还于旧都。此臣所以报先帝而忠陛下之职分也。至于斟酌损益，进尽忠言，则攸之、祎、允之任也。愿陛下托臣以讨贼兴复之效，不效，则治臣之罪，以告先帝之灵。若无兴德之言，则责攸之、祎、允等之慢，以彰其咎；陛下亦宜自谋，以咨诹善道，察纳雅言，深追先帝遗诏。臣不胜受恩感激。今当远离，临表涕零，不知所言。"
-                }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluExpander{
+    headerText:"打开一个单选框"
+    Item{
+        anchors.fill: parent
+        Flickable{
+            width: parent.width
+            height: parent.height
+            contentWidth: width
+            contentHeight: text_info.height
+            ScrollBar.vertical: FluScrollBar {}
+            FluText{
+                id:text_info
+                width: scrollview.width
+                wrapMode: Text.WrapAnywhere
+                padding: 14
+                text:"先帝创业未半而中道崩殂，今天下三分......""
             }
         }
     }
+}'
+    }
+
+
 }

example/T_FlipView.qml

@@ -0,0 +1,122 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
+
+FluScrollablePage{
+
+    title:"FlipView"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 340
+        paddings: 10
+        Layout.topMargin: 20
+        ColumnLayout{
+            anchors.verticalCenter: parent.verticalCenter
+            FluText{
+                text:"水平方向的FlipView"
+            }
+            FluFlipView{
+                Image{
+                    source: "qrc:/res/image/banner_1.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/res/image/banner_2.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/res/image/banner_3.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluFlipView{
+    Image{
+        source: "qrc:/res/image/banner_1.jpg"
+        asynchronous: true
+        fillMode:Image.PreserveAspectCrop
+    }
+    Image{
+        source: "qrc:/res/image/banner_1.jpg"
+        asynchronous: true
+        fillMode:Image.PreserveAspectCrop
+    }
+    Image{
+        source: "qrc:/res/image/banner_1.jpg"
+        asynchronous: true
+        fillMode:Image.PreserveAspectCrop
+    }
+}
+'
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 340
+        paddings: 10
+        Layout.topMargin: 20
+        ColumnLayout{
+            anchors.verticalCenter: parent.verticalCenter
+            FluText{
+                text:"垂直方向的FlipView"
+            }
+            FluFlipView{
+                vertical:true
+                Image{
+                    source: "qrc:/res/image/banner_1.jpg"
+                    asynchronous: true
+                    sourceSize: Qt.size(400,300)
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/res/image/banner_2.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/res/image/banner_3.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluFlipView{
+    vertical:true
+    Image{
+        source: "qrc:/res/image/banner_1.jpg"
+        asynchronous: true
+        fillMode:Image.PreserveAspectCrop
+    }
+    Image{
+        source: "qrc:/res/image/banner_1.jpg"
+        asynchronous: true
+        fillMode:Image.PreserveAspectCrop
+    }
+    Image{
+        source: "qrc:/res/image/banner_1.jpg"
+        asynchronous: true
+        fillMode:Image.PreserveAspectCrop
+    }
+}
+'
+    }
+}

example/T_Home.qml

@@ -1,8 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import "qrc:///global/"
+import FluentUI
 
 FluScrollablePage{
 
@@ -56,7 +57,6 @@ FluScrollablePage{
                 bottom: parent.bottom
             }
             orientation: ListView.Horizontal
-            boundsBehavior: ListView.StopAtBounds
             height: 240
             model: model_header
             header: Item{height: 10;width: 10}
@@ -101,7 +101,7 @@ FluScrollablePage{
                         }
                         FluText{
                             text: model.title
-                            fontStyle: FluText.BodyLarge
+                            fontStyle: FluText.Body
                             Layout.topMargin: 20
                             Layout.leftMargin: 20
                         }
@@ -110,7 +110,7 @@ FluScrollablePage{
                             Layout.topMargin: 5
                             Layout.preferredWidth: 160
                             Layout.leftMargin: 20
-                            color: FluColors.Grey100
+                            color: FluColors.Grey120
                             font.pixelSize: 12
                             wrapMode: Text.WrapAnywhere
                         }
@@ -129,7 +129,7 @@ FluScrollablePage{
                         id:item_mouse
                         anchors.fill: parent
                         hoverEnabled: true
-                        onWheel: {
+                        onWheel: (wheel)=>{
                             if (wheel.angleDelta.y > 0) scrollbar_header.decrease()
                             else scrollbar_header.increase()
                         }
@@ -142,44 +142,6 @@ FluScrollablePage{
         }
     }
 
-    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{
@@ -211,7 +173,7 @@ FluScrollablePage{
                     id:item_icon
                     height: 40
                     width: 40
-                    source: model.icon
+                    source: modelData.image
                     anchors{
                         left: parent.left
                         leftMargin: 20
@@ -221,8 +183,8 @@ FluScrollablePage{
 
                 FluText{
                     id:item_title
-                    text:model.title
-                    fontStyle: FluText.Subtitle
+                    text:modelData.title
+                    fontStyle: FluText.BodyStrong
                     anchors{
                         left: item_icon.right
                         leftMargin: 20
@@ -232,10 +194,11 @@ FluScrollablePage{
 
                 FluText{
                     id:item_desc
-                    text:model.desc
-                    color:FluColors.Grey100
+                    text:modelData.desc
+                    color:FluColors.Grey120
                     wrapMode: Text.WrapAnywhere
                     elide: Text.ElideRight
+                    fontStyle: FluText.Caption
                     maximumLineCount: 2
                     anchors{
                         left: item_title.left
@@ -246,12 +209,25 @@ FluScrollablePage{
                     }
                 }
 
+                Rectangle{
+                    height: 12
+                    width: 12
+                    radius:  6
+                    color: FluTheme.primaryColor.dark
+                    anchors{
+                        right: parent.right
+                        top: parent.top
+                        rightMargin: 14
+                        topMargin: 14
+                    }
+                }
+
                 MouseArea{
                     id:item_mouse
                     anchors.fill: parent
                     hoverEnabled: true
                     onClicked: {
-                        rootwindow.startPageByTitle(model.title)
+                        ItemsOriginal.startPageByItem(modelData)
                     }
                 }
             }
@@ -260,7 +236,7 @@ FluScrollablePage{
 
     FluText{
         text: "Recently added samples"
-        fontStyle: FluText.TitleLarge
+        fontStyle: FluText.Title
         Layout.topMargin: 20
         Layout.leftMargin: 20
     }
@@ -270,14 +246,14 @@ FluScrollablePage{
         implicitHeight: contentHeight
         cellHeight: 120
         cellWidth: 320
-        boundsBehavior: GridView.StopAtBounds
-        model:model_added
+        model:ItemsOriginal.getRecentlyAddedData()
+        interactive: false
         delegate: com_item
     }
 
     FluText{
         text: "Recently updated samples"
-        fontStyle: FluText.TitleLarge
+        fontStyle: FluText.Title
         Layout.topMargin: 20
         Layout.leftMargin: 20
     }
@@ -287,8 +263,8 @@ FluScrollablePage{
         implicitHeight: contentHeight
         cellHeight: 120
         cellWidth: 320
-        boundsBehavior: GridView.StopAtBounds
-        model: model_update
+        interactive: false
+        model: ItemsOriginal.getRecentlyUpdatedData()
         delegate: com_item
     }
 

example/T_InfoBar.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,33 +11,54 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluButton{
-        text:"Info"
+    FluArea{
+        Layout.fillWidth: true
         Layout.topMargin: 20
-        onClicked: {
-            showInfo("这是一个Info样式的InfoBar")
+        height: 200
+        paddings: 10
+        ColumnLayout{
+            spacing: 14
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluButton{
+                text:"Info"
+                onClicked: {
+                    showInfo("这是一个Info样式的InfoBar")
+                }
+            }
+            FluButton{
+                text:"Warning"
+                onClicked: {
+                    showWarning("这是一个Warning样式的InfoBar")
+                }
+            }
+            FluButton{
+                text:"Error"
+                onClicked: {
+                    showError("这是一个Error样式的InfoBar")
+                }
+            }
+            FluButton{
+                text:"Success"
+                onClicked: {
+                    showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")
+                }
+            }
         }
     }
-    FluButton{
-        text:"Warning"
-        Layout.topMargin: 20
-        onClicked: {
-            showWarning("这是一个Warning样式的InfoBar")
-        }
-    }
-    FluButton{
-        text:"Error"
-        Layout.topMargin: 20
-        onClicked: {
-            showError("这是一个Error样式的InfoBar")
-        }
-    }
-    FluButton{
-        text:"Success"
-        Layout.topMargin: 20
-        onClicked: {
-            showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")
-        }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'showInfo("这是一个Info样式的InfoBar")
+
+showWarning("这是一个Warning样式的InfoBar")
+
+showError("这是一个Error样式的InfoBar")
+
+showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")'
     }
 }

example/T_MediaPlayer.qml

@@ -1,9 +1,9 @@
-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
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,6 +11,7 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     onVisibleChanged: {
         if(visible){
@@ -19,9 +20,8 @@ FluScrollablePage{
             player.pause()
         }
     }
-
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 320
         Layout.topMargin: 20
         paddings: 10
@@ -30,17 +30,37 @@ FluScrollablePage{
                 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"
             }
-
+        }
+    }
+    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"})
+            }
         }
     }
 
 
+
+
 }
 

example/T_Menu.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,30 +11,67 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluButton{
-        text:"左击菜单"
+    FluArea{
+        Layout.fillWidth: true
+        height: 100
+        paddings: 10
         Layout.topMargin: 20
-        onClicked:{
-            menu.popup()
+        Column{
+            id:layout_column
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left:parent.left
+            }
+
+            FluButton{
+                text:"左击菜单"
+                Layout.topMargin: 20
+                onClicked:{
+                    menu.popup()
+                }
+            }
+
+            FluButton{
+                text:"右击菜单"
+                Layout.topMargin: 20
+                onClicked: {
+                    showSuccess("请按鼠标右击")
+                }
+                MouseArea{
+                    anchors.fill: parent
+                    acceptedButtons: Qt.RightButton
+                    onClicked: {
+                        menu.popup()
+                    }
+                }
+            }
         }
     }
 
-
-    FluButton{
-        text:"右击菜单"
-        Layout.topMargin: 20
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluMenu{
+    id:menu
+    FluMenuItem:{
+        text:"删除"
         onClicked: {
-            showSuccess("请按鼠标右击")
+            showError("删除")
         }
-        MouseArea{
-            anchors.fill: parent
-            acceptedButtons: Qt.RightButton
-            onClicked: {
-                menu.popup()
-            }
+    }
+    FluMenuItem:{
+        text:"修改"
+        onClicked: {
+            showInfo"修改")
         }
     }
+}
+menu.popup()
+'
+    }
 
     FluMenu{
         id:menu
@@ -47,7 +84,7 @@ FluScrollablePage{
         FluMenuItem{
             text:"修改"
             onClicked: {
-                showError("修改")
+                showInfo("修改")
             }
         }
     }

example/T_MultiWindow.qml

@@ -1,19 +1,20 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
+    property string password: ""
+    property var loginPageRegister: registerForPageResult("/login")
+
     title:"MultiWindow"
     leftPadding:10
     rightPadding:10
     bottomPadding:20
-
-    property string password: ""
-
-    property var loginPageRegister: registerForPageResult("/login")
+    spacing: 0
 
     Connections{
         target: loginPageRegister
@@ -24,11 +25,91 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
+        height: 86
+        paddings: 10
+        Layout.topMargin: 20
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluText{
+                text:"<font color='red'>Standard</font>模式窗口，每次都会创建新窗口"
+            }
+            FluButton{
+                text:"点击创建窗口"
+                onClicked: {
+                    FluApp.navigate("/standardWindow")
+                }
+            }
+        }
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 86
+        paddings: 10
+        Layout.topMargin: 10
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluText{
+                text:"<font color='red'>SingleTask</font>模式窗口，如果窗口存在，这激活该窗口"
+                textFormat: Text.RichText
+            }
+            FluButton{
+                text:"点击创建窗口"
+                onClicked: {
+                    FluApp.navigate("/singleTaskWindow")
+                }
+            }
+        }
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 86
+        paddings: 10
+        Layout.topMargin: 10
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluText{
+                text:"<font color='red'>SingleInstance</font>模式窗口，如果窗口存在，则销毁窗口，然后新建窗口"
+            }
+            FluButton{
+                text:"点击创建窗口"
+                onClicked: {
+                    FluApp.navigate("/singleInstanceWindow")
+                }
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluWindow{
+  //launchMode: FluWindow.Standard
+  //launchMode: FluWindow.SingleTask
+     launchMode: FluWindow.SingleInstance
+}
+'
+    }
+
+
+    FluArea{
+        Layout.fillWidth: true
         height: 100
         paddings: 10
         Layout.topMargin: 20
-
         Column{
             spacing: 15
             anchors{
@@ -46,9 +127,20 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluButton{
+    text:"点击跳转"
+    onClicked: {
+        FluApp.navigate("/about")
+    }
+}
+'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 130
         paddings: 10
         Layout.topMargin: 20
@@ -68,13 +160,31 @@ FluScrollablePage{
                     loginPageRegister.launch({username:"zhuzichu"})
                 }
             }
-
             FluText{
                 text:"登录窗口返回过来的密码->"+password
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'property var loginPageRegister: registerForPageResult("/login")
 
+Connections{
+    target: loginPageRegister
+    function onResult(data)
+    {
+        password = data.password
+    }
+}
 
+FluButton{
+    text:"点击跳转"
+    onClicked: {
+        loginPageRegister.launch({username:"zhuzichu"})
+    }
+}
+'
+    }
 
 }

example/T_Pivot.qml

@@ -0,0 +1,84 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
+
+FluScrollablePage{
+
+    title:"Pivot"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 400
+        paddings: 10
+
+        FluPivot{
+            anchors.fill: parent
+            currentIndex: 2
+            FluPivotItem{
+                title:"All"
+                contentItem:FluText{
+                    text:"All emails go here."
+                }
+            }
+            FluPivotItem{
+                title:"Unread"
+                contentItem:FluText{
+                    text:"Unread emails go here."
+                }
+            }
+            FluPivotItem{
+                title:"Flagged"
+                contentItem:FluText{
+                    text:"Flagged emails go here."
+                }
+            }
+            FluPivotItem{
+                title:"Urgent"
+                contentItem:FluText{
+                    text:"Urgent emails go here."
+                }
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluPivot{
+    anchors.fill: parent
+    FluPivotItem:{
+        text:"All"
+        contentItem: FluText{
+            text:"All emails go here."
+        }
+    }
+    FluPivotItem:{
+        text:"Unread"
+        contentItem: FluText{
+            text:"Unread emails go here."
+        }
+    }
+    FluPivotItem:{
+        text:"Flagged"
+        contentItem: FluText{
+            text:"Flagged emails go here."
+        }
+    }
+    FluPivotItem:{
+        text:"Urgent"
+        contentItem: FluText{
+            text:"Urgent emails go here."
+        }
+    }
+}
+'
+    }
+
+}

example/T_Progress.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,30 +11,60 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluProgressBar{
+    FluArea{
+        Layout.fillWidth: true
         Layout.topMargin: 20
-    }
-    FluProgressRing{
-        Layout.topMargin: 10
-    }
-    FluProgressBar{
-        id:progress_bar
-        Layout.topMargin: 20
-        indeterminate: false
-    }
-    FluProgressRing{
-        id:progress_ring
-        Layout.topMargin: 10
-        indeterminate: false
-    }
-    FluSlider{
-        Layout.topMargin: 30
-        value:50
-        onValueChanged:{
-            progress_bar.progress = value/100
-            progress_ring.progress = value/100
+        height: 260
+        paddings: 10
+        ColumnLayout{
+            spacing: 20
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluProgressBar{
+            }
+            FluProgressRing{
+            }
+            FluProgressBar{
+                id:progress_bar
+                indeterminate: false
+            }
+            FluProgressRing{
+                id:progress_ring
+                indeterminate: false
+            }
+            FluSlider{
+                value:50
+                onValueChanged:{
+                    progress_bar.progress = value/100
+                    progress_ring.progress = value/100
+                }
+            }
         }
-        Layout.bottomMargin: 30
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluProgressBar{
+
+}
+
+FluProgressRing{
+
+}
+
+FluProgressBar{
+    indeterminate: false
+}
+
+FluProgressRing{
+    indeterminate: false
+}'
+    }
+
+
+
 }

example/T_RatingControl.qml

@@ -0,0 +1,44 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
+
+FluScrollablePage{
+
+    title:"RatingControl"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 100
+        paddings: 10
+        Layout.topMargin: 20
+
+        Column{
+            spacing: 10
+            anchors.verticalCenter: parent.verticalCenter
+            FluRatingControl{
+
+            }
+            FluRatingControl{
+                number:10
+            }
+        }
+
+    }
+
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluRatingControl{
+
+}'
+    }
+
+
+}

example/T_Rectangle.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtQuick.Window 2.15
-import QtGraphicalEffects 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtQuick.Window
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,108 +11,142 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    RowLayout{
+    FluArea{
+        Layout.fillWidth: true
         Layout.topMargin: 20
-        FluRectangle{
-            width: 50
-            height: 50
-            color:"#0078d4"
-            radius:[0,0,0,0]
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            color:"#744da9"
-            radius:[15,15,15,15]
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            color:"#ffeb3b"
-            radius:[15,0,0,0]
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            color:"#f7630c"
-            radius:[0,15,0,0]
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            color:"#e71123"
-            radius:[0,0,15,0]
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            color:"#b4009e"
-            radius:[0,0,0,15]
+        height: 480
+        paddings: 10
+
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+
+            RowLayout{
+                Layout.topMargin: 20
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    color:"#0078d4"
+                    radius:[0,0,0,0]
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    color:"#744da9"
+                    radius:[15,15,15,15]
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    color:"#ffeb3b"
+                    radius:[15,0,0,0]
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    color:"#f7630c"
+                    radius:[0,15,0,0]
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    color:"#e71123"
+                    radius:[0,0,15,0]
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    color:"#b4009e"
+                    radius:[0,0,0,15]
+                }
+            }
+            FluText{
+                text:"配合图片使用"
+                fontStyle: FluText.SubTitle
+                Layout.topMargin: 20
+            }
+            RowLayout{
+                spacing: 14
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    radius:[25,0,25,25]
+                    Image {
+                        asynchronous: true
+                        anchors.fill: parent
+                        source: "qrc:/res/svg/avatar_1.svg"
+                        sourceSize: Qt.size(width,height)
+                    }
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    radius:[10,10,10,10]
+                    Image {
+                        asynchronous: true
+                        anchors.fill: parent
+                        sourceSize: Qt.size(width,height)
+                        source: "qrc:/res/svg/avatar_2.svg"
+                    }
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    radius:[25,25,25,25]
+                    Image {
+                        asynchronous: true
+                        anchors.fill: parent
+                        sourceSize: Qt.size(width,height)
+                        source: "qrc:/res/svg/avatar_3.svg"
+                    }
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    radius:[0,25,25,25]
+                    Image {
+                        asynchronous: true
+                        anchors.fill: parent
+                        sourceSize: Qt.size(width,height)
+                        source: "qrc:/res/svg/avatar_4.svg"
+                    }
+                }
+            }
+            FluRectangle{
+                width: 1080/5
+                height: 1439/5
+                radius:[25,25,25,25]
+                Image {
+                    asynchronous: true
+                    source: "qrc:/res/image/image_huoyin.webp"
+                    anchors.fill: parent
+                    sourceSize: Qt.size(width,height)
+                }
+                Layout.topMargin: 10
+            }
+
         }
     }
-    FluText{
-        text:"配合图片使用"
-        fontStyle: FluText.Subtitle
-        Layout.topMargin: 20
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluRectangle{
+    radius: [25,25,25,25]
+    width: 50
+    height: 50
+    Image{
+        asynchronous: true
+        anchors.fill: parent
+        source: "qrc:/res/svg/avatar_4.svg"
+        sourceSize: Qt.size(width,height)
     }
-    RowLayout{
-        spacing: 14
-        FluRectangle{
-            width: 50
-            height: 50
-            radius:[25,0,25,25]
-            Image {
-                asynchronous: true
-                anchors.fill: parent
-                source: "qrc:/res/svg/avatar_1.svg"
-                sourceSize: Qt.size(width,height)
-            }
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            radius:[10,10,10,10]
-            Image {
-                asynchronous: true
-                anchors.fill: parent
-                sourceSize: Qt.size(width,height)
-                source: "qrc:/res/svg/avatar_2.svg"
-            }
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            radius:[25,25,25,25]
-            Image {
-                asynchronous: true
-                anchors.fill: parent
-                sourceSize: Qt.size(width,height)
-                source: "qrc:/res/svg/avatar_3.svg"
-            }
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            radius:[0,25,25,25]
-            Image {
-                asynchronous: true
-                anchors.fill: parent
-                sourceSize: Qt.size(width,height)
-                source: "qrc:/res/svg/avatar_4.svg"
-            }
-        }
-    }
-    FluRectangle{
-        width: 1080/5
-        height: 1439/5
-        radius:[25,25,25,25]
-        Image {
-            asynchronous: true
-            source: "qrc:/res/image/image_huoyin.webp"
-            anchors.fill: parent
-            sourceSize: Qt.size(width,height)
-        }
-        Layout.topMargin: 10
+}'
     }
+
+
 }

example/T_Settings.qml

@@ -0,0 +1,117 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "qrc:///global/"
+import "./component"
+
+FluScrollablePage{
+
+    title:"Settings"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 136
+        paddings: 10
+
+        ColumnLayout{
+            spacing: 10
+            anchors{
+                top: parent.top
+                left: parent.left
+            }
+            FluText{
+                text:lang.dark_mode
+                fontStyle: FluText.BodyStrong
+                Layout.bottomMargin: 4
+            }
+            Repeater{
+                model: [{title:"System",mode:FluDarkMode.System},{title:"Light",mode:FluDarkMode.Light},{title:"Dark",mode:FluDarkMode.Dark}]
+                delegate:  FluRadioButton{
+                    selected : FluTheme.darkMode === modelData.mode
+                    text:modelData.title
+                    onClicked:{
+                        FluTheme.darkMode = modelData.mode
+                    }
+                }
+            }
+
+
+        }
+
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 168
+        paddings: 10
+
+        ColumnLayout{
+            spacing: 10
+            anchors{
+                top: parent.top
+                left: parent.left
+            }
+
+            FluText{
+                text:lang.navigation_view_display_mode
+                fontStyle: FluText.BodyStrong
+                Layout.bottomMargin: 4
+            }
+            Repeater{
+                model: [{title:"Open",mode:FluNavigationView.Open},{title:"Compact",mode:FluNavigationView.Compact},{title:"Minimal",mode:FluNavigationView.Minimal},{title:"Auto",mode:FluNavigationView.Auto}]
+                delegate:  FluRadioButton{
+                    selected : MainEvent.displayMode===modelData.mode
+                    text:modelData.title
+                    onClicked:{
+                        MainEvent.displayMode = modelData.mode
+                    }
+                }
+            }
+        }
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 80
+        paddings: 10
+
+        ColumnLayout{
+            spacing: 10
+            anchors{
+                top: parent.top
+                left: parent.left
+            }
+
+            FluText{
+                text:lang.locale
+                fontStyle: FluText.BodyStrong
+                Layout.bottomMargin: 4
+            }
+
+            Flow{
+                spacing: 5
+                Repeater{
+                    model: ["Zh","En"]
+                    delegate:  FluRadioButton{
+                        selected : appInfo.lang.objectName === modelData
+                        text:modelData
+                        onClicked:{
+                            console.debug(modelData)
+                            appInfo.changeLang(modelData)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+}

example/T_Slider.qml

@@ -1,8 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import "./component"
+import FluentUI
 
 FluScrollablePage{
 
@@ -10,17 +11,48 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluSlider{
+    FluArea{
+        Layout.fillWidth: true
+        height: 100
+        paddings: 10
         Layout.topMargin: 20
-        value: 50
-        Layout.leftMargin: 10
+        FluSlider{
+            value: 50
+            anchors.verticalCenter: parent.verticalCenter
+        }
     }
-    FluSlider{
-        orientation:FluSlider.Vertical
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluSlider{
+    value:50
+}'
+    }
+
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 200
+        paddings: 10
         Layout.topMargin: 20
-        Layout.leftMargin: 10
-        Layout.bottomMargin: 20
-        value: 50
+        FluSlider{
+            value: 50
+            vertical:true
+            anchors.left: parent.left
+            anchors.leftMargin: 20
+            anchors.verticalCenter: parent.verticalCenter
+        }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluSlider{
+    vertical:true
+    value:50
+}'
+    }
+
+
 }

example/T_StatusView.qml

@@ -0,0 +1,92 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import QtQuick.Window
+import FluentUI
+import "./component"
+
+FluScrollablePage{
+
+    title:"StatusView"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    FluArea{
+        id:layout_actions
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 50
+        paddings: 10
+        RowLayout{
+            spacing: 14
+            FluDropDownButton{
+                id:btn_status_mode
+                Layout.preferredWidth: 140
+                text:"Loading"
+                items:[
+                    FluMenuItem{
+                        text:"Loading"
+                        onClicked: {
+                            btn_status_mode.text = text
+                            status_view.statusMode = FluStatusView.Loading
+                        }
+                    },
+                    FluMenuItem{
+                        text:"Empty"
+                        onClicked: {
+                            btn_status_mode.text = text
+                            status_view.statusMode = FluStatusView.Empty
+                        }
+                    },
+                    FluMenuItem{
+                        text:"Error"
+                        onClicked: {
+                            btn_status_mode.text = text
+                            status_view.statusMode = FluStatusView.Error
+                        }
+                    },
+                    FluMenuItem{
+                        text:"Success"
+                        onClicked: {
+                            btn_status_mode.text = text
+                            status_view.statusMode = FluStatusView.Success
+                        }
+                    }
+                ]
+            }
+        }
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 10
+        height: 380
+        paddings: 10
+        FluStatusView{
+            id:status_view
+            anchors.fill: parent
+            onErrorClicked:{
+                showError("点击重新加载")
+            }
+            Rectangle {
+                anchors.fill: parent
+                color:FluTheme.primaryColor.dark
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluStatusView{
+    anchors.fill: parent
+    statusMode: FluStatusView.Loading
+    Rectangle{
+        anchors.fill: parent
+        color:FluTheme.primaryColor.dark
+    }
+}'
+    }
+
+}

example/T_TabView.qml

@@ -1,8 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,6 +11,9 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
+
+    property var colors : [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]
 
     Component{
         id:com_page
@@ -19,26 +23,116 @@ FluScrollablePage{
         }
     }
 
+    function newTab(){
+        tab_view.appendTab("qrc:/res/image/favicon.ico","Document "+tab_view.count(),com_page,colors[Math.floor(Math.random() * 8)].dark)
+    }
+
     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)
+        newTab()
+        newTab()
+        newTab()
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 50
+        paddings: 10
+        RowLayout{
+            spacing: 14
+            FluDropDownButton{
+                id:btn_tab_width_behavior
+                Layout.preferredWidth: 140
+                text:"Equal"
+                items:[
+                    FluMenuItem{
+                        text:"Equal"
+                        onClicked: {
+                            btn_tab_width_behavior.text = text
+                            tab_view.tabWidthBehavior = FluTabView.Equal
+                        }
+                    },
+                    FluMenuItem{
+                        text:"SizeToContent"
+                        onClicked: {
+                            btn_tab_width_behavior.text = text
+                            tab_view.tabWidthBehavior = FluTabView.SizeToContent
+                        }
+                    },
+                    FluMenuItem{
+                        text:"Compact"
+                        onClicked: {
+                            btn_tab_width_behavior.text = text
+                            tab_view.tabWidthBehavior = FluTabView.Compact
+                        }
+                    }
+                ]
+            }
+            FluDropDownButton{
+                id:btn_close_button_visibility
+                text:"Always"
+                Layout.preferredWidth: 120
+                items:[
+                    FluMenuItem{
+                        text:"Nerver"
+                        onClicked: {
+                            btn_close_button_visibility.text = text
+                            tab_view.closeButtonVisibility = FluTabView.Nerver
+                        }
+                    },
+                    FluMenuItem{
+                        text:"Always"
+                        onClicked: {
+                            btn_close_button_visibility.text = text
+                            tab_view.closeButtonVisibility = FluTabView.Always
+                        }
+                    },
+                    FluMenuItem{
+                        text:"OnHover"
+                        onClicked: {
+                            btn_close_button_visibility.text = text
+                            tab_view.closeButtonVisibility = FluTabView.OnHover
+                        }
+                    }
+                ]
+            }
         }
     }
 
     FluArea{
-        width: parent.width
-        Layout.topMargin: 20
+        Layout.fillWidth: true
+        Layout.topMargin: 15
         height: 400
         paddings: 10
-
-
         FluTabView{
             id:tab_view
+            onNewPressed:{
+                newTab()
+            }
         }
-
-
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluTabView{
+    anchors.fill: parent
+    Component.onCompleted: {
+        newTab()
+        newTab()
+        newTab()
+    }
+    Component{
+        id:com_page
+        Rectangle{
+            anchors.fill: parent
+            color: argument
+        }
+    }
+    function newTab(){
+        tab_view.appendTab("qrc:/res/image/favicon.ico","Document 1",com_page,argument)
+    }
+}
+'
     }
 
-
 }

example/T_TableView.qml

@@ -0,0 +1,159 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
+
+FluScrollablePage{
+
+    title:"TableView"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    Component.onCompleted: {
+        const columns = [
+                          {
+                              title: '姓名',
+                              dataIndex: 'name',
+                              width:100
+                          },
+                          {
+                              title: '年龄',
+                              dataIndex: 'age',
+                              width:100
+                          },
+                          {
+                              title: '住址',
+                              dataIndex: 'address',
+                              width:200
+                          },
+                          {
+                              title: '别名',
+                              dataIndex: 'nickname',
+                              width:100
+                          },
+                          {
+                              title: '操作',
+                              dataIndex: 'action',
+                              width:100
+                          },
+                      ];
+        table_view.columns = columns
+        loadData(1,10)
+    }
+
+    FluTableView{
+        id:table_view
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        pageCurrent:1
+        pageCount:10
+        itemCount: 1000
+        onRequestPage:
+            (page,count)=> {
+                loadData(page,count)
+            }
+    }
+
+    Component{
+        id:com_action
+        Item{
+            Row{
+                anchors.centerIn: parent
+                spacing: 10
+                FluFilledButton{
+                    text:"编辑"
+                    topPadding:3
+                    bottomPadding:3
+                    leftPadding:3
+                    rightPadding:3
+                    onClicked:{
+                        console.debug(dataModel.index)
+                        showSuccess(JSON.stringify(dataObject))
+                    }
+                }
+                FluFilledButton{
+                    text:"删除"
+                    topPadding:3
+                    bottomPadding:3
+                    leftPadding:3
+                    rightPadding:3
+                    onClicked:{
+                        showError(JSON.stringify(dataObject))
+                    }
+                }
+            }
+        }
+    }
+
+    function loadData(page,count){
+        const dataSource = []
+        for(var i=0;i<count;i++){
+            dataSource.push({
+                                name: "孙悟空%1".arg(((page-1)*count+i)),
+                                age: 500,
+                                address: "钟灵毓秀的花果山,如神仙仙境的水帘洞",
+                                nickname: "齐天大圣",
+                                action:com_action
+                            })
+        }
+        table_view.dataSource = dataSource
+    }
+
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: 10
+        code:'FluTableView{
+    id:table_view
+    Layout.fillWidth: true
+    Layout.topMargin: 20
+    pageCurrent:1
+    pageCount:10
+    itemCount: 1000
+    onRequestPage:
+            (page,count)=> {
+                loadData(page,count)
+            }
+    Component.onCompleted: {
+        const columns = [
+                          {
+                              title: "姓名",
+                              dataIndex: "name",
+                              width:100
+                          },
+                          {
+                              title: "年龄",
+                              dataIndex: "age",
+                              width:100
+                          },
+                          {
+                              title: "住址",
+                              dataIndex: "address",
+                              width:200
+                          },
+                          {
+                              title: "别名",
+                              dataIndex: "nickname",
+                              width:100
+                          }
+                      ];
+        table_view.columns = columns
+        const dataSource = [
+                {
+                    name: "孙悟空”,
+                    age: 500,
+                    address:"钟灵毓秀的花果山,如神仙仙境的水帘洞",
+                    nickname:"齐天大圣"
+                }
+        ];
+        table_view.dataSource = columns
+    }
+}'
+    }
+
+
+
+}

example/T_TextBox.qml

@@ -1,9 +1,9 @@
-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
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,32 +11,164 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluTextBox{
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
         Layout.topMargin: 20
-        placeholderText: "单行输入框"
-        Layout.preferredWidth: 300
-        disabled:toggle_switch.selected
+
+        FluTextBox{
+            Layout.topMargin: 20
+            placeholderText: "单行输入框"
+            Layout.preferredWidth: 300
+            disabled:text_box_switch.selected
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:text_box_switch
+                Layout.alignment: Qt.AlignRight
+                text:"Disabled"
+            }
+        }
     }
-    FluMultiLineTextBox{
-        Layout.topMargin: 20
-        Layout.preferredWidth: 300
-        placeholderText: "多行输入框"
-        disabled:toggle_switch.selected
-    }
-    FluAutoSuggestBox{
-        Layout.topMargin: 20
-        values:generateRandomNames(100)
-        placeholderText: "AutoSuggestBox"
-        Layout.preferredWidth: 300
-        disabled:toggle_switch.selected
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluTextBox{
+    placeholderText:"单行输入框"
+}'
     }
 
-    FluToggleSwitch{
-        id:toggle_switch
-        text:"Disabled"
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
         Layout.topMargin: 20
+
+        FluPasswordBox{
+            Layout.topMargin: 20
+            placeholderText: "请输入密码"
+            Layout.preferredWidth: 300
+            disabled:password_box_switch.selected
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:password_box_switch
+                Layout.alignment: Qt.AlignRight
+                text:"Disabled"
+            }
+        }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluPasswordBox{
+    placeholderText:"请输入密码"
+}'
+    }
+
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 36+multiine_textbox.height
+        paddings: 10
+        Layout.topMargin: 20
+
+        FluMultilineTextBox{
+            id:multiine_textbox
+            Layout.topMargin: 20
+            placeholderText: "多行输入框"
+            Layout.preferredWidth: 300
+            disabled:text_box_multi_switch.selected
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:text_box_multi_switch
+                Layout.alignment: Qt.AlignRight
+                text:"Disabled"
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluMultilineTextBox{
+    placeholderText:"多行输入框"
+}'
+    }
+
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
+        Layout.topMargin: 20
+
+        FluAutoSuggestBox{
+            Layout.topMargin: 20
+            placeholderText: "AutoSuggestBox"
+            Layout.preferredWidth: 300
+            items:generateRandomNames(100)
+            disabled:text_box_suggest_switch.selected
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:text_box_suggest_switch
+                Layout.alignment: Qt.AlignRight
+                text:"Disabled"
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluAutoSuggestBox{
+    placeholderText:"AutoSuggestBox"
+}'
+    }
+
 
     function generateRandomNames(numNames) {
         const alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
@@ -52,7 +184,7 @@ FluScrollablePage{
         }
         for (let i = 0; i < numNames; i++) {
             const name = generateRandomName();
-            names.push(name);
+            names.push({title:name});
         }
         return names;
     }

example/T_Theme.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,52 +11,82 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    RowLayout{
+    FluArea{
+        Layout.fillWidth: true
         Layout.topMargin: 20
-        Repeater{
-            model: [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]
-            delegate:  FluRectangle{
-                width: 42
-                height: 42
-                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.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
-                }
-                MouseArea{
-                    id:mouse_item
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    onClicked: {
-                        FluTheme.primaryColor = modelData
+        height: 210
+        paddings: 10
+        ColumnLayout{
+            spacing:0
+            anchors{
+                left: parent.left
+            }
+            RowLayout{
+                Layout.topMargin: 10
+                Repeater{
+                    model: [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]
+                    delegate:  FluRectangle{
+                        width: 42
+                        height: 42
+                        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.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
+                        }
+                        MouseArea{
+                            id:mouse_item
+                            anchors.fill: parent
+                            hoverEnabled: true
+                            onClicked: {
+                                FluTheme.primaryColor = modelData
+                            }
+                        }
                     }
                 }
             }
+            FluText{
+                text:"夜间模式"
+                Layout.topMargin: 20
+            }
+            FluToggleSwitch{
+                Layout.topMargin: 5
+                selected: FluTheme.dark
+                clickFunc:function(){
+                    if(FluTheme.dark){
+                        FluTheme.darkMode = FluDarkMode.Light
+                    }else{
+                        FluTheme.darkMode = FluDarkMode.Dark
+                    }
+                }
+            }
+            FluText{
+                text:"native文本渲染"
+                Layout.topMargin: 20
+            }
+            FluToggleSwitch{
+                Layout.topMargin: 5
+                selected: FluTheme.nativeText
+                clickFunc:function(){
+                    FluTheme.nativeText = !FluTheme.nativeText
+                }
+            }
         }
     }
-    FluText{
-        text:"夜间模式"
-        Layout.topMargin: 20
-    }
-    FluToggleSwitch{
-        selected: FluTheme.dark
-        clickFunc:function(){
-            FluTheme.dark = !FluTheme.dark
-        }
-    }
-    FluText{
-        text:"native文本渲染"
-        Layout.topMargin: 20
-    }
-    FluToggleSwitch{
-        selected: FluTheme.nativeText
-        clickFunc:function(){
-            FluTheme.nativeText = !FluTheme.nativeText
-        }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluTheme.primaryColor = FluColors.Orange
+
+FluTheme.dark = true
+
+FluTheme.nativeText = true'
     }
+
+
 }

example/T_TimePicker.qml

@@ -1,8 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,9 +11,10 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10
@@ -33,10 +35,16 @@ FluScrollablePage{
 
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluTimePicker{
 
+}'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10
@@ -49,15 +57,21 @@ FluScrollablePage{
             }
 
             FluText{
-                text:"hourFormat=FluTimePicker.HH"
+                text:"hourFormat=FluTimePicker.H"
             }
 
             FluTimePicker{
-                hourFormat:FluTimePicker.HH
+                 hourFormat:FluTimePicker.HH
             }
 
         }
     }
-
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluTimePicker{
+    hourFormat:FluTimePicker.HH
+}'
+    }
 
 }

example/T_ToggleSwitch.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtGraphicalEffects 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,12 +11,30 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluToggleSwitch{
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
         Layout.topMargin: 20
+        Row{
+            spacing: 30
+            anchors.verticalCenter: parent.verticalCenter
+            FluToggleSwitch{
+            }
+            FluToggleSwitch{
+                text:"Text"
+            }
+        }
     }
-    FluToggleSwitch{
-        Layout.topMargin: 20
-        text:"Disabled"
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluToggleSwitch{
+    text:"Text"
+}'
     }
+
+
 }

example/T_Tooltip.qml

@@ -1,9 +1,9 @@
-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
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,15 +11,15 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluText{
         Layout.topMargin: 20
         text:"鼠标悬停不动，弹出Tooltip"
     }
 
-
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 68
         paddings: 10
@@ -43,9 +43,22 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluIconButton{
+    iconSource:FluentIcons.ChromeCloseContrast
+    iconSize: 15
+    text:"删除"
+    onClicked:{
+        showSuccess("点击IconButton")
+    }
+}
+'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 68
         paddings: 10
@@ -73,6 +86,22 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluButton{
+    id:button_1
+    text:"删除"
+    FluTooltip{
+        visible: button_1.hovered
+        text:button_1.text
+        delay: 1000
+    }
+    onClicked:{
+        showSuccess("点击一个Button")
+    }
+}'
+    }
 
 
 }

example/T_TreeView.qml

@@ -1,15 +1,17 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "./component"
 
-FluContentPage {
+FluScrollablePage {
 
     title:"TreeView"
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     function randomName() {
         var names = ["张三", "李四", "王五", "赵六", "钱七", "孙八", "周九", "吴十"]
@@ -50,95 +52,111 @@ FluContentPage {
         return [tree_view.createItem(randomCompany(), true, subtrees)].concat(createOrg(numLevels - 1, numSubtrees, numEmployees))
     }
 
-
-    FluTreeView{
-        id:tree_view
-        width:240
-        anchors{
-            top:parent.top
-            left:parent.left
-            bottom:parent.bottom
-        }
-        onItemClicked:
-            (model)=>{
-                showSuccess(model.text)
+    FluArea{
+        id:layout_actions
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 50
+        paddings: 10
+        RowLayout{
+            spacing: 14
+            FluDropDownButton{
+                id:btn_selection_model
+                Layout.preferredWidth: 140
+                text:"None"
+                items:[
+                    FluMenuItem{
+                        text:"None"
+                        onClicked: {
+                            btn_selection_model.text = text
+                            tree_view.selectionMode = FluTabView.Equal
+                        }
+                    },
+                    FluMenuItem{
+                        text:"Single"
+                        onClicked: {
+                            btn_selection_model.text = text
+                            tree_view.selectionMode = FluTabView.SizeToContent
+                        }
+                    },
+                    FluMenuItem{
+                        text:"Muiltple"
+                        onClicked: {
+                            btn_selection_model.text = text
+                            tree_view.selectionMode = FluTabView.Compact
+                        }
+                    }
+                ]
+            }
+            FluFilledButton{
+                text:"获取选中的数据"
+                onClicked: {
+                    if(tree_view.selectionMode === FluTreeView.None){
+                        showError("当前非选择模式,没有选中的数据")
+                    }
+                    if(tree_view.selectionMode === FluTreeView.Single){
+                        if(!tree_view.signleData()){
+                            showError("没有选中数据")
+                            return
+                        }
+                        showSuccess(tree_view.signleData().text)
+                    }
+                    if(tree_view.selectionMode === FluTreeView.Multiple){
+                        if(tree_view.multipData().length===0){
+                            showError("没有选中数据")
+                            return
+                        }
+                        var info = []
+                        tree_view.multipData().map((value)=>info.push(value.text))
+                        showSuccess(info.join(","))
+                    }
+                }
             }
-
-        Component.onCompleted: {
-            var org = createOrg(3, 3, 3)
-            updateData(org)
-
         }
+    }
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 10
+        paddings: 10
+        height: 400
+        FluTreeView{
+            id:tree_view
+            width:240
+            anchors{
+                top:parent.top
+                left:parent.left
+                bottom:parent.bottom
+            }
+            onItemClicked:
+                (model)=>{
+                    showSuccess(model.text)
+                }
 
+            Component.onCompleted: {
+                var org = createOrg(3, 3, 3)
+                createItem()
+                updateData(org)
+            }
+        }
     }
 
-
-    ColumnLayout{
-        anchors{
-            left: tree_view.right
-            right: parent.right
-            top: parent.top
-        }
-
-        FluText{
-            text:{
-                if(tree_view.selectionMode === FluTreeView.None){
-                    return "selectionMode->FluTreeView.None"
-                }
-                if(tree_view.selectionMode === FluTreeView.Single){
-                    return "selectionMode->FluTreeView.Single"
-                }
-                if(tree_view.selectionMode === FluTreeView.Multiple){
-                    return "selectionMode->FluTreeView.Multiple"
-                }
-            }
-        }
-
-        FluButton{
-            text:"None"
-            onClicked: {
-                tree_view.selectionMode = FluTreeView.None
-            }
-        }
-
-        FluButton{
-            text:"Single"
-            onClicked: {
-                tree_view.selectionMode = FluTreeView.Single
-            }
-        }
-
-        FluButton{
-            text:"Multiple"
-            onClicked: {
-                tree_view.selectionMode = FluTreeView.Multiple
-            }
-        }
-
-        FluFilledButton{
-            text:"获取选中的数据"
-            onClicked: {
-                if(tree_view.selectionMode === FluTreeView.None){
-                    showError("当前非选择模式,没有选中的数据")
-                }
-                if(tree_view.selectionMode === FluTreeView.Single){
-                    if(!tree_view.signleData()){
-                        showError("没有选中数据")
-                        return
-                    }
-                    showSuccess(tree_view.signleData().text)
-                }
-                if(tree_view.selectionMode === FluTreeView.Multiple){
-                    if(tree_view.multipData().length===0){
-                        showError("没有选中数据")
-                        return
-                    }
-                    var info = []
-                    tree_view.multipData().map((value)=>info.push(value.text))
-                    showSuccess(info.join(","))
-                }
-            }
-        }
-
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluTreeView{
+    id:tree_view
+    width:240
+    height:600
+    Component.onCompleted: {
+        var datas = []
+        datas.push(createItem("Node1",false))
+        datas.push(createItem("Node2",false))
+        datas.push(createItem("Node2",true,[createItem("Node2-1",false),createItem("Node2-2",false)]))
+        updateData(datas)
     }
 }
+'
+    }
+
+
+}

example/T_Typography.qml

@@ -1,29 +1,33 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import FluentUI
 
 FluContentPage {
 
     title: "Typography"
-    property int textSize: 13
+    property int textSize: FluTheme.textSize
     leftPadding:10
     rightPadding:10
     bottomPadding:20
 
     Component.onCompleted: {
-        slider.seek(31)
+        slider.seek(0)
     }
 
-    ScrollView{
-        clip: true
-        width: parent.width
-        contentWidth: parent.width
+    FluArea{
+        anchors{
+            top:parent.top
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            topMargin: 20
+        }
+        paddings: 10
         ColumnLayout{
             spacing: 0
             FluText{
                 text:"Display"
-                Layout.topMargin: 20
                 padding: 0
                 pixelSize: textSize
                 fontStyle: FluText.Display
@@ -44,13 +48,7 @@ FluContentPage {
                 text:"Subtitle"
                 padding: 0
                 pixelSize: textSize
-                fontStyle: FluText.Subtitle
-            }
-            FluText{
-                text:"Body Large"
-                padding: 0
-                pixelSize: textSize
-                fontStyle: FluText.BodyLarge
+                fontStyle: FluText.SubTitle
             }
             FluText{
                 text:"Body Strong"
@@ -71,21 +69,26 @@ FluContentPage {
                 fontStyle: FluText.Caption
             }
         }
+
+        FluSlider{
+            id:slider
+            vertical:true
+            anchors{
+                right: parent.right
+                rightMargin: 45
+                top: parent.top
+                topMargin: 30
+            }
+            onValueChanged:{
+                textSize = value/100*6+FluTheme.textSize
+            }
+        }
+
     }
 
 
-    FluSlider{
-        id:slider
-        orientation:FluSlider.Vertical
-        anchors{
-            right: parent.right
-            rightMargin: 45
-            top: parent.top
-            topMargin: 30
-        }
-        onValueChanged:{
-            textSize = value/100*16+8
-        }
-    }
+
+
+
 
 }

example/component/CodeExpander.qml

@@ -0,0 +1,131 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+
+FluExpander{
+
+    property string code: ""
+
+    headerText: "Source"
+    contentHeight:content.height
+
+    FluMultilineTextBox{
+        id:content
+        width:parent.width
+        readOnly:true
+        text:highlightQmlCode(code)
+        focus:false
+        textFormat: FluMultilineTextBox.RichText
+        KeyNavigation.priority: KeyNavigation.BeforeItem
+        background:Rectangle{
+            radius: 4
+            color:FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
+            border.color: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
+            border.width: 1
+        }
+    }
+
+    FluIconButton{
+        iconSource:FluentIcons.Copy
+        anchors{
+            right: parent.right
+            top: parent.top
+            rightMargin: 5
+            topMargin: 5
+        }
+        onClicked:{
+            FluApp.clipText(content.text)
+            showSuccess("复制成功")
+        }
+    }
+
+    function htmlEncode(e){
+      var i,s;
+      for(i in s={
+        "&":/&/g,//""//":/"/g,"'":/'/g,
+        "<":/</g,">":/>/g,"<br/>":/\n/g,
+        " ":/ /g,"  ":/\t/g
+      })e=e.replace(s[i],i);
+      return e;
+    }
+
+    function highlightQmlCode(code) {
+      // 定义 QML 关键字列表
+      var qmlKeywords = [
+        "FluTextButton",
+        "FluAppBar",
+          "FluAutoSuggestBox",
+          "FluBadge",
+          "FluButton",
+          "FluCalendarPicker",
+          "FluCalendarView",
+          "FluCarousel",
+          "FluCheckBox",
+          "FluColorPicker",
+          "FluColorView",
+          "FluComboBox",
+          "FluContentDialog",
+          "FluContentPage",
+          "FluDatePicker",
+          "FluDivider",
+          "FluDropDownButton",
+          "FluExpander",
+          "FluFilledButton",
+          "FluFlipView",
+          "FluFocusRectangle",
+          "FluIcon",
+          "FluIconButton",
+          "FluInfoBar",
+          "FluItem",
+          "FluMediaPlayer",
+          "FluMenu",
+          "FluMenuItem",
+          "FluMultilineTextBox",
+          "FluNavigationView",
+          "FluObject",
+          "FluPaneItem",
+          "FluPaneItemExpander",
+          "FluPaneItemHeader",
+          "FluPaneItemSeparator",
+          "FluPivot",
+          "FluPivotItem",
+          "FluProgressBar",
+          "FluProgressRing",
+          "FluRadioButton",
+          "FluRectangle",
+          "FluScrollablePage",
+          "FluScrollBar",
+          "FluShadow",
+          "FluSlider",
+          "FluTabView",
+          "FluText",
+          "FluTextArea",
+          "FluTextBox",
+          "FluTextBoxBackground",
+          "FluTextBoxMenu",
+          "FluTextButton",
+          "FluTextFiled",
+          "FluTimePicker",
+          "FluToggleSwitch",
+          "FluTooltip",
+          "FluTreeView",
+          "FluWindow",
+          "FluWindowResize",
+          "FluToggleButton",
+          "FluTableView",
+          "FluColors",
+          "FluTheme",
+          "FluStatusView",
+          "FluRatingControl",
+          "FluPasswordBox"
+      ];
+      code = code.replace(/\n/g, "<br>");
+      code = code.replace(/ /g, "&nbsp;");
+      return code.replace(RegExp("\\b(" + qmlKeywords.join("|") + ")\\b", "g"), "<span style='color: #c23a80'>$1</span>");
+    }
+
+
+
+}

example/example.pro

@@ -1,12 +1,21 @@
 QT += quick concurrent network multimedia
-CONFIG += c++11
+CONFIG += c++17
 DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT
 
 HEADERS += \
-    ChatController.h
+    lang/En.h \
+    lang/Lang.h \
+    lang/Zh.h \
+    stdafx.h \
+    ChatController.h \
+    AppInfo.h
 
 SOURCES += \
         ChatController.cpp \
+        AppInfo.cpp \
+        lang/En.cpp \
+        lang/Lang.cpp \
+        lang/Zh.cpp \
         main.cpp
 
 RESOURCES += qml.qrc
@@ -23,21 +32,15 @@ CONFIG(debug,debug|release) {
 }
 
 win32 {
-contains(QT_ARCH, i386) {
-    COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x86/*.dll) $$DESTDIR
-    contains(QMAKE_CC, cl) {
-        QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, \\)
-    } else {
-        QMAKE_PRE_LINK += $$QMAKE_COPY $$COPYDLL
-    }
+
+contains(QMAKE_CC, cl) {
+    COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/msvc/*.dll) $$DESTDIR
+    QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP)
 } else {
-    COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x64/*.dll) $$DESTDIR
-    contains(QMAKE_CC, cl) {
-        QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, \\)
-    } else {
-        QMAKE_PRE_LINK += $$QMAKE_COPY $$COPYDLL
-    }
+    COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/mingw/*.dll) $$DESTDIR
+    QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP)
 }
+
 }
 
 qnx: target.path = /tmp/$${TARGET}/bin

example/global/ItemsFooter.qml

@@ -0,0 +1,26 @@
+pragma Singleton
+
+import QtQuick
+import FluentUI
+
+FluObject{
+    id:footer_items
+
+    property var navigationView
+
+    FluPaneItemSeparator{}
+    FluPaneItem{
+        title:lang.about
+        icon:FluentIcons.Contact
+        tapFunc:function(){
+            FluApp.navigate("/about")
+        }
+    }
+    FluPaneItem{
+        title:lang.settings
+        icon:FluentIcons.Settings
+        onTap:{
+            navigationView.push("qrc:/T_Settings.qml")
+        }
+    }
+}

example/global/ItemsOriginal.qml

@@ -0,0 +1,320 @@
+pragma Singleton
+
+import QtQuick
+import FluentUI
+
+FluObject{
+
+    property var navigationView
+
+    FluPaneItem{
+        title:lang.home
+        //        icon:FluentIcons.Home
+        cusIcon: Image{
+            anchors.centerIn: parent
+            source: FluTheme.dark ? "qrc:/res/svg/home_dark.svg" : "qrc:/res/svg/home.svg"
+            sourceSize: Qt.size(30,30)
+            width: 18
+            height: 18
+        }
+        onTap:{
+            navigationView.push("qrc:/T_Home.qml")
+        }
+    }
+
+    FluPaneItemExpander{
+        title:lang.basic_input
+        icon:FluentIcons.CheckboxComposite
+        FluPaneItem{
+            title:"Buttons"
+            image:"qrc:/res/image/control/Button.png"
+            recentlyUpdated:true
+            desc:"A control that responds to user input and raisesa Click event."
+            onTap:{
+                navigationView.push("qrc:/T_Buttons.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Slider"
+            image:"qrc:/res/image/control/Slider.png"
+            recentlyUpdated:true
+            desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack."
+            onTap:{
+                navigationView.push("qrc:/T_Slider.qml")
+            }
+        }
+        FluPaneItem{
+            title:"CheckBox"
+            image:"qrc:/res/image/control/Checkbox.png"
+            recentlyUpdated:true
+            desc:"A control that a user can select or clear."
+            onTap:{
+                navigationView.push("qrc:/T_CheckBox.qml")
+            }
+        }
+        FluPaneItem{
+            title:"ToggleSwitch"
+            onTap:{
+                navigationView.push("qrc:/T_ToggleSwitch.qml")
+            }
+        }
+    }
+
+    FluPaneItemExpander{
+        title:lang.form
+        icon:FluentIcons.GridView
+        FluPaneItem{
+            title:"TextBox"
+            onTap:{
+                navigationView.push("qrc:/T_TextBox.qml")
+            }
+        }
+        FluPaneItem{
+            title:"TimePicker"
+            onTap:{
+                navigationView.push("qrc:/T_TimePicker.qml")
+            }
+        }
+        FluPaneItem{
+            title:"DatePicker"
+            onTap:{
+                navigationView.push("qrc:/T_DatePicker.qml")
+            }
+        }
+        FluPaneItem{
+            title:"CalendarPicker"
+            onTap:{
+                navigationView.push("qrc:/T_CalendarPicker.qml")
+            }
+        }
+        FluPaneItem{
+            title:"ColorPicker"
+            onTap:{
+                navigationView.push("qrc:/T_ColorPicker.qml")
+            }
+        }
+    }
+
+    FluPaneItemExpander{
+        title:lang.surface
+        icon:FluentIcons.SurfaceHub
+        FluPaneItem{
+            title:"InfoBar"
+            image:"qrc:/res/image/control/InfoBar.png"
+            recentlyUpdated:true
+            desc:"An inline message to display app-wide statuschange information."
+            onTap:{
+                navigationView.push("qrc:/T_InfoBar.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Progress"
+            onTap:{
+                navigationView.push("qrc:/T_Progress.qml")
+            }
+        }
+        FluPaneItem{
+            title:"RatingControl"
+            onTap:{
+                navigationView.push("qrc:/T_RatingControl.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Badge"
+            onTap:{
+                navigationView.push("qrc:/T_Badge.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Rectangle"
+            onTap:{
+                navigationView.push("qrc:/T_Rectangle.qml")
+            }
+        }
+        FluPaneItem{
+            title:"StatusView"
+            onTap:{
+                navigationView.push("qrc:/T_StatusView.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Carousel"
+            onTap:{
+                navigationView.push("qrc:/T_Carousel.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Expander"
+            onTap:{
+                navigationView.push("qrc:/T_Expander.qml")
+            }
+        }
+    }
+
+    FluPaneItemExpander{
+        title:lang.popus
+        icon:FluentIcons.ButtonMenu
+        FluPaneItem{
+            title:"Dialog"
+            onTap:{
+                navigationView.push("qrc:/T_Dialog.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Tooltip"
+            onTap:{
+                navigationView.push("qrc:/T_Tooltip.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Menu"
+            onTap:{
+                navigationView.push("qrc:/T_Menu.qml")
+            }
+        }
+    }
+
+    FluPaneItemExpander{
+        title:lang.navigation
+        icon:FluentIcons.AllApps
+        FluPaneItem{
+            title:"Pivot"
+            image:"qrc:/res/image/control/Pivot.png"
+            recentlyAdded:true
+            order:3
+            desc:"Presents information from different sources in atabbed view."
+            onTap:{
+                navigationView.push("qrc:/T_Pivot.qml")
+            }
+        }
+        FluPaneItem{
+            title:"TabView"
+            image:"qrc:/res/image/control/TabView.png"
+            recentlyAdded:true
+            order:1
+            desc:"A control that displays a collection of tabs thatcan be used to display several documents."
+            onTap:{
+                navigationView.push("qrc:/T_TabView.qml")
+            }
+        }
+        FluPaneItem{
+            title:"TreeView"
+            onTap:{
+                navigationView.push("qrc:/T_TreeView.qml")
+            }
+        }
+        FluPaneItem{
+            title:"TableView"
+            image:"qrc:/res/image/control/DataGrid.png"
+            recentlyAdded:true
+            order:4
+            desc:"The TableView control provides a flexible way to display a collection of data in rows and columns"
+            onTap:{
+                navigationView.push("qrc:/T_TableView.qml")
+            }
+        }
+        FluPaneItem{
+            title:"MultiWindow"
+            onTap:{
+                navigationView.push("qrc:/T_MultiWindow.qml")
+            }
+        }
+        FluPaneItem{
+            title:"FlipView"
+            image:"qrc:/res/image/control/FlipView.png"
+            recentlyAdded:true
+            order:2
+            desc:"Presents a collection of items that the user canflip through, one item at a time."
+            onTap:{
+                navigationView.push("qrc:/T_FlipView.qml")
+            }
+        }
+    }
+
+    FluPaneItemExpander{
+        title:lang.theming
+        icon:FluentIcons.Brightness
+        FluPaneItem{
+            title:"Theme"
+            onTap:{
+                navigationView.push("qrc:/T_Theme.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Typography"
+            onTap:{
+                navigationView.push("qrc:/T_Typography.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Awesome"
+            onTap:{
+                navigationView.push("qrc:/T_Awesome.qml")
+            }
+        }
+    }
+
+    FluPaneItemExpander{
+        title:lang.media
+        icon:FluentIcons.Media
+        FluPaneItem{
+            title:"MediaPlayer"
+            image:"qrc:/res/image/control/MediaPlayerElement.png"
+            recentlyAdded:true
+            order:0
+            desc:"A control to display video and image content."
+            onTap:{
+                navigationView.push("qrc:/T_MediaPlayer.qml")
+            }
+        }
+    }
+
+    function getRecentlyAddedData(){
+        var arr = []
+        for(var i=0;i<children.length;i++){
+            var item = children[i]
+            if(item instanceof FluPaneItem && item.recentlyAdded){
+                arr.push(item)
+            }
+            if(item instanceof FluPaneItemExpander){
+                for(var j=0;j<item.children.length;j++){
+                    var itemChild = item.children[j]
+                    if(itemChild instanceof FluPaneItem && itemChild.recentlyAdded){
+                        arr.push(itemChild)
+                    }
+                }
+            }
+        }
+        arr.sort(function(o1,o2){ return o2.order-o1.order })
+        return arr
+    }
+
+    function getRecentlyUpdatedData(){
+        var arr = []
+        var items = navigationView.getItems();
+        for(var i=0;i<items.length;i++){
+            var item = items[i]
+            if(item instanceof FluPaneItem && item.recentlyUpdated){
+                arr.push(item)
+            }
+        }
+        return arr
+    }
+
+    function getSearchData(){
+        var arr = []
+        var items = navigationView.getItems();
+        for(var i=0;i<items.length;i++){
+            var item = items[i]
+            if(item instanceof FluPaneItem){
+                arr.push({title:item.title,key:item.key})
+            }
+        }
+        return arr
+    }
+
+    function startPageByItem(data){
+        navigationView.startPageByItem(data)
+    }
+
+}

example/global/MainEvent.qml

@@ -0,0 +1,9 @@
+pragma Singleton
+
+import QtQuick
+import QtQuick.Controls
+import FluentUI
+
+QtObject {
+    property int displayMode : FluNavigationView.Auto
+}

example/global/qmldir

@@ -0,0 +1,3 @@
+singleton ItemsOriginal 1.0 ItemsOriginal.qml
+singleton ItemsFooter 1.0 ItemsFooter.qml
+singleton MainEvent 1.0 MainEvent.qml

example/lang/En.cpp

@@ -0,0 +1,22 @@
+#include "En.h"
+
+En::En(QObject *parent)
+    : Lang{parent}
+{
+    setObjectName("En");
+    home("Home");
+    basic_input("Basic Input");
+    form("Form");
+    surface("Surfaces");
+    popus("Popus");
+    navigation("Navigation");
+    theming("Theming");
+    media("Media");
+    dark_mode("Dark Mode");
+    sys_dark_mode("Sync with system");
+    search("Search");
+    about("About");
+    settings("Settings");
+    locale("Locale");
+    navigation_view_display_mode("NavigationView Display Mode");
+}

example/lang/En.h

@@ -0,0 +1,17 @@
+#ifndef EN_H
+#define EN_H
+
+#include <QObject>
+#include "Lang.h"
+
+class En : public Lang
+{
+    Q_OBJECT
+public:
+    explicit En(QObject *parent = nullptr);
+
+signals:
+
+};
+
+#endif // EN_H

example/lang/Lang.cpp

@@ -0,0 +1,7 @@
+#include "Lang.h"
+
+Lang::Lang(QObject *parent)
+    : QObject{parent}
+{
+
+}

example/lang/Lang.h

@@ -0,0 +1,30 @@
+#ifndef LANG_H
+#define LANG_H
+
+#include <QObject>
+#include "stdafx.h"
+
+class Lang : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY_AUTO(QString,home);
+    Q_PROPERTY_AUTO(QString,basic_input);
+    Q_PROPERTY_AUTO(QString,form);
+    Q_PROPERTY_AUTO(QString,surface);
+    Q_PROPERTY_AUTO(QString,popus);
+    Q_PROPERTY_AUTO(QString,navigation);
+    Q_PROPERTY_AUTO(QString,theming);
+    Q_PROPERTY_AUTO(QString,media);
+    Q_PROPERTY_AUTO(QString,dark_mode);
+    Q_PROPERTY_AUTO(QString,sys_dark_mode);
+    Q_PROPERTY_AUTO(QString,search);
+    Q_PROPERTY_AUTO(QString,about);
+    Q_PROPERTY_AUTO(QString,settings);
+    Q_PROPERTY_AUTO(QString,navigation_view_display_mode);
+    Q_PROPERTY_AUTO(QString,locale);
+public:
+    explicit Lang(QObject *parent = nullptr);
+
+};
+
+#endif // LANG_H

example/lang/Zh.cpp

@@ -0,0 +1,22 @@
+#include "Zh.h"
+
+Zh::Zh(QObject *parent)
+    : Lang{parent}
+{
+    setObjectName("Zh");
+    home("首页");
+    basic_input("基本输入");
+    form("表单");
+    surface("表面");
+    popus("弹窗");
+    navigation("导航");
+    theming("主题");
+    media("媒体");
+    dark_mode("夜间模式");
+    sys_dark_mode("跟随系统");
+    search("查找");
+    about("关于");
+    settings("设置");
+    locale("语言环境");
+    navigation_view_display_mode("导航视图显示模式");
+}

example/lang/Zh.h

@@ -0,0 +1,17 @@
+#ifndef ZH_H
+#define ZH_H
+
+#include <QObject>
+#include "Lang.h"
+
+class Zh : public Lang
+{
+    Q_OBJECT
+public:
+    explicit Zh(QObject *parent = nullptr);
+
+signals:
+
+};
+
+#endif // ZH_H

example/main.cpp

@@ -4,34 +4,34 @@
 #include <QDir>
 #include <QQuickWindow>
 #include <QProcess>
+#include "lang/Lang.h"
+#include "AppInfo.h"
 #include "ChatController.h"
 
-QMap<QString, QVariant> properties(){
-    QMap<QString, QVariant> map;
-//    map["installHelper"] = QVariant::fromValue(QVariant::fromValue(InstallHelper::getInstance()));
-    return map;
-}
-
 int main(int argc, char *argv[])
 {
-    QCoreApplication::setOrganizationName("ZhuZiChu");
-    QCoreApplication::setOrganizationDomain("https://zhuzichu520.github.io");
-    QCoreApplication::setApplicationName("FluentUI");
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-//    QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
+    //将样式设置为Basic，不然会导致组件显示异常
+    qputenv("QT_QUICK_CONTROLS_STYLE","Basic");
+    //6.4及以下监听系统深色模式变化
+#ifdef Q_OS_WIN
+    qputenv("QT_QPA_PLATFORM","windows:darkmode=2");
+#endif
+    QGuiApplication::setOrganizationName("ZhuZiChu");
+    QGuiApplication::setOrganizationDomain("https://zhuzichu520.github.io");
+    QGuiApplication::setApplicationName("FluentUI");
+//    QQuickWindow::setGraphicsApi(QSGRendererInterface::Software);
     QGuiApplication app(argc, argv);
+    app.setQuitOnLastWindowClosed(false);
     QQmlApplicationEngine engine;
-
     qmlRegisterType<ChatController>("Controller",1,0,"ChatController");
-
-    QMapIterator<QString, QVariant> iterator(properties());
-    while (iterator.hasNext()) {
-        iterator.next();
-        QString key = iterator.key();
-        QVariant value = iterator.value();
-        engine.rootContext()->setContextProperty(key,value);
-    }
-    engine.rootContext()->setContextProperty("properties",properties());
+    AppInfo* appInfo = new AppInfo();
+    QQmlContext * context = engine.rootContext();
+    Lang* lang = appInfo->lang();
+    context->setContextProperty("lang",lang);
+    QObject::connect(appInfo,&AppInfo::langChanged,&app,[context,appInfo]{
+        context->setContextProperty("lang",appInfo->lang());
+    });
+    context->setContextProperty("appInfo",appInfo);
     const QUrl url(QStringLiteral("qrc:/App.qml"));
     QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
                      &app, [url](QObject *obj, const QUrl &objUrl) {

example/page/AboutPage.qml

@@ -1,22 +1,26 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
 
 FluWindow {
 
-    width: 500
+    id:window
+
+    width: 600
     height: 600
-    minimumWidth: 500
+    minimumWidth: 600
     minimumHeight: 600
-    maximumWidth: 500
+    maximumWidth: 600
     maximumHeight: 600
+    launchMode: FluWindow.SingleTask
 
     title:"关于"
 
     FluAppBar{
         id:appbar
         title:"关于"
+        width:parent.width
     }
 
     ColumnLayout{
@@ -35,7 +39,7 @@ FluWindow {
                 fontStyle: FluText.Title
             }
             FluText{
-                text:"v1.1.5"
+                text:"v%1".arg(appInfo.version)
                 fontStyle: FluText.Body
                 Layout.alignment: Qt.AlignBottom
             }
@@ -56,13 +60,14 @@ FluWindow {
 
         RowLayout{
             spacing: 14
-            Layout.topMargin: 20
             Layout.leftMargin: 15
             FluText{
                 text:"GitHub："
             }
             FluTextButton{
                 id:text_hublink
+                topPadding:0
+                bottomPadding:0
                 text:"https://github.com/zhuzichu520/FluentUI"
                 Layout.alignment: Qt.AlignBottom
                 onClicked: {
@@ -70,13 +75,30 @@ FluWindow {
                 }
             }
         }
+
+        RowLayout{
+            spacing: 14
+            Layout.leftMargin: 15
+            FluText{
+                text:"B站："
+            }
+            FluTextButton{
+                topPadding:0
+                bottomPadding:0
+                text:"https://www.bilibili.com/video/BV1mg4y1M71w/"
+                Layout.alignment: Qt.AlignBottom
+                onClicked: {
+                    Qt.openUrlExternally(text)
+                }
+            }
+        }
+
         RowLayout{
             spacing: 14
-            Layout.topMargin: 20
             Layout.leftMargin: 15
             FluText{
                 id:text_info
-                text:"如果该项目对你有作用，就请点击上方链接给一个免费的star吧！"
+                text:"如果该项目对你有作用，就请点击上方链接给一个免费的star，或者一键三连，谢谢！"
                 ColorAnimation {
                     id: animation
                     target: text_info
@@ -90,5 +112,43 @@ FluWindow {
                 }
             }
         }
+
+        RowLayout{
+            spacing: 14
+            Layout.leftMargin: 15
+            FluText{
+                text:"捐赠："
+            }
+        }
+
+        Item{
+            Layout.preferredWidth: parent.width
+            Layout.preferredHeight: 252
+            Row{
+                anchors.horizontalCenter: parent.horizontalCenter
+                spacing: 60
+                Image{
+                    width: 164.55
+                    height: 224.25
+                    source: "qrc:/res/image/qrcode_wx.jpg"
+                }
+                Image{
+                    width: 162
+                    height: 252
+                    source: "qrc:/res/image/qrcode_zfb.jpg"
+                }
+            }
+        }
+
+        RowLayout{
+            spacing: 14
+            Layout.leftMargin: 15
+            FluText{
+                id:text_desc
+                text:"个人开发，维护不易，你们的捐赠就是我继续更新的动力！\n有什么问题提Issues，只要时间充足我就会解决的！！"
+            }
+        }
+
+
     }
 }

example/page/ChatPage.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import FluentUI 1.0
-import Controller 1.0
-import QtQuick.Dialogs 1.3
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import FluentUI
+import Controller
+import QtQuick.Dialogs
 
 FluWindow {
 
@@ -43,6 +43,7 @@ FluWindow {
     FluAppBar{
         id:appbar
         title:"ChatGPT"
+        width:parent.width
     }
 
     Component{
@@ -182,7 +183,7 @@ FluWindow {
                 rightMargin: 10
             }
             height: Math.min(textbox.implicitHeight,64)
-            FluMultiLineTextBox{
+            FluMultilineTextBox{
                 id:textbox
                 focus:true
                 placeholderText: "请输入消息"

example/page/LoginPage.qml

@@ -1,6 +1,7 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Controls
+import FluentUI
 
 FluWindow {
 
@@ -11,19 +12,18 @@ FluWindow {
     minimumHeight: 400
     maximumWidth: 400
     maximumHeight: 400
-    modality:2
-
     title:"登录"
 
     onInitArgument:
         (argument)=>{
-            textbox_uesrname.text = argument.username
+            textbox_uesrname.updateText(argument.username)
             textbox_password.focus =  true
         }
 
     FluAppBar{
         id:appbar
         title:"登录"
+        width:parent.width
     }
 
     ColumnLayout{
@@ -33,10 +33,9 @@ FluWindow {
             verticalCenter: parent.verticalCenter
         }
 
-
         FluAutoSuggestBox{
             id:textbox_uesrname
-            values:["Admin","User"]
+            items:[{title:"Admin"},{title:"User"}]
             placeholderText: "请输入账号"
             Layout.preferredWidth: 260
             Layout.alignment: Qt.AlignHCenter

example/page/MainPage.qml

@@ -1,274 +1,101 @@
-import QtQuick 2.15
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtGraphicalEffects 1.15
-
-import FluentUI 1.0
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
+import Qt.labs.platform
+import FluentUI
+import "qrc:///global/"
 
 FluWindow {
-    id:rootwindow
+    id:window
     width: 1000
     height: 640
     title: "FluentUI"
+    closeDestory:false
     minimumWidth: 520
-    minimumHeight: 400
+    minimumHeight: 460
+
+    closeFunc:function(event){
+        close_app.open()
+        event.accepted = false
+    }
 
     FluAppBar{
         id:appbar
-        z:10
+        z:9
         showDark: true
+        width:parent.width
+        darkText: lang.dark_mode
     }
 
-    FluObject{
-        id:original_items
-
-        FluPaneItem{
-            title:"Home"
-            icon:FluentIcons.Home
-            onTap:{
-                nav_view.push("qrc:/T_Home.qml")
+    SystemTrayIcon {
+        id:system_tray
+        visible: true
+        icon.source: "qrc:/res/image/favicon.ico"
+        tooltip: "FluentUI"
+        menu: Menu {
+            MenuItem {
+                text: "退出"
+                onTriggered: {
+                    window.destoryWindow()
+                    FluApp.closeApp()
+                }
             }
         }
-
-        FluPaneItemHeader{
-            title:"Inputs"
-        }
-
-        FluPaneItem{
-            title:"Buttons"
-            onTap:{
-                nav_view.push("qrc:/T_Buttons.qml")
+        onActivated:
+            (reason)=>{
+                if(reason === SystemTrayIcon.Trigger){
+                    window.show()
+                    window.raise()
+                    window.requestActivate()
+                }
             }
-        }
-
-        FluPaneItem{
-            title:"Slider"
-            onTap:{
-                nav_view.push("qrc:/T_Slider.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"CheckBox"
-            onTap:{
-                nav_view.push("qrc:/T_CheckBox.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"ToggleSwitch"
-            onTap:{
-                nav_view.push("qrc:/T_ToggleSwitch.qml")
-            }
-        }
-
-        FluPaneItemHeader{
-            title:"Form"
-        }
-
-        FluPaneItem{
-            title:"TextBox"
-            onTap:{
-                nav_view.push("qrc:/T_TextBox.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"TimePicker"
-            onTap:{
-                nav_view.push("qrc:/T_TimePicker.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"DatePicker"
-            onTap:{
-                nav_view.push("qrc:/T_DatePicker.qml")
-            }
-        }
-
-        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"
-        }
-
-        FluPaneItem{
-            title:"InfoBar"
-            onTap:{
-                nav_view.push("qrc:/T_InfoBar.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"Progress"
-            onTap:{
-                nav_view.push("qrc:/T_Progress.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"Badge"
-            onTap:{
-                nav_view.push("qrc:/T_Badge.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"Rectangle"
-            onTap:{
-                nav_view.push("qrc:/T_Rectangle.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"Carousel"
-            onTap:{
-                nav_view.push("qrc:/T_Carousel.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"Expander"
-            onTap:{
-                nav_view.push("qrc:/T_Expander.qml")
-            }
-        }
-
-        FluPaneItemHeader{
-            title:"Popus"
-        }
-
-        FluPaneItem{
-            title:"Dialog"
-            onTap:{
-                nav_view.push("qrc:/T_Dialog.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"Tooltip"
-            onTap:{
-                nav_view.push("qrc:/T_Tooltip.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"Menu"
-            onTap:{
-                nav_view.push("qrc:/T_Menu.qml")
-            }
-        }
-
-        FluPaneItemHeader{
-            title:"Navigation"
-        }
-
-        FluPaneItem{
-            title:"TabView"
-            onTap:{
-                nav_view.push("qrc:/T_TabView.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"TreeView"
-            onTap:{
-                nav_view.push("qrc:/T_TreeView.qml")
-            }
-        }
-
-
-        FluPaneItem{
-            title:"MultiWindow"
-            onTap:{
-                nav_view.push("qrc:/T_MultiWindow.qml")
-            }
-        }
-
-        FluPaneItemHeader{
-            title:"Theming"
-        }
-
-        FluPaneItem{
-            title:"Theme"
-            onTap:{
-                nav_view.push("qrc:/T_Theme.qml")
-            }
-        }
-
-        FluPaneItem{
-            title:"Awesome"
-            onTap:{
-                nav_view.push("qrc:/T_Awesome.qml")
-            }
-        }
-        FluPaneItem{
-            title:"Typography"
-            onTap:{
-                nav_view.push("qrc:/T_Typography.qml")
-            }
-        }
-
-        FluPaneItemHeader{
-            title:"Media"
-        }
-
-        FluPaneItem{
-            title:"MediaPlayer"
-            onTap:{
-                nav_view.push("qrc:/T_MediaPlayer.qml")
-            }
-        }
-
     }
 
-    FluObject{
-        id:footer_items
-        FluPaneItemSeparator{}
-        FluPaneItem{
-            title:"意见反馈"
-            onTap:{
-                Qt.openUrlExternally("https://github.com/zhuzichu520/FluentUI/issues/new")
-            }
+    FluContentDialog{
+        id:close_app
+        title:"退出"
+        message:"确定要退出程序吗？"
+        negativeText:"最小化"
+        buttonFlags: FluContentDialog.NeutralButton | FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
+        onNegativeClicked:{
+            system_tray.showMessage("友情提示","FluentUI已隐藏至托盘,点击托盘可再次激活窗口");
+            window.hide()
         }
-        FluPaneItem{
-            title:"关于"
-            onTap:{
-                FluApp.navigate("/about")
-            }
+        positiveText:"退出"
+        neutralText:"取消"
+        onPositiveClicked:{
+            window.destoryWindow()
+            FluApp.closeApp()
         }
+
     }
 
     FluNavigationView{
         id:nav_view
         anchors.fill: parent
-        items: original_items
-        footerItems:footer_items
+        items: ItemsOriginal
+        footerItems:ItemsFooter
+        z:11
+        displayMode:MainEvent.displayMode
         logo: "qrc:/res/image/favicon.ico"
-        z: 11
+        title:"FluentUI"
+        autoSuggestBox:FluAutoSuggestBox{
+            width: 280
+            anchors.centerIn: parent
+            iconSource: FluentIcons.Search
+            items: ItemsOriginal.getSearchData()
+            placeholderText: lang.search
+            onItemClicked:
+                (data)=>{
+                    ItemsOriginal.startPageByItem(data)
+                }
+        }
         Component.onCompleted: {
+            ItemsOriginal.navigationView = nav_view
+            ItemsFooter.navigationView = nav_view
             nav_view.setCurrentIndex(0)
-            nav_view.push("qrc:/T_Home.qml")
         }
     }
 
-    function startPageByTitle(title){
-        console.debug(title)
-        nav_view.startPageByTitle(title)
-    }
-
 }

example/page/MediaPage.qml

@@ -0,0 +1,37 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+FluWindow {
+
+    width: 640
+    height: 480
+    minimumWidth: 640
+    minimumHeight: 480
+
+    title:"视频播放器"
+
+    onInitArgument:
+        (argument)=>{
+            player.source = argument.source
+        }
+
+    FluAppBar{
+        id:appbar
+        title:"视频播放器"
+        width:parent.width
+    }
+
+
+    FluMediaPlayer{
+        id:player
+        anchors{
+            left: parent.left
+            right: parent.right
+            top: appbar.bottom
+            bottom: parent.bottom
+        }
+    }
+
+}

example/page/SingleInstanceWindow.qml

@@ -0,0 +1,46 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+FluWindow {
+
+    id:window
+
+    width: 500
+    height: 600
+    minimumWidth: 500
+    minimumHeight: 600
+    maximumWidth: 500
+    maximumHeight: 600
+    launchMode: FluWindow.SingleInstance
+
+    title:"SingleInstance"
+
+    FluAppBar{
+        id:appbar
+        title:"SingleInstance"
+        width:parent.width
+    }
+
+    FluTextBox{
+        anchors{
+            top:parent.top
+            topMargin:60
+            horizontalCenter: parent.horizontalCenter
+        }
+    }
+
+    FluText{
+        wrapMode: Text.WrapAnywhere
+        anchors{
+            left: parent.left
+            right: parent.right
+            leftMargin: 20
+            rightMargin: 20
+            verticalCenter: parent.verticalCenter
+        }
+        text:"我是一个SingleInstance模式的窗口，如果我存在，我会销毁之前的窗口，并创建一个新窗口"
+    }
+
+}

example/page/SingleTaskWindow.qml

@@ -0,0 +1,31 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+FluWindow {
+
+    id:window
+
+    width: 500
+    height: 600
+    minimumWidth: 500
+    minimumHeight: 600
+    maximumWidth: 500
+    maximumHeight: 600
+    launchMode: FluWindow.SingleTask
+
+    title:"SingleTask"
+
+    FluAppBar{
+        id:appbar
+        title:"SingleTask"
+        width:parent.width
+    }
+
+    FluText{
+        anchors.centerIn: parent
+        text:"我是一个SingleTask模式的窗口，如果我存在，我就激活窗口"
+    }
+
+}

example/page/StandardWindow.qml

@@ -0,0 +1,31 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+FluWindow {
+
+    id:window
+
+    width: 500
+    height: 600
+    minimumWidth: 500
+    minimumHeight: 600
+    maximumWidth: 500
+    maximumHeight: 600
+    launchMode: FluWindow.Standard
+
+    title:"Standard"
+
+    FluAppBar{
+        id:appbar
+        title:"Standard"
+        width:parent.width
+    }
+
+    FluText{
+        anchors.centerIn: parent
+        text:"我是一个Standard模式的窗口，每次我都会创建一个新的窗口"
+    }
+
+}

example/qml.qrc

@@ -149,5 +149,24 @@
         <file>res/image/control/WebView.png</file>
         <file>res/image/control/XamlUICommand.png</file>
         <file>T_CheckBox.qml</file>
+        <file>global/ItemsOriginal.qml</file>
+        <file>global/qmldir</file>
+        <file>global/ItemsFooter.qml</file>
+        <file>page/MediaPage.qml</file>
+        <file>T_FlipView.qml</file>
+        <file>T_Pivot.qml</file>
+        <file>component/CodeExpander.qml</file>
+        <file>T_TableView.qml</file>
+        <file>T_StatusView.qml</file>
+        <file>T_Settings.qml</file>
+        <file>global/MainEvent.qml</file>
+        <file>res/svg/home.svg</file>
+        <file>res/svg/home_dark.svg</file>
+        <file>page/StandardWindow.qml</file>
+        <file>page/SingleTaskWindow.qml</file>
+        <file>page/SingleInstanceWindow.qml</file>
+        <file>T_RatingControl.qml</file>
+        <file>res/image/qrcode_wx.jpg</file>
+        <file>res/image/qrcode_zfb.jpg</file>
     </qresource>
 </RCC>

example/res/svg/home.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1681271578882" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3664" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M923.733333 394.666667c-85.333333-70.4-206.933333-174.933333-362.666666-309.333334C533.333333 61.866667 490.666667 61.866667 462.933333 85.333333c-155.733333 134.4-277.333333 238.933333-362.666666 309.333334-14.933333 14.933333-25.6 34.133333-25.6 53.333333 0 38.4 32 70.4 70.4 70.4H192v358.4c0 29.866667 23.466667 53.333333 53.333333 53.333333H405.333333c29.866667 0 53.333333-23.466667 53.333334-53.333333v-206.933333h106.666666v206.933333c0 29.866667 23.466667 53.333333 53.333334 53.333333h160c29.866667 0 53.333333-23.466667 53.333333-53.333333V518.4h46.933333c38.4 0 70.4-32 70.4-70.4 0-21.333333-10.666667-40.533333-25.6-53.333333z m-44.8 59.733333h-57.6c-29.866667 0-53.333333 23.466667-53.333333 53.333333v358.4h-138.666667V661.333333c0-29.866667-23.466667-53.333333-53.333333-53.333333h-128c-29.866667 0-53.333333 23.466667-53.333333 53.333333v206.933334H256V507.733333c0-29.866667-23.466667-53.333333-53.333333-53.333333H145.066667c-4.266667 0-6.4-2.133333-6.4-6.4 0-2.133333 2.133333-4.266667 2.133333-6.4 85.333333-70.4 206.933333-174.933333 362.666667-309.333333 4.266667-4.266667 10.666667-4.266667 14.933333 0 155.733333 134.4 277.333333 238.933333 362.666667 309.333333 2.133333 2.133333 2.133333 2.133333 2.133333 4.266667 2.133333 6.4-2.133333 8.533333-4.266667 8.533333z" fill="#2c2c2c" p-id="3665"></path></svg>

example/res/svg/home_dark.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1681277986581" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3875" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M923.733333 394.666667c-85.333333-70.4-206.933333-174.933333-362.666666-309.333334C533.333333 61.866667 490.666667 61.866667 462.933333 85.333333c-155.733333 134.4-277.333333 238.933333-362.666666 309.333334-14.933333 14.933333-25.6 34.133333-25.6 53.333333 0 38.4 32 70.4 70.4 70.4H192v358.4c0 29.866667 23.466667 53.333333 53.333333 53.333333H405.333333c29.866667 0 53.333333-23.466667 53.333334-53.333333v-206.933333h106.666666v206.933333c0 29.866667 23.466667 53.333333 53.333334 53.333333h160c29.866667 0 53.333333-23.466667 53.333333-53.333333V518.4h46.933333c38.4 0 70.4-32 70.4-70.4 0-21.333333-10.666667-40.533333-25.6-53.333333z m-44.8 59.733333h-57.6c-29.866667 0-53.333333 23.466667-53.333333 53.333333v358.4h-138.666667V661.333333c0-29.866667-23.466667-53.333333-53.333333-53.333333h-128c-29.866667 0-53.333333 23.466667-53.333333 53.333333v206.933334H256V507.733333c0-29.866667-23.466667-53.333333-53.333333-53.333333H145.066667c-4.266667 0-6.4-2.133333-6.4-6.4 0-2.133333 2.133333-4.266667 2.133333-6.4 85.333333-70.4 206.933333-174.933333 362.666667-309.333333 4.266667-4.266667 10.666667-4.266667 14.933333 0 155.733333 134.4 277.333333 238.933333 362.666667 309.333333 2.133333 2.133333 2.133333 2.133333 2.133333 4.266667 2.133333 6.4-2.133333 8.533333-4.266667 8.533333z" fill="#ffffff" p-id="3876"></path></svg>

scripts/windows-mingw-publish.ps1

@@ -0,0 +1,34 @@
+[CmdletBinding()]
+param (
+    [string] $archiveName, [string] $targetName
+)
+# 外部环境变量包括:
+# archiveName: ${{ matrix.qt_ver }}-${{ matrix.qt_arch }}
+
+
+# archiveName: 5.15.2-win64_mingw81
+
+$scriptDir = $PSScriptRoot
+$currentDir = Get-Location
+Write-Host "currentDir" $currentDir
+Write-Host "scriptDir" $scriptDir
+
+function Main() {
+
+    New-Item -ItemType Directory $archiveName
+    # 拷贝exe
+    Copy-Item bin\release\* $archiveName\
+    # 拷贝依赖
+    windeployqt --qmldir . --plugindir $archiveName\plugins --no-translations --compiler-runtime $archiveName\$targetName
+    # 删除不必要的文件
+    $excludeList = @("*.qmlc", "*.ilk", "*.exp", "*.lib", "*.pdb")
+    Remove-Item -Path $archiveName -Include $excludeList -Recurse -Force
+    # 打包zip
+    Compress-Archive -Path $archiveName $archiveName'.zip'
+}
+
+if ($null -eq $archiveName || $null -eq $targetName) {
+    Write-Host "args missing, archiveName is" $archiveName ", targetName is" $targetName
+    return
+}
+Main

src/CMakeLists.txt

@@ -0,0 +1,67 @@
+cmake_minimum_required(VERSION 3.16)
+project(FluentUI)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(Qt6 COMPONENTS Core Quick Svg REQUIRED)
+set(QT_INSTALL_QML ${Qt6Core_DIR}/../../../qml)
+set(TARGET_TYPE SHARED)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/FluentUI)
+
+if(WIN32)
+	set(CMAKE_SHARED_LIBRARY_PREFIX "")
+endif()
+
+set(TARGET_RESOURCES res.qrc)
+set(TARGET_SOURCES
+    Def.cpp
+    FluApp.cpp
+    FluColorSet.cpp
+    FluColors.cpp
+    FluRegister.cpp
+    FluTheme.cpp
+    Fluent.cpp
+    FluentUI.cpp
+	NativeEventFilter.cpp
+    WindowHelper.cpp
+    qml_plugin.cpp
+)
+
+set(TARGET_HEADERS
+    Def.h
+    FluApp.h
+    FluColorSet.h
+    FluColors.h
+    FluRegister.h
+    FluTheme.h
+    Fluent.h
+    FluentUI.h
+	NativeEventFilter.h 
+    WindowHelper.h
+    qml_plugin.h
+    stdafx.h
+)
+
+add_definitions(-DVERSION_IN="1.0.0")
+add_definitions(-DVURI_STR="FluentUI")
+
+add_library(${PROJECT_NAME} ${TARGET_TYPE} ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESOURCES})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/FluentUI)
+
+if(WIN32)
+    target_link_libraries(${PROJECT_NAME} PRIVATE dwmapi user32)
+else()
+endif()
+
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Quick Qt6::Svg)
+
+if(WIN32)
+    include(build_windows.cmake)
+else()
+    include(build_macos.cmake)
+endif()

src/Def.h

@@ -3,6 +3,16 @@
 
 #include <QObject>
 
+namespace Fluent_DarkMode {
+Q_NAMESPACE
+    enum Fluent_DarkModeType {
+        System      = 0x0,
+        Light    = 0x1,
+        Dark     = 0x2,
+    };
+Q_ENUMS(Fluent_DarkModeType);
+}
+
 namespace Fluent_Awesome {
 Q_NAMESPACE
 enum class Fluent_AwesomeType {

src/FluApp.cpp

@@ -5,9 +5,22 @@
 #include <QQmlContext>
 #include <QQuickItem>
 #include <QTimer>
+#include <QUuid>
 #include <QClipboard>
+#include "FluTheme.h"
 #include "Def.h"
 
+#ifdef Q_OS_WIN
+#include <dwmapi.h>
+#include <Windows.h>
+#include <windowsx.h>
+static bool isCompositionEnabled()
+{
+    BOOL composition_enabled = FALSE;
+    bool success = ::DwmIsCompositionEnabled(&composition_enabled) == S_OK;
+    return composition_enabled && success;
+}
+#endif
 
 FluApp* FluApp::m_instance = nullptr;
 
@@ -24,12 +37,16 @@ FluApp::FluApp(QObject *parent)
 {
 }
 
-void FluApp::init(QWindow *window,QMap<QString, QVariant> properties){
+void FluApp::init(QQuickWindow *window){
     this->appWindow = window;
-    this->properties = properties;
 }
 
 void FluApp::run(){
+#ifdef Q_OS_WIN
+    if(!isCompositionEnabled()){
+        FluTheme::getInstance()->frameless(false);
+    }
+#endif
     navigate(initialRoute());
 }
 
@@ -38,38 +55,45 @@ void FluApp::navigate(const QString& route,const QJsonObject& argument,FluRegist
         qErrnoWarning("没有找到当前路由");
         return;
     }
-    bool isAppWindow = route == initialRoute();
-    FramelessView *view = new FramelessView();
+    QQmlEngine *engine = qmlEngine(appWindow);
+    QQmlComponent component(engine, routes().value(route).toString());
+    QVariantMap properties;
+    properties.insert("route",route);
+    if(fluRegister){
+        properties.insert("pageRegister",QVariant::fromValue(fluRegister));
+    }
+    properties.insert("argument",argument);
+    QQuickWindow *view = qobject_cast<QQuickWindow*>(component.createWithInitialProperties(properties));
+
+    int launchMode = view->property("launchMode").toInt();
+    if(launchMode==1){
+        for (auto& pair : wnds) {
+            QString r =  pair->property("route").toString();
+            if(r == route){
+                pair->requestActivate();
+                view->deleteLater();
+                return;
+            }
+        }
+    }else if(launchMode==2){
+        for (auto& pair : wnds) {
+            QString r =  pair->property("route").toString();
+            if(r == route){
+                pair->close();
+                break;
+            }
+        }
+    }
+
+    if(FluTheme::getInstance()->frameless()){
+        view->setFlag(Qt::FramelessWindowHint,true);
+    }
+    wnds.insert(view->winId(),view);
     if(fluRegister){
         fluRegister->to(view);
-        view->setProperty("pageRegister",QVariant::fromValue(fluRegister));
-    }
-    view->setProperty("argument",argument);
-    QMapIterator<QString, QVariant> iterator(properties);
-    while (iterator.hasNext()) {
-        iterator.next();
-        QString key = iterator.key();
-        QVariant value = iterator.value();
-        view->engine()->rootContext()->setContextProperty(key,value);
     }
     view->setColor(QColor(Qt::transparent));
-    QObject::connect(view, &QQuickView::statusChanged, view, [&](QQuickView::Status status) {
-        if (status == QQuickView::Status::Ready) {
-            Q_EMIT windowReady(view);
-            view->moveToScreenCenter();
-            view->show();
-        }
-    });
-    view->setSource((routes().value(route).toString()));
-    if(isAppWindow){
-        QObject::connect(view->engine(), &QQmlEngine::quit, qApp, &QCoreApplication::quit);
-    }else{
-        view->closeDeleteLater();
-    }
-}
-
-bool FluApp::equalsWindow(FramelessView *view,QWindow *window){
-    return view->winId() == window->winId();
+    view->show();
 }
 
 QJsonArray FluApp::awesomelist(const QString& keyword)
@@ -99,3 +123,11 @@ QJsonArray FluApp::awesomelist(const QString& keyword)
 void FluApp::clipText(const QString& text){
     QGuiApplication::clipboard()->setText(text);
 }
+
+QString FluApp::uuid(){
+    return QUuid::createUuid().toString();
+}
+
+void FluApp::closeApp(){
+    qApp->exit(0);
+}

src/FluApp.h

@@ -8,7 +8,6 @@
 #include <QJsonObject>
 #include <QQmlEngine>
 #include "FluRegister.h"
-#include "FramelessView.h"
 #include "stdafx.h"
 
 class FluApp : public QObject
@@ -27,21 +26,21 @@ public:
 
     Q_INVOKABLE void navigate(const QString& route,const QJsonObject& argument  = {},FluRegister* fluRegister = nullptr);
 
-    Q_INVOKABLE void init(QWindow *window,QMap<QString, QVariant> properties);
-
-    Q_SIGNAL void windowReady(FramelessView *view);
-
-    Q_INVOKABLE bool equalsWindow(FramelessView *view,QWindow *window);
+    Q_INVOKABLE void init(QQuickWindow *window);
 
     Q_INVOKABLE QJsonArray awesomelist(const QString& keyword = "");
 
     Q_INVOKABLE void clipText(const QString& text);
 
+    Q_INVOKABLE QString uuid();
+
+    Q_INVOKABLE void closeApp();
+
+public:
+    QMap<quint64, QQuickWindow*> wnds;
 private:
-    QMap<QString, QVariant> properties;
     static FluApp* m_instance;
     QWindow *appWindow;
-
 };
 
 #endif // FLUAPP_H

src/FluRegister.h

@@ -2,15 +2,15 @@
 #define FLUREGISTER_H
 
 #include <QObject>
-#include <FramelessView.h>
+#include <QQuickWindow>
 #include <QJsonObject>
 #include "stdafx.h"
 
 class FluRegister : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY_AUTO(FramelessView*,from)
-    Q_PROPERTY_AUTO(FramelessView*,to)
+    Q_PROPERTY_AUTO(QQuickWindow*,from)
+    Q_PROPERTY_AUTO(QQuickWindow*,to)
     Q_PROPERTY_AUTO(QString,path);
 public:
     explicit FluRegister(QObject *parent = nullptr);

src/FluTheme.cpp

@@ -1,6 +1,9 @@
 #include "FluTheme.h"
 
 #include "FluColors.h"
+#include "Def.h"
+#include <QPalette>
+#include <QGuiApplication>
 
 FluTheme* FluTheme::m_instance = nullptr;
 
@@ -15,9 +18,44 @@ FluTheme *FluTheme::getInstance()
 FluTheme::FluTheme(QObject *parent)
     : QObject{parent}
 {
+    connect(this,&FluTheme::darkModeChanged,this,[=]{
+        Q_EMIT darkChanged();
+    });
     primaryColor(FluColors::getInstance()->Blue());
     textSize(13);
     nativeText(false);
     frameless(true);
-    dark(false);
+    darkMode(Fluent_DarkMode::Fluent_DarkModeType::Light);
+    qApp->installEventFilter(this);
+}
+
+bool FluTheme::eventFilter(QObject *obj, QEvent *event)
+{
+    Q_UNUSED(obj);
+    if (event->type() == QEvent::ApplicationPaletteChange)
+    {
+        Q_EMIT darkChanged();
+        event->accept();
+        return true;
+    }
+    return false;
+}
+
+bool FluTheme::systemDark()
+{
+    QPalette palette = qApp->palette();
+    QColor color = palette.color(QPalette::Window).rgb();
+    return !(color.red() * 0.2126 + color.green() * 0.7152 + color.blue() * 0.0722 > 255 / 2);
+}
+
+bool FluTheme::dark(){
+    if(_darkMode == Fluent_DarkMode::Fluent_DarkModeType::Dark){
+        return true;
+    }else if(_darkMode == Fluent_DarkMode::Fluent_DarkModeType::Light){
+        return false;
+    }else if(_darkMode == Fluent_DarkMode::Fluent_DarkModeType::System){
+        return systemDark();
+    }else{
+        return false;
+    }
 }

src/FluTheme.h

@@ -8,17 +8,22 @@
 class FluTheme : public QObject
 {
     Q_OBJECT
+    Q_PROPERTY(bool dark READ dark NOTIFY darkChanged)
     Q_PROPERTY_AUTO(FluColorSet*,primaryColor)
     Q_PROPERTY_AUTO(bool,frameless);
-    Q_PROPERTY_AUTO(bool,dark);
+    Q_PROPERTY_AUTO(int,darkMode);
     Q_PROPERTY_AUTO(bool,nativeText);
     Q_PROPERTY_AUTO(int,textSize);
 public:
     explicit FluTheme(QObject *parent = nullptr);
     static FluTheme *getInstance();
+    bool dark();
+    Q_SIGNAL void darkChanged();
 private:
     static FluTheme* m_instance;
-
+    bool _dark;
+    bool eventFilter(QObject *obj, QEvent *event);
+    bool systemDark();
 };
 
 #endif // FLUTHEME_H

src/Fluent.cpp

@@ -5,6 +5,7 @@
 #include <QGuiApplication>
 #include <QQuickWindow>
 #include "FluColors.h"
+#include "NativeEventFilter.h"
 #include "FluTheme.h"
 #include "WindowHelper.h"
 #include "FluApp.h"
@@ -32,6 +33,16 @@ void Fluent::registerTypes(const char *uri){
 
     qmlRegisterType<WindowHelper>(uri,major,minor,"WindowHelper");
     qmlRegisterType<FluColorSet>(uri,major,minor,"FluColorSet");
+
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluRatingControl.qml"),uri,major,minor,"FluRatingControl");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluStatusView.qml"),uri,major,minor,"FluStatusView");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPagination.qml"),uri,major,minor,"FluPagination");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluToggleButton.qml"),uri,major,minor,"FluToggleButton");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTableView.qml"),uri,major,minor,"FluTableView");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPivotItem.qml"),uri,major,minor,"FluPivotItem");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPivot.qml"),uri,major,minor,"FluPivot");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluFlipView.qml"),uri,major,minor,"FluFlipView");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPaneItemExpander.qml"),uri,major,minor,"FluPaneItemExpander");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTabView.qml"),uri,major,minor,"FluTabView");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluArea.qml"),uri,major,minor,"FluArea");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluBadge.qml"),uri,major,minor,"FluBadge");
@@ -57,7 +68,7 @@ void Fluent::registerTypes(const char *uri){
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluMenu.qml"),uri,major,minor,"FluMenu");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluScrollBar.qml"),uri,major,minor,"FluScrollBar");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTextButton.qml"),uri,major,minor,"FluTextButton");
-    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluMultiLineTextBox.qml"),uri,major,minor,"FluMultiLineTextBox");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluMultilineTextBox.qml"),uri,major,minor,"FluMultilineTextBox");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTooltip.qml"),uri,major,minor,"FluTooltip");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluDivider.qml"),uri,major,minor,"FluDivider");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluIcon.qml"),uri,major,minor,"FluIcon");
@@ -77,15 +88,20 @@ void Fluent::registerTypes(const char *uri){
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluRadioButton.qml"),uri,major,minor,"FluRadioButton");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluSlider.qml"),uri,major,minor,"FluSlider");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTextBox.qml"),uri,major,minor,"FluTextBox");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPasswordBox.qml"),uri,major,minor,"FluPasswordBox");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluText.qml"),uri,major,minor,"FluText");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluFilledButton.qml"),uri,major,minor,"FluFilledButton");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluToggleSwitch.qml"),uri,major,minor,"FluToggleSwitch");
 
     qmlRegisterUncreatableMetaObject(Fluent_Awesome::staticMetaObject,  uri,major,minor,"FluentIcons", "Access to enums & flags only");
+    qmlRegisterUncreatableMetaObject(Fluent_DarkMode::staticMetaObject,  uri,major,minor,"FluDarkMode", "Access to enums & flags only");
+
 }
 
 void Fluent::initializeEngine(QQmlEngine *engine, const char *uri)
 {
+    nativeEvent = new NativeEventFilter();
+    qApp->installNativeEventFilter(nativeEvent);
     Q_UNUSED(engine)
     Q_UNUSED(uri)
 #ifdef Q_OS_WIN

src/Fluent.h

@@ -3,17 +3,25 @@
 
 #include <QObject>
 #include <QQmlEngine>
+#include "NativeEventFilter.h"
 
 class Fluent: public QObject
 {
     Q_OBJECT
 public:
     Q_INVOKABLE QString version() const;
+    ~Fluent(){
+        if (nativeEvent != Q_NULLPTR) {
+               delete nativeEvent;
+               nativeEvent = Q_NULLPTR;
+           }
+    }
     void registerTypes(const char *uri);
     void initializeEngine(QQmlEngine *engine, const char *uri);
     static Fluent *getInstance();
 private:
     static Fluent* m_instance;
+    NativeEventFilter *nativeEvent = Q_NULLPTR;
 };
 
 #endif // FLUENT_H

src/FluentUI.pro

@@ -1,5 +1,5 @@
 QT          += qml quick svg
-CONFIG      += plugin c++11
+CONFIG      += plugin c++17
 TEMPLATE    = lib
 TARGET      = FluentUI
 TARGET      = $$qtLibraryTarget($$TARGET)
@@ -19,7 +19,7 @@ HEADERS += \
     FluTheme.h \
     Fluent.h \
     FluentUI.h \
-    FramelessView.h \
+    NativeEventFilter.h \
     WindowHelper.h \
     qml_plugin.h \
     stdafx.h
@@ -33,16 +33,12 @@ SOURCES += \
     FluTheme.cpp \
     Fluent.cpp \
     FluentUI.cpp \
+    NativeEventFilter.cpp \
     WindowHelper.cpp \
     qml_plugin.cpp \
 
 win32 {
     LIBS += -ldwmapi -luser32
-    SOURCES += \
-        FramelessView_win.cpp
-} else {
-    SOURCES += \
-        FramelessView_unix.cpp
 }
 
 DEFINES += VERSION_IN=\\\"1.0.0\\\"

src/FramelessView.h

@@ -1,56 +0,0 @@
-#pragma once
-
-#include <QMouseEvent>
-#include <QQuickView>
-#include <QRegion>
-
-class FramelessViewPrivate;
-class FramelessView : public QQuickView
-{
-    Q_OBJECT
-    using Super = QQuickView;
-    Q_PROPERTY(bool isMax READ isMax NOTIFY isMaxChanged)
-    Q_PROPERTY(bool isFull READ isFull NOTIFY isFullChanged)
-public:
-    explicit FramelessView(QWindow *parent = nullptr);
-    ~FramelessView();
-    void moveToScreenCenter();
-    void closeDeleteLater();
-    bool isMax() const;
-    bool isFull() const;
-    QQuickItem *titleItem() const;
-
-    static QMap<WId,FramelessView*> *windowCache;
-    static QRect calcCenterGeo(const QRect &screenGeo, const QSize &normalSize);
-public slots:
-    void setIsMax(bool isMax);
-    void setIsFull(bool isFull);
-    void setTitleItem(QQuickItem* item);
-
-signals:
-    void isMaxChanged(bool isMax);
-    void isFullChanged(bool isFull);
-    void mousePressed(int xPos, int yPos, int button);
-
-protected:
-    void showEvent(QShowEvent *e) override;
-    void resizeEvent(QResizeEvent *e) override;
-    bool event(QEvent *ev) override;
-#    if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
-#    else
-    bool nativeEvent(const QByteArray &eventType, void *message, long *result) override;
-#    endif
-    void mousePressEvent(QMouseEvent* event) override
-    {
-#    if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        emit mousePressed(event->position().x(), event->position().y(), event->button());
-#else
-        emit mousePressed(event->x(), event->y(), event->button());
-#endif
-        Super::mousePressEvent(event);
-    }
-
-private:
-    FramelessViewPrivate *d;
-};

src/FramelessView_unix.cpp

@@ -1,138 +0,0 @@
-#include "FramelessView.h"
-#include <QGuiApplication>
-#include <QQuickItem>
-#include <QScreen>
-#include <QWindow>
-#include <FluTheme.h>
-
-class FramelessViewPrivate
-{
-public:
-    bool m_isMax = false;
-    bool m_isFull = false;
-    bool m_deleteLater = false;
-    QQuickItem *m_titleItem = nullptr;
-};
-
-FramelessView::FramelessView(QWindow *parent) : Super(parent), d(new FramelessViewPrivate)
-{
-    if(FluTheme::getInstance()->frameless()){
-        setFlags( Qt::Window | Qt::FramelessWindowHint | Qt::WindowTitleHint | Qt::WindowSystemMenuHint);
-    }
-    setResizeMode(SizeRootObjectToView);
-    setIsMax(windowState() == Qt::WindowMaximized);
-    setIsFull(windowState() == Qt::WindowFullScreen);
-    connect(this, &QWindow::windowStateChanged, this, [&](Qt::WindowState state) {
-        (void)state;
-        setIsMax(windowState() == Qt::WindowMaximized);
-        setIsFull(windowState() == Qt::WindowFullScreen);
-    });
-    connect(FluTheme::getInstance(),&FluTheme::framelessChanged,this,[=](){
-        setFlag(Qt::Window,false);
-        setFlag(Qt::Window,true);
-    });
-}
-
-FramelessView::~FramelessView()
-{
-    delete d;
-}
-
-void FramelessView::showEvent(QShowEvent *e)
-{
-    Super::showEvent(e);
-}
-
-QRect FramelessView::calcCenterGeo(const QRect &screenGeo, const QSize &normalSize)
-{
-    int w = normalSize.width();
-    int h = normalSize.height();
-    int x = screenGeo.x() + (screenGeo.width() - w) / 2;
-    int y = screenGeo.y() + (screenGeo.height() - h) / 2;
-    if (screenGeo.width() < w) {
-        x = screenGeo.x();
-        w = screenGeo.width();
-    }
-    if (screenGeo.height() < h) {
-        y = screenGeo.y();
-        h = screenGeo.height();
-    }
-    return { x, y, w, h };
-}
-
-void FramelessView::moveToScreenCenter()
-{
-    auto geo = calcCenterGeo(screen()->availableGeometry(), size());
-    if (minimumWidth() > geo.width() || minimumHeight() > geo.height()) {
-        setMinimumSize(geo.size());
-    }
-    setGeometry(geo);
-    update();
-}
-
-void FramelessView::closeDeleteLater(){
-    d->m_deleteLater = true;
-}
-
-bool FramelessView::isMax() const
-{
-    return d->m_isMax;
-}
-
-bool FramelessView::isFull() const
-{
-    return d->m_isFull;
-}
-
-QQuickItem *FramelessView::titleItem() const
-{
-    return d->m_titleItem;
-}
-
-void FramelessView::setIsMax(bool isMax)
-{
-    if (d->m_isMax == isMax)
-        return;
-
-    d->m_isMax = isMax;
-    emit isMaxChanged(d->m_isMax);
-}
-
-void FramelessView::setIsFull(bool isFull)
-{
-    if(d->m_isFull == isFull)
-        return;
-
-    d->m_isFull = isFull;
-    emit isFullChanged(d->m_isFull);
-}
-
-void FramelessView::setTitleItem(QQuickItem *item)
-{
-    d->m_titleItem = item;
-}
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-bool FramelessView::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
-#else
-bool FramelessView::nativeEvent(const QByteArray &eventType, void *message, long *result)
-#endif
-{
-    return Super::nativeEvent(eventType, message, result);
-}
-
-void FramelessView::resizeEvent(QResizeEvent *e)
-{
-    Super::resizeEvent(e);
-}
-
-bool FramelessView::event(QEvent *ev)
-{
-    if (ev->type() == QEvent::Close) {
-        if(d->m_deleteLater){
-            deleteLater();
-            ev->setAccepted(false);
-        }
-    }
-    return QQuickWindow::event(ev);
-}
-

src/FramelessView_win.cpp

@@ -1,268 +0,0 @@
-#include "FramelessView.h"
-#include <QGuiApplication>
-#include <QQuickItem>
-#include <QScreen>
-#include <QWindow>
-#include <FluTheme.h>
-#include <QTimer>
-
-#include <dwmapi.h>
-#include <windowsx.h>
-#pragma comment(lib, "Dwmapi.lib")
-#pragma comment(lib, "User32.lib")
-
-
-static bool isCompositionEnabled()
-{
-    BOOL composition_enabled = FALSE;
-    bool success = ::DwmIsCompositionEnabled(&composition_enabled) == S_OK;
-    return composition_enabled && success;
-}
-
-static bool isMaxWin(QWindow* win)
-{
-    return win->windowState() == Qt::WindowMaximized;
-}
-static bool isFullWin(QQuickView* win)
-{
-    return win->windowState() == Qt::WindowFullScreen;
-}
-static bool isFixWin(QQuickView* win)
-{
-    return win->minimumWidth() ==  win->maximumWidth() && win->minimumHeight() ==  win->maximumHeight();
-}
-static long hitTest(RECT winrect, long x, long y, int borderWidth)
-{
-    if ((x >= winrect.left) && (x < winrect.left + borderWidth) && (y >= winrect.top) && (y < winrect.top + borderWidth))
-    {
-        return HTTOPLEFT;
-    }
-    else if (x < winrect.right && x >= winrect.right - borderWidth && y >= winrect.top && y < winrect.top + borderWidth)
-    {
-        return HTTOPRIGHT;
-    }
-    else if (x >= winrect.left && x < winrect.left + borderWidth && y < winrect.bottom && y >= winrect.bottom - borderWidth)
-    {
-        return HTBOTTOMLEFT;
-    }
-    else if (x < winrect.right && x >= winrect.right - borderWidth && y < winrect.bottom && y >= winrect.bottom - borderWidth)
-    {
-        return HTBOTTOMRIGHT;
-    }
-    else if (x >= winrect.left && x < winrect.left + borderWidth)
-    {
-        return HTLEFT;
-    }
-    else if (x < winrect.right && x >= winrect.right - borderWidth)
-    {
-        return HTRIGHT;
-    }
-    else if (y >= winrect.top && y < winrect.top + borderWidth)
-    {
-        return HTTOP;
-    }
-    else if (y < winrect.bottom && y >= winrect.bottom - borderWidth)
-    {
-        return HTBOTTOM;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-class FramelessViewPrivate
-{
-public:
-    bool m_isMax = false;
-    bool m_isFull = false;
-    bool m_deleteLater = false;
-    bool m_isFirst = true;
-    QQuickItem *m_titleItem = nullptr;
-};
-
-FramelessView::FramelessView(QWindow *parent) : Super(parent), d(new FramelessViewPrivate)
-{
-    if(!isCompositionEnabled()){
-        FluTheme::getInstance()->frameless(false);
-    }
-    if(FluTheme::getInstance()->frameless()){
-        setFlag(Qt::FramelessWindowHint,true);
-    }
-    setResizeMode(SizeRootObjectToView);
-    setIsMax(windowState() == Qt::WindowMaximized);
-    setIsFull(windowState() == Qt::WindowFullScreen);
-    connect(this, &QWindow::windowStateChanged, this, [=](Qt::WindowState state) {
-        (void)state;
-        setIsMax(windowState() == Qt::WindowMaximized);
-        setIsFull(windowState() == Qt::WindowFullScreen);
-    });
-    connect(FluTheme::getInstance(),&FluTheme::framelessChanged,this,[=](){
-        setFlag(Qt::Window,false);
-        setFlag(Qt::Window,true);
-    });
-}
-
-FramelessView::~FramelessView()
-{
-    delete d;
-}
-
-void FramelessView::showEvent(QShowEvent *e)
-{
-    static const MARGINS shadow_state[2] { { 0, 0, 0, 0 }, { 1, 1, 1, 1 } };
-    ::DwmExtendFrameIntoClientArea((HWND)(winId()), &shadow_state[true]);
-    if(FluTheme::getInstance()->frameless()){
-        setFlag(Qt::FramelessWindowHint,false);
-    }
-    Super::showEvent(e);
-}
-
-QRect FramelessView::calcCenterGeo(const QRect &screenGeo, const QSize &normalSize)
-{
-    int w = normalSize.width();
-    int h = normalSize.height();
-    int x = screenGeo.x() + (screenGeo.width() - w) / 2;
-    int y = screenGeo.y() + (screenGeo.height() - h) / 2;
-    if (screenGeo.width() < w) {
-        x = screenGeo.x();
-        w = screenGeo.width();
-    }
-    if (screenGeo.height() < h) {
-        y = screenGeo.y();
-        h = screenGeo.height();
-    }
-    return { x, y, w, h };
-}
-
-void FramelessView::moveToScreenCenter()
-{
-    auto geo = calcCenterGeo(screen()->availableGeometry(), size());
-    if (minimumWidth() > geo.width() || minimumHeight() > geo.height()) {
-        setMinimumSize(geo.size());
-    }
-    setGeometry(geo);
-    update();
-}
-
-void FramelessView::closeDeleteLater(){
-    d->m_deleteLater = true;
-}
-
-bool FramelessView::isMax() const
-{
-    return d->m_isMax;
-}
-
-bool FramelessView::isFull() const
-{
-    return d->m_isFull;
-}
-
-QQuickItem *FramelessView::titleItem() const
-{
-    return d->m_titleItem;
-}
-
-void FramelessView::setIsMax(bool isMax)
-{
-    if (d->m_isMax == isMax)
-        return;
-
-    d->m_isMax = isMax;
-    emit isMaxChanged(d->m_isMax);
-}
-
-void FramelessView::setIsFull(bool isFull)
-{
-    if(d->m_isFull == isFull)
-        return;
-
-    d->m_isFull = isFull;
-    emit isFullChanged(d->m_isFull);
-}
-
-int count = 1;
-
-void FramelessView::setTitleItem(QQuickItem *item)
-{
-    d->m_titleItem = item;
-}
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-bool FramelessView::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
-#else
-bool FramelessView::nativeEvent(const QByteArray &eventType, void *message, long *result)
-#endif
-{
-    MSG* msg = static_cast<MSG*>(message);
-    if (!msg || !msg->hwnd)
-    {
-        return false;
-    }
-    if (msg->message == WM_NCHITTEST && FluTheme::getInstance()->frameless())
-    {
-        RECT winrect;
-        GetWindowRect(HWND(winId()), &winrect);
-        long x = GET_X_LPARAM(msg->lParam);
-        long y = GET_Y_LPARAM(msg->lParam);
-        *result = 0;
-        if (!isMaxWin(this) && !isFullWin(this) && !isFixWin(this))
-        {
-            *result = hitTest(winrect, x, y, 4);
-            if (0 != *result)
-            {
-                return true;
-            }
-        }
-    }else if (msg->message == WM_NCCALCSIZE && FluTheme::getInstance()->frameless())
-    {
-        const auto mode = static_cast<BOOL>(msg->wParam);
-        const auto clientRect = mode ? &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(msg->lParam)->rgrc[0]) : reinterpret_cast<LPRECT>(msg->lParam);
-        if (mode == TRUE)
-        {
-            *result = WVR_REDRAW;
-            if (!isMaxWin(this) && !isFullWin(this))
-            {
-                if (clientRect->top != 0)
-                {
-                    clientRect->top -= 0.1;
-                }
-            }
-            else
-            {
-                if (clientRect->top != 0)
-                {
-                    clientRect->top += 0.1;
-                }
-            }
-            return true;
-        }
-    }else if (msg->message == WM_WINDOWPOSCHANGING)
-    {
-        WINDOWPOS* wp = reinterpret_cast<WINDOWPOS*>(msg->lParam);
-        if (wp != nullptr && (wp->flags & SWP_NOSIZE) == 0)
-        {
-            wp->flags |= SWP_NOCOPYBITS;
-            *result = 0;
-            return true;
-        }
-    }
-    return Super::nativeEvent(eventType, message, result);
-}
-
-void FramelessView::resizeEvent(QResizeEvent *e)
-{
-    Super::resizeEvent(e);
-}
-
-bool FramelessView::event(QEvent *ev)
-{
-    if (ev->type() == QEvent::Close) {
-        if(d->m_deleteLater){
-            deleteLater();
-            ev->setAccepted(false);
-        }
-    }
-    return QQuickWindow::event(ev);
-}
-

src/NativeEventFilter.cpp

@@ -0,0 +1,76 @@
+#include "NativeEventFilter.h"
+#include "FluTheme.h"
+#include "FluApp.h"
+#ifdef Q_OS_WIN
+#include <Windows.h>
+#include <windowsx.h>
+#endif
+
+bool NativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result)
+{
+#ifdef Q_OS_WIN
+    if (eventType == "windows_generic_MSG" && FluTheme::getInstance()->frameless()) {
+        MSG* msg = static_cast<MSG *>(message);
+        if (msg == Q_NULLPTR)
+            return false;
+        switch(msg->message) {
+        case WM_NCCALCSIZE:{
+            NCCALCSIZE_PARAMS& params = *reinterpret_cast<NCCALCSIZE_PARAMS*>(msg->lParam);
+            if (params.rgrc[0].top != 0)
+                params.rgrc[0].top -= 1;
+            *result = WVR_REDRAW;
+            return true;
+        }
+        case WM_NCHITTEST: {
+            auto view = FluApp::getInstance()->wnds[(WId)msg->hwnd];
+            bool isResize = !(view->maximumWidth()==view->minimumWidth()&&view->maximumHeight()==view->minimumHeight());
+            const LONG borderWidth = 8;
+            RECT winrect;
+            GetWindowRect(msg->hwnd, &winrect);
+            long x = GET_X_LPARAM(msg->lParam);
+            long y = GET_Y_LPARAM(msg->lParam);
+            if (x >= winrect.left && x < winrect.left + borderWidth &&
+                    y < winrect.bottom && y >= winrect.bottom - borderWidth && isResize) {
+                *result = HTBOTTOMLEFT;
+                return true;
+            }
+            if (x < winrect.right && x >= winrect.right - borderWidth &&
+                    y < winrect.bottom && y >= winrect.bottom - borderWidth && isResize) {
+                *result = HTBOTTOMRIGHT;
+                return true;
+            }
+            if (x >= winrect.left && x < winrect.left + borderWidth &&
+                    y >= winrect.top && y < winrect.top + borderWidth && isResize) {
+                *result = HTTOPLEFT;
+                return true;
+            }
+            if (x < winrect.right && x >= winrect.right - borderWidth &&
+                    y >= winrect.top && y < winrect.top + borderWidth && isResize) {
+                *result = HTTOPRIGHT;
+                return true;
+            }
+            if (x >= winrect.left && x < winrect.left + borderWidth && isResize) {
+                *result = HTLEFT;
+                return true;
+            }
+            if (x < winrect.right && x >= winrect.right - borderWidth && isResize) {
+                *result = HTRIGHT;
+                return true;
+            }
+            if (y < winrect.bottom && y >= winrect.bottom - borderWidth && isResize) {
+                *result = HTBOTTOM;
+                return true;
+            }
+            if (y >= winrect.top && y < winrect.top + borderWidth && isResize) {
+                *result = HTTOP;
+                return true;
+            }
+            return false;
+        }
+        default:
+            break;
+        }
+    }
+#endif
+    return false;
+}

src/NativeEventFilter.h

@@ -0,0 +1,14 @@
+#ifndef NATIVEEVENTFILTER_H
+#define NATIVEEVENTFILTER_H
+
+#include <QObject>
+#include <QAbstractNativeEventFilter>
+
+class NativeEventFilter : public QAbstractNativeEventFilter
+{
+
+public:
+    bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) override;
+};
+
+#endif // NATIVEEVENTFILTER_H

src/WindowHelper.cpp

@@ -1,6 +1,19 @@
 #include "WindowHelper.h"
 
 #include "FluRegister.h"
+#include "FluApp.h"
+#include "FluTheme.h"
+
+#ifdef Q_OS_WIN
+#include <dwmapi.h>
+#include <Windows.h>
+#include <windowsx.h>
+enum class Style : DWORD
+{
+    windowed = (WS_OVERLAPPEDWINDOW | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME | WS_CLIPCHILDREN),
+    aero_borderless = (WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME | WS_CLIPCHILDREN)
+};
+#endif
 
 WindowHelper::WindowHelper(QObject *parent)
     : QObject{parent}
@@ -8,56 +21,38 @@ WindowHelper::WindowHelper(QObject *parent)
 
 }
 
-void WindowHelper::setTitle(const QString& text){
-    window->setTitle(text);
-}
-
-void WindowHelper::initWindow(FramelessView* window){
+void WindowHelper::initWindow(QQuickWindow* window){
     this->window = window;
 }
 
-QJsonObject WindowHelper::getArgument(){
-    return window->property("argument").toJsonObject();
-}
-
-QVariant WindowHelper::getPageRegister(){
-    return window->property("pageRegister");
-}
-
-void WindowHelper::setMinimumWidth(int width){
-    this->window->setMinimumWidth(width);
-}
-void WindowHelper::setMaximumWidth(int width){
-    this->window->setMaximumWidth(width);
-}
-void WindowHelper::setMinimumHeight(int height){
-    this->window->setMinimumHeight(height);
-}
-void WindowHelper::setMaximumHeight(int height){
-    this->window->setMaximumHeight(height);
-}
-void WindowHelper::updateWindow(){
-    this->window->setFlag(Qt::Window,false);
-    this->window->setFlag(Qt::Window,true);
-}
-void WindowHelper::setOpacity(qreal opacity){
-    this->window->setOpacity(opacity);
-}
-void WindowHelper::setModality(int type){
-    if(type == 0){
-        this->window->setModality(Qt::NonModal);
-    }else if(type == 1){
-        this->window->setModality(Qt::WindowModal);
-    }else if(type == 2){
-        this->window->setModality(Qt::ApplicationModal);
-    }else{
-        this->window->setModality(Qt::NonModal);
+void WindowHelper::firstUpdate(){
+    if(isFisrt){
+#ifdef Q_OS_WIN
+        if(FluTheme::getInstance()->frameless()){
+            HWND wnd = (HWND)window->winId();
+            SetWindowLongPtr(wnd, GWL_STYLE, static_cast<LONG>(Style::aero_borderless));
+            const MARGINS shadow_on = { 1, 1, 1, 1 };
+            DwmExtendFrameIntoClientArea(wnd, &shadow_on);
+            SetWindowPos(wnd, Q_NULLPTR, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE);
+            ShowWindow(wnd, SW_SHOW);
+            window->setFlag(Qt::FramelessWindowHint,false);
+        }
+#endif
+        isFisrt = false;
     }
+
 }
 
-QVariant WindowHelper::createRegister(const QString& path){
-    FluRegister *p = new FluRegister(this->window);
-    p->from(this->window);
+QVariant WindowHelper::createRegister(QQuickWindow* window,const QString& path){
+    FluRegister *p = new FluRegister(window);
+    p->from(window);
     p->path(path);
     return  QVariant::fromValue(p);
 }
+
+void WindowHelper::destoryWindow(){
+    if(this->window){
+        FluApp::getInstance()->wnds.remove(this->window->winId());
+        this->window->deleteLater();
+    }
+}

src/WindowHelper.h

@@ -6,7 +6,6 @@
 #include <QQuickItem>
 #include <QWindow>
 #include <QJsonObject>
-#include "FramelessView.h"
 
 class WindowHelper : public QObject
 {
@@ -15,22 +14,15 @@ class WindowHelper : public QObject
 public:
     explicit WindowHelper(QObject *parent = nullptr);
 
-    Q_INVOKABLE void initWindow(FramelessView* window);
-    Q_INVOKABLE void setTitle(const QString& text);
-    Q_INVOKABLE void setMinimumWidth(int width);
-    Q_INVOKABLE void setMaximumWidth(int width);
-    Q_INVOKABLE void setMinimumHeight(int height);
-    Q_INVOKABLE void setMaximumHeight(int height);
-    Q_INVOKABLE QJsonObject getArgument();
-    Q_INVOKABLE QVariant getPageRegister();
-    Q_INVOKABLE void updateWindow();
-    Q_INVOKABLE void setOpacity(qreal opacity);
-    Q_INVOKABLE void setModality(int type);
-    Q_INVOKABLE QVariant createRegister(const QString& path);
+    Q_INVOKABLE void initWindow(QQuickWindow* window);
+    Q_INVOKABLE void destoryWindow();
+    Q_INVOKABLE QVariant createRegister(QQuickWindow* window,const QString& path);
+
+    Q_INVOKABLE void firstUpdate();
 
 private:
-    FramelessView* window;
-
+    QQuickWindow* window;
+    bool isFisrt=true;
 };
 
 #endif // WINDOWHELPER_H

src/build_macos.cmake

@@ -0,0 +1,32 @@
+set(OUTP ${CMAKE_BINARY_DIR}/bin/FluentUI/)
+
+add_definitions(-DMACOS)
+
+set(CMAKE_INSTALL_PREFIX ${OUTP})
+set(CMAKE_INSTALL_DESTDIR ${OUTP})
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set(QMAKE_MOC_OPTIONS -Muri=${uri})
+
+add_custom_command(
+    TARGET ${PROJECT_NAME} POST_BUILD
+    COMMAND chmod -R 777 ${CMAKE_CURRENT_SOURCE_DIR}/macos_install.sh
+)
+
+add_custom_command(
+    TARGET ${PROJECT_NAME} POST_BUILD
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/macos_install.sh PRESET ${CMAKE_CURRENT_SOURCE_DIR}/ ${OUTP}
+)
+
+
+
+if(${TARGET_TYPE} STREQUAL "SHARED")
+
+    set(INST_QMLPATH ${QT_INSTALL_QML}/FluentUI)
+    add_custom_command(
+        TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/macos_install.sh INSTALL ${CMAKE_CURRENT_SOURCE_DIR}/ ${OUTP} ${INST_QMLPATH}
+    )
+
+endif()

src/build_windows.cmake

@@ -0,0 +1,27 @@
+set(OUTP "${CMAKE_BINARY_DIR}/bin/FluentUI")
+set(BUILDBIN_PATH "${OUTP}")
+set(QTQMLFLUENT_PATH "${QT_INSTALL_QML}/FluentUI")
+set(PRESET_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build-preset")
+set(SOLIBFILE_PATH "${CMAKE_BINARY_DIR}/libFluentUI.so")
+set(ANDROID NO)
+if (ANDROID)
+    set(ANDROID YES)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${OUTP})
+else()
+    set(CMAKE_INSTALL_PREFIX "${OUTP}")
+endif()
+set(SHAREDSCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/win_install.bat SHARED ${CMAKE_CURRENT_SOURCE_DIR} ${PRESET_PATH} ${BUILDBIN_PATH} ${QTQMLFLUENT_PATH} ${ANDROID} ${SOLIBFILE_PATH})
+set(STATICSCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/win_install.bat STATIC ${CMAKE_CURRENT_SOURCE_DIR} ${PRESET_PATH} ${BUILDBIN_PATH} ${QTQMLFLUENT_PATH} ${ANDROID} ${SOLIBFILE_PATH})
+string(REPLACE "/" "\\" SHAREDSCRIPT "${SHAREDSCRIPT}")
+string(REPLACE "/" "\\" STATICSCRIPT "${STATICSCRIPT}")
+if (${TARGET_TYPE} STREQUAL "SHARED")
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${SHAREDSCRIPT}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+else()
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${STATICSCRIPT}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+endif()

src/build_windows.pri

@@ -4,17 +4,14 @@ QTQMLFLUENT_PATH = $$[QT_INSTALL_QML]/FluentUI
 PRESET_PATH = $$PWD/build-preset
 SOLIBFILE_PATH = $$OUT_PWD/libFluentUI.so
 ANDROID = NO
-
 android{
     ANDROID=YES
     QMAKE_PRE_LINK *= md $$replace(OUTP, /, \\)
 }else{
     DESTDIR += $$OUTP
 }
-
 SHAREDSCRIPT = "$$PWD\win_install.bat" SHARED "$$PWD" "$$PRESET_PATH" "$$BUILDBIN_PATH" "$$QTQMLFLUENT_PATH" $$ANDROID "$$SOLIBFILE_PATH"
 STATICSCRIPT = "$$PWD\win_install.bat" STATIC "$$PWD" "$$PRESET_PATH" "$$BUILDBIN_PATH" "$$QTQMLFLUENT_PATH" $$ANDROID "$$SOLIBFILE_PATH"
-
 CONFIG(sharedlib){
     QMAKE_POST_LINK *= $$replace(SHAREDSCRIPT, /, \\)
 }