Update README.md

feat: FluCarousel支持纵向轮播

.clang-format

@@ -0,0 +1,130 @@
+# References:
+#   https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+#   https://code.qt.io/cgit/qt/qt5.git/tree/_clang-format
+
+BasedOnStyle: LLVM
+
+Standard: c++17
+
+# 指针和引用的对齐方式。
+# 可能的值有：
+# PAS_Left (在配置中： Left) 指针左对齐。
+# PAS_Right (在配置中： Right) 指针右对齐。
+# PAS_Middle (在配置中： Middle) 指针中间对齐。
+PointerAlignment: Right
+
+# public/protected/private 等访问修饰符偏移量
+AccessModifierOffset: -4
+
+# 缩进长度
+IndentWidth: 4
+
+# 连续空行的最大数
+MaxEmptyLinesToKeep: 999
+
+# 在OC中的@property后面添加一个空格。例如：使用“@property (readonly)”而不是“@property(readonly)”
+ObjCSpaceAfterProperty: true
+
+# OC块中所拍的字符数
+ObjCBlockIndentWidth: 4
+
+# 取决于值, 语句“int f() { return 0; }”可以被放到一个单行。
+# 可能的值有：
+# SFS_None (在配置中： None) 从不合并方法或函数到单独的一行。
+# SFS_Empty (在配置中： Empty) 仅合并空的函数。
+# SFS_Inline (在配置中： Inline) 仅合并类中定义的方法或函数. 意味着 “empty”.
+# SFS_All (在配置中： All) 合并所有的方法适应单行.
+AllowShortFunctionsOnASingleLine: None
+
+# 如果为真（true）, 语句“if (a) return;” 能被放到单行。
+AllowShortIfStatementsOnASingleLine: false
+
+# 如果为真（true）, 对齐注释。
+AlignTrailingComments: true
+
+# 如果为真,对齐连续的宏定义
+AlignConsecutiveMacros: true
+
+# 如果为真（true）,将会在“[”之后和“]”之前插入空格。
+SpacesInSquareBrackets: false
+
+# 如果为真（true）, 将会在“(”之后和“)”之前插入空格。
+SpacesInParentheses : false
+
+# 如果为真（true）, 校准连续的声明。
+# 这将会校准连续多行的声明的名字。这将会导致像下面这样的格式：
+# int         aaaa = 12;
+# float       b = 23;
+# std::string ccc = 23;
+AlignConsecutiveDeclarations: false
+
+# 如果为真（true），连续调整多行
+# 这将会调整连续行中的分配操作符。这将会导致像下面这样的格式：
+# int aaaa = 12;
+# int b    = 23;
+# int ccc  = 23;
+AlignConsecutiveAssignments: false
+
+# 如果为假（false），移除分配操作符（=）前空格。
+SpaceBeforeAssignmentOperators: true
+
+# 如果为真（true）, 将会在字面量容器中插入空格(例如 OC和Javascript的数组和字典字面量)。
+SpacesInContainerLiterals: false
+
+# 缩进case标签
+IndentCaseLabels: true
+
+# 如果表达式中包含函数调用，并且函数调用因为表达式太长被放到了下一行，是否缩进
+IndentWrappedFunctionNames: true
+
+# 如果为真（true）, 保持块的起始空行。
+# true:                                  false:
+# if (foo) {                     vs.     if (foo) {
+#                                          bar();
+#   bar();                               }
+# }
+KeepEmptyLinesAtTheStartOfBlocks: true
+
+# 允许所有参数都被放在下一行
+AllowAllParametersOfDeclarationOnNextLine: false
+
+# 使用C风格强制类型转换后，是否在中间添加一个空格
+SpaceAfterCStyleCast: true
+
+# 在模板定义后换行
+AlwaysBreakTemplateDeclarations: Yes
+
+# Tab长度
+TabWidth: 4
+
+# 是否使用Tab
+UseTab: Never
+
+# 在括号后对齐参数
+# someLongFunction(argument1,
+#                  argument2);
+AlignAfterOpenBracket: Align
+
+# 名字空间内部缩进
+NamespaceIndentation: All
+
+# 一行最长列数
+ColumnLimit: 100
+
+# 按层次缩进宏定义
+IndentPPDirectives: AfterHash
+
+# 预处理语句缩进为 2
+PPIndentWidth: 2
+
+# 数组元素对齐
+AlignArrayOfStructures: Left
+
+# 不对头文件排序
+SortIncludes: Never
+
+FixNamespaceComments: false
+
+StatementMacros: ['__qas_attr__', '__qas_exclude__', '__qas_include__']
+
+ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]

.github/workflows/macos.yml

@@ -60,7 +60,7 @@ jobs:
           # 拷贝依赖
           sudo macdeployqt bin/Release/${targetName}.app -qmldir=. -dmg     
           
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
           path: bin/release/${{ env.targetName }}.app

.github/workflows/ubuntu.yml

@@ -69,6 +69,11 @@ jobs:
       - name: Check if svg file exists
         run: if [ ! -f "${targetName}.svg" ]; then echo "File not found, creating..."; touch ${targetName}.svg; fi
 
+      - name: Copy translation files
+        run: |
+          mkdir -p bin/release/usr/bin/
+          cp -r bin/Release/i18n/ bin/release/usr/bin/i18n/
+
       - name: package
         run: |
           # make sure Qt plugin finds QML sources so it can deploy the imported files
@@ -77,7 +82,7 @@ jobs:
           linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=bin/Release/${targetName} --appdir bin/release/
           mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage
         
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
           path: ${{ env.targetName }}.AppImage

.github/workflows/windows-mingw.yml

@@ -82,7 +82,7 @@ jobs:
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name"       
       
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package.outputs.packageName }}
           path: dist
@@ -91,14 +91,14 @@ jobs:
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: zhuzichu520/inno-setup-action@v1.0.1
         with:
-          filepath: ./action-cli/InstallerScript.iss
+          filepath: ./package/InstallerScript.iss
           
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ./action-cli/installer.exe
+          file: ./package/installer.exe
           asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.exe
           tag: ${{ github.ref }}
           overwrite: true

.github/workflows/windows-qt5.yml

@@ -69,7 +69,7 @@ jobs:
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name"     
            
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package.outputs.packageName }}
           path: dist
@@ -78,14 +78,14 @@ jobs:
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: zhuzichu520/inno-setup-action@v1.0.1
         with:
-          filepath: ./action-cli/InstallerScript.iss
+          filepath: ./package/InstallerScript.iss
           
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ./action-cli/installer.exe
+          file: ./package/installer.exe
           asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.exe
           tag: ${{ github.ref }}
           overwrite: true

.github/workflows/windows.yml

@@ -76,7 +76,7 @@ jobs:
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name"     
            
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.package.outputs.packageName }}
           path: dist
@@ -85,14 +85,14 @@ jobs:
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: zhuzichu520/inno-setup-action@v1.0.1
         with:
-          filepath: ./action-cli/InstallerScript.iss
+          filepath: ./package/InstallerScript.iss
           
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ./action-cli/installer.exe
+          file: ./package/installer.exe
           asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.exe
           tag: ${{ github.ref }}
           overwrite: true 

.gitignore

@@ -36,10 +36,8 @@ bin
 build
 cmake-build-*
 .idea
-
+package
 example/Version.h
-
-action-cli
 dist
 
 *.qm

.vscode/settings.json

@@ -0,0 +1,20 @@
+{
+    "MicroPython.executeButton": [
+        {
+            "text": "▶",
+            "tooltip": "运行",
+            "alignment": "left",
+            "command": "extension.executeFile",
+            "priority": 3.5
+        }
+    ],
+    "MicroPython.syncButton": [
+        {
+            "text": "$(sync)",
+            "tooltip": "同步",
+            "alignment": "left",
+            "command": "extension.execute",
+            "priority": 4
+        }
+    ]
+}

CMakeLists.txt

@@ -2,18 +2,18 @@ cmake_minimum_required(VERSION 3.20)
 
 project(FluentUI VERSION 1.0)
 
-if(MSVC)
+if (MSVC)
     #让Release也生成pdb文件
     set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
-endif()
+endif ()
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/.cmake/)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.cmake/)
 
 include(GetGitRevisionDescription)
 
 option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON)
-set(FLUENTUI_BUILD_STATIC_LIB OFF)
+option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF)
 
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
@@ -22,8 +22,8 @@ add_subdirectory(src)
 
 #Release也支持日志打印代码位置
 target_compile_definitions(fluentuiplugin
-    PRIVATE
+        PRIVATE
-    QT_MESSAGELOGCONTEXT
+        QT_MESSAGELOGCONTEXT
 )
 
 if (FLUENTUI_BUILD_EXAMPLES)

README.md

@@ -1,23 +1,23 @@
+# ATTENTION! 
+# PLEASE USE THE BRAND NEW [FluentUI Pro](https://github.com/zhuzichu520/FluentUI2) INSTEAD!
 <div align=center>
-  <img width=64 src="doc/preview/fluent_design.svg">
+<img width=64 src="doc/preview/fluent_design.svg">
-</div>
 
