update

CMakeLists: simplify code.

.cmake/version_exe.rc.in

@@ -31,4 +31,4 @@ BEGIN
     END
 END
 
-IDI_ICON1 ICON DISCARDABLE "${FLUENTUI_DIRECTORY}/example/favicon.ico"
+IDI_ICON1 ICON DISCARDABLE "${CMAKE_SOURCE_DIR}/example/favicon.ico"

.github/workflows/macos.yml

@@ -21,8 +21,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13]
-        qt_ver: [6.6.1]
+        os: [macos-latest]
+        qt_ver: [6.6.2]
         qt_arch: [clang_64]
     env:
       targetName: example
@@ -50,15 +50,15 @@ jobs:
           cmake --version
           mkdir build
           cd build
-          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/FluentUI/Qt/6.6.1/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/FluentUI/Qt/${{ matrix.qt_ver }}/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
           cmake --build . --target all --config Release --parallel
           
       - name: package
         run: |
           # 先删除所有dSYM文件，减少包的体积
-          sudo find /Users/runner/work/FluentUI/Qt/6.6.1/macos/qml -name "*.dSYM" | xargs rm -r
+          sudo find /Users/runner/work/FluentUI/Qt/${{ matrix.qt_ver }}/macos/qml -name "*.dSYM" | xargs rm -r
           # 拷贝依赖
-          sudo macdeployqt bin/release/${targetName}.app -qmldir=. -dmg     
+          sudo macdeployqt bin/Release/${targetName}.app -qmldir=. -dmg     
           
       - uses: actions/upload-artifact@v2
         with:
@@ -73,4 +73,4 @@ jobs:
           file: bin/release/${{ env.targetName }}.dmg
           asset_name: ${{ env.targetName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.dmg
           tag: ${{ github.ref }}
-          overwrite: true
+          overwrite: true

.github/workflows/ubuntu.yml

@@ -22,8 +22,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04]
-        qt_ver: [6.6.1]
+        os: [ubuntu-latest]
+        qt_ver: [6.6.2]
         qt_arch: [gcc_64]
     env:
       targetName: example
@@ -49,13 +49,16 @@ jobs:
       - name: ubuntu install GL library
         run: sudo apt-get install -y libxcb-cursor0 libgl1-mesa-dev libxcb1-dev libgtk-3-dev libxkbcommon-x11-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-sync-dev  libxcb-render-util0-dev libxcb-shm0-dev
         
+      - name: ubuntu install libfuse2
+        run: sudo apt install libfuse2
+        
       - name: build ubuntu
         run: |
           ninja --version
           cmake --version
           mkdir build
           cd build
-          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/FluentUI/Qt/6.6.1/gcc_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/FluentUI/Qt/${{ matrix.qt_ver }}/gcc_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
           cmake --build . --target all --config Release --parallel
           
       - name: install QT linux deploy
@@ -71,7 +74,7 @@ jobs:
           # make sure Qt plugin finds QML sources so it can deploy the imported files
           export QML_SOURCES_PATHS=./
           # 拷贝依赖
-          linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=bin/release/${targetName} --appdir bin/release/
+          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
@@ -87,4 +90,4 @@ jobs:
           file: ${{ env.targetName }}.AppImage
           asset_name: ${{ env.targetName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.AppImage
           tag: ${{ github.ref }}
-          overwrite: true
+          overwrite: true

.github/workflows/windows-mingw.yml

@@ -21,10 +21,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2022]
+        os: [windows-latest]
         include:
           - qt_arch: win64_mingw
-            qt_ver: 6.6.1
+            qt_ver: 6.6.2
             qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900"
             qt_tools_mingw_install: mingw900_64
     env:
@@ -69,7 +69,7 @@ jobs:
           mkdir build
           cd build
           ninja --version
-          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.6.1\mingw_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\${{ matrix.qt_ver }}\mingw_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
           cmake --build . --target all --config Release --parallel
       
       - name: package
@@ -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
+          overwrite: true

.github/workflows/windows-qt5.yml

@@ -50,7 +50,7 @@ jobs:
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }}
           mkdir build
           cd build
-          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\5.15.2\msvc2019 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja ..
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\${{ matrix.qt_ver }}\msvc2019 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja ..
           cmake --build . --target all --config Release --parallel
           echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV%
           echo winSdkVer=%WindowsSdkVersion% >> %GITHUB_ENV%
@@ -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
+          overwrite: true

.github/workflows/windows.yml

@@ -21,9 +21,9 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2019]
+        os: [windows-latest]
         include:
-          - qt_ver: 6.6.1        
+          - qt_ver: 6.6.2        
             qt_arch: win64_msvc2019_64
             msvc_arch: x64
             qt_arch_install: msvc2019_64  
@@ -35,7 +35,12 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: recursive
-             
+          
+      - name: Setup ninja
+        uses: seanmiddleditch/gha-setup-ninja@master
+        with:
+          version: 1.10.2
+          
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
@@ -48,11 +53,11 @@ jobs:
         id: build
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }}
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }}
           ninja --version
           mkdir build
           cd build
-          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.6.1\msvc2019_64 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja ..
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\${{ matrix.qt_ver }}\msvc2019_64 -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DCMAKE_BUILD_TYPE=Release -GNinja ..
           cmake --build . --target all --config Release --parallel
           echo winSdkDir=%WindowsSdkDir% >> %GITHUB_ENV%
           echo winSdkVer=%WindowsSdkVersion% >> %GITHUB_ENV%
@@ -80,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 
+          overwrite: true 

.gitignore

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

CMakeLists.txt

@@ -2,34 +2,28 @@ cmake_minimum_required(VERSION 3.20)
 
 project(FluentUI VERSION 1.0)
 
-set(FLUENTUI_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
-list(APPEND CMAKE_MODULE_PATH ${FLUENTUI_DIRECTORY}/.cmake/)
+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 ()
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.cmake/)
 
 include(GetGitRevisionDescription)
 
 option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON)
-option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF)
+set(FLUENTUI_BUILD_STATIC_LIB OFF)
 
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
 
-set(QT_SDK_DIR "${Qt${QT_VERSION_MAJOR}_DIR}")
-cmake_path(GET QT_SDK_DIR PARENT_PATH QT_SDK_DIR)
-cmake_path(GET QT_SDK_DIR PARENT_PATH QT_SDK_DIR)
-cmake_path(GET QT_SDK_DIR PARENT_PATH QT_SDK_DIR)
-
-#设置QML插件输出目录，可以通过外部设置，如果外部没有设置就默认到<QT_SDK_DIR_PATH>\qml\FluentUI目录下
-set(FLUENTUI_QML_PLUGIN_DIRECTORY "" CACHE PATH "Path to FluentUI plugin")
-if(NOT FLUENTUI_QML_PLUGIN_DIRECTORY)
-    set(FLUENTUI_QML_PLUGIN_DIRECTORY ${QT_SDK_DIR}/qml/FluentUI)
-endif()
-
 add_subdirectory(src)
 
 #Release也支持日志打印代码位置
 target_compile_definitions(fluentuiplugin
-    PRIVATE
-    QT_MESSAGELOGCONTEXT
+        PRIVATE
+        QT_MESSAGELOGCONTEXT
 )
 
 if (FLUENTUI_BUILD_EXAMPLES)

README.md

@@ -46,7 +46,7 @@ Use [Qt Online Installers](https://download.qt.io/archive/online_installers/) to
 
 ## ⚽ Get started
 
-+ Download the [pre-built release](https://github.com/zhuzichu520/FluentUI/releases). (Please pecify your platform and compilers.)
++ Download the [pre-built release](https://github.com/zhuzichu520/FluentUI/releases). (Please specify your platform and compilers.)
 
 + run `example` program.
 

example/CMakeLists.txt

@@ -4,179 +4,172 @@ project(example VERSION 1.0)
 
 #配置通用编译
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-#导入exmaple的QML位置，不然import example有时候会爆红
-set(QML_IMPORT_PATH ${CMAKE_BINARY_DIR}/example CACHE STRING "Qt Creator extra QML import paths" FORCE)
-
 #判断FluentUI库类型
-if(FLUENTUI_BUILD_STATIC_LIB)
+if (FLUENTUI_BUILD_STATIC_LIB)
     add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)
-endif()
+endif ()
 
 #设置可执行文件输出目录
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${FLUENTUI_DIRECTORY}/bin/debug>)
-else()
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${FLUENTUI_DIRECTORY}/bin/release>)
-endif()
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
 
-#获取文件路径分隔符（解决执行命令的时候有些平台会报错）
-file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
+if (APPLE)
+    set(APPLICATION_DIR_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${PROJECT_NAME}.app/Contents/MacOS)
+else ()
+    set(APPLICATION_DIR_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+endif ()
 
 #导入Qt相关依赖包
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Quick Svg Network)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Quick Svg Network)
 
-if(QT_VERSION VERSION_GREATER_EQUAL "6.3")
-    qt_standard_project_setup()
-else()
-    set(CMAKE_AUTOMOC ON)
-    set(CMAKE_AUTORCC ON)
-    set(CMAKE_AUTOUIC ON)
-endif()
+#添加国际化脚本
+find_program(QT_LUPDATE NAMES lupdate)
+find_program(QT_LRELEASE NAMES lrelease)
+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}_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}_zh_CN.ts WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+        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
+        SOURCES ${TS_FILE_PATHS}
+)
 
 ##生成版本信息头文件