-<h1 align="center">
+# QML FluentUI
-  QML FluentUI 
+
-</h1>
+A Fluent Design component library for Qt QML, You need PySide6 [PySide6-FluentUI-QML](https://github.com/zhuzichu520/PySide6-FluentUI-QML).
-<p align="center">
+
-  A fluent design component library for Qt QML， You need Pyside6 <a href="https://github.com/zhuzichu520/PySide6-FluentUI-QML">PySide6-FluentUI-QML</a>。
+</div>
-</p>
 
 ![win-badge] ![ubuntu-badge] ![macos-badge] ![release-badge] ![download-badge] ![download-latest]
 
-<p align="center">
-English | <a href="README_zh_CN.md">简体中文</a>
-</p>
 <div align=center>
-  <img src="doc/preview/demo_large.png">
-</div>
 
+English | [简体中文](README_zh_CN.md)
+
+<img src="doc/preview/demo_large.png">
+
+</div>
 
 [win-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AWindows "WindowsAction"
 [win-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Windows/badge.svg  "Windows"
@@ -31,7 +31,6 @@ English | <a href="README_zh_CN.md">简体中文</a>
 [download-badge]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/total.svg "Download status"
 [download-latest]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/latest/total.svg "latest status"
 
-
 <p align=center>
 This is a beautiful FluentUI component library based on Qt QML. Currently the main branch supports Qt 6. If you want to use it in Qt 5, checkout the Qt 5 branch.
 </p>
@@ -54,13 +53,13 @@ or
 
 + Clone the repository.
 
-```SHELL
+```bash
 git clone --recursive https://github.com/zhuzichu520/FluentUI.git
 ```
 
 + Build
 
-```
+```bash
 git clone --recursive https://github.com/zhuzichu520/FluentUI.git
 cd FluentUI
 mkdir build
@@ -79,38 +78,35 @@ cmake --build . --config Release --target all --parallel
 
 + Great! Now you are ready to write your first QML FluentUI program! Check the documentations for more details.
 
-
 ## 📑 Documentations
 
 (Work in progress...🚀)
 
 ## Supported components
 
-|Catalog|Detail|Notes / Demos|
+|       Catalog       |              Detail              |                    Notes / Demos                    |
-|:----:|:----:|:----:|
+| :-----------------: | :------------------------------: | :-------------------------------------------------: |
-|FluApp|The initial entry of the program|Router supported(SPA)|
+|       FluApp        | The initial entry of the program |                Router supported(SPA)                |
-|FluWindow|Frameless Window|*This only works on windows|
+|      FluWindow      |         Frameless Window         |             *This only works on windows             |
-|FluAppBar|Title bar on top of the window|Drag, minimize, maximize and close are supported.|
+|      FluAppBar      |  Title bar on top of the window  |  Drag, minimize, maximize and close are supported.  |
-|FluText|Common text||
+|       FluText       |           Common text            |                                                     |
-|FluButton|Common button|![btn](doc/preview/demo_standardbtn.png) |
+|      FluButton      |          Common button           |      ![btn](doc/preview/demo_standardbtn.png)       |
-|FluFilledButton|Filled button|![filledbtn](doc/preview/demo_filledbtn.png)|
+|   FluFilledButton   |          Filled button           |    ![filledbtn](doc/preview/demo_filledbtn.png)     |
-|FluTextButton|Text button|![textbtn](doc/preview/demo_textbtn.png)|
+|    FluTextButton    |           Text button            |      ![textbtn](doc/preview/demo_textbtn.png)       |
-|FluToggleButton|Toggle buttons|![togglebtn](doc/preview/demo_toggle_btn.png)|
+|   FluToggleButton   |          Toggle buttons          |    ![togglebtn](doc/preview/demo_toggle_btn.png)    |
-|FluIcon|Common icon|![icons](doc/preview/demo_icon.png)|
+|       FluIcon       |           Common icon            |         ![icons](doc/preview/demo_icon.png)         |
-|FluRadioButton|radio button|![radiobtn](doc/preview/demo_radiobtn.png)|
+|   FluRadioButton    |           radio button           |     ![radiobtn](doc/preview/demo_radiobtn.png)      |
-|FluTextBox|Single-line input box|![textbox](doc/preview/demo_textbox.png)|
+|     FluTextBox      |      Single-line input box       |      ![textbox](doc/preview/demo_textbox.png)       |
-|FluMultiLineTextBox|Multi-lines input area|![textarea](doc/preview/demo_multiline_textbox.png)|
+| FluMultiLineTextBox |      Multi-lines input area      | ![textarea](doc/preview/demo_multiline_textbox.png) |
-|FluToggleSwitch|toggle switch|![toggleswitch](doc/preview/demo_toggle_switch.png)|
+|   FluToggleSwitch   |          toggle switch           | ![toggleswitch](doc/preview/demo_toggle_switch.png) |
-
 
 View more [`here`](doc/md/all_components.md)!
 
-
 ## Reference
+
 + [**Windows design**: Design guidelines and toolkits of Microsoft.](https://learn.microsoft.com/en-us/windows/apps/design/)
 + [**Microsoft/WinUI-Gallery**: Microsoft's demo](https://github.com/microsoft/WinUI-Gallery)
 
-
 ## License
 
 This FluentUI library currently licensed under [MIT License](./License)
@@ -120,4 +116,5 @@ This FluentUI library currently licensed under [MIT License](./License)
 [![Star History Chart](https://api.star-history.com/svg?repos=zhuzichu520/FluentUI&type=Date)](https://star-history.com/#zhuzichu520/FluentUI&Date)
 
 ## ⚡ Visitor count
-![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)
+
+![Visitor count](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)

README_zh_CN.md

@@ -1,99 +1,118 @@
-# FluentUI
+<div align=center>
+<img width=64 src="doc/preview/fluent_design.svg">
 
-## 简介
+# QML FluentUI
 
-这是一个漂亮的Fluent组件库，使用QML插件开发的。main分支是Qt6.4.3，<a href="https://github.com/zhuzichu520/FluentUI/wiki/%E6%96%B0%E6%89%8B%E5%85%A5%E9%97%A8" target="_blank">如何使用？</a>。如果需要qt5的请切换至qt5分支，<a href="https://github.com/zhuzichu520/FluentUI/wiki/%E6%96%B0%E6%89%8B%E5%85%A5%E9%97%A8%EF%BC%881.2.7%E4%BB%A5%E5%8F%8A%E4%B9%8B%E5%89%8D%E7%89%88%E6%9C%AC%EF%BC%89" target="_blank">如何使用？</a>
+一个 Qt QML 的 Fluent Design 组件库，需要 PySide6 [PySide6-FluentUI-QML](https://github.com/zhuzichu520/PySide6-FluentUI-QML)。
 
-## 编译状态
+</div>
-| [Windows][win-link]| [Ubuntu][ubuntu-link]|[MacOS][macos-link]|
+
-|---------------|---------------|-----------------|
+![win-badge] ![ubuntu-badge] ![macos-badge] ![release-badge] ![download-badge] ![download-latest]
-| ![win-badge]  | ![ubuntu-badge]      | ![macos-badge] |
+
+<div align=center>
+
+[English](README.md) | 简体中文
+
+<img src="doc/preview/demo_large.png">
+
+</div>
 
 [win-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AWindows "WindowsAction"
 [win-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Windows/badge.svg  "Windows"
-
 [ubuntu-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AUbuntu "UbuntuAction"
 [ubuntu-badge]: https://github.com/zhuzichu520/FluentUI/workflows/Ubuntu/badge.svg "Ubuntu"
-
 [macos-link]: https://github.com/zhuzichu520/FluentUI/actions?query=workflow%3AMacOS "MacOSAction"
 [macos-badge]: https://github.com/zhuzichu520/FluentUI/workflows/MacOS/badge.svg "MacOS"
-
-## 发布
-
-|[已发布][release-link]|[下载][download-link]|下载次数|
-|:--:|:--:|:--:|
-|![release-badge] |![download-badge]|![download-latest]|
-
 [release-link]: https://github.com/zhuzichu520/FluentUI/releases "Release status"
 [release-badge]: https://img.shields.io/github/release/zhuzichu520/FluentUI.svg?style=flat-square "Release status"
 [download-link]: https://github.com/zhuzichu520/FluentUI/releases/latest "Download status"
 [download-badge]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/total.svg "Download status"
 [download-latest]: https://img.shields.io/github/downloads/zhuzichu520/FluentUI/latest/total.svg "latest status"
 
+<p align=center>
+这是一个基于 Qt QML 的漂亮 FluentUI 组件库。目前主分支支持 Qt 6。如果您想在 Qt 5 中使用它，请切换至 Qt 5 分支。
+</p>
+
+## 必要条件
+
++ Qt Core、Qt Quick、Qt QML、Qt ShaderTool、Qt 5 Compatibility Module.（**重要**）
++ Qt LinguistTool（可选，用于翻译）
++ Qt Svg（可选，但对于 Qt 5 来说必不可少）
+
+在使用库之前使用 [Qt 在线安装程序](https://download.qt.io/archive/online_installers/) 获取模块（**推荐**），或先编译模块。
+
+## ⚽ 快速开始
+
++ 下载 [预编译版本](https://github.com/zhuzichu520/FluentUI/releases)。（请注意您的平台和编译器）。
+
++ 运行 `example` 程序。
+
+或者
+
++ 克隆此仓库
+
+```bash
+git clone --recursive https://github.com/zhuzichu520/FluentUI.git
+```
+
++ 构建
+
+```bash
+git clone --recursive https://github.com/zhuzichu520/FluentUI.git
+cd FluentUI
+mkdir build
+cd build
+cmake -DCMAKE_PREFIX_PATH=<YOUR_QT_SDK_DIR_PATH> -DCMAKE_BUILD_TYPE=Release -GNinja <仓库路径>
+cmake --build . --config Release --target all --parallel
+```
+
++ 使用 IDE（`Qt Creator` 或者 `CLion`）打开项目。（仅支持 **CMake**）。
+
+<div align=center>
+  <img src="doc/preview/qt_creator_project.png">
+</div>
+
++ 编译项目。然后尝试执行 `example` 演示程序。
+
++ 太好了！现在您可以编写第一个 QML FluentUI 程序了！查看文档了解更多详情。
+
+## 📑 文档
+
+(正在进行中...🚀)
+
 ## 支持的组件
 
-|目录|说明|备注|
+|        目录         |       详情       |                    备注 / Demos                     |
-|----|----|----|
+| :-----------------: | :--------------: | :-------------------------------------------------: |
-|FluApp|初始化入口|支持路由跳转|
+|       FluApp        |   程序初始入口   |                   支持路由（SPA）                   |
-|FluWindow|无边框窗口|解决windows拖动闪烁问题|
+|      FluWindow      |     无框窗口     |                  *仅适用于 Windows                  |
-|FluAppBar|窗口顶部标题栏|支持拖动窗口，最小化、最大化、关闭窗口|
+|      FluAppBar      | 窗口顶部的标题栏 |          支持拖动、最小化、最大化和关闭。           |
-|FluText|Text文本||
+|       FluText       |     通用文本     |                                                     |
-|FluButton|按钮||
+|      FluButton      |     通用按钮     |      ![btn](doc/preview/demo_standardbtn.png)       |
-|FluFilledButton|实心按钮||
+|   FluFilledButton   |   Filled 按钮    |    ![filledbtn](doc/preview/demo_filledbtn.png)     |
-|FluIconButton|图标按钮||
+|    FluTextButton    |     文本按钮     |      ![textbtn](doc/preview/demo_textbtn.png)       |
-|FluTextButton|文本按钮||
+|   FluToggleButton   |     切换按钮     |    ![togglebtn](doc/preview/demo_toggle_btn.png)    |
-|FluIcon|图标||
+|       FluIcon       |     通用图标     |         ![icons](doc/preview/demo_icon.png)         |
-|FluRadioButton|单选按钮||
+|   FluRadioButton    |      单选框      |     ![radiobtn](doc/preview/demo_radiobtn.png)      |
-|FluTextBox|单行输入框||
+|     FluTextBox      |    单行输入框    |      ![textbox](doc/preview/demo_textbox.png)       |
-|FluMultiLineTextBox|多行输入框||
+| FluMultiLineTextBox |    多行输入框    | ![textarea](doc/preview/demo_multiline_textbox.png) |
-|FluToggleSwitch|开关按钮||
+|   FluToggleSwitch   |       开关       | ![toggleswitch](doc/preview/demo_toggle_switch.png) |
-|FluSlider|拖动条||
-|FluInfoBar|提示Toast||
-|FluContentDialog|对话框||
-|FluProgressBar|条形进度条||
-|FluProgressRing|圆形进度条||
-|FluRectangle|矩形|支持部分圆角、clip|
-|FluMenu|菜单框||
-|FluTooltip|tooltip提示框||
-|FluTreeView|树控件||
-|FluTheme|主题设置|支持主题颜色切换，夜间模式|
-|FluCarousel|轮播图组件|支持无限轮播|
-|FluTimePicker|时间选择器||
-|FluDatePicker|日期选择器||
-|FluMenu|菜单Popup||
-|FluNavigationView|响应式导航布局||
-|FluScrollbar|滚动条||
-|FluToggleButton|开关按钮||
-|FluPagination|分页组件||
-|FluTableView|表格组件||
-|FluMediaPlayer|播放器||
-|FluFlipView|FlipView||
 
-# 部分效果预览
+在 [`这里`](doc/md/all_components.md) 查看更多！
 
-## 首页
+## 参考
 
-![](doc/preview/home.png)
++ [**Windows 设计**：Microsoft 的设计指南和工具包。](https://learn.microsoft.com/zh-CN/windows/apps/design/)
++ [**Microsoft/WinUI-Gallery**: Microsoft's demo](https://github.com/microsoft/WinUI-Gallery)
 
-## 各种Button按钮
+## 许可
 
-![](doc/preview/buttons.png)
+本 FluentUI 库目前采用 [MIT License](./License) 许可。
 
-## 主题颜色切换、夜间模式
+## 星标历史
 
-![](doc/preview/theme.png)
+[![星标历史图表](https://api.star-history.com/svg?repos=zhuzichu520/FluentUI&type=Date)](https://star-history.com/#zhuzichu520/FluentUI&Date)
 
-## TableView表格组件
+## ⚡ 游客数量
 
-![](doc/preview/tableview.png)
+![游客数量](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)
-
-## FluTreeView树组件
-
-![](doc/preview/treeview.png)
-
-## 轮播图组件
-
-![](doc/preview/carousel.png)
-
-### ⚡ Visitor count
-![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)

THIRD_PARTY_COPYRIGHT.txt

@@ -34,6 +34,38 @@ providing powerful tools and support for this project.
 For more information about the Qt project,
 please visit the official Qt website (https://www.qt.io/).
 
+
+************************************************************************************
+QHotkey
+
+Copyright (c) 2016, Felix Barz
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of QHotkey nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 ************************************************************************************
 framelesshelper
 
@@ -313,3 +345,682 @@ 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.
+
+************************************************************************************
+QmlQCustomPlot
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+

example/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 
-project(example VERSION 1.0 LANGUAGES CXX)
+project(example VERSION 1.0)
 
 #配置通用编译
 set(CMAKE_CXX_STANDARD 17)
@@ -10,104 +10,100 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 #判断FluentUI库类型
-if(FLUENTUI_BUILD_STATIC_LIB)
+if (FLUENTUI_BUILD_STATIC_LIB)
     add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)
-endif()
+endif ()
 
 #设置可执行文件输出目录
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
 
-if(APPLE)
+if (APPLE)
     set(APPLICATION_DIR_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME}.app/Contents/MacOS)
-else()
+else ()
     set(APPLICATION_DIR_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-endif()
+endif ()
 
 #导入Qt相关依赖包
-find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Quick Svg Network)
+find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Quick Svg Network Widgets)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Quick Svg Network)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Quick Svg Network Widgets)
 
 #添加国际化脚本
-find_program(QT_LUPDATE NAMES lupdate)
+find_program(QT_LUPDATE NAMES lupdate lupdate-qt6)
-find_program(QT_LRELEASE NAMES lrelease)
+find_program(QT_LRELEASE NAMES lrelease lrelease-qt6)
 file(GLOB TS_FILE_PATHS ${CMAKE_CURRENT_LIST_DIR}/ *.ts)
 add_custom_target(Script-UpdateTranslations
-    COMMAND ${QT_LUPDATE} ${CMAKE_CURRENT_LIST_DIR} -ts ${PROJECT_NAME}_en_US.ts WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+        COMMAND ${QT_LUPDATE} ${CMAKE_CURRENT_LIST_DIR} -ts ${PROJECT_NAME}_en_US.ts WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-    COMMAND ${QT_LUPDATE} ${CMAKE_CURRENT_LIST_DIR} -ts ${PROJECT_NAME}_zh_CN.ts WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+        COMMAND ${QT_LUPDATE} ${CMAKE_CURRENT_LIST_DIR} -ts ${PROJECT_NAME}_zh_CN.ts WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-    COMMAND ${QT_LRELEASE} ${PROJECT_NAME}_en_US.ts WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+        COMMAND ${QT_LRELEASE} ${PROJECT_NAME}_en_US.ts WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-    COMMAND ${QT_LRELEASE} ${PROJECT_NAME}_zh_CN.ts WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+        COMMAND ${QT_LRELEASE} ${PROJECT_NAME}_zh_CN.ts WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${APPLICATION_DIR_PATH}/i18n
+        COMMAND ${CMAKE_COMMAND} -E make_directory ${APPLICATION_DIR_PATH}/i18n
-    COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_NAME}_en_US.qm ${PROJECT_NAME}_zh_CN.qm ${APPLICATION_DIR_PATH}/i18n
+        COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_NAME}_en_US.qm ${PROJECT_NAME}_zh_CN.qm ${APPLICATION_DIR_PATH}/i18n
-    SOURCES ${TS_FILE_PATHS}
+        SOURCES ${TS_FILE_PATHS}
 )
 
 ##生成版本信息头文件
 set(HEADER_FILE_VERSION_PATH ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/Version.h)
 configure_file(
-    ${CMAKE_SOURCE_DIR}/.cmake/Version.h.in
+        ${CMAKE_SOURCE_DIR}/.cmake/Version.h.in
-    ${HEADER_FILE_VERSION_PATH}
+        ${HEADER_FILE_VERSION_PATH}
 )
 
 #遍历所有Cpp文件
 file(GLOB_RECURSE CPP_FILES *.cpp *.h)
-foreach(filepath ${CPP_FILES})
+foreach (filepath ${CPP_FILES})
     string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
     list(APPEND sources_files ${filename})
-endforeach(filepath)
+endforeach (filepath)
 
-if(WIN32)
+if (WIN32)
     list(APPEND sources_files "src/app_dmp.h")
-endif()
+endif ()
 
 #如果是Windows平台，则生成rc文件，还有inno setup脚本文件
 set(EXAMPLE_VERSION_RC_PATH "")
-if(WIN32)
+if (WIN32)
     set(EXAMPLE_VERSION_RC_PATH ${CMAKE_CURRENT_BINARY_DIR}/version_${PROJECT_NAME}.rc)
     configure_file(
-        ${CMAKE_SOURCE_DIR}/.cmake/version_exe.rc.in
+            ${CMAKE_SOURCE_DIR}/.cmake/version_exe.rc.in
-        ${EXAMPLE_VERSION_RC_PATH}
+            ${EXAMPLE_VERSION_RC_PATH}
     )
-configure_file(
+    configure_file(
-    ${CMAKE_SOURCE_DIR}/.cmake/InstallerScript.iss.in
+            ${CMAKE_SOURCE_DIR}/.cmake/InstallerScript.iss.in
-    ${CMAKE_SOURCE_DIR}/action-cli/InstallerScript.iss
+            ${CMAKE_SOURCE_DIR}/package/InstallerScript.iss
-)
+    )
-endif()
+endif ()
 
-#加快qrc编译
+list(APPEND sources_files ${PROJECT_NAME}.qrc)
-qt_add_big_resources(QRC_RESOURCES ${PROJECT_NAME}.qrc)
-list(APPEND QRC_RESOURCES ${PROJECT_NAME}.qrc)
-set_property(SOURCE ${PROJECT_NAME}.qrc PROPERTY SKIP_AUTORCC ON)
-list(APPEND sources_files ${QRC_RESOURCES})
 
 #添加可执行文件
-if(WIN32)
+if (WIN32)
     list(APPEND sources_files ${EXAMPLE_VERSION_RC_PATH})
-endif()
+endif ()
-if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+if (${QT_VERSION_MAJOR} GREATER_EQUAL 6)
     qt_add_executable(${PROJECT_NAME}
-        MANUAL_FINALIZATION
+            MANUAL_FINALIZATION
-        ${sources_files}
+            ${sources_files}
     )
-else()
+else ()
     add_executable(${PROJECT_NAME}
-        ${sources_files}
+            ${sources_files}
     )
-endif()
+endif ()
 add_dependencies(${PROJECT_NAME} Script-UpdateTranslations)
 
 #复制程序运行所需要的动态库
-if(WIN32)
+if (WIN32)
-    if(MSVC)
+    if (MSVC)
-        if(CMAKE_SIZEOF_VOID_P EQUAL 4)
+        if (CMAKE_SIZEOF_VOID_P EQUAL 4)
             file(GLOB_RECURSE 3RDPARTY_DLL_DIR ${CMAKE_SOURCE_DIR}/3rdparty/msvc/x86/*.dll)
-        elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        elseif (CMAKE_SIZEOF_VOID_P EQUAL 8)
             file(GLOB_RECURSE 3RDPARTY_DLL_DIR ${CMAKE_SOURCE_DIR}/3rdparty/msvc/x64/*.dll)
-        endif()
+        endif ()
-    elseif(MINGW)
+    elseif (MINGW)
         file(GLOB_RECURSE 3RDPARTY_DLL_DIR ${CMAKE_SOURCE_DIR}/3rdparty/mingw/*.dll)
-    endif()
+    endif ()
     file(COPY ${3RDPARTY_DLL_DIR} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
-endif()
+endif ()
 
 #复制FluentUI源码到运行目录下，用于脚手架生成
 file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/source/)
@@ -115,37 +111,38 @@ file(COPY ${CMAKE_SOURCE_DIR}/src/ DESTINATION ${APPLICATION_DIR_PATH}/source/)
 
 #导入component头文件,不然通过QML_NAMED_ELEMENT生成的c++类会找不到头文件报错
 target_include_directories(${PROJECT_NAME} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/component
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/component
 )
 
 #如果是静态库则需要手动注册插件，导入FluentUI.h头文件
-if(FLUENTUI_BUILD_STATIC_LIB)
+if (FLUENTUI_BUILD_STATIC_LIB)
     target_include_directories(${PROJECT_NAME} PRIVATE
-        ${CMAKE_SOURCE_DIR}/src
+            ${CMAKE_SOURCE_DIR}/src
     )
-endif()
+endif ()
 
 #设置属性
 set_target_properties(${PROJECT_NAME} PROPERTIES
-    MACOSX_BUNDLE_GUI_IDENTIFIER my.${PROJECT_NAME}.com
+        MACOSX_BUNDLE_GUI_IDENTIFIER my.${PROJECT_NAME}.com
-    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+        MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
-    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+        MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-    MACOSX_BUNDLE TRUE
+        MACOSX_BUNDLE TRUE
-    WIN32_EXECUTABLE TRUE
+        WIN32_EXECUTABLE TRUE
 )
 
 #Release也支持日志打印代码位置
 target_compile_definitions(${PROJECT_NAME}
-    PRIVATE
+        PRIVATE
-    QT_MESSAGELOGCONTEXT
+        QT_MESSAGELOGCONTEXT
 )
 
 #目标文件链接库
 target_link_libraries(${PROJECT_NAME} PRIVATE
-    Qt${QT_VERSION_MAJOR}::Quick
+        Qt${QT_VERSION_MAJOR}::Quick
-    Qt${QT_VERSION_MAJOR}::Svg
+        Qt${QT_VERSION_MAJOR}::Svg
-    Qt${QT_VERSION_MAJOR}::Network
+        Qt${QT_VERSION_MAJOR}::Network
-    fluentuiplugin
+	Qt${QT_VERSION_MAJOR}::Widgets
+        fluentuiplugin
 )
 
 #添加部署脚本
@@ -153,23 +150,23 @@ if (CMAKE_BUILD_TYPE MATCHES "Release")
     if (APPLE)
         find_program(QT_DEPLOY_QT NAMES macdeployqt)
         add_custom_target(Script-DeployRelease
-            COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_SOURCE_DIR}/dist
+                COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_SOURCE_DIR}/dist
-            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${CMAKE_SOURCE_DIR}/dist
+                COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${CMAKE_SOURCE_DIR}/dist
-            COMMAND ${QT_DEPLOY_QT} ${CMAKE_SOURCE_DIR}/dist/${PROJECT_NAME}.app -qmldir=${CMAKE_CURRENT_LIST_DIR}
+                COMMAND ${QT_DEPLOY_QT} ${CMAKE_SOURCE_DIR}/dist/${PROJECT_NAME}.app -qmldir=${CMAKE_CURRENT_LIST_DIR}
-            COMMENT "MacOs Deploying Qt Dependencies After Build........."
+                COMMENT "MacOs Deploying Qt Dependencies After Build........."
-            SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         )
-    endif()
+    endif ()
-    if(WIN32)
+    if (WIN32)
         find_program(QT_DEPLOY_QT NAMES windeployqt)
         add_custom_target(Script-DeployRelease
-            COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_SOURCE_DIR}/dist
+                COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_SOURCE_DIR}/dist
-            COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${CMAKE_SOURCE_DIR}/dist
+                COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${CMAKE_SOURCE_DIR}/dist
-            COMMAND ${QT_DEPLOY_QT} ${CMAKE_SOURCE_DIR}/dist/${PROJECT_NAME}.exe -qmldir=${CMAKE_CURRENT_LIST_DIR}
+                COMMAND ${QT_DEPLOY_QT} --qmldir=${CMAKE_CURRENT_LIST_DIR} --plugindir ${CMAKE_SOURCE_DIR}/dist/plugins --no-translations --compiler-runtime ${CMAKE_SOURCE_DIR}/dist/${PROJECT_NAME}.exe
-            COMMENT "Windows Deploying Qt Dependencies After Build........."
+                COMMENT "Windows Deploying Qt Dependencies After Build........."
-            SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
         )
-endif()
+    endif ()
-endif()
+endif ()

example/example.qrc

@@ -127,7 +127,6 @@
         <file>qml/global/ItemsOriginal.qml</file>
         <file>qml/global/qmldir</file>
         <file>qml/page/T_Acrylic.qml</file>
-        <file>qml/page/T_Awesome.qml</file>
         <file>qml/page/T_Badge.qml</file>
         <file>qml/page/T_BreadcrumbBar.qml</file>
         <file>qml/page/T_Buttons.qml</file>
@@ -177,14 +176,10 @@
         <file>qml/window/SingleInstanceWindow.qml</file>
         <file>qml/window/SingleTaskWindow.qml</file>
         <file>qml/window/StandardWindow.qml</file>
-        <file>res/image/bg_scenic.png</file>
         <file>res/image/image_1.jpg</file>
         <file>qml/window/PageWindow.qml</file>
         <file>qml/page/T_StaggeredLayout.qml</file>
-        <file>qml/viewmodel/SettingsViewModel.qml</file>
-        <file>qml/viewmodel/TextBoxViewModel.qml</file>
         <file>qml/page/T_Clip.qml</file>
-        <file>qml/page/T_3D.qml</file>
         <file>qml/page/T_Network.qml</file>
         <file>qml/page/T_ShortcutPicker.qml</file>
         <file>qml/chart/T_BarChart.qml</file>
@@ -197,7 +192,6 @@
         <file>res/image/ic_crash.png</file>
         <file>qml/window/CrashWindow.qml</file>
         <file>qml/page/T_SplitLayout.qml</file>
-        <file>qml/window/FluentInitalizrWindow.qml</file>
         <file>res/template/CMakeLists.txt.in</file>
         <file>res/template/src/App.qml.in</file>
         <file>res/template/src/CMakeLists.txt.in</file>
@@ -208,5 +202,17 @@
         <file>res/template/src/qml.qrc.in</file>
         <file>res/template/src/zh_CN.ts.in</file>
         <file>res/template/src/README.md.in</file>
+        <file>qml/global/GlobalModel.qml</file>
+        <file>qml/page/T_Sheet.qml</file>
+        <file>qml/page/T_GroupBox.qml</file>
+        <file>res/image/bg_scenic.jpg</file>
+        <file>qml/window/FluentInitializrWindow.qml</file>
+        <file>qml/page/T_OpenGL.qml</file>
+        <file>qml/page/T_Icons.qml</file>
+        <file>qml/window/HotkeyWindow.qml</file>
+        <file>qml/page/T_CustomPlot.qml</file>
+        <file>res/image/logo_pro.png</file>
+        <file>qml/page/T_FluentPro.qml</file>
     </qresource>
+    <qresource prefix="/"/>
 </RCC>

example/qml/App.qml

@@ -4,41 +4,37 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import FluentUI 1.0
 
-Item {
+FluLauncher {
     id: app
-
     Connections{
         target: FluTheme
         function onDarkModeChanged(){
             SettingsHelper.saveDarkMode(FluTheme.darkMode)
         }
     }
-
     Connections{
         target: FluApp
         function onUseSystemAppBarChanged(){
             SettingsHelper.saveUseSystemAppBar(FluApp.useSystemAppBar)
         }
     }
-
     Connections{
         target: TranslateHelper
         function onCurrentChanged(){
             SettingsHelper.saveLanguage(TranslateHelper.current)
         }
     }
-
     Component.onCompleted: {
-        FluNetwork.openLog = false
+        Network.openLog = false
-        FluNetwork.setInterceptor(function(param){
+        Network.setInterceptor(function(param){
             param.addHeader("Token","000000000000000000000")
         })
         FluApp.init(app,Qt.locale(TranslateHelper.current))
         FluApp.windowIcon = "qrc:/example/res/image/favicon.ico"
         FluApp.useSystemAppBar = SettingsHelper.getUseSystemAppBar()
         FluTheme.darkMode = SettingsHelper.getDarkMode()
-        FluTheme.enableAnimation = true
+        FluTheme.animationEnabled = true
-        FluApp.routes = {
+        FluRouter.routes = {
             "/":"qrc:/example/qml/window/MainWindow.qml",
             "/about":"qrc:/example/qml/window/AboutWindow.qml",
             "/login":"qrc:/example/qml/window/LoginWindow.qml",
@@ -47,13 +43,83 @@ Item {
             "/singleTaskWindow":"qrc:/example/qml/window/SingleTaskWindow.qml",
             "/standardWindow":"qrc:/example/qml/window/StandardWindow.qml",
             "/singleInstanceWindow":"qrc:/example/qml/window/SingleInstanceWindow.qml",
-            "/pageWindow":"qrc:/example/qml/window/PageWindow.qml"
+            "/pageWindow":"qrc:/example/qml/window/PageWindow.qml",
+            "/hotkey":"qrc:/example/qml/window/HotkeyWindow.qml"
         }
         var args = Qt.application.arguments
         if(args.length>=2 && args[1].startsWith("-crashed=")){
-            FluApp.navigate("/crash",{crashFilePath:args[1].replace("-crashed=","")})
+            FluRouter.navigate("/crash",{crashFilePath:args[1].replace("-crashed=","")})
         }else{
-            FluApp.navigate("/")
+            FluRouter.navigate("/")
         }
     }
+
+    property alias hotkeys: object_hotkey
+    FluObject{
+        id: object_hotkey
+        FluHotkey{
+            name: qsTr("Quit")
+            sequence: "Ctrl+Alt+Q"
+            onActivated: {
+                FluRouter.exit()
+            }
+        }
+        FluHotkey{
+            name: qsTr("Test1")
+            sequence: "Alt+A"
+            onActivated: {
+                FluRouter.navigate("/hotkey",{sequence:sequence})
+            }
+        }
+        FluHotkey{
+            name: qsTr("Test2")
+            sequence: "Alt+B"
+            onActivated: {
+                FluRouter.navigate("/hotkey",{sequence:sequence})
+            }
+        }
+        FluHotkey{
+            name: qsTr("Test3")
+            sequence: "Alt+C"
+            onActivated: {
+                FluRouter.navigate("/hotkey",{sequence:sequence})
+            }
+        }
+        FluHotkey{
+            name: qsTr("Test4")
+            sequence: "Alt+D"
+            onActivated: {
+                FluRouter.navigate("/hotkey",{sequence:sequence})
+            }
+        }
+        FluHotkey{
+            name: qsTr("Test5")
+            sequence: "Alt+E"
+            onActivated: {
+                FluRouter.navigate("/hotkey",{sequence:sequence})
+            }
+        }
+        FluHotkey{
+            name: qsTr("Test6")
+            sequence: "Alt+F"
+            onActivated: {
+                FluRouter.navigate("/hotkey",{sequence:sequence})
+            }
+        }
+        FluHotkey{
+            name: qsTr("Test7")
+            sequence: "Alt+G"
+            onActivated: {
+                FluRouter.navigate("/hotkey",{sequence:sequence})
+            }
+        }
+        FluHotkey{
+            name: qsTr("Test8")
+            sequence: "Alt+H"
+            onActivated: {
+                FluRouter.navigate("/hotkey",{sequence:sequence})
+            }
+        }
+    }
+
 }

example/qml/chart/T_BarChart.qml

@@ -9,10 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Bar Chart")
 
-    FluArea{
+    FluFrame{
-        width: 500
+        Layout.preferredWidth: 500
-        height: 370
+        Layout.preferredHeight: 370
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluChart{
             anchors.fill: parent
@@ -69,10 +69,10 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
-        width: 500
+        Layout.preferredWidth: 500
-        height: 370
+        Layout.preferredHeight: 370
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluChart{
             anchors.fill: parent

example/qml/chart/T_BubbleChart.qml

@@ -13,10 +13,10 @@ FluScrollablePage{
         return Math.random().toFixed(1);
     }
 
-    FluArea{
+    FluFrame{
-        height: 370
+        Layout.preferredWidth: 500
-        width: 500
+        Layout.preferredHeight: 370
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluChart{
             anchors.fill: parent

example/qml/chart/T_LineChart.qml

@@ -7,21 +7,24 @@ import "../component"
 
 FluScrollablePage{
 
+    id: root
     title: qsTr("Line Chart")
+    property var data : []
 
-    FluArea{
+    FluFrame{
-        width: 500
+        Layout.preferredWidth: 500
-        height: 370
+        Layout.preferredHeight: 370
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluChart{
+            id: chart
             anchors.fill: parent
             chartType: 'line'
             chartData: { return {
                     labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
                     datasets: [{
                             label: 'My First Dataset',
-                            data: [65, 59, 80, 81, 56, 55, 40],
+                            data: root.data,
                             fill: false,
                             borderColor: 'rgb(75, 192, 192)',
                             tension: 0.1
@@ -41,5 +44,20 @@ FluScrollablePage{
                 }
             }
         }
+        Timer{
+            id: timer
+            interval: 300
+            repeat: true
+            onTriggered: {
+                root.data.push(Math.random()*100)
+                if(root.data.length>7){
+                    root.data.shift()
+                }
+                chart.animateToNewData()
+            }
+        }
+        Component.onCompleted: {
+            timer.restart()
+        }
     }
 }

example/qml/chart/T_PieChart.qml

@@ -9,10 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Pie Chart")
 
-    FluArea{
+    FluFrame{
-        width: 500
+        Layout.preferredWidth: 500
-        height: 370
+        Layout.preferredHeight: 370
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluChart{
             anchors.fill: parent
@@ -50,10 +50,10 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
-        width: 500
+        Layout.preferredWidth: 500
-        height: 370
+        Layout.preferredHeight: 370
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluChart{
             anchors.fill: parent

example/qml/chart/T_PolarAreaChart.qml

@@ -9,10 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Polar Area Chart")
 
-    FluArea{
+    FluFrame{
-        width: 500
+        Layout.preferredWidth: 500
-        height: 370
+        Layout.preferredHeight: 370
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluChart{
             anchors.fill: parent

example/qml/chart/T_RadarChart.qml

@@ -9,10 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Radar Chart")
 
-    FluArea{
+    FluFrame{
-        width: 500
+        Layout.preferredWidth: 500
-        height: 370
+        Layout.preferredHeight: 370
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluChart{
             anchors.fill: parent

example/qml/chart/T_ScatterChart.qml

@@ -13,10 +13,10 @@ FluScrollablePage{
         return Math.random().toFixed(1);
     }
 
-    FluArea{
+    FluFrame{
-        height: 370
+        Layout.preferredWidth: 500
-        width: 500
+        Layout.preferredHeight: 370
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluChart{
             anchors.fill: parent
@@ -119,5 +119,4 @@ FluScrollablePage{
             }
         }
     }
-
 }

example/qml/component/CodeExpander.qml

@@ -16,7 +16,7 @@ FluExpander{
         id:content
         width:parent.width
         text:highlightQmlCode(code)
-        textFormat: FluMultilineTextBox.RichText
+        textFormat: FluCopyableText.RichText
         padding: 10
         topPadding: 10
         leftPadding: 10
@@ -135,7 +135,11 @@ FluExpander{
                     "FluLoadingButton",
                     "FluClip",
                     "FluNetwork",
-                    "FluShortcutPicker"
+                    "FluShortcutPicker",
+                    "FluWindowResultLauncher",
+                    "FluRouter",
+                    "FluGroupBox",
+                    "FluSheet",
                 ];
         code = code.replace(/\n/g, "<br>");
         code = code.replace(/ /g, "&nbsp;");

example/qml/global/GlobalModel.qml

@@ -0,0 +1,10 @@
+pragma Singleton
+
+import QtQuick 2.15
+import FluentUI 1.0
+
+QtObject{
+
+    property int displayMode: FluNavigationViewType.Auto
+
+}

example/qml/global/ItemsFooter.qml

@@ -16,7 +16,7 @@ FluObject{
         title:qsTr("About")
         icon:FluentIcons.Contact
         onTapListener:function(){
-            FluApp.navigate("/about")
+            FluRouter.navigate("/about")
         }
     }
 
@@ -30,4 +30,13 @@ FluObject{
         }
     }
 
+    FluPaneItem{
+        title:qsTr("FluentUI Pro")
+        menuDelegate: paneItemMenu
+        icon: FluentIcons.Airplane
+        url:"qrc:/example/qml/page/T_FluentPro.qml"
+        onTap:{
+            navigationView.push(url)
+        }
+    }
 }

example/qml/global/ItemsOriginal.qml

@@ -104,6 +104,12 @@ FluObject{
             url: "qrc:/example/qml/page/T_ToggleSwitch.qml"
             onTap: { navigationView.push(url) }
         }
+        FluPaneItem{
+            title: qsTr("GroupBox")
+            menuDelegate: paneItemMenu
+            url: "qrc:/example/qml/page/T_GroupBox.qml"
+            onTap: { navigationView.push(url) }
+        }
         FluPaneItem{
             title: qsTr("PaneItem Disabled")
             disabled: true
@@ -271,6 +277,12 @@ FluObject{
             url: "qrc:/example/qml/page/T_Menu.qml"
             onTap: { navigationView.push(url) }
         }
+        FluPaneItem{
+            title: qsTr("Sheet")
+            menuDelegate: paneItemMenu
+            url: "qrc:/example/qml/page/T_Sheet.qml"
+            onTap: { navigationView.push(url) }
+        }
     }
 
     FluPaneItemExpander{
@@ -352,9 +364,9 @@ FluObject{
             onTap: { navigationView.push(url) }
         }
         FluPaneItem{
-            title: qsTr("Awesome")
+            title: qsTr("Icons")
             menuDelegate: paneItemMenu
-            url: "qrc:/example/qml/page/T_Awesome.qml"
+            url: "qrc:/example/qml/page/T_Icons.qml"
             onTap: { navigationView.push(url) }
         }
     }
@@ -414,6 +426,18 @@ FluObject{
     FluPaneItemExpander{
         title: qsTr("Other")
         icon: FluentIcons.Shop
+        FluPaneItem{
+            title: qsTr("OpenGL")
+            menuDelegate: paneItemMenu
+            url: "qrc:/example/qml/page/T_OpenGL.qml"
+            onTap: { navigationView.push(url) }
+        }
+        FluPaneItem{
+            title: qsTr("QCustomPlot")
+            menuDelegate: paneItemMenu
+            url: "qrc:/example/qml/page/T_CustomPlot.qml"
+            onTap: { navigationView.push(url) }
+        }
         FluPaneItem{
             title: qsTr("QRCode")
             menuDelegate: paneItemMenu
@@ -462,21 +486,17 @@ FluObject{
         FluPaneItem{
             title: qsTr("Hot Loader")
             onTapListener: function(){
-                FluApp.navigate("/hotload")
+                FluRouter.navigate("/hotload")
             }
         }
-        FluPaneItem{
-            title: qsTr("3D")
-            menuDelegate: paneItemMenu
-            url: "qrc:/example/qml/page/T_3D.qml"
-            onTap: { navigationView.push(url) }
-        }
         FluPaneItem{
             title: qsTr("Test Crash")
-            visible: FluTools.isWin()
             onTapListener: function(){
                 AppInfo.testCrash()
             }
+            Component.onCompleted: {
+                visible = FluTools.isWin()
+            }
         }
     }
 

example/qml/global/qmldir

@@ -1,2 +1,3 @@
-singleton ItemsOriginal 1.0 ItemsOriginal.qml
+singleton ItemsOriginal 1.0 ItemsOriginal.qml
 singleton ItemsFooter 1.0 ItemsFooter.qml
+singleton GlobalModel 1.0 GlobalModel.qml

example/qml/page/T_3D.qml

@@ -1,116 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Controls 2.15
-import QtQuick.Window 2.15
-import Qt3D.Core 2.15
-import Qt3D.Render 2.15
-import Qt3D.Input 2.12
-import Qt3D.Extras 2.15
-import QtQuick.Scene3D 2.15
-import Qt.labs.platform 1.1
-import FluentUI 1.0
-import "../component"
-
-FluContentPage{
-
-    id:root
-    title:"3D"
-
-    Scene3D{
-        id:scene_3d
-        anchors.fill: parent
-        focus: true
-        aspects: ["input", "logic"]
-        cameraAspectRatioMode: Scene3D.AutomaticAspectRatio
-        Entity {
-            Camera {
-                id: camera
-                projectionType: CameraLens.PerspectiveProjection
-                fieldOfView: 22.5
-                aspectRatio: scene_3d.width / scene_3d.height
-                nearPlane: 1
-                farPlane: 1000.0
-                viewCenter: Qt.vector3d( 0.0, 0.0, 0.0 )
-                upVector: Qt.vector3d( 0.0, 1.0, 0.0 )
-                position: Qt.vector3d( 0.0, 0.0, 15.0 )
-            }
-            FirstPersonCameraController {
-                linearSpeed: 100
-                lookSpeed: 50
-                camera: camera
-            }
-            components: [
-                RenderSettings{
-                    activeFrameGraph: ForwardRenderer{
-                        clearColor: Qt.rgba(0,0,0,0);
-                        camera: camera
-                    }
-                },
-                InputSettings{}
-            ]
-            Mesh {
-                id: mesh
-                source: "https://zhu-zichu.gitee.io/test.obj"
-            }
-            PhongMaterial {
-                id: material
-                ambient: color_picker.current
-            }
-            Transform{
-                id:transform
-                scale: 1.0
-                translation: Qt.vector3d(0, 0, 0)
-                rotation: fromEulerAngles(0, 0, 0)
-                property real hAngle:0.0
-                NumberAnimation on hAngle{
-                    from:0
-                    to:360.0
-                    duration: 5000
-                    loops: Animation.Infinite
-                }
-                matrix:{
-                    var m=Qt.matrix4x4();
-                    m.rotate(hAngle,Qt.vector3d(0,1,0));
-                    m.translate(Qt.vector3d(0,0,0));
-                    return m;
-                }
-            }
-            Entity {
-                id: entity
-                components: [mesh, material,transform]
-            }
-        }
-    }
-    ColumnLayout{
-        RowLayout{
-            spacing: 10
-            Layout.topMargin: 20
-            FluText{
-                text:"tintColor:"
-                Layout.alignment: Qt.AlignVCenter
-            }
-            FluColorPicker{
-                id:color_picker
-                current: "gray"
-            }
-        }
-
-        FluButton{
-            text:"选择obj资源"
-            onClicked: {
-                file_dialog.open()
-            }
-        }
-    }
-
-    FileDialog {
-        id: file_dialog
-        nameFilters: ["Obj files (*.obj)"]
-        folder: StandardPaths.writableLocation(StandardPaths.DocumentsLocation)
-        onAccepted: {
-            var fileUrl =  file_dialog.currentFile
-            mesh.source = fileUrl
-        }
-    }
-
-}

example/qml/page/T_Acrylic.qml

@@ -11,9 +11,8 @@ FluScrollablePage{
 
     RowLayout{
         spacing: 10
-        Layout.topMargin: 20
         FluText{
-            text:"tintColor:"
+            text: qsTr("tintColor:")
             Layout.alignment: Qt.AlignVCenter
         }
         FluColorPicker{
@@ -23,7 +22,7 @@ FluScrollablePage{
     RowLayout{
         spacing: 10
         FluText{
-            text:"tintOpacity:"
+            text: qsTr("tintOpacity:")
             Layout.alignment: Qt.AlignVCenter
         }
         FluSlider{
@@ -34,7 +33,7 @@ FluScrollablePage{
     RowLayout{
         spacing: 10
         FluText{
-            text:"blurRadius:"
+            text: qsTr("blurRadius:")
             Layout.alignment: Qt.AlignVCenter
         }
         FluSlider{
@@ -42,10 +41,10 @@ FluScrollablePage{
             value: 32
         }
     }
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 1200/4+20
+        Layout.preferredHeight: 1200/4+20
-        paddings: 10
+        padding: 10
         Layout.topMargin: 10
         FluClip{
             width: 1920/4
@@ -54,7 +53,7 @@ FluScrollablePage{
             Image {
                 id:image
                 asynchronous: true
-                source: "qrc:/example/res/image/bg_scenic.png"
+                source: "qrc:/example/res/image/bg_scenic.jpg"
                 anchors.fill: parent
                 sourceSize: Qt.size(2*width,2*height)
             }
@@ -70,9 +69,9 @@ FluScrollablePage{
                 y:(image.height-height)/2
                 FluText {
                     anchors.centerIn: parent
-                    text: "Acrylic"
+                    text: qsTr("Acrylic")
                     color: "#FFFFFF"
-                    font.bold: true
+                    font: FluTextStyle.Subtitle
                 }
                 MouseArea {
                     property point clickPos: Qt.point(0,0)
@@ -95,7 +94,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'Image{
     id:image
     width: 800

example/qml/page/T_Awesome.qml

@@ -1,71 +0,0 @@
-import QtQuick 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
-import QtQuick.Window 2.15
-import FluentUI 1.0
-
-FluContentPage {
-
-    title: qsTr("Awesome")
-
-    FluTextBox{
-        id:text_box
-        placeholderText: qsTr("Please enter a keyword")
-        anchors{
-            topMargin: 20
-            top:parent.top
-        }
-    }
-
-    FluFilledButton{
-        text: qsTr("Search")
-        anchors{
-            left: text_box.right
-            verticalCenter: text_box.verticalCenter
-            leftMargin: 14
-        }
-        onClicked: {
-            grid_view.model = FluTheme.awesomeList(text_box.text)
-        }
-    }
-    GridView{
-        id:grid_view
-        cellWidth: 80
-        cellHeight: 80
-        clip: true
-        boundsBehavior: GridView.StopAtBounds
-        model:FluTheme.awesomeList()
-        ScrollBar.vertical: FluScrollBar {}
-        anchors{
-            topMargin: 10
-            top:text_box.bottom
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        delegate: Item {
-            width: 68
-            height: 80
-            FluIconButton{
-                id:item_icon
-                iconSource:modelData.icon
-                anchors.horizontalCenter: parent.horizontalCenter
-                onClicked: {
-                    var text  ="FluentIcons."+modelData.name;
-                    FluTools.clipText(text)
-                    showSuccess(qsTr("You Copied ")+text)
-                }
-            }
-            FluText {
-                id:item_name
-                font.pixelSize: 10
-                anchors.horizontalCenter: parent.horizontalCenter
-                anchors.top: item_icon.bottom
-                width:parent.width
-                wrapMode: Text.WrapAnywhere
-                text: modelData.name
-                horizontalAlignment: Text.AlignHCenter
-            }
-        }
-    }
-}

example/qml/page/T_Badge.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Badge")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
         height: 120
-        paddings: 10
+        padding: 10
 
         Column{
             spacing: 15
@@ -114,7 +113,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'Rectangle{
     width: 40
     height: 40

example/qml/page/T_BreadcrumbBar.qml

@@ -12,17 +12,16 @@ FluScrollablePage{
     Component.onCompleted: {
         var items = []
         for(var i=0;i<10;i++){
-            items.push({title:"Item_"+(i+1)})
+            items.push({title: qsTr("Item_%1").arg(i+1)})
         }
         breadcrumb_1.items = items
         breadcrumb_2.items = items
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
 
         FluBreadcrumbBar{
             id:breadcrumb_1
@@ -36,10 +35,10 @@ FluScrollablePage{
     }
 
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 100
+        Layout.preferredHeight: 100
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
 
         ColumnLayout{
@@ -52,7 +51,7 @@ FluScrollablePage{
                 onClicked:{
                     var items = []
                     for(var i=0;i<10;i++){
-                        items.push({title:"Item_"+(i+1)})
+                        items.push({title: qsTr("Item_")+(i+1)})
                     }
                      breadcrumb_2.items = items
                 }
@@ -77,7 +76,7 @@ FluScrollablePage{
 
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluBreadcrumbBar{
     width:parent.width
     separator:">"

example/qml/page/T_Buttons.qml

@@ -10,15 +10,14 @@ FluScrollablePage{
     title: qsTr("Buttons")
 
     FluText{
-        Layout.topMargin: 20
         text: qsTr("Support the Tab key to switch focus, and the Space key to perform click events")
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        Layout.topMargin: 10
-        Layout.topMargin: 20
+        padding: 10
 
         FluTextButton{
             disabled: text_button_switch.checked
@@ -42,7 +41,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluTextButton{
     text:"Text Button"
     onClicked: {
@@ -51,10 +50,10 @@ FluScrollablePage{
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
 
         FluButton{
@@ -79,7 +78,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluButton{
     text:"Standard Button"
     onClicked: {
@@ -88,11 +87,11 @@ FluScrollablePage{
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
         Layout.topMargin: 20
-        paddings: 10
+        padding: 10
 
         FluFilledButton{
             disabled: filled_button_switch.checked
@@ -116,7 +115,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluFilledButton{
     text:"Filled Button"
     onClicked: {
@@ -125,11 +124,11 @@ FluScrollablePage{
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
         Layout.topMargin: 20
-        paddings: 10
+        padding: 10
 
         FluToggleButton{
             disabled:toggle_button_switch.checked
@@ -150,7 +149,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluToggleButton{
     text:"Toggle Button"
     onClicked: {
@@ -172,11 +171,11 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
         Layout.topMargin: 20
-        paddings: 10
+        padding: 10
 
         FluProgressButton{
             id: btn_progress
@@ -202,7 +201,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluProgressButton{
     text:"Progress Button"
     onClicked: {
@@ -211,16 +210,16 @@ FluScrollablePage{
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
         Layout.topMargin: 20
-        paddings: 10
+        padding: 10
 
         FluLoadingButton{
             id: btn_loading
             loading: loading_button_switch.checked
-            text: qsTr("Loading Button")
+            text: loading_button_switch.checked ? qsTr("Loading") : qsTr("Loading Button")
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
@@ -236,12 +235,12 @@ FluScrollablePage{
                 right: parent.right
                 verticalCenter: parent.verticalCenter
             }
-            text: qsTr("Loading")
+            text: loading_button_switch.checked ? qsTr("Loading") : qsTr("Normal")
         }
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluLoadingButton{
     text:"Loading Button"
     onClicked: {
@@ -251,10 +250,10 @@ FluScrollablePage{
     }
 
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: layout_icon_button.height + 30
+        Layout.preferredHeight: layout_icon_button.height + 30
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         Flow{
             id: layout_icon_button
@@ -323,7 +322,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluIconButton{
     iconSource:FluentIcons.ChromeCloseContrast
     onClicked: {
@@ -332,10 +331,10 @@ FluScrollablePage{
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluDropDownButton{
             disabled: drop_down_button_switch.checked
@@ -371,7 +370,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluDropDownButton{
     text:"DropDownButton"
     FluMenuItem{
@@ -389,10 +388,10 @@ FluScrollablePage{
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 100
+        Layout.preferredHeight: 100
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluRadioButtons{
             spacing: 8
@@ -400,16 +399,14 @@ FluScrollablePage{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
+            disabled: radio_button_switch.checked
             FluRadioButton{
-                disabled:radio_button_switch.checked
                 text: qsTr("Radio Button_1")
             }
             FluRadioButton{
-                disabled:radio_button_switch.checked
                 text: qsTr("Radio Button_2")
             }
             FluRadioButton{
-                disabled:radio_button_switch.checked
                 text: qsTr("Radio Button_3")
             }
         }
@@ -424,7 +421,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluRadioButton{
     checked:true
     text:"Text Button"

example/qml/page/T_CalendarPicker.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("CalendarPicker")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: 80
-        height: 80
+        padding: 10
-        paddings: 10
         ColumnLayout{
             anchors{
                 verticalCenter: parent.verticalCenter
@@ -28,7 +27,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluCalendarPicker{
 
 }'

example/qml/page/T_Captcha.qml

@@ -11,7 +11,6 @@ FluScrollablePage{
 
     FluCaptcha{
         id: captcha
-        Layout.topMargin: 20
         ignoreCase:switch_case.checked
         MouseArea{
             anchors.fill: parent
@@ -46,7 +45,7 @@ FluScrollablePage{
             Layout.preferredWidth: 240
         }
         FluButton{
-            text:"verify"
+            text: qsTr("verify")
             onClicked: {
                 var success =  captcha.verify(text_box.text)
                 if(success){

example/qml/page/T_Carousel.qml

@@ -22,11 +22,10 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         height: 370
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
         Column{
             spacing: 15
             anchors{
@@ -62,10 +61,10 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         height: 340
-        paddings: 10
+        padding: 10
         Layout.topMargin: 10
         Column{
             spacing: 15
@@ -104,7 +103,6 @@ FluScrollablePage{
                                     horizontalAlignment: Qt.AlignHCenter
                                     text:model.title
                                     color: FluColors.Grey10
-                                    font.pixelSize: 15
                                 }
                             }
                         }
@@ -123,10 +121,9 @@ FluScrollablePage{
 
         }
     }
-
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluCarousel{
     id:carousel
     width: 400
@@ -142,6 +139,90 @@ FluScrollablePage{
     Component.onCompleted: {
         carousel.model = [{url:"qrc:/example/res/image/banner_1.jpg"},{url:"qrc:/example/res/image/banner_2.jpg"},{url:"qrc:/example/res/image/banner_3.jpg"}]
     }
+}'
+    }
+
+    FluFrame{
+        Layout.fillWidth: true
+        Layout.preferredHeight: 300 + topPadding + bottomPadding
+        padding: 10
+        Layout.topMargin: 10
+        RowLayout{
+            anchors.fill: parent
+            Item{
+                Layout.preferredWidth: 400
+                Layout.fillHeight: true
+                FluShadow{
+                    radius: 8
+                }
+                FluCarousel{
+                    anchors.fill: parent
+                    orientation: Qt.Vertical
+                    autoPlay: auto_play_switch.checked
+                    loopTime:1500
+                    indicatorGravity: Qt.AlignVCenter | Qt.AlignRight
+                    indicatorMarginTop:15
+                    delegate: Component{
+                        Item{
+                            anchors.fill: parent
+                            Image {
+                                anchors.fill: parent
+                                source: model.url
+                                asynchronous: true
+                                fillMode:Image.PreserveAspectCrop
+                            }
+                            Rectangle{
+                                height: 40
+                                width: parent.width
+                                anchors.bottom: parent.bottom
+                                color: "#33000000"
+                                FluText{
+                                    anchors.fill: parent
+                                    verticalAlignment: Qt.AlignVCenter
+                                    horizontalAlignment: Qt.AlignHCenter
+                                    text:model.title
+                                    color: FluColors.Grey10
+                                }
+                            }
+                        }
+                    }
+                    Layout.topMargin: 20
+                    Layout.leftMargin: 5
+                    Component.onCompleted: {
+                        var arr = []
+                        arr.push({url:"qrc:/example/res/image/banner_1.jpg",title:"共同应对全球性问题"})
+                        arr.push({url:"qrc:/example/res/image/banner_2.jpg",title:"三小只全程没互动"})
+                        arr.push({url:"qrc:/example/res/image/banner_3.jpg",title:"有效投资扩大 激发增长动能"})
+                        model = arr
+                    }
+                }
+            }
+            FluToggleSwitch{
+                id: auto_play_switch
+                Layout.alignment: Qt.AlignRight
+                text: qsTr("Auto play")
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -6
+        code:'FluCarousel{
+    id:carousel
+    width: 400
+    height: 300
+    orientation: Qt.Vertical
+    delegate: Component{
+        Image {
+            anchors.fill: parent
+            source: model.url
+            asynchronous: true
+            fillMode:Image.PreserveAspectCrop
+        }
+    }
+    Component.onCompleted: {
+        carousel.model = [{url:"qrc:/example/res/image/banner_1.jpg"},{url:"qrc:/example/res/image/banner_2.jpg"},{url:"qrc:/example/res/image/banner_3.jpg"}]
+    }
 }'
     }
 }

example/qml/page/T_CheckBox.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("CheckBox")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 72
+        Layout.preferredHeight: 72
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
 
         FluText{
             text: qsTr("A 2-state CheckBox")
@@ -49,16 +48,16 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluCheckBox{
     text:"Text"
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 72
+        Layout.preferredHeight: 72
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
 
         FluText{
@@ -104,7 +103,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluCheckBox{
     text:"Text"
     indeterminate:true

example/qml/page/T_Clip.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Clip")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: 380
-        height: 380
+        padding: 10
-        paddings: 10
 
         Column{
             spacing: 15
@@ -88,7 +87,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluClip{
     radius: [25,25,25,25]
     width: 50

example/qml/page/T_ColorPicker.qml

@@ -9,31 +9,21 @@ FluScrollablePage{
 
     title: qsTr("ColorPicker")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: 60
-        height: 60
+        padding: 10
-        paddings: 10
         RowLayout{
             FluText{
                 text: qsTr("Click to Select a Color - >")
                 Layout.alignment: Qt.AlignVCenter
             }
-            FluColorPicker{
+            FluColorPicker{}
-                cancelText: qsTr("Cancel")
-                okText: qsTr("OK")
-                titleText: qsTr("Color Picker")
-                editText: qsTr("Edit Color")
-                redText: qsTr("Red")
-                greenText: qsTr("Green")
-                blueText: qsTr("Blue")
-                opacityText: qsTr("Opacity")
-            }
         }
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluColorPicker{
 
 }'

example/qml/page/T_ComboBox.qml

@@ -9,72 +9,71 @@ FluScrollablePage{
 
     title: qsTr("ComboBox")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 80
+        Layout.preferredHeight: 80
-        paddings: 5
+        padding: 5
-        Layout.topMargin: 20
         Column{
             spacing: 5
             anchors.verticalCenter: parent.verticalCenter
             FluText{
-                text: "editable=false"
+                text: qsTr("editable=false")
                 x:10
             }
             FluComboBox {
                 model: ListModel {
                     id: model_1
-                    ListElement { text: "Banana" }
+                    ListElement { text: qsTr("Banana") }
-                    ListElement { text: "Apple" }
+                    ListElement { text: qsTr("Apple") }
-                    ListElement { text: "Coconut" }
+                    ListElement { text: qsTr("Coconut") }
                 }
             }
         }
     }
 
-    FluArea {
+    FluFrame {
         Layout.fillWidth: true
-        height: 80
+        Layout.preferredHeight: 80
-        paddings: 5
+        padding: 5
         Layout.topMargin: 20
         Column{
             spacing: 5
             anchors.verticalCenter: parent.verticalCenter
             FluText{
-                text: "disabled=true"
+                text: qsTr("disabled=true")
                 x:10
             }
             FluComboBox {
                 disabled: true
                 model: ListModel {
                     id: model_2
-                    ListElement { text: "Banana" }
+                    ListElement { text: qsTr("Banana") }
-                    ListElement { text: "Apple" }
+                    ListElement { text: qsTr("Apple") }
-                    ListElement { text: "Coconut" }
+                    ListElement { text: qsTr("Coconut") }
                 }
             }
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         height: 80
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         Column{
             spacing: 5
             anchors.verticalCenter: parent.verticalCenter
             FluText{
-                text: "editable=true"
+                text: qsTr("editable=true")
                 x:5
             }
             FluComboBox {
                 editable: true
                 model: ListModel {
                     id: model_3
-                    ListElement { text: "Banana" }
+                    ListElement { text: qsTr("Banana") }
-                    ListElement { text: "Apple" }
+                    ListElement { text: qsTr("Apple") }
-                    ListElement { text: "Coconut" }
+                    ListElement { text: qsTr("Coconut") }
                 }
                 onAccepted: {
                     if (find(editText) === -1)
@@ -85,20 +84,22 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
-        code:'FluComboBox{
+        code:qsTr('FluComboBox{
     editable: true
     model: ListModel {
         id: model
-        ListElement { text: "Banana" }
+        ListElement { text: "%1" }
-        ListElement { text: "Apple" }
+        ListElement { text: "%2" }
-        ListElement { text: "Coconut" }
+        ListElement { text: "%3" }
     }
     onAccepted: {
         if (find(editText) === -1)
             model.append({text: editText})
     }
-}'
+}').arg(qsTr("Banana"))
+   .arg(qsTr("Apple"))
+   .arg(qsTr("Coconut"))
     }
 
 }

example/qml/page/T_CustomPlot.qml

@@ -0,0 +1,49 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import QtQuick.Controls 2.15
+import FluentUI 1.0
+import "../component"
+
+FluPage{
+
+    title: qsTr("QCustomPlot")
+    TimePlot {
+        id: timePlot
+        anchors.fill: parent
+        plotTimeRangeInMilliseconds: 10
+        xAxis.visible: true
+        yAxis.visible: true
+        x1Axis.visible: false
+        y1Axis.visible: false
+        yAxis.ticker.tickCount: 6
+        yAxis.ticker.ticks: false
+        yAxis.ticker.subTicks: false
+        yAxis.ticker.baseColor: "transparent"
+        yAxis.grid.lineColor: "mediumaquamarine"
+        xAxis.ticker.baseColor: "midnightblue"
+        xAxis.ticker.baseWidth: 2
+        xAxis.grid.lineColor: "transparent"
+        backgroundColor: "mistyrose"
+        Component.onCompleted: {
+            yAxis.setRange(0, 100)
+            addGraph("1")
+            graphs["1"].graphColor = "slategrey"
+        }
+    }
+    Timer {
+        running: true
+        repeat: true
+        interval: 20
+        property int data: 60
+        onTriggered: {
+            data = data - 1
+            if(data == 20) {
+                data = 60
+            }
+            timePlot.addCurrentTimeValue("1", data)
+        }
+    }
+
+
+}

example/qml/page/T_DatePicker.qml

@@ -7,13 +7,12 @@ import "../component"
 
 FluScrollablePage{
 
-    title: qsTr("TimePicker")
+    title: qsTr("DatePicker")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: 80
-        height: 80
+        padding: 10
-        paddings: 10
         ColumnLayout{
             anchors{
                 verticalCenter: parent.verticalCenter
@@ -32,17 +31,17 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluDatePicker{
 
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.topMargin: 20
-        height: 80
+        Layout.preferredHeight: 80
-        paddings: 10
+        padding: 10
         ColumnLayout{
             anchors{
                 verticalCenter: parent.verticalCenter
@@ -61,7 +60,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluDatePicker{
     showYear:false
 }'

example/qml/page/T_Dialog.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Dialog")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
         FluButton{
             anchors.verticalCenter: parent.verticalCenter
             text: qsTr("Show Double Button Dialog")
@@ -24,7 +23,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluContentDialog{
     id:dialog
     title: qsTr("Friendly Reminder")
@@ -57,10 +56,10 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluButton{
             anchors.verticalCenter: parent.verticalCenter
@@ -72,7 +71,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluContentDialog{
     id: dialog
     title: qsTr("Friendly Reminder")
@@ -114,10 +113,10 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 100
+        Layout.preferredHeight: 100
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluButton{
             anchors.top: parent.top
@@ -138,7 +137,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluContentDialog{
     id: dialog
     title: qsTr("Friendly Reminder")

example/qml/page/T_Expander.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Expander")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         height: layout_column.height+20
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
         Column{
             id:layout_column
             spacing: 15
@@ -83,7 +82,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluExpander{
     headerText: qsTr("Open a radio box")
     Item{
@@ -106,5 +105,147 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 }'
     }
 
+    FluFrame {
+        Layout.fillWidth: true
+        padding: 10
+        Layout.topMargin: 20
+        Column {
+            spacing: 15
+            FluExpander {
+                headerHeight: 60
+                contentHeight: content_layout.implicitHeight
+                headerDelegate: Component {
+                    Item {
+                        RowLayout {
+                            anchors {
+                                verticalCenter: parent.verticalCenter
+                                left: parent.left
+                                leftMargin: 15
+                            }
+                            spacing: 15
+                            FluImage {
+                                width: 20
+                                height: 20
+                                sourceSize.width: 20
+                                sourceSize.height: 20
+                                source: "qrc:/example/res/image/favicon.ico"
+                            }
+                            ColumnLayout {
+                                spacing: 0
+                                FluText {
+                                    text: "FluentUI"
+                                }
+                                FluText {
+                                    text: "%1".arg(AppInfo.version)
+                                    textColor: FluTheme.fontSecondaryColor
+                                    font.pixelSize: 12
+                                }
+                            }
+                        }
+                        FluLoadingButton {
+                            id: btn_checkupdate
+                            anchors {
+                                verticalCenter: parent.verticalCenter
+                                right: parent.right
+                                rightMargin: 15
+                            }
+                            text: qsTr("Check for Updates")
+                            onClicked: {
+                                loading = true;
+                                FluEventBus.post("checkUpdate");
+                            }
+                        }
+                        FluEvent {
+                            name: "checkUpdateFinish"
+                            onTriggered: {
+                                btn_checkupdate.loading = false;
+                            }
+                        }
+                    }
+                }
+                content: ColumnLayout {
+                    id: content_layout
+                    spacing: 0
+                    RowLayout {
+                        Layout.topMargin: 15
+                        Layout.leftMargin: 15
+                        spacing: 0
+                        FluText {
+                            text: "GitHub: "
+                        }
+                        FluTextButton {
+                            text: "https://github.com/zhuzichu520/FluentUI"
+                            onClicked: {
+                                Qt.openUrlExternally(text);
+                            }
+                        }
+                    }
+                    RowLayout {
+                        Layout.bottomMargin: 15
+                        Layout.leftMargin: 15
+                        spacing: 0
+                        FluText {
+                            text: "bilibili: "
+                        }
+                        FluTextButton {
+                            text: "https://www.bilibili.com/video/BV1mg4y1M71w"
+                            onClicked: {
+                                Qt.openUrlExternally(text);
+                            }
+                        }
+                    }
+                }
+            }
 
+            FluExpander {
+                contentHeight: 100
+                headerHeight: 45
+                headerDelegate: Component {
+                    Item {
+                        FluToggleButton {
+                            anchors.centerIn: parent
+                            text: qsTr("This is a ToggleButton in the header")
+                        }
+                    }
+                }
+                content: Item {
+                    anchors.fill: parent
+                    FluButton {
+                        anchors.centerIn: parent
+                        text: qsTr("This is a StandardButton in the content")
+                        onClicked: {
+                            showInfo(qsTr("Click StandardButton"))
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    CodeExpander {
+        Layout.fillWidth: true
+        Layout.topMargin: -6
+        code: 'FluExpander {
+    contentHeight: 100
+    headerHeight: 45
+    headerDelegate: Component {
+        Item {
+            FluToggleButton {
+                anchors.centerIn: parent
+                text: qsTr("This is a ToggleButton in the header")
+            }
+        }
+    }
+    content: Item {
+        anchors.fill: parent
+        FluButton {
+            anchors.centerIn: parent
+            text: qsTr("This is a StandardButton in the content")
+            onClicked: {
+                showInfo(qsTr("Click StandardButton"))
+            }
+        }
+    }
+}'
+    }
 }

example/qml/page/T_FlipView.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("FlipView")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 340
+        Layout.preferredHeight: 340
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
         ColumnLayout{
             anchors.verticalCenter: parent.verticalCenter
             FluText{
@@ -40,7 +39,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluFlipView{
     Image{
         source: "qrc:/example/res/image/banner_1.jpg"
@@ -61,10 +60,10 @@ FluScrollablePage{
 '
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         height: 340
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         ColumnLayout{
             anchors.verticalCenter: parent.verticalCenter
@@ -93,7 +92,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluFlipView{
     vertical:true
     Image{

example/qml/page/T_FluentPro.qml

@@ -0,0 +1,65 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Controls 2.15
+import QtQuick.Window 2.15
+import FluentUI 1.0
+import "../component"
+
+FluContentPage{
+
+    title: "FluentUI Pro"
+
+    Image{
+        id: iamge_logo
+        width: 80
+        height: 80
+        source: "qrc:/example/res/image/logo_pro.png"
+    }
+
+    Flickable{
+        anchors{
+            top: iamge_logo.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        ScrollBar.vertical: FluScrollBar {}
+        ScrollBar.horizontal: FluScrollBar {}
+        contentWidth: text.width
+        contentHeight: text.height
+        clip: true
+        FluText{
+            id: text
+            textFormat: Text.MarkdownText
+            onLinkActivated:
+                (link)=> {
+                    Qt.openUrlExternally(link)
+                }
+            onLinkHovered:
+                (link)=> {
+                    if(link === ""){
+                        FluTools.restoreOverrideCursor()
+                    }else{
+                        FluTools.setOverrideCursor(Qt.PointingHandCursor)
+                    }
+                }
+            text:'
+基于[FluentUI](https://github.com/zhuzichu520/FluentUI)开源版本重新打造的项目,代码更加漂亮,API更加好用,界面更加细腻
+
+## 与开源版本有啥不同?
+
+1. 开源版本支持Qt6与Qt5.15.2,Pro版本仅支持Qt6
+2. 开源版本所有组件都有Flu前缀,Pro版本去掉Flu前缀,只需添加一行```qputenv("QT_QUICK_CONTROLS_STYLE", "FluentUI");```代码,就能将原有Button换成FluentUI样式
+3. 项目整体架构不同,开源版本代码都写在一个模块下,Pro版本分为FluentUI,FluentUI.Controls,FluentUI.impl三个模块
+4. 开源版本不支持热加载，Pro版本支持热加载，运行之后修改代码可实时关注QML界面变化，支持一键关闭开启
+5. 开源版不支持wasm编译，Pro版本支持wasm编译
+6. 开源版本过于臃肿，Pro版本做了减法，去其糟粕，取其精华，重新打造
+7. 开源版默认动态库依赖，Pro版本默认静态库依赖
+8. 开源版MIT协议免费，Pro版本付费，如有需要请联系作者wx购买：FluentUI
+
+## 下载Pro版本
+[下载地址](https://github.com/zhuzichu520/FluentUI-Pro-Installer/releases)'
+        }
+    }
+
+}

example/qml/page/T_GroupBox.qml

@@ -0,0 +1,80 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import FluentUI 1.0
+import "../component"
+
+FluScrollablePage{
+
+    title: qsTr("GroupBox")
+
+    FluGroupBox {
+        title: qsTr("CheckBox Group")
+        ColumnLayout {
+            spacing: 10
+            anchors.fill: parent
+            FluCheckBox { text: qsTr("E-mail") }
+            FluCheckBox { text: qsTr("Calendar") }
+            FluCheckBox { text: qsTr("Contacts") }
+        }
+    }
+
+    FluGroupBox {
+        title: qsTr("RadioButton Group")
+        Layout.fillWidth: true
+        Layout.preferredHeight: 150
+        Layout.topMargin: 20
+        FluRadioButtons {
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            spacing: 10
+            disabled: radio_button_switch.checked
+            FluRadioButton { text: qsTr("E-mail") }
+            FluRadioButton { text: qsTr("Calendar") }
+            FluRadioButton { text: qsTr("Contacts") }
+        }
+        
+        FluToggleSwitch{
+            id: radio_button_switch
+            anchors{
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            text: qsTr("Disabled")
+        }
+    }
+
+
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: 4
+        code:`
+FluGroupBox {
+    title: qsTr("CheckBox Group")
+    ColumnLayout {
+        spacing: 10
+        anchors.fill: parent
+        FluCheckBox { text: qsTr("E-mail") }
+        FluCheckBox { text: qsTr("Calendar") }
+        FluCheckBox { text: qsTr("Contacts") }
+    }
+}
+
+FluGroupBox {
+    title: qsTr("RadioButton Group")
+    FluRadioButtons {
+        spacing: 10
+        disabled: true // 禁用所有FluRadioButton子组件
+        manuallyDisabled: true // 是否指定每个FluRadioButton上的disabled选项
+        FluRadioButton { text: qsTr("E-mail") }
+        FluRadioButton { text: qsTr("Calendar") }
+        FluRadioButton { text: qsTr("Contacts") }
+    }
+}
+`
+    }
+
+}

example/qml/page/T_Home.qml

@@ -9,14 +9,20 @@ import "../global"
 FluScrollablePage{
 
     launchMode: FluPageType.SingleTask
-    animDisabled: true
+    animationEnabled: false
-
+    header: Item{}
-    FluentInitalizrWindow{
-        id:fluent_initalizr
-    }
 
     ListModel{
         id: model_header
+        ListElement{
+            icon: "qrc:/example/res/image/logo_pro.png"
+            title: qsTr("FluentUI Pro")
+            desc: qsTr("The latest FluentUI Pro controls and styles for your applications.")
+            url: "https://github.com/zhuzichu520/FluentUI-Pro-Installer"
+            clicked: function(model){
+                Qt.openUrlExternally(model.url)
+            }
+        }
         ListElement{
             icon: "qrc:/example/res/image/ic_home_github.png"
             title: qsTr("FluentUI GitHub")
@@ -28,11 +34,11 @@ FluScrollablePage{
         }
         ListElement{
             icon: "qrc:/example/res/image/favicon.ico"
-            title: qsTr("FluentUI Initalizr")
+            title: qsTr("FluentUI Initializr")
             desc: qsTr("FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.")
             url: "https://github.com/zhuzichu520/FluentUI"
             clicked: function(model){
-                fluent_initalizr.showDialog()
+                fluent_Initializr.showDialog()
             }
         }
     }
@@ -121,6 +127,7 @@ FluScrollablePage{
                             Layout.leftMargin: 20
                             color: FluColors.Grey120
                             font.pixelSize: 12
+                            font.family: FluTextStyle.family
                             wrapMode: Text.WrapAnywhere
                         }
                     }
@@ -177,7 +184,7 @@ FluScrollablePage{
             property string desc: modelData.extra.desc
             width: 320
             height: 120
-            FluArea{
+            FluFrame{
                 radius: 8
                 width: 300
                 height: 100

example/qml/page/T_Icons.qml

@@ -0,0 +1,75 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import FluentUI 1.0
+
+FluContentPage {
+
+    title: qsTr("Icons")
+
+    FluTextBox{
+        id: text_box
+        placeholderText: qsTr("Please enter a keyword")
+        anchors{
+            top: parent.top
+        }
+        onTextChanged: {
+            grid_view.model = FluApp.iconData(text_box.text)
+        }
+    }
+    FluToggleSwitch{
+        id: toggle_switch
+        anchors{
+            left: text_box.right
+            verticalCenter: text_box.verticalCenter
+            leftMargin: 10
+        }
+        text: qsTr("Disabled")
+    }
+    GridView{
+        id: grid_view
+        cellWidth: 110
+        cellHeight: 110
+        clip: true
+        boundsBehavior: GridView.StopAtBounds
+        model: FluApp.iconData()
+        ScrollBar.vertical: FluScrollBar {}
+        anchors{
+            topMargin: 10
+            top: text_box.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        delegate: Item {
+            width: 100
+            height: 100
+            FluIconButton{
+                id:item_icon
+                iconSource: modelData.icon
+                iconSize: 30
+                padding: 0
+                verticalPadding: 0
+                horizontalPadding: 0
+                bottomPadding: 30
+                anchors.fill: parent
+                disabled: toggle_switch.checked
+                onClicked: {
+                    var text  ="FluentIcons."+modelData.name;
+                    FluTools.clipText(text)
+                    showSuccess(qsTr("You Copied ")+text)
+                }
+                FluText{
+                    width: parent.width
+                    horizontalAlignment: Qt.AlignHCenter
+                    wrapMode: Text.WrapAnywhere
+                    text: modelData.name
+                    anchors.top: parent.top
+                    anchors.topMargin: 60
+                    enabled: !toggle_switch.checked
+                }
+            }
+        }
+    }
+}

example/qml/page/T_Image.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Image")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 260
+        Layout.preferredHeight: 260
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
         Column{
             spacing: 15
             anchors{
@@ -37,7 +36,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluImage{
     width: 400
     height: 300

example/qml/page/T_InfoBar.qml

@@ -9,11 +9,14 @@ FluScrollablePage{
 
     title: qsTr("InfoBar")
 
-    FluArea{
+    property var info1
+    property var info2
+    property var info3
+
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: 350
-        height: 270
+        padding: 10
-        paddings: 10
         ColumnLayout{
             spacing: 14
             anchors{
@@ -33,13 +36,13 @@ FluScrollablePage{
                 }
             }
             FluButton{
-                text:"Error"
+                text: qsTr("Error")
                 onClicked: {
                     showError(qsTr("This is an InfoBar in the Error Style"))
                 }
             }
             FluButton{
-                text:"Success"
+                text: qsTr("Success")
                 onClicked: {
                     showSuccess(qsTr("This is an InfoBar in the Success Style"))
                 }
@@ -50,8 +53,54 @@ FluScrollablePage{
                     showInfo(qsTr("This is an InfoBar in the Info Style"),0,qsTr("Manual shutdown is supported"))
                 }
             }
+            FluText{
+                wrapMode: Text.WrapAnywhere
+                width: parent.width
+                text: qsTr("Manually close the info message box")
+            }
+            Row{
+                spacing: 5
+                FluButton{
+                    text: (info1 ? qsTr("close '%1'") : qsTr("show '%1'")).arg(qsTr("info1"))
+                    onClicked: {
+                        if(info1) {
+                            info1.close()
+                            return
+                        }
+                        info1 = showInfo(qsTr("This is an '%1'").arg(qsTr("info1")), 0)
+                        info1.close()
+                    }
+                }
+                FluButton{
+                    text: (info2 ? qsTr("close '%1'") : qsTr("show '%1'")).arg(qsTr("info2"))
+                    onClicked: {
+                        if(info2) {
+                            info2.close()
+                            return
+                        }
+                        info2 = showInfo(qsTr("This is an '%1'").arg(qsTr("info2")), 0)
+                    }
+                }
+                FluButton{
+                    text: (info3 ? qsTr("close '%1'") : qsTr("show '%1'")).arg(qsTr("info3"))
+                    onClicked: {
+                        if(info3) {
+                            info3.close()
+                            return
+                        }
+                        info3 = showInfo(qsTr("This is an '%1'").arg(qsTr("info3")), 0)
+                    }
+                }
+                FluButton{
+                    text: qsTr("clear all info")
+                    onClicked: {
+                        clearAllInfo()
+                    }
+                }
+            }
+
             FluButton{
-                text:"Loading"
+                text: qsTr("Loading")
                 onClicked: {
                     showLoading()
                 }
@@ -60,13 +109,18 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
-        code:'showInfo(qsTr("This is an InfoBar in the Info Style"))
+        code:`
+showInfo(qsTr("This is an InfoBar in the Info Style"))
 
 showWarning(qsTr("This is an InfoBar in the Warning Style"))
 
 showError(qsTr("This is an InfoBar in the Error Style"))
 
-showSuccess(qsTr("This is an InfoBar in the Success Style"))'
+showSuccess(qsTr("This is an InfoBar in the Success Style"))
+
+var info1 = showInfo(qsTr("This is an 'Info1'"), 0)
+info1.close()
+`
     }
 }

example/qml/page/T_Menu.qml

@@ -47,11 +47,10 @@ FluScrollablePage{
     }
 
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 100
+        Layout.preferredHeight: 100
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
         Column{
             id: layout_column
             spacing: 15
@@ -78,7 +77,7 @@ FluScrollablePage{
 
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluMenu{
     id:menu
     FluMenuItem:{
@@ -99,10 +98,10 @@ menu.popup()
     }
 
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 100
+        Layout.preferredHeight: 100
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         Column{
             spacing: 15
@@ -151,7 +150,7 @@ menu.popup()
 
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluMenuBar{
     id:menu
     FluMenu:{

example/qml/page/T_MultiWindow.qml

@@ -8,23 +8,23 @@ import "../component"
 FluScrollablePage{
 
     property string password: ""
-    property var loginPageRegister: registerForWindowResult("/login")
 
     title: qsTr("MultiWindow")
 
-    Connections{
+    FluWindowResultLauncher{
-        target: loginPageRegister
+        id:loginResultLauncher
-        function onResult(data)
+        path: "/login"
-        {
+        onResult:
-            password = data.password
+            (data)=>{
-        }
+                password = data.password
+            }
+
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 86
+        Layout.preferredHeight: 86
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
         Column{
             spacing: 15
             anchors{
@@ -37,16 +37,16 @@ FluScrollablePage{
             FluButton{
                 text: qsTr("Create Window")
                 onClicked: {
-                    FluApp.navigate("/standardWindow")
+                    FluRouter.navigate("/standardWindow")
                 }
             }
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 86
+        Layout.preferredHeight: 86
-        paddings: 10
+        padding: 10
         Layout.topMargin: 10
         Column{
             spacing: 15
@@ -61,16 +61,16 @@ FluScrollablePage{
             FluButton{
                 text: qsTr("Create Window")
                 onClicked: {
-                    FluApp.navigate("/singleTaskWindow")
+                    FluRouter.navigate("/singleTaskWindow")
                 }
             }
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 86
+        Layout.preferredHeight: 86
-        paddings: 10
+        padding: 10
         Layout.topMargin: 10
         Column{
             spacing: 15
@@ -84,14 +84,14 @@ FluScrollablePage{
             FluButton{
                 text: qsTr("Create Window")
                 onClicked: {
-                    FluApp.navigate("/singleInstanceWindow")
+                    FluRouter.navigate("/singleInstanceWindow")
                 }
             }
         }
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluWindow{
   //launchMode: FluWindowType.Standard
   //launchMode: FluWindowType.SingleTask
@@ -101,10 +101,10 @@ FluScrollablePage{
     }
 
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 100
+        Layout.preferredHeight: 100
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         Column{
             spacing: 15
@@ -118,27 +118,27 @@ FluScrollablePage{
             FluButton{
                 text: qsTr("Create Window")
                 onClicked: {
-                    FluApp.navigate("/about")
+                    FluRouter.navigate("/about")
                 }
             }
         }
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluButton{
     text: qsTr("Create Window")
     onClicked: {
-        FluApp.navigate("/about")
+        FluRouter.navigate("/about")
     }
 }
 '
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 130
+        Layout.preferredHeight: 130
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
 
         Column{
@@ -153,7 +153,7 @@ FluScrollablePage{
             FluButton{
                 text: qsTr("Create Window")
                 onClicked: {
-                    loginPageRegister.launch({username:"zhuzichu"})
+                    loginResultLauncher.launch({username:"zhuzichu"})
                 }
             }
             FluText{
@@ -163,21 +163,20 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
-        code:'property var loginPageRegister: registerForWindowResult("/login")
+        code:'FluWindowResultLauncher{
-
+    id:loginResultLauncher
-Connections{
+    path: "/login"
-    target: loginPageRegister
+    onResult:
-    function onResult(data)
+        (data)=>{
-    {
+            password = data.password
-        password = data.password
+     }
-    }
 }
 
 FluButton{
     text: qsTr("Create Window")
     onClicked: {
-        loginPageRegister.launch({username:"zhuzichu"})
+        loginResultLauncher.launch({username:"zhuzichu"})
     }
 }
 '

example/qml/page/T_Network.qml

@@ -4,6 +4,7 @@ import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
 import FluentUI 1.0
 import Qt.labs.platform 1.0
+import example 1.0
 import "../component"
 
 FluContentPage{
@@ -11,7 +12,7 @@ FluContentPage{
     id:root
     title: qsTr("Network")
 
-    FluNetworkCallable{
+    NetworkCallable{
         id:callable
         onStart: {
             showLoading()
@@ -39,7 +40,6 @@ FluContentPage{
         clip: true
         anchors{
             top: parent.top
-            topMargin: 20
             bottom: parent.bottom
             left: parent.left
         }
@@ -56,7 +56,7 @@ FluContentPage{
                 text: "Get"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.get("https://httpbingo.org/get")
+                    Network.get("https://httpbingo.org/get")
                     .addQuery("name","孙悟空")
                     .addQuery("age",500)
                     .addQuery("address","花果山水帘洞")
@@ -70,7 +70,7 @@ FluContentPage{
                 text: "Head"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.head("https://httpbingo.org/head")
+                    Network.head("https://httpbingo.org/head")
                     .addQuery("name","孙悟空")
                     .addQuery("age",500)
                     .addQuery("address","花果山水帘洞")
@@ -84,7 +84,7 @@ FluContentPage{
                 text: "Post Body"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.postBody("https://httpbingo.org/post")
+                    Network.postBody("https://httpbingo.org/post")
                     .setBody("花果山水帘洞美猴王齐天大圣孙悟空")
                     .bind(root)
                     .go(callable)
@@ -96,7 +96,7 @@ FluContentPage{
                 text: "Post Form"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.postForm("https://httpbingo.org/post")
+                    Network.postForm("https://httpbingo.org/post")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -110,7 +110,7 @@ FluContentPage{
                 text: "Post JSON"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.postJson("https://httpbingo.org/post")
+                    Network.postJson("https://httpbingo.org/post")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -124,7 +124,7 @@ FluContentPage{
                 text: "Post JSON Array"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.postJsonArray("https://httpbingo.org/post")
+                    Network.postJsonArray("https://httpbingo.org/post")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -138,7 +138,7 @@ FluContentPage{
                 text: "Put Body"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.putBody("https://httpbingo.org/put")
+                    Network.putBody("https://httpbingo.org/put")
                     .setBody("花果山水帘洞美猴王齐天大圣孙悟空")
                     .bind(root)
                     .go(callable)
@@ -150,7 +150,7 @@ FluContentPage{
                 text: "Put Form"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.putForm("https://httpbingo.org/put")
+                    Network.putForm("https://httpbingo.org/put")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -164,7 +164,7 @@ FluContentPage{
                 text: "Put JSON"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.putJson("https://httpbingo.org/put")
+                    Network.putJson("https://httpbingo.org/put")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -178,7 +178,7 @@ FluContentPage{
                 text: "Put JSON Array"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.putJsonArray("https://httpbingo.org/put")
+                    Network.putJsonArray("https://httpbingo.org/put")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -192,7 +192,7 @@ FluContentPage{
                 text: "Patch Body"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.patchBody("https://httpbingo.org/patch")
+                    Network.patchBody("https://httpbingo.org/patch")
                     .setBody("花果山水帘洞美猴王齐天大圣孙悟空")
                     .bind(root)
                     .go(callable)
@@ -204,7 +204,7 @@ FluContentPage{
                 text: "Patch Form"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.patchForm("https://httpbingo.org/patch")
+                    Network.patchForm("https://httpbingo.org/patch")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -218,7 +218,7 @@ FluContentPage{
                 text: "Patch JSON"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.patchJson("https://httpbingo.org/patch")
+                    Network.patchJson("https://httpbingo.org/patch")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -232,7 +232,7 @@ FluContentPage{
                 text: "Patch JSON Array"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.patchJsonArray("https://httpbingo.org/patch")
+                    Network.patchJsonArray("https://httpbingo.org/patch")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -246,7 +246,7 @@ FluContentPage{
                 text: "Delete Body"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.deleteBody("https://httpbingo.org/delete")
+                    Network.deleteBody("https://httpbingo.org/delete")
                     .setBody("花果山水帘洞美猴王齐天大圣孙悟空")
                     .bind(root)
                     .go(callable)
@@ -258,7 +258,7 @@ FluContentPage{
                 text: "Delete Form"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.deleteForm("https://httpbingo.org/delete")
+                    Network.deleteForm("https://httpbingo.org/delete")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -272,7 +272,7 @@ FluContentPage{
                 text: "Delete JSON"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.deleteJson("https://httpbingo.org/delete")
+                    Network.deleteJson("https://httpbingo.org/delete")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -286,7 +286,7 @@ FluContentPage{
                 text: "Delete JSON Array"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.deleteJsonArray("https://httpbingo.org/delete")
+                    Network.deleteJsonArray("https://httpbingo.org/delete")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -300,7 +300,7 @@ FluContentPage{
                 text: "Open Log"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.postJson("https://httpbingo.org/post")
+                    Network.postJson("https://httpbingo.org/post")
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -315,7 +315,7 @@ FluContentPage{
                 text: "Custom Header"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.postJson("https://httpbingo.org/post")
+                    Network.postJson("https://httpbingo.org/post")
                     .addHeader("os","PC")
                     .addHeader("version","1.0.0")
                     .add("name","孙悟空")
@@ -331,8 +331,8 @@ FluContentPage{
                 text: "RequestFailedReadCache"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.postJson("https://httpbingo.org/post")
+                    Network.postJson("https://httpbingo.org/post")
-                    .setCacheMode(FluNetworkType.RequestFailedReadCache)
+                    .setCacheMode(NetworkType.RequestFailedReadCache)
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -347,8 +347,8 @@ FluContentPage{
                 text: "IfNoneCacheRequest"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.postJson("https://httpbingo.org/post")
+                    Network.postJson("https://httpbingo.org/post")
-                    .setCacheMode(FluNetworkType.IfNoneCacheRequest)
+                    .setCacheMode(NetworkType.IfNoneCacheRequest)
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -363,8 +363,8 @@ FluContentPage{
                 text: "FirstCacheThenRequest"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.postJson("https://httpbingo.org/post")
+                    Network.postJson("https://httpbingo.org/post")
-                    .setCacheMode(FluNetworkType.FirstCacheThenRequest)
+                    .setCacheMode(NetworkType.FirstCacheThenRequest)
                     .add("name","孙悟空")
                     .add("age",500)
                     .add("address","花果山水帘洞")
@@ -379,7 +379,7 @@ FluContentPage{
                 text: "Timeout And Retry"
                 onClicked: {
                     text_info.text = ""
-                    FluNetwork.postJson("https://httpbingo.org/post")
+                    Network.postJson("https://httpbingo.org/post")
                     .setTimeout(5000)
                     .setRetry(3)
                     .add("name","孙悟空")
@@ -407,7 +407,7 @@ FluContentPage{
                 text: "Download File"
                 onClicked: {
                     folder_dialog.showDialog(function(path){
-                        FluNetwork.get("http://vjs.zencdn.net/v/oceans.mp4")
+                        Network.get("http://vjs.zencdn.net/v/oceans.mp4")
                         .toDownload(path)
                         .bind(root)
                         .go(callable_download_file)
@@ -421,7 +421,7 @@ FluContentPage{
                 text: "Breakpoint Download File"
                 onClicked: {
                     folder_dialog.showDialog(function(path){
-                        FluNetwork.get("http://vjs.zencdn.net/v/oceans.mp4")
+                        Network.get("http://vjs.zencdn.net/v/oceans.mp4")
                         .toDownload(path,true)
                         .bind(root)
                         .go(callable_breakpoint_download_file)
@@ -431,7 +431,7 @@ FluContentPage{
         }
     }
 
-    FluNetworkCallable{
+    NetworkCallable{
         id:callable_upload_file
         onStart: {
             btn_upload.disabled = true
@@ -455,7 +455,7 @@ FluContentPage{
             }
     }
 
-    FluNetworkCallable{
+    NetworkCallable{
         id:callable_download_file
         onStart: {
             btn_download.progress = 0
@@ -480,7 +480,7 @@ FluContentPage{
             }
     }
 
-    FluNetworkCallable{
+    NetworkCallable{
         id:callable_breakpoint_download_file
         onStart: {
             btn_download_breakpoint.progress = 0
@@ -508,7 +508,7 @@ FluContentPage{
     FileDialog {
         id: file_dialog
         onAccepted: {
-            FluNetwork.postForm("https://httpbingo.org/post")
+            Network.postForm("https://httpbingo.org/post")
             .setRetry(1)//只请求一次
             .add("accessToken","12345678")
             .addFile("file",FluTools.toLocalPath(file_dialog.currentFile))
@@ -532,7 +532,7 @@ FluContentPage{
         }
     }
 
-    FluArea{
+    FluFrame{
         anchors{
             top: layout_flick.top
             bottom: layout_flick.bottom

example/qml/page/T_OpenGL.qml

@@ -0,0 +1,26 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import QtQuick.Controls 2.15
+import FluentUI 1.0
+import example 1.0
+import "../component"
+
+FluContentPage{
+
+    title: qsTr("OpenGL")
+
+    FluFrame{
+        anchors.fill: parent
+        OpenGLItem{
+            anchors.fill: parent
+            SequentialAnimation on t {
+                NumberAnimation { to: 1; duration: 2500; easing.type: Easing.InQuad }
+                NumberAnimation { to: 0; duration: 2500; easing.type: Easing.OutQuad }
+                loops: Animation.Infinite
+                running: true
+            }
+        }
+    }
+
+}

example/qml/page/T_Pagination.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Pagination")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 200
+        Layout.preferredHeight: 200
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
         ColumnLayout{
             spacing: 20
             anchors.verticalCenter: parent.verticalCenter
@@ -37,7 +36,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluPagination{
     pageCurrent: 1
     itemCount: 1000

example/qml/page/T_Pivot.qml

@@ -9,13 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Pivot")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: 400
-        height: 400
+        padding: 10
-        paddings: 10
-
-
 
         FluPivot{
             anchors.fill: parent
@@ -49,29 +46,29 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluPivot{
     anchors.fill: parent
-    FluPivotItem:{
+    FluPivotItem {
-        text: qsTr("All")
+        title: qsTr("All")
         contentItem: FluText{
             text: qsTr("All emails go here.")
         }
     }
-    FluPivotItem:{
+    FluPivotItem {
-        text: qsTr("Unread")
+        title: qsTr("Unread")
         contentItem: FluText{
             text: qsTr("Unread emails go here.")
         }
     }
-    FluPivotItem:{
+    FluPivotItem {
-        text: qsTr("Flagged")
+        title: qsTr("Flagged")
         contentItem: FluText{
             text: qsTr("Flagged emails go here.")
         }
     }
-    FluPivotItem:{
+    FluPivotItem {
-        text: qsTr("Urgent")
+        title: qsTr("Urgent")
         contentItem: FluText{
             text: qsTr("Urgent emails go here.")
         }

example/qml/page/T_Progress.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Progress")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: 130
-        height: 130
+        padding: 10
-        paddings: 10
 
         ColumnLayout{
             spacing: 10
@@ -32,7 +31,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluProgressBar{
 
 }
@@ -42,11 +41,11 @@ FluProgressRing{
 '
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.topMargin: 20
-        height: 286
+        Layout.preferredHeight: 286
-        paddings: 10
+        padding: 10
 
         ColumnLayout{
             spacing: 10
@@ -88,7 +87,7 @@ FluProgressRing{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluProgressBar{
     indeterminate: false
 }

example/qml/page/T_QRCode.qml

@@ -11,7 +11,6 @@ FluScrollablePage{
 
     FluQRCode{
         id:qrcode
-        Layout.topMargin: 20
         size:slider_size.value
         text:text_box.text
         color:color_picker.current
@@ -25,7 +24,7 @@ FluScrollablePage{
         spacing: 10
         Layout.topMargin: 20
         FluText{
-            text:"text:"
+            text: qsTr("text:")
             Layout.alignment: Qt.AlignVCenter
         }
         FluTextBox{
@@ -39,7 +38,7 @@ FluScrollablePage{
         spacing: 10
         Layout.topMargin: 10
         FluText{
-            text:"color:"
+            text: qsTr("color:")
             Layout.alignment: Qt.AlignVCenter
         }
         FluColorPicker{
@@ -52,7 +51,7 @@ FluScrollablePage{
         spacing: 10
         Layout.topMargin: 10
         FluText{
-            text:"bgColor:"
+            text: qsTr("bgColor:")
             Layout.alignment: Qt.AlignVCenter
         }
         FluColorPicker{
@@ -64,7 +63,7 @@ FluScrollablePage{
     RowLayout{
         spacing: 10
         FluText{
-            text:"margins:"
+            text: qsTr("margins:")
             Layout.alignment: Qt.AlignVCenter
         }
         FluSlider{
@@ -78,7 +77,7 @@ FluScrollablePage{
     RowLayout{
         spacing: 10
         FluText{
-            text:"size:"
+            text: qsTr("size:")
             Layout.alignment: Qt.AlignVCenter
         }
         FluSlider{

example/qml/page/T_RadioButton.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("RadioButton")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
         Row{
             spacing: 30
             anchors.verticalCenter: parent.verticalCenter
@@ -41,34 +40,33 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluRadioButton{
     text:"Text"
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 100
+        Layout.preferredHeight: 100
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluRadioButtons{
             spacing: 8
+            disabled: radio_button_switch2.checked
             anchors.verticalCenter: parent.verticalCenter
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
+            currentIndex: 1
             FluRadioButton{
-                disabled: radio_button_switch2.checked
                 text: qsTr("Radio Button_1")
             }
             FluRadioButton{
-                disabled: radio_button_switch2.checked
                 text: qsTr("Radio Button_2")
             }
             FluRadioButton{
-                disabled: radio_button_switch2.checked
                 text: qsTr("Radio Button_3")
             }
         }
@@ -83,7 +81,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluRadioButtons{
     spacing: 8
     FluRadioButton{
@@ -98,4 +96,106 @@ FluScrollablePage{
 }'
     }
 
+    FluFrame{
+        Layout.fillWidth: true
+        Layout.preferredHeight: 60
+        padding: 10
+        Layout.topMargin: 20
+        FluRadioButtons{
+            spacing: 8
+            anchors.verticalCenter: parent.verticalCenter
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            disabled: radio_button_switch3.checked
+            orientation: Qt.Horizontal
+            currentIndex: 1
+            FluRadioButton{
+                text: qsTr("Radio Button_1")
+            }
+            FluRadioButton{
+                text: qsTr("Radio Button_2")
+            }
+            FluRadioButton{
+                text: qsTr("Radio Button_3")
+            }
+        }
+        FluToggleSwitch{
+            id: radio_button_switch3
+            anchors{
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            text: qsTr("Disabled")
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -6
+        code:'FluRadioButtons{
+    spacing: 8
+    orientation: Qt.Horizontal
+    FluRadioButton{
+        text:"Radio Button_1"
+    }
+    FluRadioButton{
+        text:"Radio Button_2"
+    }
+    FluRadioButton{
+        text:"Radio Button_3"
+    }
+}'
+    }
+
+    FluFrame{
+        Layout.fillWidth: true
+        Layout.preferredHeight: 100
+        padding: 10
+        Layout.topMargin: 20
+        FluRadioButtons{
+            spacing: 8
+            anchors.verticalCenter: parent.verticalCenter
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            disabled: radio_button_switch4.checked
+            currentIndex: -1
+            FluCheckBox{
+                text: qsTr("Radio Button_1")
+            }
+            FluCheckBox{
+                text: qsTr("Radio Button_2")
+            }
+            FluCheckBox{
+                text: qsTr("Radio Button_3")
+            }
+        }
+        FluToggleSwitch{
+            id: radio_button_switch4
+            anchors{
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            text: qsTr("Disabled")
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -6
+        code:'FluRadioButtons{
+    spacing: 8
+    FluCheckBox{
+        text:"Radio Button_1"
+    }
+    FluCheckBox{
+        text:"Radio Button_2"
+    }
+    FluCheckBox{
+        text:"Radio Button_3"
+    }
+}'
+    }
+
 }

example/qml/page/T_RatingControl.qml

@@ -9,11 +9,10 @@ FluScrollablePage {
 
     title: qsTr("RatingControl")
 
-    FluArea {
+    FluFrame {
         Layout.fillWidth: true
-        height: 100
+        Layout.preferredHeight: 100
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
 
         Column {
             spacing: 10
@@ -27,7 +26,7 @@ FluScrollablePage {
 
     CodeExpander {
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code: 'FluRatingControl{
 
 }'

example/qml/page/T_Rectangle.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Rectangle")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: 80
-        height: 80
+        padding: 10
-        paddings: 10
 
         Column{
             spacing: 15
@@ -64,7 +63,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluRectangle{
     radius: [25,25,25,25]
     width: 50

example/qml/page/T_RemoteLoader.qml

@@ -9,6 +9,6 @@ FluPage{
     launchMode: FluPageType.SingleTop
     FluRemoteLoader{
         anchors.fill: parent
-        source: "https://zhu-zichu.gitee.io/Qt5_T_RemoteLoader.qml"
+        source: "https://zhu-zichu.gitee.io/Qt_174_RemoteLoader.qml"
     }
 }

example/qml/page/T_Settings.qml

@@ -4,38 +4,24 @@ import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
 import FluentUI 1.0
 import "../component"
-import "../viewmodel"
 import "../global"
 
 FluScrollablePage{
 
     title: qsTr("Settings")
 
-    SettingsViewModel{
-        id:viewmodel_settings
-    }
-
     FluEvent{
-        id:event_checkupdate_finish
         name: "checkUpdateFinish"
         onTriggered: {
             btn_checkupdate.loading = false
         }
     }
 
-    Component.onCompleted: {
+    FluFrame{
-        FluEventBus.registerEvent(event_checkupdate_finish)
-    }
-
-    Component.onDestruction: {
-        FluEventBus.unRegisterEvent(event_checkupdate_finish)
-    }
-
-    FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
-        height: 60
+        Layout.preferredHeight: 60
-        paddings: 10
+        padding: 10
         Row{
             spacing: 20
             anchors.verticalCenter: parent.verticalCenter
@@ -56,11 +42,11 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.topMargin: 20
         height: 50
-        paddings: 10
+        padding: 10
         FluCheckBox{
             text: qsTr("Use System AppBar")
             checked: FluApp.useSystemAppBar
@@ -72,11 +58,11 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.topMargin: 20
         height: 50
-        paddings: 10
+        padding: 10
         FluCheckBox{
             text:qsTr("Fits AppBar Windows")
             checked: window.fitsAppBarWindows
@@ -95,15 +81,15 @@ FluScrollablePage{
         negativeText: qsTr("Cancel")
         positiveText: qsTr("OK")
         onPositiveClicked: {
-            FluApp.exit(931)
+            FluRouter.exit(931)
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.topMargin: 20
         height: 128
-        paddings: 10
+        padding: 10
 
         ColumnLayout{
             spacing: 5
@@ -129,11 +115,11 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.topMargin: 20
         height: 160
-        paddings: 10
+        padding: 10
 
         ColumnLayout{
             spacing: 5
@@ -149,10 +135,10 @@ FluScrollablePage{
             Repeater{
                 model: [{title:qsTr("Open"),mode:FluNavigationViewType.Open},{title:qsTr("Compact"),mode:FluNavigationViewType.Compact},{title:qsTr("Minimal"),mode:FluNavigationViewType.Minimal},{title:qsTr("Auto"),mode:FluNavigationViewType.Auto}]
                 delegate: FluRadioButton{
-                    checked : viewmodel_settings.displayMode===modelData.mode
+                    text: modelData.title
-                    text:modelData.title
+                    checked: GlobalModel.displayMode === modelData.mode
                     clickListener:function(){
-                        viewmodel_settings.displayMode = modelData.mode
+                        GlobalModel.displayMode = modelData.mode
                     }
                 }
             }
@@ -169,11 +155,11 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
-        paddings: 10
+        padding: 10
 
         ColumnLayout{
             spacing: 10

example/qml/page/T_Sheet.qml

@@ -0,0 +1,90 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Controls 2.15
+import QtQuick.Window 2.15
+import FluentUI 1.0
+import "../component"
+
+FluScrollablePage{
+
+    title: qsTr("Sheet")
+
+    FluSheet{
+        id:sheet
+        title: qsTr("Title")
+        FluText{
+            text: qsTr("Some contents...\nSome contents...\nSome contents...")
+            anchors{
+                left: parent.left
+                leftMargin: 10
+            }
+        }
+    }
+
+    FluFrame{
+        Layout.fillWidth: true
+        Layout.preferredHeight: 280
+        padding: 10
+        Column{
+            anchors.centerIn: parent
+            spacing: 10
+            Row{
+                spacing: 10
+                FluButton{
+                    width: 80
+                    height: 30
+                    text: qsTr("top")
+                    onClicked: {
+                        sheet.open(FluSheetType.Top)
+                    }
+                }
+                FluButton{
+                    width: 80
+                    height: 30
+                    text: qsTr("right")
+                    onClicked: {
+                        sheet.open(FluSheetType.Right)
+                    }
+                }
+            }
+            Row{
+                spacing: 10
+                FluButton{
+                    width: 80
+                    height: 30
+                    text: qsTr("bottom")
+                    onClicked: {
+                        sheet.open(FluSheetType.Bottom)
+                    }
+                }
+                FluButton{
+                    width: 80
+                    height: 30
+                    text: qsTr("left")
+                    onClicked: {
+                        sheet.open(FluSheetType.Left)
+                    }
+                }
+            }
+        }
+    }
+
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -6
+        code:'FluSheet{
+    id:sheet
+    title: qsTr("Title")
+    FluText{
+        text: qsTr("Some contents...")
+        anchors{
+            left: parent.left
+            leftMargin: 10
+        }
+    }
+}
+sheet.open(FluSheetType.Bottom)
+'
+    }
+
+}

example/qml/page/T_ShortcutPicker.qml

@@ -9,23 +9,34 @@ FluScrollablePage{
 
     title: qsTr("ShortcutPicker")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: childrenRect.height
-        height: 100
+        ColumnLayout{
-        paddings: 10
-        FluShortcutPicker{
             anchors.verticalCenter: parent.verticalCenter
+            Item{
+                Layout.preferredHeight: 15
+            }
+            Repeater{
+                model: FluApp.launcher.hotkeys.children
+                delegate: FluShortcutPicker{
+                    text: model.name
+                    syncHotkey: FluApp.launcher.hotkeys.children[index]
+                    Layout.leftMargin: 15
+                }
+            }
+            Item{
+                Layout.preferredHeight: 15
+            }
         }
     }
+
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluShortcutPicker{
 
 }'
     }
 
 }
-
-

example/qml/page/T_Slider.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("Slider")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.preferredHeight: 200
-        Layout.topMargin: 20
+        padding: 10
-        paddings: 10
 
         Row{
             spacing: 30
@@ -27,18 +26,18 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluSlider{
     value:50
 }'
     }
 
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.preferredHeight: 200
         Layout.topMargin: 20
-        paddings: 10
+        padding: 10
         Row{
             spacing: 30
             FluRangeSlider{
@@ -51,7 +50,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluRangeSlider{
     orientation: Qt.Vertical
 }'

example/qml/page/T_SplitLayout.qml

@@ -13,24 +13,23 @@ FluContentPage{
         id:layout_dropdown
         anchors{
             top: parent.top
-            topMargin: 20
         }
         FluText{
-            text:"orientation:"
+            text: qsTr("orientation:")
         }
         FluDropDownButton{
             id:btn_orientation
             Layout.preferredWidth: 120
-            text:"Horizontal"
+            text: qsTr("Horizontal")
             FluMenuItem{
-                text:"Horizontal"
+                text: qsTr("Horizontal")
                 onClicked: {
                     btn_orientation.text = text
                     split_layout.orientation = Qt.Horizontal
                 }
             }
             FluMenuItem{
-                text:"Vertical"
+                text: qsTr("Vertical")
                 onClicked: {
                     btn_orientation.text = text
                     split_layout.orientation = Qt.Vertical
@@ -55,7 +54,7 @@ FluContentPage{
             SplitView.maximumWidth: 400
             SplitView.maximumHeight: 400
             FluText {
-                text: "Page 1"
+                text: qsTr("Page 1")
                 anchors.centerIn: parent
             }
         }
@@ -67,7 +66,7 @@ FluContentPage{
             SplitView.fillWidth: true
             SplitView.fillHeight: true
             FluText {
-                text: "Page 2"
+                text: qsTr("Page 2")
                 anchors.centerIn: parent
             }
         }
@@ -76,7 +75,7 @@ FluContentPage{
             implicitWidth: 200
             implicitHeight: 200
             FluText {
-                text: "Page 3"
+                text: qsTr("Page 3")
                 anchors.centerIn: parent
             }
         }

example/qml/page/T_StaggeredLayout.qml

@@ -27,7 +27,6 @@ FluContentPage{
     Flickable{
         id: scroll
         anchors.fill: parent
-        anchors.topMargin: 20
         boundsBehavior:Flickable.StopAtBounds
         contentHeight: staggered_view.implicitHeight
         clip: true
@@ -43,8 +42,7 @@ FluContentPage{
                 FluText{
                     color:"#FFFFFF"
                     text:model.index
-                    font.bold: true
+                    font: FluTextStyle.Title
-                    font.pixelSize: 18
                     anchors.centerIn: parent
                 }
             }

example/qml/page/T_StatusLayout.qml

@@ -9,41 +9,40 @@ FluScrollablePage{
 
     title: qsTr("StatusLayout")
 
-    FluArea{
+    FluFrame{
         id:layout_actions
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: 50
-        height: 50
+        padding: 10
-        paddings: 10
         RowLayout{
             spacing: 14
             FluDropDownButton{
                 id:btn_status_mode
                 Layout.preferredWidth: 140
-                text:"Loading"
+                text: qsTr("Loading")
                 FluMenuItem{
-                    text:"Loading"
+                    text: qsTr("Loading")
                     onClicked: {
                         btn_status_mode.text = text
                         status_view.statusMode = FluStatusLayoutType.Loading
                     }
                 }
                 FluMenuItem{
-                    text:"Empty"
+                    text: qsTr("Empty")
                     onClicked: {
                         btn_status_mode.text = text
                         status_view.statusMode = FluStatusLayoutType.Empty
                     }
                 }
                 FluMenuItem{
-                    text:"Error"
+                    text: qsTr("Error")
                     onClicked: {
                         btn_status_mode.text = text
                         status_view.statusMode = FluStatusLayoutType.Error
                     }
                 }
                 FluMenuItem{
-                    text:"Success"
+                    text: qsTr("Success")
                     onClicked: {
                         btn_status_mode.text = text
                         status_view.statusMode = FluStatusLayoutType.Success
@@ -53,20 +52,16 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.topMargin: 10
-        height: 380
+        Layout.preferredHeight: 380
-        paddings: 10
+        padding: 10
         FluStatusLayout{
             id:status_view
             anchors.fill: parent
-            loadingText: qsTr("Loading...")
-            emptyText: qsTr("Empty")
-            errorText: qsTr("The page went wrong...")
-            errorButtonText: qsTr("Reload")
             onErrorClicked:{
-                showError("Click Reload")
+                status_view.statusMode = FluStatusLayoutType.Loading
             }
             Rectangle {
                 anchors.fill: parent
@@ -76,7 +71,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluStatusLayout{
     anchors.fill: parent
     statusMode: FluStatusLayoutType.Loading

example/qml/page/T_TabView.qml

@@ -29,59 +29,64 @@ FluScrollablePage{
         newTab()
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: 50
-        height: 50
+        padding: 10
-        paddings: 10
         RowLayout{
             spacing: 14
+            FluCopyableText{
+                text: qsTr("Tab Width Behavior:")
+            }
             FluDropDownButton{
                 id:btn_tab_width_behavior
                 Layout.preferredWidth: 140
-                text:"Equal"
+                text:  qsTr("Equal")
                 FluMenuItem{
-                    text:"Equal"
+                    text: qsTr("Equal")
                     onClicked: {
                         btn_tab_width_behavior.text = text
                         tab_view.tabWidthBehavior = FluTabViewType.Equal
                     }
                 }
                 FluMenuItem{
-                    text:"SizeToContent"
+                    text: qsTr("SizeToContent")
                     onClicked: {
                         btn_tab_width_behavior.text = text
                         tab_view.tabWidthBehavior = FluTabViewType.SizeToContent
                     }
                 }
                 FluMenuItem{
-                    text:"Compact"
+                    text: qsTr("Compact")
                     onClicked: {
                         btn_tab_width_behavior.text = text
                         tab_view.tabWidthBehavior = FluTabViewType.Compact
                     }
                 }
             }
+            FluCopyableText{
+                text: qsTr("Tab Close Button Visibility:")
+            }
             FluDropDownButton{
                 id:btn_close_button_visibility
-                text:"Always"
+                text: qsTr("Always")
                 Layout.preferredWidth: 120
                 FluMenuItem{
-                    text:"Never"
+                    text: qsTr("Never")
                     onClicked: {
                         btn_close_button_visibility.text = text
                         tab_view.closeButtonVisibility = FluTabViewType.Never
                     }
                 }
                 FluMenuItem{
-                    text:"Always"
+                    text: qsTr("Always")
                     onClicked: {
                         btn_close_button_visibility.text = text
                         tab_view.closeButtonVisibility = FluTabViewType.Always
                     }
                 }
                 FluMenuItem{
-                    text:"OnHover"
+                    text: qsTr("OnHover")
                     onClicked: {
                         btn_close_button_visibility.text = text
                         tab_view.closeButtonVisibility = FluTabViewType.OnHover
@@ -91,11 +96,11 @@ FluScrollablePage{
         }
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.topMargin: 15
-        height: 400
+        Layout.preferredHeight: 400
-        paddings: 10
+        padding: 10
         FluTabView{
             id:tab_view
             onNewPressed:{
@@ -105,7 +110,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluTabView{
     anchors.fill: parent
     Component.onCompleted: {

example/qml/page/T_TableView.qml

@@ -11,9 +11,8 @@ FluContentPage{
     title: qsTr("TableView")
     signal checkBoxChanged
 
-    property var dataSource : []
     property int sortType: 0
-    property bool seletedAll: true
+    property bool selectedAll: true
     property string nameKeyword: ""
 
     onNameKeywordChanged: {
@@ -32,11 +31,11 @@ FluContentPage{
     onCheckBoxChanged: {
         for(var i =0;i< table_view.rows ;i++){
             if(false === table_view.getRow(i).checkbox.options.checked){
-                root.seletedAll = false
+                root.selectedAll = false
                 return
             }
         }
-        root.seletedAll = true
+        root.selectedAll = true
     }
 
     onSortTypeChanged: {
@@ -159,7 +158,7 @@ FluContentPage{
             FluCheckBox{
                 anchors.centerIn: parent
                 checked: true === options.checked
-                enableAnimation: false
+                animationEnabled: false
                 clickListener: function(){
                     var obj = table_view.getRow(row)
                     obj.checkbox = table_view.customItem(com_checbox,{checked:!options.checked})
@@ -238,13 +237,15 @@ FluContentPage{
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluCheckBox{
-                    checked: true === root.seletedAll
+                    checked: true === root.selectedAll
-                    enableAnimation: false
+                    animationEnabled: false
                     Layout.alignment: Qt.AlignVCenter
                     clickListener: function(){
-                        root.seletedAll = !root.seletedAll
+                        root.selectedAll = !root.selectedAll
-                        var checked = root.seletedAll
+                        var checked = root.selectedAll
-                        itemModel.display = table_view.customItem(com_column_checbox,{"checked":checked})
+                        var columnModel = model.display
+                        columnModel.title = table_view.customItem(com_column_checbox,{"checked":checked})
+                        model.display = columnModel
                         for(var i =0;i< table_view.rows ;i++){
                             var rowData = table_view.getRow(i)
                             rowData.checkbox = table_view.customItem(com_checbox,{"checked":checked})
@@ -271,7 +272,8 @@ FluContentPage{
             }
             Component.onCompleted: {
                 currentIndex=["100","300","500","1000"].findIndex((element) => element === display)
-                selectAll()
+                textBox.forceActiveFocus()
+                textBox.selectAll()
             }
             onCommit: {
                 editTextChaged(editText)
@@ -280,6 +282,29 @@ FluContentPage{
         }
     }
 
+    Component{
+        id:com_auto_suggestbox
+        FluAutoSuggestBox {
+            id: textbox
+            anchors.fill: parent
+            focus: true
+            Component.onCompleted: {
+                var data = ["傲来国界花果山水帘洞","傲来国界坎源山脏水洞","大唐国界黑风山黑风洞","大唐国界黄风岭黄风洞","大唐国界骷髅山白骨洞","宝象国界碗子山波月洞","宝象国界平顶山莲花洞","宝象国界压龙山压龙洞","乌鸡国界号山枯松涧火云洞","乌鸡国界衡阳峪黑水河河神府"]
+                var result = data.map(function(item) {
+                    return {title: item};
+                });
+                items = result
+                textbox.text= String(display)
+                forceActiveFocus()
+                selectAll()
+            }
+            onCommit: {
+                editTextChaged(textbox.text)
+                tableView.closeEditor()
+            }
+        }
+    }
+
     Component{
         id:com_avatar
         Item{
@@ -290,12 +315,7 @@ FluContentPage{
                 radius: [20,20,20,20]
                 Image{
                     anchors.fill: parent
-                    source: {
+                    source: options && options.avatar ? options.avatar : ""
-                        if(options && options.avatar){
-                            return options.avatar
-                        }
-                        return ""
-                    }
                     sourceSize: Qt.size(80,80)
                 }
             }
@@ -323,7 +343,9 @@ FluContentPage{
                 cursorShape: Qt.PointingHandCursor
                 onClicked: {
                     custom_update_dialog.showDialog(options.title,function(text){
-                        itemModel.display = table_view.customItem(com_column_update_title,{"title":text})
+                        var columnModel = model.display
+                        columnModel.title = table_view.customItem(com_column_update_title,{"title":text})
+                        model.display = columnModel
                     })
                 }
             }
@@ -390,7 +412,7 @@ FluContentPage{
         }
     }
 
-    FluArea{
+    FluFrame{
         id:layout_controls
         anchors{
             left: parent.left
@@ -421,15 +443,15 @@ FluContentPage{
                     var data = []
                     var rows = []
                     for (var i = 0; i < table_view.rows; i++) {
-                        var item = table_view.getRow(i);
+                        var item = table_view.getRow(i)
                         rows.push(item)
                         if (!item.checkbox.options.checked) {
                             data.push(item);
                         }
                     }
-                    var sourceModel = table_view.sourceModel;
+                    var sourceModel = table_view.sourceModel
                     for (i = 0; i < sourceModel.rowCount; i++) {
-                        var sourceItem = sourceModel.getRow(i);
+                        var sourceItem = sourceModel.getRow(i)
                         const foundItem = rows.find(item=> item._key === sourceItem._key)
                         if (!foundItem) {
                             data.push(sourceItem);
@@ -438,14 +460,24 @@ FluContentPage{
                     table_view.dataSource = data
                 }
             }
-
             FluButton{
                 text: qsTr("Add a row of Data")
                 onClicked: {
                     table_view.appendRow(genTestObject())
                 }
             }
-
+            FluButton{
+                text: qsTr("Insert a Row")
+                onClicked: {
+                    var index = table_view.currentIndex()
+                    if(index !== -1){
+                        var testObj = genTestObject()
+                        table_view.insertRow(index,testObj)
+                    }else{
+                        showWarning(qsTr("Focus not acquired: Please click any item in the form as the target for insertion!"))
+                    }
+                }
+            }
         }
     }
 
@@ -465,20 +497,19 @@ FluContentPage{
             {
                 title: table_view.customItem(com_column_checbox,{checked:true}),
                 dataIndex: 'checkbox',
-                width:100,
+                frozen: true
-                minimumWidth:100,
-                maximumWidth:100
-            },
-            {
-                title: table_view.customItem(com_column_update_title,{title:qsTr("Avatar")}),
-                dataIndex: 'avatar',
-                width:100
             },
             {
                 title: table_view.customItem(com_column_filter_name,{title:qsTr("Name")}),
                 dataIndex: 'name',
                 readOnly:true
             },
+            {
+                title: table_view.customItem(com_column_update_title,{title:qsTr("Avatar")}),
+                dataIndex: 'avatar',
+                width:100,
+                frozen:true
+            },
             {
                 title: table_view.customItem(com_column_sort_age,{sort:0}),
                 dataIndex: 'age',
@@ -490,6 +521,7 @@ FluContentPage{
             {
                 title: qsTr("Address"),
                 dataIndex: 'address',
+                editDelegate: com_auto_suggestbox,
                 width:200,
                 minimumWidth:100,
                 maximumWidth:250
@@ -513,8 +545,7 @@ FluContentPage{
                 title: qsTr("Options"),
                 dataIndex: 'action',
                 width:160,
-                minimumWidth:160,
+                frozen:true
-                maximumWidth:160
             }
         ]
     }
@@ -566,7 +597,7 @@ FluContentPage{
             return avatars[randomIndex];
         }
         return {
-            checkbox: table_view.customItem(com_checbox,{checked:root.seletedAll}),
+            checkbox: table_view.customItem(com_checbox,{checked:root.selectedAll}),
             avatar:table_view.customItem(com_avatar,{avatar:getAvatar()}),
             name: getRandomName(),
             age:getRandomAge(),
@@ -579,12 +610,11 @@ FluContentPage{
         }
     }
     function loadData(page,count){
-        root.seletedAll = true
+        root.selectedAll = true
         const dataSource = []
         for(var i=0;i<count;i++){
             dataSource.push(genTestObject())
         }
-        root.dataSource = dataSource
+        table_view.dataSource = dataSource
-        table_view.dataSource = root.dataSource
     }
 }

example/qml/page/T_Text.qml

@@ -9,21 +9,29 @@ FluScrollablePage{
 
     title: qsTr("Text")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: 60
-        height: 60
+        padding: 10
-        paddings: 10
 
         FluCopyableText{
+            enabled: !toggle_switch.checked
             text: qsTr("This is a text that can be copied")
             anchors.verticalCenter: parent.verticalCenter
         }
 
+        FluToggleSwitch{
+            id: toggle_switch
+            anchors{
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            text: qsTr("Disabled")
+        }
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluCopyableText{
     text: qsTr("This is a text that can be copied")
 }'

example/qml/page/T_TextBox.qml

@@ -4,30 +4,20 @@ import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import FluentUI 1.0
 import "../component"
-import "../viewmodel"
 
 FluScrollablePage{
 
     title: qsTr("TextBox")
 
-    TextBoxViewModel{
+    FluFrame{
-        id:viewModel
-    }
-
-    FluArea{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
 
         FluTextBox{
             placeholderText: qsTr("Single-line Input Box")
             disabled: text_box_switch.checked
             cleanEnabled: true
-            text: viewModel.text1
-            onTextChanged: {
-                viewModel.text1 = text
-            }
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
@@ -45,16 +35,16 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluTextBox{
     placeholderText: qsTr("Single-line Input Box")
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
 
         FluPasswordBox{
@@ -76,26 +66,21 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluPasswordBox{
     placeholderText: qsTr("Please enter your password")
 }'
     }
 
-
+    FluFrame{
-    FluArea{
         Layout.fillWidth: true
-        height: 36+multiine_textbox.height
+        Layout.preferredHeight: 36+multiine_textbox.height
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
 
         FluMultilineTextBox{
             id: multiine_textbox
             placeholderText: qsTr("Multi-line Input Box")
-            text:viewModel.text2
-            onTextChanged: {
-                viewModel.text2 = text
-            }
             disabled: text_box_multi_switch.checked
             anchors{
                 verticalCenter: parent.verticalCenter
@@ -114,16 +99,16 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluMultilineTextBox{
     placeholderText: qsTr("Multi-line Input Box")
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluAutoSuggestBox{
             placeholderText: qsTr("AutoSuggestBox")
@@ -145,16 +130,16 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluAutoSuggestBox{
     placeholderText: qsTr("AutoSuggestBox")
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
         Layout.topMargin: 20
         FluSpinBox{
             disabled: spin_box_switch.checked
@@ -174,7 +159,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluSpinBox{
 
 }'

example/qml/page/T_Theme.qml

@@ -11,11 +11,10 @@ FluScrollablePage{
     id: root
     title: qsTr("Theme")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.fillHeight: true
-        Layout.preferredHeight: 340
+        padding: 10
-        paddings: 10
 
         ColumnLayout{
             spacing:0
@@ -115,16 +114,84 @@ FluScrollablePage{
             }
             FluToggleSwitch{
                 Layout.topMargin: 5
-                checked: FluTheme.enableAnimation
+                checked: FluTheme.animationEnabled
                 onClicked: {
-                    FluTheme.enableAnimation = !FluTheme.enableAnimation
+                    FluTheme.animationEnabled = !FluTheme.animationEnabled
+                }
+            }
+            FluText{
+                text: qsTr("Open Blur Window")
+                Layout.topMargin: 20
+            }
+            FluToggleSwitch{
+                id: toggle_blur
+                Layout.topMargin: 5
+                checked: FluTheme.blurBehindWindowEnabled
+                onClicked: {
+                    FluTheme.blurBehindWindowEnabled = !FluTheme.blurBehindWindowEnabled
+                }
+            }
+            FluText{
+                text: qsTr("window effect")
+                Layout.topMargin: 20
+            }
+            Row{
+                spacing: 10
+                Repeater{
+                    model: window.availableEffects
+                    delegate: FluRadioButton{
+                        checked: window.effect === modelData
+                        text: qsTr(`${modelData}`)
+                        clickListener:function(){
+                            window.effect = modelData
+                            if(window.effective){
+                                FluTheme.blurBehindWindowEnabled = false
+                                toggle_blur.checked = Qt.binding( function() {return FluTheme.blurBehindWindowEnabled})
+                            }
+                        }
+                    }
+
+                }
+            }
+            FluText{
+                visible: FluTheme.blurBehindWindowEnabled || window.effect === qsTr("dwm-blur")
+                text: qsTr("window tintOpacity")
+                Layout.topMargin: 20
+            }
+            FluSlider{
+                visible: FluTheme.blurBehindWindowEnabled || window.effect === qsTr("dwm-blur")
+                Layout.topMargin: 5
+                to:1
+                stepSize:0.1
+                onValueChanged: {
+                    window.tintOpacity = value
+                }
+                Component.onCompleted: {
+                    value = window.tintOpacity
+                }
+            }
+            FluText{
+                visible: FluTheme.blurBehindWindowEnabled
+                text: qsTr("window blurRadius")
+                Layout.topMargin: 20
+            }
+            FluSlider{
+                visible: FluTheme.blurBehindWindowEnabled
+                Layout.topMargin: 5
+                to:100
+                stepSize:1
+                onValueChanged: {
+                    window.blurRadius = value
+                }
+                Component.onCompleted: {
+                    value = window.blurRadius
                 }
             }
         }
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluTheme.accentColor = FluColors.Orange
 
 FluTheme.dark = true

example/qml/page/T_TimePicker.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("TimePicker")
     launchMode: FluPageType.SingleInstance
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        Layout.preferredHeight: 80
-        height: 80
+        padding: 10
-        paddings: 10
 
         ColumnLayout{
 
@@ -43,17 +42,17 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluTimePicker{
 
 }'
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.topMargin: 20
-        height: 80
+        Layout.preferredHeight: 80
-        paddings: 10
+        padding: 10
 
         ColumnLayout{
 
@@ -83,7 +82,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluTimePicker{
     hourFormat:FluTimePickerType.HH
 }'

example/qml/page/T_Timeline.qml

@@ -44,7 +44,6 @@ FluScrollablePage{
             wrapMode: Text.WrapAnywhere
             horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
             text: modelData.text
-            font.bold: true
             linkColor: FluTheme.dark ? FluColors.Teal.lighter : FluColors.Teal.dark
             onLinkActivated:
                 (link)=> {
@@ -106,7 +105,6 @@ FluScrollablePage{
 
     RowLayout{
         spacing: 20
-        Layout.topMargin: 20
         FluTextBox{
             id: text_box
             text: "Technical testing 2015-09-01"
@@ -129,28 +127,28 @@ FluScrollablePage{
     RowLayout{
         Layout.topMargin: 10
         FluText{
-            text:"mode:"
+            text: qsTr("mode:")
         }
         FluDropDownButton{
             id: btn_mode
             Layout.preferredWidth: 100
-            text: "Alternate"
+            text:  qsTr("Alternate")
             FluMenuItem{
-                text: "Left"
+                text: qsTr("Left")
                 onClicked: {
                     btn_mode.text = text
                     time_line.mode = FluTimelineType.Left
                 }
             }
             FluMenuItem{
-                text: "Right"
+                text: qsTr("Right")
                 onClicked: {
                     btn_mode.text = text
                     time_line.mode = FluTimelineType.Right
                 }
             }
             FluMenuItem{
-                text: "Alternate"
+                text: qsTr("Alternate")
                 onClicked: {
                     btn_mode.text = text
                     time_line.mode = FluTimelineType.Alternate

example/qml/page/T_ToggleSwitch.qml

@@ -9,11 +9,10 @@ FluScrollablePage{
 
     title: qsTr("ToggleSwitch")
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
         Row{
             spacing: 30
             anchors.verticalCenter: parent.verticalCenter
@@ -41,7 +40,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluToggleSwitch{
     text:"Text"
 }'

example/qml/page/T_Tooltip.qml

@@ -10,15 +10,14 @@ FluScrollablePage{
     title: qsTr("Tooltip")
 
     FluText{
-        Layout.topMargin: 20
         text: qsTr("Hover over Tultip and it pops up")
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.topMargin: 20
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
 
         Column{
             spacing: 5
@@ -41,7 +40,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluIconButton{
     iconSource:FluentIcons.ChromeCloseContrast
     iconSize: 15
@@ -53,11 +52,11 @@ FluScrollablePage{
 '
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
         Layout.topMargin: 20
-        height: 68
+        Layout.preferredHeight: 68
-        paddings: 10
+        padding: 10
 
         Column{
             spacing: 5
@@ -84,7 +83,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluButton{
     id: button_1
     text: qsTr("Delete")

example/qml/page/T_Tour.qml

@@ -18,11 +18,10 @@ FluScrollablePage{
         ]
     }
 
-    FluArea{
+    FluFrame{
         Layout.fillWidth: true
-        height: 130
+        Layout.preferredHeight: 130
-        paddings: 10
+        padding: 10
-        Layout.topMargin: 20
 
         FluFilledButton{
             anchors{
@@ -66,7 +65,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
-        Layout.topMargin: -1
+        Layout.topMargin: -6
         code:'FluTour{
     id:tour
     steps:[

example/qml/page/T_TreeView.qml

@@ -10,13 +10,31 @@ FluContentPage {
     title: qsTr("TreeView")
 
     function treeData(){
-        const dig = (path = '0', level = 4) => {
+        const names = ["孙悟空", "猪八戒", "沙和尚", "唐僧","白骨夫人","金角大王","熊山君","黄风怪","银角大王"]
+        function getRandomName(){
+            var randomIndex = Math.floor(Math.random() * names.length)
+            return names[randomIndex]
+        }
+        const addresses = ["傲来国界花果山水帘洞","傲来国界坎源山脏水洞","大唐国界黑风山黑风洞","大唐国界黄风岭黄风洞","大唐国界骷髅山白骨洞","宝象国界碗子山波月洞","宝象国界平顶山莲花洞","宝象国界压龙山压龙洞","乌鸡国界号山枯松涧火云洞","乌鸡国界衡阳峪黑水河河神府"]
+        function getRandomAddresses(){
+            var randomIndex = Math.floor(Math.random() * addresses.length)
+            return addresses[randomIndex]
+        }
+        const avatars = ["qrc:/example/res/svg/avatar_1.svg", "qrc:/example/res/svg/avatar_2.svg", "qrc:/example/res/svg/avatar_3.svg", "qrc:/example/res/svg/avatar_4.svg","qrc:/example/res/svg/avatar_5.svg","qrc:/example/res/svg/avatar_6.svg","qrc:/example/res/svg/avatar_7.svg","qrc:/example/res/svg/avatar_8.svg","qrc:/example/res/svg/avatar_9.svg","qrc:/example/res/svg/avatar_10.svg","qrc:/example/res/svg/avatar_11.svg","qrc:/example/res/svg/avatar_12.svg"]
+        function getRandomAvatar(){
+            var randomIndex = Math.floor(Math.random() * avatars.length);
+            return avatars[randomIndex];
+        }
+        const dig = (path = '0', level = 5) => {
             const list = [];
-            for (let i = 0; i < 6; i += 1) {
+            for (let i = 0; i < 4; i += 1) {
                 const key = `${path}-${i}`;
                 const treeNode = {
                     title: key,
-                    key,
+                    _key: key,
+                    name: getRandomName(),
+                    avatar:tree_view.customItem(com_avatar,{avatar:getRandomAvatar()}),
+                    address: getRandomAddresses()
                 };
                 if (level > 0) {
                     treeNode.children = dig(key, level - 1);
@@ -28,104 +46,159 @@ FluContentPage {
         return dig();
     }
 
-    Column{
+    Component{
-        id: layout_column
+        id:com_avatar
-        spacing: 12
+        Item{
-        width: 300
+            FluClip{
-        anchors{
+                anchors.centerIn: parent
-            topMargin: 20
+                width: height
-            top:parent.top
+                height: parent.height/3*2
-            left: parent.left
+                radius: [height/2,height/2,height/2,height/2]
-            leftMargin: 10
+                Image{
-            bottom:parent.bottom
+                    anchors.fill: parent
-            bottomMargin: 20
+                    source: {
-        }
+                        if(options && options.avatar){
-
+                            return options.avatar
-        FluText{
+                        }
-            text: qsTr("Total %1 data, %2 data currently displayed").arg(tree_view.count()).arg(tree_view.visibleCount())
+                        return ""
-        }
+                    }
-
+                    sourceSize: Qt.size(80,80)
-        FluText{
+                }
-            text: qsTr("A total of %1 data items are selected").arg(tree_view.selectionModel().length)
-        }
-
-        RowLayout{
-            spacing: 10
-            FluText{
-                text: "cellHeight:"
-                Layout.alignment: Qt.AlignVCenter
-            }
-            FluSlider{
-                id: slider_cell_height
-                value: 30
-                from: 30
-                to:100
-            }
-        }
-        RowLayout{
-            spacing: 10
-            FluText{
-                text: "depthPadding:"
-                Layout.alignment: Qt.AlignVCenter
-            }
-            FluSlider{
-                id: slider_depth_padding
-                value: 30
-                from: 30
-                to:100
-            }
-        }
-        FluToggleSwitch{
-            id: switch_showline
-            text:"showLine"
-            checked: false
-        }
-        FluToggleSwitch{
-            id: switch_draggable
-            text:"draggable"
-            checked: false
-        }
-        FluToggleSwitch{
-            id: switch_checkable
-            text:"checkable"
-            checked: false
-        }
-        FluButton{
-            text: "all expand"
-            onClicked: {
-                tree_view.allExpand()
-            }
-        }
-        FluButton{
-            text: "all collapse"
-            onClicked: {
-                tree_view.allCollapse()
             }
         }
     }
-    FluArea{
+    FluFrame{
+        id:layout_controls
         anchors{
-            left: layout_column.right
+            left: parent.left
+            right: parent.right
             top: parent.top
+            topMargin: 10
+        }
+        height: 80
+        clip: true
+        Row{
+            spacing: 12
+            anchors{
+                left: parent.left
+                leftMargin: 10
+                verticalCenter: parent.verticalCenter
+            }
+            Column{
+                anchors.verticalCenter: parent.verticalCenter
+                RowLayout{
+                    spacing: 10
+                    FluText{
+                        text: qsTr("cellHeight:")
+                        Layout.alignment: Qt.AlignVCenter
+                    }
+                    FluSlider{
+                        id: slider_cell_height
+                        value: 38
+                        from: 38
+                        to:100
+                    }
+                }
+                RowLayout{
+                    spacing: 10
+                    FluText{
+                        text: qsTr("depthPadding:")
+                        Layout.alignment: Qt.AlignVCenter
+                    }
+                    FluSlider{
+                        id: slider_depth_padding
+                        value: 15
+                        from: 15
+                        to:100
+                    }
+                }
+            }
+            Column{
+                spacing: 8
+                anchors.verticalCenter: parent.verticalCenter
+                FluToggleSwitch{
+                    id: switch_showline
+                    text: qsTr("showLine")
+                    checked: false
+                }
+                FluToggleSwitch{
+                    id: switch_checkable
+                    text: qsTr("checkable")
+                    checked: false
+                }
+            }
+            Column{
+                spacing: 8
+                anchors.verticalCenter: parent.verticalCenter
+                FluButton{
+                    text: qsTr("all expand")
+                    onClicked: {
+                        tree_view.allExpand()
+                    }
+                }
+                FluButton{
+                    text: qsTr("all collapse")
+                    onClicked: {
+                        tree_view.allCollapse()
+                    }
+                }
+            }
+            FluButton{
+                text: qsTr("print selection model")
+                onClicked: {
+                    var printData = []
+                    var data = tree_view.selectionModel();
+                    console.debug(data.length)
+                    for(var i = 0; i <= data.length-1 ; i++){
+                        const newObj = Object.assign({}, data[i].data);
+                        delete newObj["__parent"];
+                        delete newObj["children"];
+                        printData.push(newObj)
+                    }
+                    console.debug(JSON.stringify(printData))
+                }
+            }
+        }
+    }
+
+    FluTreeView{
+        id:tree_view
+        anchors{
+            left: parent.left
+            top: layout_controls.bottom
+            topMargin: 10
             bottom: parent.bottom
             right: parent.right
-            rightMargin: 5
-            topMargin: 5
-            bottomMargin: 5
         }
-        FluShadow{}
+        cellHeight: slider_cell_height.value
-        FluTreeView{
+        showLine: switch_showline.checked
-            id:tree_view
+        checkable:switch_checkable.checked
-            anchors.fill: parent
+        depthPadding: slider_depth_padding.value
-            cellHeight: slider_cell_height.value
+        onCurrentChanged: {
-            draggable:switch_draggable.checked
+            showInfo(current.data.title)
-            showLine: switch_showline.checked
+        }
-            checkable:switch_checkable.checked
+        columnSource:[
-            depthPadding: slider_depth_padding.value
+            {
-            Component.onCompleted: {
+                title: qsTr("Title"),
-                var data = treeData()
+                dataIndex: 'title',
-                dataSource = data
+                width: 300
-            }
+            },{
+                title: qsTr("Name"),
+                dataIndex: 'name',
+                width: 100
+            },{
+                title: qsTr("Avatar"),
+                dataIndex: 'avatar',
+                width: 100
+            },{
+                title: qsTr("Address"),
+                dataIndex: 'address',
+                width: 200
+            },
+        ]
+        Component.onCompleted: {
+            var data = treeData()
+            dataSource = data
         }
     }
 }

example/qml/page/T_Typography.qml

@@ -10,58 +10,57 @@ FluContentPage {
     title: qsTr("Typography")
     rightPadding: 10
 
-    FluArea{
+    FluFrame{
         anchors{
             top:parent.top
             left: parent.left
             right: parent.right
             bottom: parent.bottom
-            topMargin: 20
         }
-        paddings: 10
+        padding: 10
         ColumnLayout{
             spacing: 0
             scale: textScale
             transformOrigin: Item.TopLeft
             FluText{
                 id:text_Display
-                text:"Display"
+                text: qsTr("Display")
                 padding: 0
                 font: FluTextStyle.Display
             }
             FluText{
                 id:text_TitleLarge
-                text:"Title Large"
+                text: qsTr("Title Large")
                 padding: 0
                 font: FluTextStyle.TitleLarge
             }
             FluText{
                 id:text_Title
-                text:"Title"
+                text: qsTr("Title")
                 padding: 0
                 font: FluTextStyle.Title
             }
             FluText{
                 id:text_Subtitle
-                text:"Subtitle"
+                text:  qsTr("Subtitle")
                 padding: 0
                 font: FluTextStyle.Subtitle
             }
             FluText{
                 id:text_BodyStrong
-                text:"Body Strong"
+                text: qsTr("Body Strong")
                 padding: 0
                 font: FluTextStyle.BodyStrong
             }
             FluText{
                 id:text_Body
-                text:"Body"
+                text: qsTr("Body")
                 padding: 0
                 font: FluTextStyle.Body
             }
             FluText{
                 id:text_Caption
-                text:"Caption"
+                text: qsTr("Caption")
                 padding: 0
                 font: FluTextStyle.Caption
             }

example/qml/page/T_Watermark.qml

@@ -9,9 +9,8 @@ FluContentPage{
 
     title: qsTr("Watermark")
 
-    FluArea{
+    FluFrame{
         anchors.fill: parent
-        anchors.topMargin: 20
 
         ColumnLayout{
             anchors{
@@ -23,7 +22,7 @@ FluContentPage{
                 spacing: 10
                 Layout.topMargin: 14
                 FluText{
-                    text: "text:"
+                    text: qsTr("text:")
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluTextBox{
@@ -36,7 +35,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: "textSize:"
+                    text: qsTr("textSize:")
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluSlider{
@@ -49,7 +48,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: "gapX:"
+                    text: qsTr("gapX:")
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluSlider{
@@ -60,7 +59,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: "gapY:"
+                    text: qsTr("gapY:")
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluSlider{
@@ -71,7 +70,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: "offsetX:"
+                    text: qsTr("offsetX:")
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluSlider{
@@ -82,7 +81,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: "offsetY:"
+                    text: qsTr("offsetY:")
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluSlider{
@@ -93,7 +92,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: "rotate:"
+                    text: qsTr("rotate:")
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluSlider{
@@ -106,7 +105,7 @@ FluContentPage{
             RowLayout{
                 spacing: 10
                 FluText{
-                    text: "textColor:"
+                    text: qsTr("textColor:")
                     Layout.alignment: Qt.AlignVCenter
                 }
                 FluColorPicker{

example/qml/viewmodel/SettingsViewModel.qml

@@ -1,14 +0,0 @@
-import QtQuick 2.15
-import FluentUI 1.0
-
-FluViewModel{
-
-    objectName: "SettingsViewModel"
-    scope: FluViewModelType.Application
-    property int displayMode
-
-    onInitData: {
-        displayMode = FluNavigationViewType.Auto
-    }
-
-}

example/qml/viewmodel/TextBoxViewModel.qml

@@ -1,8 +0,0 @@
-import QtQuick 2.15
-import FluentUI 1.0
-
-FluViewModel {
-    objectName: "TextBoxView"
-    property string text1
-    property string text2
-}

example/qml/window/AboutWindow.qml

@@ -31,7 +31,7 @@ FluWindow {
                 MouseArea{
                     anchors.fill: parent
                     onClicked: {
-                        FluApp.navigate("/")
+                        FluRouter.navigate("/")
                     }
                 }
             }

example/qml/window/CrashWindow.qml

@@ -71,7 +71,7 @@ FluWindow {
         FluFilledButton{
             text: qsTr("Restart Program")
             onClicked: {
-                FluApp.exit(931)
+                FluRouter.exit(931)
             }
         }
     }

example/qml/window/FluentInitializrWindow.qml

@@ -8,26 +8,26 @@ import "../component"
 FluWindowDialog {
 
     id:window
-    title:qsTr("FluentUI Initalizr")
+    title:qsTr("FluentUI Initializr")
     width: 600
     height: 400
 
     contentDelegate:Component{
         Item{
             Connections{
-                target: InitalizrHelper
+                target: InitializrHelper
                 function onError(message){
                     showError(message)
                 }
                 function onSuccess(path){
-                    FluTools.showFileInFolder(path+"/CMakeLists.txt")
+                    FluTools.showFileInFolder(path)
                     window.close()
                 }
             }
 
             FluText{
                 id:text_title
-                text:qsTr("FluentUI Initalizr")
+                text:qsTr("FluentUI Initializr")
                 font: FluTextStyle.Title
                 anchors{
                     left: parent.left
@@ -102,7 +102,7 @@ FluWindowDialog {
                         width: 120
                         anchors.verticalCenter: parent.verticalCenter
                         onClicked: {
-                            InitalizrHelper.generate(text_box_name.text,text_box_path.text)
+                            InitializrHelper.generate(text_box_name.text,text_box_path.text)
                         }
                     }
                 }

example/qml/window/HotkeyWindow.qml

@@ -0,0 +1,26 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
+import FluentUI 1.0
+import "../component"
+
+FluWindow {
+
+    id: window
+    property string sequence: ""
+    title: qsTr("Hotkey")
+    width: 250
+    height: 250
+    fixSize: true
+    launchMode: FluWindowType.SingleInstance
+    onInitArgument:
+        (argument)=>{
+            window.sequence = argument.sequence
+        }
+    FluText{
+        anchors.centerIn: parent
+        color: FluTheme.primaryColor
+        font: FluTextStyle.Title
+        text: window.sequence
+    }
+}

example/qml/window/HotloadWindow.qml

@@ -20,7 +20,7 @@ FluWindow {
             loader.reload()
         }
     }
-    FluArea{
+    FluFrame{
         anchors.fill: parent
         FluRemoteLoader{
             id:loader
@@ -41,7 +41,7 @@ FluWindow {
         }
         FluText{
             text: qsTr("Drag in a qml file")
-            font.pixelSize: 26
+            font: FluTextStyle.Title
             anchors.centerIn: parent
             visible: !loader.itemLodaer().item && loader.statusMode === FluStatusLayoutType.Success
         }

example/qml/window/LoginWindow.qml

@@ -51,7 +51,7 @@ FluWindow {
                     showError(qsTr("Please feel free to enter a password"))
                     return
                 }
-                onResult({password:textbox_password.text})
+                setResult({password:textbox_password.text})
                 window.close()
             }
         }

example/qml/window/MainWindow.qml

@@ -7,7 +7,6 @@ import Qt.labs.platform 1.1
 import FluentUI 1.0
 import example 1.0
 import "../component"
-import "../viewmodel"
 import "../global"
 
 FluWindow {
@@ -15,13 +14,12 @@ FluWindow {
     id:window
     title: "FluentUI"
     width: 1000
-    height: 680
+    height: 668
-    minimumWidth: 520
+    minimumWidth: 668
-    minimumHeight: 200
+    minimumHeight: 320
     launchMode: FluWindowType.SingleTask
     fitsAppBarWindows: true
     appBar: FluAppBar {
-        width: window.width
         height: 30
         showDark: true
         darkClickListener:(button)=>handleDarkChanged(button)
@@ -29,37 +27,27 @@ FluWindow {
         z:7
     }
 
-    SettingsViewModel{
+    FluentInitializrWindow{
-        id:viewmodel_settings
+        id:fluent_Initializr
     }
 
     FluEvent{
-        id:event_checkupdate
         name: "checkUpdate"
         onTriggered: {
             checkUpdate(false)
         }
     }
 
-    onFirstVisible: {
+    onLazyLoad: {
-        timer_tour_delay.restart()
+        tour.open()
-    }
-
-    Timer{
-        id:timer_tour_delay
-        interval: 200
-        onTriggered: {
-            tour.open()
-        }
     }
 
     Component.onCompleted: {
         checkUpdate(true)
-        FluEventBus.registerEvent(event_checkupdate)
     }
 
     Component.onDestruction: {
-        FluEventBus.unRegisterEvent(event_checkupdate)
+        FluRouter.exit()
     }
 
     SystemTrayIcon {
@@ -71,7 +59,7 @@ FluWindow {
             MenuItem {
                 text: "退出"
                 onTriggered: {
-                    FluApp.exit()
+                    FluRouter.exit()
                 }
             }
         }
@@ -106,7 +94,7 @@ FluWindow {
         positiveText: qsTr("Quit")
         neutralText: qsTr("Cancel")
         onPositiveClicked:{
-            FluApp.exit(0)
+            FluRouter.exit(0)
         }
     }
 
@@ -116,9 +104,9 @@ FluWindow {
             width: 186
             FluMenuItem{
                 text: qsTr("Open in Separate Window")
-                font.pixelSize: 12
+                font: FluTextStyle.Caption
                 onClicked: {
-                    FluApp.navigate("/pageWindow",{title:modelData.title,url:modelData.url})
+                    FluRouter.navigate("/pageWindow",{title:modelData.title,url:modelData.url})
                 }
             }
         }
@@ -175,14 +163,14 @@ FluWindow {
                     }
                 }
                 Component.onCompleted: {
-                    appBar.setHitTestVisible(layout_back_buttons)
+                    window.setHitTestVisible(layout_back_buttons)
                 }
             }
             FluRemoteLoader{
                 id:loader
                 lazy: true
                 anchors.fill: parent
-                source: "https://zhu-zichu.gitee.io/Qt_168_LieflatPage.qml"
+                source: "https://zhu-zichu.gitee.io/Qt_174_LieflatPage.qml"
             }
         }
         front: Item{
@@ -197,7 +185,7 @@ FluWindow {
                 z:999
                 //Stack模式，每次切换都会将页面压入栈中，随着栈的页面增多，消耗的内存也越多，内存消耗多就会卡顿，这时候就需要按返回将页面pop掉，释放内存。该模式可以配合FluPage中的launchMode属性，设置页面的启动模式
                 //                pageMode: FluNavigationViewType.Stack
-                //NoStack模式，每次切换都会销毁之前的页面然后创建一个新的页面，只需消耗少量内存，可以配合FluViewModel保存页面数据（推荐）
+                //NoStack模式，每次切换都会销毁之前的页面然后创建一个新的页面，只需消耗少量内存
                 pageMode: FluNavigationViewType.NoStack
                 items: ItemsOriginal
                 footerItems:ItemsFooter
@@ -207,7 +195,7 @@ FluWindow {
                     }
                     return FluTools.isMacos() ? 20 : 0
                 }
-                displayMode:viewmodel_settings.displayMode
+                displayMode: GlobalModel.displayMode
                 logo: "qrc:/example/res/image/favicon.ico"
                 title:"FluentUI"
                 onLogoClicked:{
@@ -233,9 +221,9 @@ FluWindow {
                     ItemsOriginal.paneItemMenu = nav_item_right_menu
                     ItemsFooter.navigationView = nav_view
                     ItemsFooter.paneItemMenu = nav_item_right_menu
-                    appBar.setHitTestVisible(nav_view.buttonMenu)
+                    window.setHitTestVisible(nav_view.buttonMenu)
-                    appBar.setHitTestVisible(nav_view.buttonBack)
+                    window.setHitTestVisible(nav_view.buttonBack)
-                    appBar.setHitTestVisible(nav_view.imageLogo)
+                    window.setHitTestVisible(nav_view.imageLogo)
                     setCurrentIndex(0)
                 }
             }
@@ -246,8 +234,9 @@ FluWindow {
         id: com_reveal
         CircularReveal{
             id: reveal
-            target: window.contentItem
+            target: window.containerItem()
             anchors.fill: parent
+            darkToLight: FluTheme.dark
             onAnimationFinished:{
                 //动画结束后释放资源
                 loader_reveal.sourceComponent = undefined
@@ -268,17 +257,14 @@ FluWindow {
     }
 
     function handleDarkChanged(button){
-        if(!FluTheme.enableAnimation || window.fitsAppBarWindows === false){
+        if(FluTools.isMacos() || !FluTheme.animationEnabled){
             changeDark()
         }else{
-            if(loader_reveal.sourceComponent){
-                return
-            }
             loader_reveal.sourceComponent = com_reveal
-            var target = window.contentItem
+            var target = window.containerItem()
             var pos = button.mapToItem(target,0,0)
-            var mouseX = pos.x
+            var mouseX = pos.x + button.width / 2
-            var mouseY = pos.y
+            var mouseY = pos.y + button.height / 2
             var radius = Math.max(distance(mouseX,mouseY,0,0),distance(mouseX,mouseY,target.width,0),distance(mouseX,mouseY,0,target.height),distance(mouseX,mouseY,target.width,target.height))
             var reveal = loader_reveal.item
             reveal.start(reveal.width*Screen.devicePixelRatio,reveal.height*Screen.devicePixelRatio,Qt.point(mouseX,mouseY),radius)
@@ -355,11 +341,11 @@ FluWindow {
         }
     }
 
-    FluNetworkCallable{
+    NetworkCallable{
         id:callable
         property bool silent: true
         onStart: {
-            console.debug("satrt check update...")
+            console.debug("start check update...")
         }
         onFinish: {
             console.debug("check update finish")
@@ -391,7 +377,7 @@ FluWindow {
 
     function checkUpdate(silent){
         callable.silent = silent
-        FluNetwork.get("https://api.github.com/repos/zhuzichu520/FluentUI/releases/latest")
+        Network.get("https://api.github.com/repos/zhuzichu520/FluentUI/releases/latest")
         .go(callable)
     }
 }

example/qml/window/PageWindow.qml

@@ -16,7 +16,7 @@ FluWindow {
     onInitArgument:
         (arg)=>{
             window.title = arg.title
-            loader.setSource( arg.url,{animDisabled:true})
+            loader.setSource(arg.url,{animationEnabled:false})
         }
     FluLoader{
         id: loader

example/res/template/src/App.qml.in

@@ -4,14 +4,14 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import FluentUI 1.0
 
-Item {
+FluLauncher {
     id: app
     Component.onCompleted: {
         FluApp.init(app)
         FluApp.windowIcon = "qrc:/logo.ico"
-        FluApp.routes = {
+        FluRouter.routes = {
             "/":"qrc:/main.qml",
         }
-        FluApp.navigate("/")
+        FluRouter.navigate("/")
     }
 }

example/res/template/src/CMakeLists.txt.in

@@ -32,13 +32,9 @@ add_custom_target(Script-UpdateTranslations
     SOURCES ${TS_FILE_PATHS}
 )
 
-qt_add_big_resources(QRC_RESOURCES qml.qrc)
-list(APPEND QRC_RESOURCES qml.qrc)
-set_property(SOURCE qml.qrc PROPERTY SKIP_AUTORCC ON)
-
 set(PROJECT_SOURCES
     main.cpp
-    ${QRC_RESOURCES}
+    qml.qrc
 )
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
@@ -76,11 +72,6 @@ install(TARGETS ${PROJECT_NAME}
     BUNDLE DESTINATION .
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-if(QT_VERSION_MAJOR EQUAL 6)
-    qt_import_qml_plugins(${PROJECT_NAME})
-    qt_finalize_executable(${PROJECT_NAME})
-endif()
-
 if (CMAKE_BUILD_TYPE MATCHES "Release")
     if (APPLE)
         find_program(QT_DEPLOY_QT NAMES macdeployqt)
@@ -98,7 +89,7 @@ if (CMAKE_BUILD_TYPE MATCHES "Release")
         add_custom_target(Script-DeployRelease
             COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_SOURCE_DIR}/dist
             COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${CMAKE_SOURCE_DIR}/dist
-            COMMAND ${QT_DEPLOY_QT} ${CMAKE_SOURCE_DIR}/dist/${PROJECT_NAME}.exe -qmldir=${CMAKE_CURRENT_LIST_DIR}
+            COMMAND ${QT_DEPLOY_QT} --qmldir=${CMAKE_CURRENT_LIST_DIR} --plugindir ${CMAKE_SOURCE_DIR}/dist/plugins --no-translations --compiler-runtime ${CMAKE_SOURCE_DIR}/dist/${PROJECT_NAME}.exe
             COMMENT "Windows Deploying Qt Dependencies After Build........."
             SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
             WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}