-set(HEADER_FILE_VERSION_PATH ${FLUENTUI_DIRECTORY}/example/Version.h)
+set(HEADER_FILE_VERSION_PATH ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}/Version.h)
 configure_file(
-    ${FLUENTUI_DIRECTORY}/.cmake/Version.h.in
-    ${HEADER_FILE_VERSION_PATH}
+        ${CMAKE_SOURCE_DIR}/.cmake/Version.h.in
+        ${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(QT_VERSION VERSION_GREATER_EQUAL "6.2")
-    #遍历所有qml文件
-    file(GLOB_RECURSE QML_PATHS *.qml qmldir)
-    foreach(filepath ${QML_PATHS})
-        string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
-        if(${filepath} MATCHES "qml-Qt6")
-            string(REPLACE "qml-Qt6" "qml" filealias ${filename})
-            set_source_files_properties(${filename} PROPERTIES QT_RESOURCE_ALIAS ${filealias})
-            if(${filename} MATCHES "qmldir")
-                list(APPEND resource_files ${filename})
-            else()
-                list(APPEND qml_files ${filename})
-            endif()
-        endif()
-    endforeach(filepath)
-
-    #遍历所有资源文件
-    file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp *.obj)
-    foreach(filepath ${RES_PATHS})
-        string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
-        message(${filename})
-        list(APPEND resource_files ${filename})
-    endforeach(filepath)
-
-endif()
+if (WIN32)
+    list(APPEND sources_files "src/app_dmp.h")
+endif ()
 
 #如果是Windows平台，则生成rc文件，还有inno setup脚本文件
 set(EXAMPLE_VERSION_RC_PATH "")
-if(WIN32)
-    set(EXAMPLE_VERSION_RC_PATH ${CMAKE_BINARY_DIR}/version_${PROJECT_NAME}.rc)
-    configure_file(
-        ${FLUENTUI_DIRECTORY}/.cmake/version_exe.rc.in
-        ${EXAMPLE_VERSION_RC_PATH}
-    )
-configure_file(
-    ${FLUENTUI_DIRECTORY}/.cmake/InstallerScript.iss.in
-    ${FLUENTUI_DIRECTORY}/action-cli/InstallerScript.iss
-)
-endif()
-
-#添加可执行文件
 if (WIN32)
-    add_executable(example
-        ${sources_files}
-        ${EXAMPLE_VERSION_RC_PATH}
+    set(EXAMPLE_VERSION_RC_PATH ${CMAKE_CURRENT_BINARY_DIR}/version_${PROJECT_NAME}.rc)
+    configure_file(
+            ${CMAKE_SOURCE_DIR}/.cmake/version_exe.rc.in
+            ${EXAMPLE_VERSION_RC_PATH}
     )
-else ()
-    add_executable(example
-        ${sources_files}
+    configure_file(
+            ${CMAKE_SOURCE_DIR}/.cmake/InstallerScript.iss.in
+            ${CMAKE_SOURCE_DIR}/package/InstallerScript.iss
     )
 endif ()
 
-#复制程序运行所需要的动态库
-if(WIN32)
-    if(MSVC)
-        if(CMAKE_SIZEOF_VOID_P EQUAL 4)
-            set(3RDPARTY_DLL_DIR ${CMAKE_SOURCE_DIR}/3rdparty/msvc/x86/*.dll)
-        elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-            set(3RDPARTY_DLL_DIR ${CMAKE_SOURCE_DIR}/3rdparty/msvc/x64/*.dll)
-        endif()
-    elseif(MINGW)
-        set(3RDPARTY_DLL_DIR ${CMAKE_SOURCE_DIR}/3rdparty/mingw/*.dll)
-    endif()
-    string(REPLACE "/" ${PATH_SEPARATOR} 3RDPARTY_DLL_DIR "${3RDPARTY_DLL_DIR}")
-    file(GLOB DLL_FILES ${3RDPARTY_DLL_DIR})
-    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy
-        ${DLL_FILES}
-        ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-    )
-endif()
+#加快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(QT_VERSION VERSION_GREATER_EQUAL "6.2")
-    #如果是Qt6.2以上，则使用qt_add_qml_module添加资源文件
-    qt_add_qml_module(example
-        URI "example"
-        VERSION 1.0
-        QML_FILES ${qml_files}
-        RESOURCES ${resource_files}
-        RESOURCE_PREFIX "/"
+#添加可执行文件
+if (WIN32)
+    list(APPEND sources_files ${EXAMPLE_VERSION_RC_PATH})
+endif ()
+if (${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+    qt_add_executable(${PROJECT_NAME}
+            MANUAL_FINALIZATION
+            ${sources_files}
     )
-else()
-    #如果是Qt6.2以下，则使用qrc添加资源文件
-    target_include_directories(example PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}
+else ()
+    add_executable(${PROJECT_NAME}
+            ${sources_files}
     )
-    target_sources(example PRIVATE example.qrc)
-endif()
+endif ()
+add_dependencies(${PROJECT_NAME} Script-UpdateTranslations)
+
+#复制程序运行所需要的动态库
+if (WIN32)
+    if (MSVC)
+        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)
+            file(GLOB_RECURSE 3RDPARTY_DLL_DIR ${CMAKE_SOURCE_DIR}/3rdparty/msvc/x64/*.dll)
+        endif ()
+    elseif (MINGW)
+        file(GLOB_RECURSE 3RDPARTY_DLL_DIR ${CMAKE_SOURCE_DIR}/3rdparty/mingw/*.dll)
+    endif ()
+    file(COPY ${3RDPARTY_DLL_DIR} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+endif ()
+
+#复制FluentUI源码到运行目录下，用于脚手架生成
+file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/source/)
+file(COPY ${CMAKE_SOURCE_DIR}/src/ DESTINATION ${APPLICATION_DIR_PATH}/source/)
 
 #导入component头文件,不然通过QML_NAMED_ELEMENT生成的c++类会找不到头文件报错
-target_include_directories(example PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/component
+target_include_directories(${PROJECT_NAME} PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/component
 )
 
 #如果是静态库则需要手动注册插件，导入FluentUI.h头文件
-if(FLUENTUI_BUILD_STATIC_LIB)
-    target_include_directories(example PRIVATE
-        ${CMAKE_SOURCE_DIR}/src
+if (FLUENTUI_BUILD_STATIC_LIB)
+    target_include_directories(${PROJECT_NAME} PRIVATE
+            ${CMAKE_SOURCE_DIR}/src
     )
-endif()
+endif ()
 
 #设置属性
-set_target_properties(example PROPERTIES
-    MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
-    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
-    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-    MACOSX_BUNDLE TRUE
-    WIN32_EXECUTABLE TRUE
+set_target_properties(${PROJECT_NAME} PROPERTIES
+        MACOSX_BUNDLE_GUI_IDENTIFIER my.${PROJECT_NAME}.com
+        MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+        MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+        MACOSX_BUNDLE TRUE
+        WIN32_EXECUTABLE TRUE
 )
 
 #Release也支持日志打印代码位置
-target_compile_definitions(example
-    PRIVATE
-    QT_MESSAGELOGCONTEXT
+target_compile_definitions(${PROJECT_NAME}
+        PRIVATE
+        QT_MESSAGELOGCONTEXT
 )
 
 #目标文件链接库
-target_link_libraries(example PRIVATE
-    Qt${QT_VERSION_MAJOR}::Quick
-    Qt${QT_VERSION_MAJOR}::Svg
-    Qt${QT_VERSION_MAJOR}::Network
-    fluentuiplugin
+target_link_libraries(${PROJECT_NAME} PRIVATE
+        Qt${QT_VERSION_MAJOR}::Quick
+        Qt${QT_VERSION_MAJOR}::Svg
+        Qt${QT_VERSION_MAJOR}::Network
+        fluentuiplugin
 )
 
-#安装
-install(TARGETS example
-    BUNDLE DESTINATION .
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-)
+#添加部署脚本
+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 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}
+                COMMENT "MacOs Deploying Qt Dependencies After Build........."
+                SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        )
+    endif ()
+    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 copy_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ${CMAKE_SOURCE_DIR}/dist
+                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}
+        )
+    endif ()
+endif ()

example/README.md

@@ -0,0 +1,18 @@
+# FluentUI 脚手架开发说明
+
+## 代码说明
+
+文件编码格式请用utf-8不带bom，代码中最好不要含有中文（包括注释），中文可能会改变文件格式导致编译失败，还会出现乱码，显示中文请用国际化，c++中用tr函数，qml中用qsTr函数
+
+### 脚本说明
+
+1. **Script-UpdateTranslations**
+
+   用于更新ts与qm文件，当你的代码添加了tr或者qsTr函数后，执行这个脚本会更新ts文件，然后编写翻译后，再执行这个脚本，qm文件会更新生效
+
+2. **Script-DeployRelease**
+
+   执行Qt的windeployqt或macdeployqt命令，这个脚本只在windows与macos才有，linux不支持
+
+
+

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>
@@ -154,10 +153,9 @@
         <file>qml/page/T_RatingControl.qml</file>
         <file>qml/page/T_Rectangle.qml</file>
         <file>qml/page/T_RemoteLoader.qml</file>
-        <file>qml/page/T_Screenshot.qml</file>
         <file>qml/page/T_Settings.qml</file>
         <file>qml/page/T_Slider.qml</file>
-        <file>qml/page/T_StatusView.qml</file>
+        <file>qml/page/T_StatusLayout.qml</file>
         <file>qml/page/T_TableView.qml</file>
         <file>qml/page/T_TabView.qml</file>
         <file>qml/page/T_Text.qml</file>
@@ -178,15 +176,11 @@
         <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_StaggeredView.qml</file>
-        <file>qml/viewmodel/SettingsViewModel.qml</file>
-        <file>qml/viewmodel/TextBoxViewModel.qml</file>
+        <file>qml/page/T_StaggeredLayout.qml</file>
         <file>qml/page/T_Clip.qml</file>
         <file>qml/page/T_3D.qml</file>
-        <file>qml/global/Lang.qml</file>
         <file>qml/page/T_Network.qml</file>
         <file>qml/page/T_ShortcutPicker.qml</file>
         <file>qml/chart/T_BarChart.qml</file>
@@ -196,5 +190,26 @@
         <file>qml/chart/T_ScatterChart.qml</file>
         <file>qml/chart/T_BubbleChart.qml</file>
         <file>qml/chart/T_PolarAreaChart.qml</file>
+        <file>res/image/ic_crash.png</file>
+        <file>qml/window/CrashWindow.qml</file>
+        <file>qml/page/T_SplitLayout.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>
+        <file>res/template/src/en_US.ts.in</file>
+        <file>res/template/src/logo.ico.in</file>
+        <file>res/template/src/main.cpp.in</file>
+        <file>res/template/src/main.qml.in</file>
+        <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>
     </qresource>
+    <qresource prefix="/"/>
 </RCC>

example/qml-Qt6/App.qml

@@ -1,47 +0,0 @@
-import QtQuick
-import QtQuick.Window
-import QtQuick.Controls
-import QtQuick.Layouts
-import FluentUI
-
-Item {
-    id: app
-
-    Connections{
-        target: FluTheme
-        function onDarkModeChanged(){
-            SettingsHelper.saveDarkMode(FluTheme.darkMode)
-        }
-    }
-
-    Connections{
-        target: FluApp
-        function onUseSystemAppBarChanged(){
-            SettingsHelper.saveUseSystemAppBar(FluApp.useSystemAppBar)
-        }
-    }
-
-    Component.onCompleted: {
-        FluNetwork.openLog = false
-        FluNetwork.setInterceptor(function(param){
-            param.addHeader("Token","000000000000000000000")
-        })
-        FluApp.init(app)
-        FluApp.windowIcon = "qrc:/example/res/image/favicon.ico"
-        FluApp.useSystemAppBar = SettingsHelper.getUseSystemAppBar()
-        FluTheme.darkMode = SettingsHelper.getDarkMode()
-        FluTheme.enableAnimation = true
-        FluApp.routes = {
-            "/":"qrc:/example/qml/window/MainWindow.qml",
-            "/about":"qrc:/example/qml/window/AboutWindow.qml",
-            "/login":"qrc:/example/qml/window/LoginWindow.qml",
-            "/hotload":"qrc:/example/qml/window/HotloadWindow.qml",
-            "/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"
-        }
-        FluApp.initialRoute = "/"
-        FluApp.run()
-    }
-}

example/qml-Qt6/chart/T_BarChart.qml

@@ -1,132 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Window
-import QtQuick.Controls
-import FluentUI
-import "qrc:///example/qml/component"
-
-FluScrollablePage{
-
-    title:"Bar Chart"
-
-    FluArea{
-        width: 500
-        height: 370
-        paddings: 10
-        Layout.topMargin: 20
-        FluChart{
-            anchors.fill: parent
-            chartType: 'bar'
-            chartData: { return {
-                    labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-                    datasets: [{
-                            label: 'My First Dataset',
-                            data: [65, 59, 80, 81, 56, 55, 40],
-                            backgroundColor: [
-                                'rgba(255, 99, 132, 0.2)',
-                                'rgba(255, 159, 64, 0.2)',
-                                'rgba(255, 205, 86, 0.2)',
-                                'rgba(75, 192, 192, 0.2)',
-                                'rgba(54, 162, 235, 0.2)',
-                                'rgba(153, 102, 255, 0.2)',
-                                'rgba(201, 203, 207, 0.2)'
-                            ],
-                            borderColor: [
-                                'rgb(255, 99, 132)',
-                                'rgb(255, 159, 64)',
-                                'rgb(255, 205, 86)',
-                                'rgb(75, 192, 192)',
-                                'rgb(54, 162, 235)',
-                                'rgb(153, 102, 255)',
-                                'rgb(201, 203, 207)'
-                            ],
-                            borderWidth: 1
-                        }]
-                }
-            }
-
-            chartOptions: { return {
-                    maintainAspectRatio: false,
-                    title: {
-                        display: true,
-                        text: 'Chart.js Bar Chart - Stacked'
-                    },
-                    tooltips: {
-                        mode: 'index',
-                        intersect: false
-                    },
-                    responsive: true,
-                    scales: {
-                        xAxes: [{
-                                stacked: true,
-                            }],
-                        yAxes: [{
-                                stacked: true
-                            }]
-                    }
-                }
-            }
-        }
-    }
-
-    FluArea{
-        width: 500
-        height: 370
-        paddings: 10
-        Layout.topMargin: 20
-        FluChart{
-            anchors.fill: parent
-            chartType: 'horizontalBar'
-            chartData: { return {
-                    labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-                    datasets: [{
-                            label: 'My First Dataset',
-                            data: [65, 59, 80, 81, 56, 55, 40],
-                            backgroundColor: [
-                                'rgba(255, 99, 132, 0.2)',
-                                'rgba(255, 159, 64, 0.2)',
-                                'rgba(255, 205, 86, 0.2)',
-                                'rgba(75, 192, 192, 0.2)',
-                                'rgba(54, 162, 235, 0.2)',
-                                'rgba(153, 102, 255, 0.2)',
-                                'rgba(201, 203, 207, 0.2)'
-                            ],
-                            borderColor: [
-                                'rgb(255, 99, 132)',
-                                'rgb(255, 159, 64)',
-                                'rgb(255, 205, 86)',
-                                'rgb(75, 192, 192)',
-                                'rgb(54, 162, 235)',
-                                'rgb(153, 102, 255)',
-                                'rgb(201, 203, 207)'
-                            ],
-                            borderWidth: 1
-                        }]
-                }
-            }
-
-            chartOptions: { return {
-                    maintainAspectRatio: false,
-                    title: {
-                        display: true,
-                        text: 'Chart.js HorizontalBar Chart - Stacked'
-                    },
-                    tooltips: {
-                        mode: 'index',
-                        intersect: false
-                    },
-                    responsive: true,
-                    scales: {
-                        xAxes: [{
-                                stacked: true,
-                            }],
-                        yAxes: [{
-                                stacked: true
-                            }]
-                    }
-                }
-            }
-        }
-    }
-
-}

example/qml-Qt6/chart/T_BubbleChart.qml

@@ -1,74 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Window
-import QtQuick.Controls
-import FluentUI
-import "qrc:///example/qml/component"
-
-FluScrollablePage{
-
-    title:"Bubble Chart"
-
-    function randomScalingFactor() {
-        return Math.random().toFixed(1);
-    }
-
-    FluArea{
-        height: 370
-        width: 500
-        paddings: 10
-        Layout.topMargin: 20
-        FluChart{
-            anchors.fill: parent
-            chartType: 'bubble'
-            chartData: {
-                return {
-                    datasets: [{
-                            label: 'First Dataset',
-                            data: [{
-                                    x: 20,
-                                    y: 30,
-                                    r: 15
-                                }, {
-                                    x: 12,
-                                    y: 70,
-                                    r: 20
-                                }, {
-                                    x: 11,
-                                    y: 28,
-                                    r: 8
-                                }, {
-                                    x: 9,
-                                    y: 28,
-                                    r: 10
-                                }, {
-                                    x: 43,
-                                    y: 7,
-                                    r: 14
-                                }, {
-                                    x: 22,
-                                    y: 22,
-                                    r: 12
-                                }, {
-                                    x: 40,
-                                    y: 10,
-                                    r: 10
-                                }],
-                            backgroundColor: 'rgb(255, 99, 132)'
-                        }]
-                }}
-            chartOptions: {return {
-                    maintainAspectRatio: false,
-                    responsive: true,
-                    hoverMode: 'nearest',
-                    intersect: true,
-                    title: {
-                        display: true,
-                        text: 'Chart.js Bubble Chart - Multi Axis'
-                    }
-                }
-            }
-        }
-    }
-
-}

example/qml-Qt6/chart/T_LineChart.qml

@@ -1,45 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Window
-import QtQuick.Controls
-import FluentUI
-import "qrc:///example/qml/component"
-
-FluScrollablePage{
-
-    title:"Line Chart"
-
-    FluArea{
-        width: 500
-        height: 370
-        paddings: 10
-        Layout.topMargin: 20
-        FluChart{
-            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],
-                            fill: false,
-                            borderColor: 'rgb(75, 192, 192)',
-                            tension: 0.1
-                        }]
-                }
-            }
-            chartOptions: { return {
-                    maintainAspectRatio: false,
-                    title: {
-                        display: true,
-                        text: 'Chart.js Line Chart - Stacked'
-                    },
-                    tooltips: {
-                        mode: 'index',
-                        intersect: false
-                    }
-                }
-            }
-        }
-    }
-}

example/qml-Qt6/chart/T_PieChart.qml

@@ -1,93 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Window
-import QtQuick.Controls
-import FluentUI
-import "qrc:///example/qml/component"
-
-FluScrollablePage{
-
-    title:"Doughnut and Pie Chart"
-
-    FluArea{
-        width: 500
-        height: 370
-        paddings: 10
-        Layout.topMargin: 20
-        FluChart{
-            anchors.fill: parent
-            chartType: "doughnut"
-            chartData: { return {
-                    labels: [
-                        'Red',
-                        'Blue',
-                        'Yellow'
-                    ],
-                    datasets: [{
-                            label: 'My First Dataset',
-                            data: [300, 50, 100],
-                            backgroundColor: [
-                                'rgb(255, 99, 132)',
-                                'rgb(54, 162, 235)',
-                                'rgb(255, 205, 86)'
-                            ],
-                            hoverOffset: 4
-                        }]
-                }
-            }
-            chartOptions: { return {
-                    maintainAspectRatio: false,
-                    title: {
-                        display: true,
-                        text: 'Chart.js Doughnut Chart - Stacked'
-                    },
-                    tooltips: {
-                        mode: 'index',
-                        intersect: false
-                    }
-                }
-            }
-        }
-    }
-
-    FluArea{
-        width: 500
-        height: 370
-        paddings: 10
-        Layout.topMargin: 20
-        FluChart{
-            anchors.fill: parent
-            chartType: "pie"
-            chartData: { return {
-                    labels: [
-                        'Red',
-                        'Blue',
-                        'Yellow'
-                    ],
-                    datasets: [{
-                            label: 'My First Dataset',
-                            data: [300, 50, 100],
-                            backgroundColor: [
-                                'rgb(255, 99, 132)',
-                                'rgb(54, 162, 235)',
-                                'rgb(255, 205, 86)'
-                            ],
-                            hoverOffset: 4
-                        }]
-                }
-            }
-            chartOptions: { return {
-                    maintainAspectRatio: false,
-                    title: {
-                        display: true,
-                        text: 'Chart.js Pie Chart - Stacked'
-                    },
-                    tooltips: {
-                        mode: 'index',
-                        intersect: false
-                    }
-                }
-            }
-        }
-    }
-}

example/qml-Qt6/chart/T_PolarAreaChart.qml

@@ -1,57 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Window
-import QtQuick.Controls
-import FluentUI
-import "qrc:///example/qml/component"
-
-FluScrollablePage{
-
-    title:"PolarArea Chart"
-
-    FluArea{
-        width: 500
-        height: 370
-        paddings: 10
-        Layout.topMargin: 20
-        FluChart{
-            anchors.fill: parent
-            chartType: 'polarArea'
-            chartData: { return {
-                    labels: [
-                        'Red',
-                        'Green',
-                        'Yellow',
-                        'Grey',
-                        'Blue'
-                    ],
-                    datasets: [{
-                            label: 'My First Dataset',
-                            data: [11, 16, 7, 3, 14],
-                            backgroundColor: [
-                                'rgb(255, 99, 132)',
-                                'rgb(75, 192, 192)',
-                                'rgb(255, 205, 86)',
-                                'rgb(201, 203, 207)',
-                                'rgb(54, 162, 235)'
-                            ]
-                        }]
-                }
-            }
-
-            chartOptions: { return {
-                    maintainAspectRatio: false,
-                    title: {
-                        display: true,
-                        text: 'Chart.js PolarArea Chart - Stacked'
-                    },
-                    tooltips: {
-                        mode: 'index',
-                        intersect: false
-                    }
-                }
-            }
-        }
-    }
-
-}

example/qml-Qt6/chart/T_RadarChart.qml

@@ -1,74 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Window
-import QtQuick.Controls
-import FluentUI
-import "qrc:///example/qml/component"
-
-FluScrollablePage{
-
-    title:"Radar Chart"
-
-    FluArea{
-        width: 500
-        height: 370
-        paddings: 10
-        Layout.topMargin: 20
-        FluChart{
-            anchors.fill: parent
-            chartType: 'radar'
-            chartData: { return {
-                    labels: [
-                        'Eating',
-                        'Drinking',
-                        'Sleeping',
-                        'Designing',
-                        'Coding',
-                        'Cycling',
-                        'Running'
-                    ],
-                    datasets:
-                        [{
-                            label: 'My First Dataset',
-                            data: [65, 59, 90, 81, 56, 55, 40],
-                            fill: true,
-                            backgroundColor: 'rgba(255, 99, 132, 0.2)',
-                            borderColor: 'rgb(255, 99, 132)',
-                            pointBackgroundColor: 'rgb(255, 99, 132)',
-                            pointBorderColor: '#fff',
-                            pointHoverBackgroundColor: '#fff',
-                            pointHoverBorderColor: 'rgb(255, 99, 132)'
-                        }, {
-                            label: 'My Second Dataset',
-                            data: [28, 48, 40, 19, 96, 27, 100],
-                            fill: true,
-                            backgroundColor: 'rgba(54, 162, 235, 0.2)',
-                            borderColor: 'rgb(54, 162, 235)',
-                            pointBackgroundColor: 'rgb(54, 162, 235)',
-                            pointBorderColor: '#fff',
-                            pointHoverBackgroundColor: '#fff',
-                            pointHoverBorderColor: 'rgb(54, 162, 235)'
-                        }]
-                }
-            }
-            chartOptions: { return {
-                    maintainAspectRatio: false,
-                    title: {
-                        display: true,
-                        text: 'Chart.js Radar Chart - Stacked'
-                    },
-                    tooltips: {
-                        mode: 'index',
-                        intersect: false
-                    },
-                    elements: {
-                        line: {
-                            borderWidth: 3
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-}

example/qml-Qt6/chart/T_ScatterChart.qml

@@ -1,123 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Window
-import QtQuick.Controls
-import FluentUI
-import "qrc:///example/qml/component"
-
-FluScrollablePage{
-
-    title:"Scatter Chart"
-
-    function randomScalingFactor() {
-        return Math.random().toFixed(1);
-    }
-
-    FluArea{
-        height: 370
-        width: 500
-        paddings: 10
-        Layout.topMargin: 20
-        FluChart{
-            anchors.fill: parent
-            chartType: 'scatter'
-            chartData: {
-                return {
-                    datasets: [{
-                            label: 'My First dataset',
-                            xAxisID: 'x-axis-1',
-                            yAxisID: 'y-axis-1',
-                            borderColor: '#ff5555',
-                            backgroundColor: 'rgba(255,192,192,0.3)',
-                            data: [{
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }, {
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }, {
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }, {
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }, {
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }, {
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }, {
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }]
-                        }, {
-                            label: 'My Second dataset',
-                            xAxisID: 'x-axis-1',
-                            yAxisID: 'y-axis-2',
-                            borderColor: '#5555ff',
-                            backgroundColor: 'rgba(192,192,255,0.3)',
-                            data: [{
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }, {
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }, {
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }, {
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }, {
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }, {
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }, {
-                                    x: randomScalingFactor(),
-                                    y: randomScalingFactor(),
-                                }]
-                        }]
-                }}
-            chartOptions: {return {
-                    maintainAspectRatio: false,
-                    responsive: true,
-                    hoverMode: 'nearest',
-                    intersect: true,
-                    title: {
-                        display: true,
-                        text: 'Chart.js Scatter Chart - Multi Axis'
-                    },
-                    scales: {
-                        xAxes: [{
-                                position: 'bottom',
-                                gridLines: {
-                                    zeroLineColor: 'rgba(0,0,0,1)'
-                                }
-                            }],
-                        yAxes: [{
-                                type: 'linear', // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-                                display: true,
-                                position: 'left',
-                                id: 'y-axis-1',
-                            }, {
-                                type: 'linear', // only linear but allow scale type registration. This allows extensions to exist solely for log scale for instance
-                                display: true,
-                                position: 'right',
-                                reverse: true,
-                                id: 'y-axis-2',
-
-                                // grid line settings
-                                gridLines: {
-                                    drawOnChartArea: false, // only want the grid lines for one axis to show up
-                                },
-                            }],
-                    }
-                }
-            }
-        }
-    }
-
-}

example/qml-Qt6/component/CodeExpander.qml

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

example/qml-Qt6/global/ItemsFooter.qml

@@ -1,33 +0,0 @@
-pragma Singleton
-
-import QtQuick
-import FluentUI
-
-FluObject{
-
-    property var navigationView
-    property var paneItemMenu
-
-    id:footer_items
-
-    FluPaneItemSeparator{}
-
-    FluPaneItem{
-        title:Lang.about
-        icon:FluentIcons.Contact
-        onTapListener:function(){
-            FluApp.navigate("/about")
-        }
-    }
-
-    FluPaneItem{
-        title:Lang.settings
-        menuDelegate: paneItemMenu
-        icon:FluentIcons.Settings
-        url:"qrc:/example/qml/page/T_Settings.qml"
-        onTap:{
-            navigationView.push(url)
-        }
-    }
-
-}

example/qml-Qt6/global/ItemsOriginal.qml

@@ -1,520 +0,0 @@
-pragma Singleton
-
-import QtQuick
-import FluentUI
-
-FluObject{
-
-    property var navigationView
-    property var paneItemMenu
-
-    function rename(item, newName){
-        if(newName && newName.trim().length>0){
-            item.title = newName;
-        }
-    }
-
-    FluPaneItem{
-        id:item_home
-        count: 9
-        title:Lang.home
-        menuDelegate: paneItemMenu
-        infoBadge:FluBadge{
-            count: item_home.count
-        }
-        icon:FluentIcons.Home
-        url:"qrc:/example/qml/page/T_Home.qml"
-        onTap:{
-            if(navigationView.getCurrentUrl()){
-                item_home.count = 0
-            }
-            navigationView.push(url)
-        }
-    }
-
-    FluPaneItemExpander{
-        title:"PaneItemExpander Disabled"
-        iconVisible: false
-        disabled: true
-    }
-
-    FluPaneItemExpander{
-        id:item_expander_basic_input
-        title:Lang.basic_input
-        icon:FluentIcons.CheckboxComposite
-        FluPaneItem{
-            id:item_buttons
-            count: 99
-            infoBadge:FluBadge{
-                count: item_buttons.count
-            }
-            title:"Buttons"
-            menuDelegate: paneItemMenu
-            extra:({image:"qrc:/example/res/image/control/Button.png",recentlyUpdated:true,desc:"A control that responds to user input and raisesa Click event."})
-            url:"qrc:/example/qml/page/T_Buttons.qml"
-            onTap:{
-                item_buttons.count = 0
-                navigationView.push(url)
-            }
-        }
-        FluPaneItem{
-            id:item_text
-            title:"Text"
-            menuDelegate: paneItemMenu
-            count: 5
-            infoBadge:FluBadge{
-                count: item_text.count
-                color: Qt.rgba(82/255,196/255,26/255,1)
-            }
-            url:"qrc:/example/qml/page/T_Text.qml"
-            onTap:{
-                item_text.count = 0
-                navigationView.push(url)
-            }
-        }
-        FluPaneItem{
-            title:"Image"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Image.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Slider"
-            menuDelegate: paneItemMenu
-            extra:({image:"qrc:/example/res/image/control/Slider.png",recentlyUpdated:true,desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack."})
-            url:"qrc:/example/qml/page/T_Slider.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"CheckBox"
-            menuDelegate: paneItemMenu
-            extra:({image:"qrc:/example/res/image/control/Checkbox.png",recentlyUpdated:true,desc:"A control that a user can select or clear."})
-            url:"qrc:/example/qml/page/T_CheckBox.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"RadioButton"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_RadioButton.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"ToggleSwitch"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_ToggleSwitch.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"PaneItem Disabled"
-            disabled: true
-            icon: FluentIcons.Error
-        }
-    }
-
-    FluPaneItemExpander{
-        title:Lang.form
-        icon:FluentIcons.GridView
-        FluPaneItem{
-            title:"TextBox"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_TextBox.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"TimePicker"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_TimePicker.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"DatePicker"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_DatePicker.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"CalendarPicker"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_CalendarPicker.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"ColorPicker"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_ColorPicker.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"ShortcutPicker"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_ShortcutPicker.qml"
-            onTap:{ navigationView.push(url) }
-        }
-    }
-
-    FluPaneItemExpander{
-        title:Lang.surface
-        icon:FluentIcons.SurfaceHub
-        FluPaneItem{
-            title:"InfoBar"
-            menuDelegate: paneItemMenu
-            extra:({image:"qrc:/example/res/image/control/InfoBar.png",recentlyUpdated:true,desc:"An inline message to display app-wide statuschange information."})
-            url:"qrc:/example/qml/page/T_InfoBar.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Progress"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Progress.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"RatingControl"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_RatingControl.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Badge"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Badge.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Rectangle"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Rectangle.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Clip"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Clip.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"StatusView"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_StatusView.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Carousel"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Carousel.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Expander"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Expander.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"StaggeredView"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_StaggeredView.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Watermark"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Watermark.qml"
-            onTap:{ navigationView.push(url) }
-        }
-    }
-
-    FluPaneItemExpander{
-        title:Lang.popus
-        icon:FluentIcons.ButtonMenu
-        FluPaneItem{
-            title:"Dialog"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Dialog.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            id:item_combobox
-            title:"ComboBox"
-            menuDelegate: paneItemMenu
-            count: 9
-            infoBadge:FluBadge{
-                count: item_combobox.count
-                color: Qt.rgba(250/255,173/255,20/255,1)
-            }
-            url:"qrc:/example/qml/page/T_ComboBox.qml"
-            onTap:{
-                item_combobox.count = 0
-                navigationView.push("qrc:/example/qml/page/T_ComboBox.qml")
-            }
-        }
-        FluPaneItem{
-            title:"Tooltip"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Tooltip.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Menu"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Menu.qml"
-            onTap:{ navigationView.push(url) }
-        }
-    }
-
-    FluPaneItemExpander{
-        title:Lang.navigation
-        icon:FluentIcons.AllApps
-        FluPaneItem{
-            title:"Pivot"
-            menuDelegate: paneItemMenu
-            extra:({image:"qrc:/example/res/image/control/Pivot.png",order:3,recentlyAdded:true,desc:"Presents information from different sources in atabbed view."})
-            url:"qrc:/example/qml/page/T_Pivot.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"BreadcrumbBar"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_BreadcrumbBar.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"TabView"
-            menuDelegate: paneItemMenu
-            extra:({image:"qrc:/example/res/image/control/TabView.png",order:1,recentlyAdded:true,desc:"A control that displays a collection of tabs thatcan be used to display several documents."})
-            url:"qrc:/example/qml/page/T_TabView.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"TreeView"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_TreeView.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"TableView"
-            menuDelegate: paneItemMenu
-            extra:({image:"qrc:/example/res/image/control/DataGrid.png",order:4,recentlyAdded:true,desc:"The TableView control provides a flexible way to display a collection of data in rows and columns"})
-            url:"qrc:/example/qml/page/T_TableView.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Pagination"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Pagination.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"MultiWindow"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_MultiWindow.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"FlipView"
-            menuDelegate: paneItemMenu
-            extra:({image:"qrc:/example/res/image/control/FlipView.png",order:2,recentlyAdded:true,desc:"Presents a collection of items that the user canflip through, one item at a time."})
-            url:"qrc:/example/qml/page/T_FlipView.qml"
-            onTap:{ navigationView.push(url) }
-        }
-    }
-
-    FluPaneItemExpander{
-        title:Lang.theming
-        icon:FluentIcons.Brightness
-        FluPaneItem{
-            title:"Acrylic"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Acrylic.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Theme"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Theme.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Typography"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Typography.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Awesome"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Awesome.qml"
-            onTap:{ navigationView.push(url) }
-        }
-    }
-
-    FluPaneItemExpander{
-        title: Lang.chart
-        icon:FluentIcons.AreaChart
-        FluPaneItem{
-            title:Lang.bar_chart
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/chart/T_BarChart.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:Lang.line_chart
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/chart/T_LineChart.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:Lang.pie_chart
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/chart/T_PieChart.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:Lang.polar_area_chart
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/chart/T_PolarAreaChart.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:Lang.bubble_chart
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/chart/T_BubbleChart.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:Lang.scatter_chart
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/chart/T_ScatterChart.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:Lang.radar_chart
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/chart/T_RadarChart.qml"
-            onTap:{ navigationView.push(url) }
-        }
-    }
-
-    FluPaneItemSeparator{
-        spacing:10
-        size:1
-    }
-
-    FluPaneItemExpander{
-        title:Lang.other
-        icon:FluentIcons.Shop
-        FluPaneItem{
-            title:"QRCode"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_QRCode.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Tour"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Tour.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Timeline"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Timeline.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Screenshot(Todo)"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Screenshot.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Captcha"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Captcha.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            title:"Network"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_Network.qml"
-            onTap:{ navigationView.push(url) }
-        }
-        FluPaneItem{
-            id:item_other
-            title:"RemoteLoader"
-            menuDelegate: paneItemMenu
-            count: 99