update

补交漏掉的FluEditableText.qml

.cmake/GetGitRevisionDescription.cmake

@@ -0,0 +1,317 @@
+if(__get_git_revision_description)
+    return()
+endif()
+set(__get_git_revision_description YES)
+
+get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+
+function(_git_find_closest_git_dir _start_dir _git_dir_var)
+    set(cur_dir "${_start_dir}")
+    set(git_dir "${_start_dir}/.git")
+    while(NOT EXISTS "${git_dir}")
+        set(git_previous_parent "${cur_dir}")
+        get_filename_component(cur_dir ${cur_dir} DIRECTORY)
+        if(cur_dir STREQUAL git_previous_parent)
+            set(${_git_dir_var}
+                ""
+                PARENT_SCOPE)
+            return()
+        endif()
+        set(git_dir "${cur_dir}/.git")
+    endwhile()
+    set(${_git_dir_var}
+        "${git_dir}"
+        PARENT_SCOPE)
+endfunction()
+
+function(get_git_head_revision _refspecvar _hashvar)
+    _git_find_closest_git_dir("${CMAKE_CURRENT_SOURCE_DIR}" GIT_DIR)
+
+    if("${ARGN}" STREQUAL "ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR")
+        set(ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR TRUE)
+    else()
+        set(ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR FALSE)
+    endif()
+    if(NOT "${GIT_DIR}" STREQUAL "")
+        file(RELATIVE_PATH _relative_to_source_dir "${CMAKE_SOURCE_DIR}"
+             "${GIT_DIR}")
+        if("${_relative_to_source_dir}" MATCHES "[.][.]" AND NOT ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR)
+            set(GIT_DIR "")
+        endif()
+    endif()
+    if("${GIT_DIR}" STREQUAL "")
+        set(${_refspecvar}
+            "GITDIR-NOTFOUND"
+            PARENT_SCOPE)
+        set(${_hashvar}
+            "GITDIR-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    if(NOT IS_DIRECTORY ${GIT_DIR})
+        execute_process(
+            COMMAND "${GIT_EXECUTABLE}" rev-parse
+                    --show-superproject-working-tree
+            WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+            OUTPUT_VARIABLE out
+            ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+        if(NOT "${out}" STREQUAL "")
+            file(READ ${GIT_DIR} submodule)
+            string(REGEX REPLACE "gitdir: (.*)$" "\\1" GIT_DIR_RELATIVE
+                                 ${submodule})
+            string(STRIP ${GIT_DIR_RELATIVE} GIT_DIR_RELATIVE)
+            get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
+            get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE}
+                                   ABSOLUTE)
+            set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD")
+        else()
+            file(READ ${GIT_DIR} worktree_ref)
+            string(REGEX REPLACE "gitdir: (.*)$" "\\1" git_worktree_dir
+                                 ${worktree_ref})
+            string(STRIP ${git_worktree_dir} git_worktree_dir)
+            _git_find_closest_git_dir("${git_worktree_dir}" GIT_DIR)
+            set(HEAD_SOURCE_FILE "${git_worktree_dir}/HEAD")
+        endif()
+    else()
+        set(HEAD_SOURCE_FILE "${GIT_DIR}/HEAD")
+    endif()
+    set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
+    if(NOT EXISTS "${GIT_DATA}")
+        file(MAKE_DIRECTORY "${GIT_DATA}")
+    endif()
+
+    if(NOT EXISTS "${HEAD_SOURCE_FILE}")
+        return()
+    endif()
+    set(HEAD_FILE "${GIT_DATA}/HEAD")
+    configure_file("${HEAD_SOURCE_FILE}" "${HEAD_FILE}" COPYONLY)
+
+    configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
+                   "${GIT_DATA}/grabRef.cmake" @ONLY)
+    include("${GIT_DATA}/grabRef.cmake")
+
+    set(${_refspecvar}
+        "${HEAD_REF}"
+        PARENT_SCOPE)
+    set(${_hashvar}
+        "${HEAD_HASH}"
+        PARENT_SCOPE)
+endfunction()
+
+function(git_latest_tag _var)
+    if(NOT GIT_FOUND)
+        find_package(Git QUIET)
+    endif()
+    if(NOT GIT_FOUND)
+        set(${_var}
+            "GIT-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+    execute_process(
+        COMMAND "${GIT_EXECUTABLE}" describe --abbrev=0 --tag
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE res
+        OUTPUT_VARIABLE out
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT res EQUAL 0)
+        set(out "GIT-TAG-NOTFOUND")
+    endif()
+
+    set(${_var}
+        "${out}"
+        PARENT_SCOPE)
+endfunction()
+
+function(git_commit_counts _var)
+    if(NOT GIT_FOUND)
+        find_package(Git QUIET)
+    endif()
+    if(NOT GIT_FOUND)
+        set(${_var}
+            "GIT-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+    execute_process(
+        COMMAND "${GIT_EXECUTABLE}" rev-list HEAD --count
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE res
+        OUTPUT_VARIABLE out
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT res EQUAL 0)
+        set(out "GIT-TAG-NOTFOUND")
+    endif()
+
+    set(${_var}
+        "${out}"
+        PARENT_SCOPE)
+endfunction()
+
+function(git_describe _var)
+    if(NOT GIT_FOUND)
+        find_package(Git QUIET)
+    endif()
+    get_git_head_revision(refspec hash ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR)
+    if(NOT GIT_FOUND)
+        set(${_var}
+            "GIT-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+    if(NOT hash)
+        set(${_var}
+            "HEAD-HASH-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    execute_process(
+        COMMAND "${GIT_EXECUTABLE}" describe --tags --always ${hash} ${ARGN}
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE res
+        OUTPUT_VARIABLE out
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT res EQUAL 0)
+        set(out "${out}-${res}-NOTFOUND")
+    endif()
+
+    set(${_var}
+        "${out}"
+        PARENT_SCOPE)
+endfunction()
+
+function(git_release_version _var)
+    if(NOT GIT_FOUND)
+        find_package(Git QUIET)
+    endif()
+    get_git_head_revision(refspec hash ALLOW_LOOKING_ABOVE_CMAKE_SOURCE_DIR)
+    if(NOT GIT_FOUND)
+        set(${_var}
+            "GIT-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+    if(NOT hash)
+        set(${_var}
+            "HEAD-HASH-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    execute_process(
+        COMMAND "${GIT_EXECUTABLE}" symbolic-ref --short -q HEAD
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE res
+        OUTPUT_VARIABLE out
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT res EQUAL 0)
+        set(out "${out}-${res}-NOTFOUND")
+    endif()
+
+    string(FIND ${out} "release/" found})
+    if(${out} MATCHES "^release/.+$")
+        string(REPLACE "release/" "" tmp_out ${out})
+        set(${_var} "${tmp_out}" PARENT_SCOPE)
+    else()
+        set(${_var} "" PARENT_SCOPE)
+    endif()
+endfunction()
+
+function(git_describe_working_tree _var)
+    if(NOT GIT_FOUND)
+        find_package(Git QUIET)
+    endif()
+    if(NOT GIT_FOUND)
+        set(${_var}
+            "GIT-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    execute_process(
+        COMMAND "${GIT_EXECUTABLE}" describe --dirty ${ARGN}
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE res
+        OUTPUT_VARIABLE out
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT res EQUAL 0)
+        set(out "${out}-${res}-NOTFOUND")
+    endif()
+
+    set(${_var}
+        "${out}"
+        PARENT_SCOPE)
+endfunction()
+
+function(git_get_exact_tag _var)
+    git_describe(out --exact-match ${ARGN})
+    set(${_var}
+        "${out}"
+        PARENT_SCOPE)
+endfunction()
+
+function(git_local_changes _var)
+    if(NOT GIT_FOUND)
+        find_package(Git QUIET)
+    endif()
+    get_git_head_revision(refspec hash)
+    if(NOT GIT_FOUND)
+        set(${_var}
+            "GIT-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+    if(NOT hash)
+        set(${_var}
+            "HEAD-HASH-NOTFOUND"
+            PARENT_SCOPE)
+        return()
+    endif()
+
+    execute_process(
+        COMMAND "${GIT_EXECUTABLE}" diff-index --quiet HEAD --
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        RESULT_VARIABLE res
+        OUTPUT_VARIABLE out
+        ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(res EQUAL 0)
+        set(${_var}
+            "CLEAN"
+            PARENT_SCOPE)
+    else()
+        set(${_var}
+            "DIRTY"
+            PARENT_SCOPE)
+    endif()
+endfunction()
+
+git_release_version(GIT_TAG)
+git_get_exact_tag(GIT_EXACT_TAG)
+if(GIT_TAG STREQUAL "")
+    git_latest_tag(GIT_TAG)
+endif()
+if(GIT_TAG STREQUAL "GIT-TAG-NOTFOUND")
+    set(GIT_TAG "1.0.0")
+endif ()
+git_describe(GIT_DESCRIBE)
+git_commit_counts(GIT_COMMIT_COUNT)
+_git_find_closest_git_dir("${CMAKE_CURRENT_SOURCE_DIR}" GIT_DIR)
+if(NOT IS_DIRECTORY ${GIT_DIR})
+  message(STATUS "Current .git not exist")
+  set(GIT_COMMIT_COUNT "1")
+  set(GIT_DESCRIBE "1.0.0")
+  set(GIT_TAG "1.0.0")
+else()
+  message(STATUS "Current .git exist")
+endif()
+string(REPLACE "." "," GIT_TAG_WITH_COMMA ${GIT_TAG})
+string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" GIT_SEMVER "${GIT_TAG}")
+string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" SEMVER_SPLITED "${GIT_SEMVER}")
+set(MAJOR_VERSION ${CMAKE_MATCH_1})
+set(MINOR_VERSION ${CMAKE_MATCH_2})
+set(PATCH_VERSION ${CMAKE_MATCH_3})
+MATH(EXPR VERSION_COUNTER "${MAJOR_VERSION} * 10000 + ${MINOR_VERSION} * 100 + ${PATCH_VERSION}")
+message(STATUS "Current git tag: ${GIT_TAG}, commit count: ${GIT_COMMIT_COUNT}, describe: ${GIT_DESCRIBE}")
+message(STATUS "Current semver: major: ${MAJOR_VERSION}, minor: ${MINOR_VERSION}, patch: ${PATCH_VERSION}, counter: ${VERSION_COUNTER}")

.cmake/GetGitRevisionDescription.cmake.in

@@ -0,0 +1,43 @@
+#
+# Internal file for GetGitRevisionDescription.cmake
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright 2009-2012, Iowa State University
+# Copyright 2011-2015, Contributors
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+# SPDX-License-Identifier: BSL-1.0
+
+set(HEAD_HASH)
+
+file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
+
+string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
+if(HEAD_CONTENTS MATCHES "ref")
+	# named branch
+	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
+	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
+		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+	else()
+		configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
+		file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
+		if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
+			set(HEAD_HASH "${CMAKE_MATCH_1}")
+		endif()
+	endif()
+else()
+	# detached HEAD
+	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
+endif()
+
+if(NOT HEAD_HASH)
+	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
+	string(STRIP "${HEAD_HASH}" HEAD_HASH)
+endif()

.cmake/QmlPlugin.cmake

@@ -0,0 +1,139 @@
+include(CMakeParseArguments)
+find_package(Qt5 REQUIRED COMPONENTS Core)
+
+function(FindQmlPluginDump)
+    get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
+    execute_process(
+        COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_BINS
+        OUTPUT_VARIABLE QT_BIN_DIR
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+endfunction()
+
+function(FindQtInstallQml)
+    execute_process(
+        COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_QML
+        OUTPUT_VARIABLE PROC_RESULT
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+set(QT_INSTALL_QML ${PROC_RESULT} PARENT_SCOPE)
+endfunction()
+
+function(add_qmlplugin TARGET)
+    set(options NO_AUTORCC NO_AUTOMOC)
+    set(oneValueArgs URI VERSION BINARY_DIR QMLDIR LIBTYPE)
+    set(multiValueArgs SOURCES QMLFILES QMLFILESALIAS)
+    cmake_parse_arguments(QMLPLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+    if(NOT QMLPLUGIN_URI OR NOT QMLPLUGIN_VERSION OR NOT QMLPLUGIN_QMLDIR OR NOT QMLPLUGIN_LIBTYPE)
+        message(WARNING "TARGET,URI,VERSION,qmldir and LIBTYPE must be set, no files generated")
+        return()
+    endif()
+    if(NOT QMLPLUGIN_BINARY_DIR)
+        set(QMLPLUGIN_BINARY_DIR ${CMAKE_BINARY_DIR}/${QMLPLUGIN_URI})
+    endif()
+    add_library(${TARGET} ${QMLPLUGIN_LIBTYPE}
+        ${QMLPLUGIN_SOURCES}
+    )
+set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib)
+add_custom_target("${TARGET}-qmlfiles" SOURCES ${QMLPLUGIN_QMLFILES})
+
+if(QMLPLUGIN_NO_AUTORCC)
+    set_target_properties(${TARGET} PROPERTIES AUTOMOC OFF)
+else()
+    set_target_properties(${TARGET} PROPERTIES AUTOMOC ON)
+endif()
+if(QMLPLUGIN_NO_AUTOMOC)
+    set_target_properties(${TARGET} PROPERTIES AUTOMOC OFF)
+else()
+    set_target_properties(${TARGET} PROPERTIES AUTOMOC ON)
+endif()
+
+if (${QMLPLUGIN_LIBTYPE} MATCHES "SHARED")
+    FindQmlPluginDump()
+    FindQtInstallQml()
+    if(QMLPLUGIN_BINARY_DIR)
+        set(MAKE_QMLPLUGINDIR_COMMAND ${CMAKE_COMMAND} -E make_directory ${QMLPLUGIN_BINARY_DIR})
+    endif()
+    set(COPY_QMLDIR_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/Qt5/${QMLPLUGIN_QMLDIR}/qmldir $<TARGET_FILE_DIR:${TARGET}>/${QMLPLUGIN_URI}/qmldir)
+    set(INSTALL_QMLDIR_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/Qt5/${QMLPLUGIN_QMLDIR}/qmldir ${QMLPLUGIN_BINARY_DIR}/qmldir)
+    set(COPY_QMLTYPES_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/Qt5/${QMLPLUGIN_QMLDIR}/plugins.qmltypes $<TARGET_FILE_DIR:${TARGET}>/${QMLPLUGIN_URI}/plugins.qmltypes)
+    set(INSTALL_QMLTYPES_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/Qt5/${QMLPLUGIN_QMLDIR}/plugins.qmltypes ${QMLPLUGIN_BINARY_DIR}/plugins.qmltypes)
+    set(COPY_LIBRARY_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_NAME:${TARGET}> $<TARGET_FILE_DIR:${TARGET}>/${QMLPLUGIN_URI})
+    set(INSTALL_LIBRARY_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_NAME:${TARGET}> ${QMLPLUGIN_BINARY_DIR})
+    if(QMLPLUGIN_QMLDIR)
+        set(COPY_QMLFILES_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_LIST_DIR}/Qt5/${QMLPLUGIN_QMLDIR} $<TARGET_FILE_DIR:${TARGET}>/${QMLPLUGIN_URI})
+    else()
+        set(COPY_QMLFILES_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/${QMLPLUGIN_QMLFILES} $<TARGET_FILE_DIR:${TARGET}>/${QMLPLUGIN_URI})
+    endif()
+    set(INSTALL_QMLFILES_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_LIST_DIR}/Qt5/${QMLPLUGIN_QMLDIR} ${QMLPLUGIN_BINARY_DIR})
+    if(QMLPLUGIN_BINARY_DIR)
+        add_custom_command(
+            TARGET ${TARGET}
+            POST_BUILD
+            COMMAND ${MAKE_QMLPLUGINDIR_COMMAND}
+            COMMAND ${COPY_QMLDIR_COMMAND}
+            COMMENT "Copying qmldir to binary directory"
+        )
+else()
+    add_custom_command(
+        TARGET ${TARGET}
+        POST_BUILD
+        COMMAND ${COPY_QMLDIR_COMMAND}
+        COMMENT "Copying qmldir to binary directory"
+    )
+endif()
+
+if(QMLPLUGIN_BINARY_DIR)
+    add_custom_command(
+        TARGET ${TARGET}
+        POST_BUILD
+        COMMAND ${MAKE_QMLPLUGINDIR_COMMAND}
+        COMMAND ${COPY_QMLTYPES_COMMAND}
+        COMMENT "Copying qmltypes to binary directory"
+    )
+else()
+    add_custom_command(
+        TARGET ${TARGET}
+        POST_BUILD
+        COMMAND ${COPY_QMLTYPES_COMMAND}
+        COMMENT "Copying qmltypes to binary directory"
+    )
+endif()
+
+add_custom_command(
+    TARGET ${TARGET}
+    POST_BUILD
+    COMMAND ${COPY_LIBRARY_COMMAND}
+    COMMENT "Copying Lib to binary plugin directory"
+)
+
+if(QMLPLUGIN_QMLFILES)
+    add_custom_command(
+        TARGET ${TARGET}
+        POST_BUILD
+        COMMAND ${COPY_QMLFILES_COMMAND}
+        COMMENT "Copying QML files to binary directory"
+    )
+endif()
+
+add_custom_command(
+    TARGET ${TARGET}
+    POST_BUILD
+    COMMAND ${GENERATE_QMLTYPES_COMMAND}
+    COMMENT "Generating plugin.qmltypes"
+)
+
+string(REPLACE "." "/" QMLPLUGIN_INSTALL_URI ${QMLPLUGIN_URI})
+
+add_custom_command(
+    TARGET ${TARGET}
+    POST_BUILD
+    COMMAND ${INSTALL_QMLTYPES_COMMAND}
+    COMMAND ${INSTALL_QMLDIR_COMMAND}
+    COMMAND ${INSTALL_LIBRARY_COMMAND}
+    COMMAND ${INSTALL_QMLFILES_COMMAND}
+    COMMAND ${INSTALL_QMLTYPES_COMMAND}
+    COMMENT "Install library and aditional files"
+)
+endif()
+endfunction()

.cmake/Version.h.in

@@ -0,0 +1,12 @@
+// 应用程序版本信息
+// 请勿修改此头文件，因为这个文件是自动生成的
+#ifndef VERSION_H
+#define VERSION_H
+
+#include <QtGlobal>
+
+#define APPLICATION_VERSION "${GIT_SEMVER}.${GIT_COMMIT_COUNT}"
+#define VERSION_COUNTER ${GIT_COMMIT_COUNT}
+#define COMMIT_HASH "${GIT_DESCRIBE}"
+
+#endif  // VERSION_H

.cmake/version_dll.rc.in

@@ -0,0 +1,32 @@
+1 VERSIONINFO
+ FILEVERSION ${GIT_TAG_WITH_COMMA},${GIT_COMMIT_COUNT}
+ PRODUCTVERSION ${GIT_TAG_WITH_COMMA},${GIT_COMMIT_COUNT}
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "080404b0"
+        BEGIN
+            VALUE "CompanyName", "ZhuZiChu"
+            VALUE "FileDescription", "${PROJECT_DESCRIPTION}"
+            VALUE "FileVersion", "${GIT_SEMVER}.${GIT_COMMIT_COUNT}"
+            VALUE "InternalName", "${PROJECT_NAME}.dll"
+            VALUE "LegalCopyright", "Copyright (C) 2023 ZhuZiChu. All rights reserved."
+            VALUE "OriginalFilename", "${PROJECT_NAME}.dll"
+            VALUE "ProductName", "${PROJECT_NAME}"
+            VALUE "ProductVersion", "${GIT_SEMVER}.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x804, 1200
+    END
+END

.cmake/version_exe.rc.in

@@ -0,0 +1,34 @@
+1 VERSIONINFO
+ FILEVERSION ${GIT_TAG_WITH_COMMA},${GIT_COMMIT_COUNT}
+ PRODUCTVERSION ${GIT_TAG_WITH_COMMA},${GIT_COMMIT_COUNT}
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "080404b0"
+        BEGIN
+            VALUE "CompanyName", "ZhuZiChu"
+            VALUE "FileDescription", "${PROJECT_DESCRIPTION}"
+            VALUE "FileVersion", "${GIT_SEMVER}.${GIT_COMMIT_COUNT}"
+            VALUE "InternalName", "${PROJECT_NAME}.exe"
+            VALUE "LegalCopyright", "Copyright (C) 2023 ZhuZiChu. All rights reserved."
+            VALUE "OriginalFilename", "${PROJECT_NAME}.exe"
+            VALUE "ProductName", "${PROJECT_NAME}"
+            VALUE "ProductVersion", "${GIT_SEMVER}.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x804, 1200
+    END
+END
+
+IDI_ICON1 ICON DISCARDABLE "${CMAKE_SOURCE_DIR}/example/favicon.ico"

.github/workflows/macos.yml

@@ -2,14 +2,19 @@ name: MacOS
 on: 
   push:
     paths:
-      - '*.pro'
+      - '*.txt'
+      - 'example/**'
       - 'src/**'
+      - 'scripts/**'
       - '.github/workflows/macos.yml'
   pull_request:
     paths:
-      - '*.pro'
+      - '*.txt'
+      - 'example/**'
       - 'src/**'
+      - 'scripts/**'
       - '.github/workflows/macos.yml' 
+      
 jobs:
   build:
     name: Build
@@ -17,17 +22,16 @@ jobs:
     strategy:
       matrix:
         os: [macos-12]
-        qt_ver: [6.4.3]
+        qt_ver: [6.5.0]
         qt_arch: [clang_64]
     env:
       targetName: example
     steps:
-      - name: '⚙️ Cache Qt'
-        id: cache-qt
-        uses: actions/cache@v3
+      - name: Check out repository
+        uses: actions/checkout@v3
         with:
-          path: ${{ runner.workspace }}/Qt
-          key: ${{runner.os}}-qtcachedir-${{ matrix.qt_ver }}
+          submodules: recursive
+          
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
@@ -35,24 +39,30 @@ jobs:
           cache: ${{steps.cache-qt.outputs.cache-hit}}
           arch: ${{ matrix.qt_arch }}
           modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
-      - uses: actions/checkout@v2
+          
+      - name: Set up Ninja
+        uses: seanmiddleditch/gha-setup-ninja@v3
         with:
-          fetch-depth: 1
+          version: 1.10.2
+          
       - name: build macos
         run: |
-          qmake
-          make
-      # 打包
+          cmake --version
+          mkdir build
+          cd build
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/Users/runner/work/FluentUI/Qt/6.5.0/macos -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
+          cmake --build . --target all --config Release --parallel
+          
       - name: package
         run: |
           # 拷贝依赖
-          macdeployqt bin/release/${targetName}.app -qmldir=. -verbose=1 -dmg
-      # 上传artifacts          
+          macdeployqt bin/release/${targetName}.app -qmldir=. -verbose=1 -dmg     
+          
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}.zip
           path: bin/release/${{ env.targetName }}.app
-      # tag 上传Release
+          
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2

.github/workflows/ubuntu.yml

@@ -1,17 +1,21 @@
 name: Ubuntu
-# Qt官方没有linux平台的x86包
 on: 
   workflow_dispatch:
   push:
     paths:
-      - '*.pro'
+      - '*.txt'
       - 'src/**'
+      - 'example/**'
+      - 'scripts/**'
       - '.github/workflows/ubuntu.yml'
   pull_request:
     paths:
-      - '*.pro'
+      - '*.txt'
       - 'src/**'
-      - '.github/workflows/ubuntu.yml' 
+      - 'example/**'
+      - 'scripts/**'
+      - '.github/workflows/ubuntu.yml'
+      
 jobs:
   build:
     name: Build
@@ -19,17 +23,16 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        qt_ver: [6.4.3]
+        qt_ver: [6.5.0]
         qt_arch: [gcc_64]
     env:
       targetName: example
     steps:
-      - name: '⚙️ Cache Qt'
-        id: cache-qt
-        uses: actions/cache@v3
+      - name: Check out repository
+        uses: actions/checkout@v3
         with:
-          path: ${{ runner.workspace }}/Qt
-          key: ${{runner.os}}-qtcachedir-${{ matrix.qt_ver }}
+          submodules: recursive
+          
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
@@ -37,35 +40,45 @@ jobs:
           cache: ${{steps.cache-qt.outputs.cache-hit}}
           arch: ${{ matrix.qt_arch }}
           modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
-      - name: ubuntu install GL library
-        run: sudo apt-get install -y libglew-dev libglfw3-dev qml-module-qtquick-controls qml-module-qtquick-controls2
-      - uses: actions/checkout@v2
+      
+      - name: Set up Ninja
+        uses: seanmiddleditch/gha-setup-ninja@v3
         with:
-          fetch-depth: 1
+          version: 1.10.2
+          
+      - 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: build ubuntu
         run: |
-          qmake
-          make
+          ninja --version
+          cmake --version
+          mkdir build
+          cd build
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=/home/runner/work/FluentUI/Qt/6.5.0/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
         uses: miurahr/install-linuxdeploy-action@v1
         with:
           plugins: qt appimage
+          
       - name: Check if svg file exists
         run: if [ ! -f "${targetName}.svg" ]; then echo "File not found, creating..."; touch ${targetName}.svg; fi
-      # 打包
+
       - name: package
         run: |
           # make sure Qt plugin finds QML sources so it can deploy the imported files
-          export QML_SOURCES_PATHS=src
+          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/
           mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}.AppImage
-      # 上传artifacts          
+        
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}
           path: ${{ env.targetName }}.AppImage
-      # tag 上传Release
+
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2

.github/workflows/windows-mingw.yml

@@ -2,14 +2,19 @@ name: Windows MinGW
 on: 
   push:
     paths:
-      - '*.pro'
+      - '*.txt'
       - 'src/**'
+      - 'example/**'
+      - 'scripts/**'
       - '.github/workflows/windows-mingw.yml'
   pull_request:
     paths:
-      - '*.pro'
+      - '*.txt'
+      - 'example/**'
       - 'src/**'
-      - '.github/workflows/windows-mingw.yml' 
+      - 'scripts/**'
+      - '.github/workflows/windows-mingw.yml'
+      
 jobs:
   build:
     name: Build
@@ -18,13 +23,18 @@ jobs:
       matrix:
         include:
           - qt_arch: win64_mingw
-            qt_ver: 6.4.3
+            qt_ver: 6.5.0
             qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900"
             qt_tools_mingw_install: mingw900_64
     env:
       targetName: example.exe
       fileName: example
     steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
@@ -32,26 +42,29 @@ jobs:
           arch: ${{ matrix.qt_arch }}
           cache: ${{steps.cache-qt.outputs.cache-hit}}
           modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
+      
       - name: Qt6 environment configuration
         if: ${{ startsWith( matrix.qt_ver, 6 ) }}
         shell: pwsh
         run: |
           Write-Output "${{ env.Qt6_DIR }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           Write-Output "${{ env.Qt6_DIR }}/../../Tools/${{ matrix.qt_tools_mingw_install }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      - name: where is qmake & where is mingw32-make
+      
+      - name: where is cmake & where is mingw32-make
         shell: pwsh
         run: |
-          Get-Command -Name 'qmake' | Format-List
+          Get-Command -Name 'cmake' | Format-List
           Get-Command -Name 'mingw32-make' | Format-List
+      
       - name: mingw-build
         id: build
         shell: cmd
         run: |
-          qmake
-          mingw32-make
+          mkdir build
+          cd build
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.5.0\mingw_64 -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=Release -GNinja ..
+          cmake --build . --target all --config Release --parallel
+      
       - name: package
         id: package      
         env:
@@ -61,10 +74,12 @@ jobs:
           & scripts\windows-mingw-publish.ps1 ${env:archiveName} ${env:targetName}
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name"       
+      
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.package.outputs.packageName }}
           path: ${{ steps.package.outputs.packageName }}
+      
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2

.github/workflows/windows.yml

@@ -1,68 +1,63 @@
 name: Windows
 on: 
-  # push代码时触发workflow
   push:
     paths:
-      - '*.pro'
+      - '*.txt'
       - 'src/**'
+      - 'example/**'
+      - 'scripts/**'
       - '.github/workflows/windows.yml'
   pull_request:
     paths:
-      - '*.pro'
+      - '*.txt'
+      - 'example/**'
       - 'src/**'
-      - '.github/workflows/windows.yml' 
+      - 'scripts/**'
+      - '.github/workflows/windows.yml'
+      
 jobs:
   build:
     name: Build
-    # 运行平台， windows-latest目前是windows server 2019 
-    # 参考文档 https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md
     runs-on: ${{ matrix.os }}
     strategy:
-      # 矩阵配置
       matrix:
         os: [windows-2019]
         include:
-          - qt_ver: 6.4.3          
+          - qt_ver: 6.5.0        
             qt_arch: win64_msvc2019_64
             msvc_arch: x64
             qt_arch_install: msvc2019_64          
     env:
       targetName: example.exe
       fileName: example
-    # 步骤
     steps:
-      - name: '⚙️ Cache Qt'
-        id: cache-qt
-        uses: actions/cache@v3
+      - name: Check out repository
+        uses: actions/checkout@v3
         with:
-          path: ${{ runner.workspace }}\Qt
-          key: ${{runner.os}}-qtcachedir-${{ matrix.qt_ver }}
-      # 安装Qt
+          submodules: recursive
+             
       - name: Install Qt
-        # 使用外部action。这个action专门用来安装Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
           arch: ${{ matrix.qt_arch }}
           cache: ${{steps.cache-qt.outputs.cache-hit}}
-          modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
-      # 拉取代码
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
-      # msvc编译
+          modules: 'qt5compat qtmultimedia qtshadertools qtimageformats qtspeech'
+          
       - name: msvc-build
         id: build
         shell: cmd
         run: |
           call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.msvc_arch }}
-          qmake
-          nmake
+          mkdir build
+          cd build
+          cmake -DCMAKE_MESSAGE_LOG_LEVEL=STATUS -DCMAKE_PREFIX_PATH=D:\a\FluentUI\Qt\6.5.0\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%
           echo vcToolsInstallDir=%VCToolsInstallDir% >> %GITHUB_ENV%
           echo vcToolsRedistDir=%VCToolsRedistDir% >> %GITHUB_ENV%
-      # 打包 
+          
       - name: package
         id: package      
         env:
@@ -73,14 +68,13 @@ jobs:
           & scripts\windows-publish.ps1 ${env:archiveName} ${env:targetName}
           # 记录packageName给后续step
            $name = ${env:archiveName}
-           echo "::set-output name=packageName::$name"       
-      # tag 查询github-Release
-      # 上传artifacts          
+           echo "::set-output name=packageName::$name"     
+           
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ steps.package.outputs.packageName }}
           path: ${{ steps.package.outputs.packageName }}
-      # tag 上传Release
+          
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2

.gitignore

@@ -31,6 +31,10 @@ target_wrapper.*
 # QtCreator CMake
 CMakeLists.txt.user*
 
-src/build-preset/plugins.qmltypes
 bin
-.DS_Store
+.DS_Store
+build
+cmake-build-*
+.idea
+
+example/Version.h

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "framelesshelper"]
+	path = framelesshelper
+	url = https://github.com/zhuzichu520/framelesshelper.git
+[submodule "zxing-cpp"]
+	path = zxing-cpp
+	url = https://github.com/zhuzichu520/zxing-cpp.git

CMakeLists.txt

@@ -1,5 +1,45 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.20)
+
 project(FluentUI VERSION 0.1 LANGUAGES CXX)
 
+set(FLUENTUI_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
+list(APPEND CMAKE_MODULE_PATH ${FLUENTUI_DIRECTORY}/.cmake/)
+
+include(GetGitRevisionDescription)
+
+option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON)
+option(FLUENTUI_BUILD_FRAMELESSHEPLER "Build FramelessHelper." ON)
+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)
+
+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)
-add_subdirectory(example)
+add_subdirectory(zxing-cpp)
+
+if (FLUENTUI_BUILD_EXAMPLES)
+    add_subdirectory(example)
+endif ()
+
+if (FLUENTUI_BUILD_FRAMELESSHEPLER)
+    set(FRAMELESSHELPER_BUILD_STATIC ON)
+    set(FRAMELESSHELPER_NO_DEBUG_OUTPUT ON)
+    add_subdirectory(framelesshelper)
+endif ()
+
+message("------------------------ FluentUI ------------------------")
+message("Build FluentUI demo applications.: ${FLUENTUI_BUILD_EXAMPLES}")
+message("Build FramelessHelper.: ${FLUENTUI_BUILD_FRAMELESSHEPLER}")
+message("Build static library.: ${FLUENTUI_BUILD_STATIC_LIB}")
+message("Path to FluentUI plugin.: ${FLUENTUI_QML_PLUGIN_DIRECTORY}")

FluentUI.pro

@@ -1,6 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += \
-    src/FluentUI.pro \
-    example
-    example.depends = src/FluentUI.pro

README.md

@@ -1,97 +1,123 @@
-# FluentUI
+<div align=center>
+  <img width=64 src="doc/preview/fluent_design.svg">
+</div>
 
-## 简介
+<h1 align="center">
+  QML FluentUI 
+</h1>
+<p align="center">
+  A fluent design component library for Qt QML。 <a href="https://zhuzichu520.github.io">official wasm app.</a>
+</p>
 
-这是一个漂亮的Fluent组件库，使用QML插件开发的
+![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>
 
-## 编译状态
-| [Windows][win-link]| [Ubuntu][ubuntu-link]|[MacOS][macos-link]|
-|---------------|---------------|-----------------|
-| ![win-badge]  | ![ubuntu-badge]      | ![macos-badge] |
 
 [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"
 
-## 支持的组件
 
-|目录|说明|备注|
-|----|----|----|
-|FluApp|初始化入口|支持路由跳转|
-|FluWindow|无边框窗口|解决windows拖动闪烁问题|
-|FluAppBar|窗口顶部标题栏|支持拖动窗口，最小化、最大化、关闭窗口|
-|FluText|Text文本||
-|FluButton|按钮||
-|FluFilledButton|实心按钮||
-|FluIconButton|图标按钮||
-|FluTextButton|文本按钮||
-|FluIcon|图标||
-|FluRadioButton|单选按钮||
-|FluTextBox|单行输入框||
-|FluMultiLineTextBox|多行输入框||
-|FluToggleSwitch|开关按钮||
-|FluSlider|拖动条||
-|FluInfoBar|提示Toast||
-|FluContentDialog|对话框||
-|FluProgressBar|条形进度条||
-|FluProgressRing|圆形进度条||
-|FluRectangle|矩形|支持部分圆角、clip|
-|FluMenu|菜单框||
-|FluTooltip|tooltip提示框||
-|FluTreeView|树控件||
-|FluTheme|主题设置|支持主题颜色切换，夜间模式|
-|FluCarousel|轮播图组件|支持无限轮播|
-|FluTimePicker|时间选择器||
-|FluDatePicker|日期选择器||
-|FluMenu|菜单Popup||
-|FluNavigationView|响应式导航布局||
+<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>
 
-# 部分效果预览
+## Requirements
 
-## 首页
++ Qt Core, Qt Quick, Qt QML, Qt ShaderTool, Qt 5 Compatibility Module. (**Essential**)
++ Qt LinguistTool (optional,for translations)
++ Qt Svg (optional, however essential for Qt 5)
 
-![](doc/preview/home.png)
+Use [Qt Online Installers](https://download.qt.io/archive/online_installers/) to acquire the modules (**Recommended**) or compile them first before using the library.
 
-## 各种Button按钮
+## ⚽ Get started
 
-![](doc/preview/buttons.png)
++ Download the [pre-built release](https://github.com/zhuzichu520/FluentUI/releases). (Please pecify your platform and compilers.)
 
-## 主题颜色切换、夜间模式
++ run `example` program.
 
-![](doc/preview/theme.png)
+or 
 
-## FluTreeView树组件
++ Clone the repository.
 
-![](doc/preview/treeview.png)
+```SHELL
+git clone --recursive https://github.com/zhuzichu520/FluentUI.git
+```
 
-## 轮播图组件
++ Build
 
-![](doc/preview/carousel.png)
+```
+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 <PATH_TO_THE_REPOSITORY>
+cmake --build . --config Release --target all --parallel
+```
 
-## InfoBar提示框组件
++ Use your IDE (`Qt Creator` or `CLion`) to open the project. (only **CMake** supported).
 
-![](doc/preview/infobar.png)
+<div align=center>
+  <img src="doc/preview/qt_creator_project.png">
+</div>
 
-## 多窗口路由跳转
++ Compile the project. Then try to execute the `example` demo program.
 
-![](doc/preview/multiwindow.png)
++ Great! Now you are ready to write your first QML FluentUI program! Check the documentations for more details.
 
-### ⚡ Visitor count
-![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)
+
+## 📑 Documentations
+
+(Work in progress...🚀)
+
+## Supported components
+
+|Catalog|Detail|Notes / Demos|
+|:----:|:----:|:----:|
+|FluApp|The initial entry of the program|Router supported(SPA)|
+|FluWindow|Frameless Window|*This only works on windows|
+|FluAppBar|Title bar on top of the window|Drag, minimize, maximize and close are supported.|
+|FluText|Common text||
+|FluButton|Common button|![btn](doc/preview/demo_standardbtn.png) |
+|FluFilledButton|Filled button|![filledbtn](doc/preview/demo_filledbtn.png)|
+|FluTextButton|Text button|![textbtn](doc/preview/demo_textbtn.png)|
+|FluToggleButton|Toggle buttons|![togglebtn](doc/preview/demo_toggle_btn.png)|
+|FluIcon|Common icon|![icons](doc/preview/demo_icon.png)|
+|FluRadioButton|radio button|![radiobtn](doc/preview/demo_radiobtn.png)|
+|FluTextBox|Single-line input box|![textbox](doc/preview/demo_textbox.png)|
+|FluMultiLineTextBox|Multi-lines input area|![textarea](doc/preview/demo_multiline_textbox.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)
+
+## Star History
+
+[![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)

README_zh_CN.md

@@ -0,0 +1,99 @@
+# 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>
+
+## 编译状态
+| [Windows][win-link]| [Ubuntu][ubuntu-link]|[MacOS][macos-link]|
+|---------------|---------------|-----------------|
+| ![win-badge]  | ![ubuntu-badge]      | ![macos-badge] |
+
+[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"
+
+## 支持的组件
+
+|目录|说明|备注|
+|----|----|----|
+|FluApp|初始化入口|支持路由跳转|
+|FluWindow|无边框窗口|解决windows拖动闪烁问题|
+|FluAppBar|窗口顶部标题栏|支持拖动窗口，最小化、最大化、关闭窗口|
+|FluText|Text文本||
+|FluButton|按钮||
+|FluFilledButton|实心按钮||
+|FluIconButton|图标按钮||
+|FluTextButton|文本按钮||
+|FluIcon|图标||
+|FluRadioButton|单选按钮||
+|FluTextBox|单行输入框||
+|FluMultiLineTextBox|多行输入框||
+|FluToggleSwitch|开关按钮||
+|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/preview/home.png)
+
+## 各种Button按钮
+
+![](doc/preview/buttons.png)
+
+## 主题颜色切换、夜间模式
+
+![](doc/preview/theme.png)
+
+## TableView表格组件
+
+![](doc/preview/tableview.png)
+
+## FluTreeView树组件
+
+![](doc/preview/treeview.png)
+
+## 轮播图组件
+
+![](doc/preview/carousel.png)
+
+### ⚡ Visitor count
+![](https://profile-counter.glitch.me/zhuzichu520-FluentUI/count.svg)

THIRD_PARTY_COPYRIGHT.txt

@@ -0,0 +1,265 @@
+This product use Third Party code for certain functions may include licensed under
+terms that require meeting to display the following notices:
+
+A text copy of this license is included with the download of
+this FluentUI software. You may obtain a copy of the
+source code from https://github.com/zhuzichu520/FluentUI
+
+************************************************************************************
+About Qt 6.5.0 Libraries Used in This Project:
+
+This project, "FluentUI", utilizes the Qt 6.5.0 library.
+Below is a list of the Qt modules used and their corresponding open-source licenses:
+
+Qt Core - LGPL v3 / GPL v2 / Commercial License
+Qt Quick - LGPL v3 / GPL v2 / Commercial License
+Qt Quick Controls 2 - LGPL v3 / GPL v2 / Commercial License
+Qt Gui - LGPL v3 / GPL v2 / Commercial License
+Qt Multimedia - LGPL v3 / GPL v2 / Commercial License
+Qt WebEngineQuick - LGPL v3 / GPL v3 / Commercial License
+Qt Sql - LGPL v3 / GPL v2 / Commercial License
+Qt Svg - LGPL v3 / GPL v2 / Commercial License
+Qt Core5Compat - LGPL v3 / GPL v2 / Commercial License
+
+Please note that the license information provided above is for reference only.
+For the exact licensing, refer to the official Qt documentation and source code:
+https://doc.qt.io/qt-6/licenses-used-in-qt.html
+You can choose an appropriate license based on your requirements.
+If you choose to use the LGPL or GPL licenses, please follow the relevant
+open-source license regulations, such as releasing source code,
+retaining copyright notices, etc.
+
+We would like to thank the Qt project and its contributors for
+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/).
+
+************************************************************************************
+framelesshelper
+
+MIT License
+
+Copyright (C) 2021-2023 by wangwenx190 (Yuhang Zhao)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+************************************************************************************
+zxing-cpp
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

doc/md/all_components.md

@@ -0,0 +1,37 @@
+# 支持的组件
+
+|Catalog|Detail|Notes / Demos|
+|:----:|:----:|:----:|
+|FluApp|The initial entry of the program|Router supported(SPA)|
+|FluWindow|Frameless Window|*This only works on windows|
+|FluAppBar|Title bar on top of the window|Drag, minimize, maximize and close are supported.|
+|FluText|Common text||
+|FluButton|Common button|![btn](../preview/demo_standardbtn.png) |
+|FluFilledButton|Filled button|![filledbtn](../preview/demo_filledbtn.png)|
+|FluTextButton|Text button|![textbtn](../preview/demo_textbtn.png)|
+|FluToggleButton|Toggle buttons|![togglebtn](../preview/demo_toggle_btn.png)|
+|FluIcon|fluent icons|![icons](../preview/demo_icon.png)|
+|FluRadioButton|radio button|![radiobtn](../preview/demo_radiobtn.png)|
+|FluTextBox|Single-line input box|![textbox](../preview/demo_textbox.png)|
+|FluMultiLineTextBox|Multi-lines input area|![textarea](../preview/demo_multiline_textbox.png)|
+|FluToggleSwitch|toggle switch|![toggleswitch](../preview/demo_toggle_switch.png)|
+|FluSlider|Slider|![slider](../preview/demo_slider.png)|
+|FluInfoBar|提示Toast|![infobar](../preview/demo_infobar.png)|
+|FluContentDialog| dialog |![dialog](../preview/demo_content_dialog.png)|
+|FluProgressBar| progress bar |![progress](../preview/demo_progress_bar_ring.png)|
+|FluProgressRing|circle progress||
+|FluRectangle|reactangle| ![rect](../preview/demo_rectangle.png)</br>*partially support `round` and `clip` feature|
+|FluMenu|menu||
+|FluTooltip|tooltip|![tooltip](../preview/demo_tooltip.png)|
+|FluTreeView|tree view component|![treeview](../preview/demo_tree_view.png)|
+|FluTheme|theme settings|theme color changes, dark mode are supported|
+|FluCarousel|-||
+|FluTimePicker| time picker ||
+|FluDatePicker|date picker||
+|FluMenu|the menu popup||
+|FluNavigationView|responsive navigation view||
+|FluScrollbar|scroll bar||
+|FluPagination|||
+|FluTableView|table component||
+|FluMediaPlayer|multimedia components||
+|FluFlipView| flip view||

doc/preview/fluent_design.svg

@@ -0,0 +1,7 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 73 73" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#000000" stroke="#000000">
+
+<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+

example.svg

@@ -1 +1,7 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1678260749060" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11227" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M0 0m170.663111 0l682.652445 0q170.663111 0 170.663111 170.663111l0 682.652445q0 170.663111-170.663111 170.663111l-682.652445 0q-170.663111 0-170.663111-170.663111l0-682.652445q0-170.663111 170.663111-170.663111Z" fill="#EBF2FF" p-id="11228"></path><path d="M512.351993 787.674257c182.822858 0 330.926439 98.568613 331.033103 231.312514 0 1.674632-0.031999 3.338597-0.106664 5.002563H181.43622c-0.074665-1.663965-0.106664-3.327931-0.106664-5.002563 0-132.743901 148.210246-231.312514 331.022437-231.312514z" fill="#7D99C8" p-id="11229"></path><path d="M592.264994 721.158309v79.817004h-0.810649c-5.546551 30.079373-38.847191 53.204225-79.102352 53.204225-40.244495 0-73.545134-23.114185-79.091686-53.193559h-0.81065V721.158309h159.815337z" fill="#FBDBCB" p-id="11230"></path><path d="M508.213412 765.626716c-44.105748-1.226641-85.363555-19.306264-118.568196-56.916147-22.826191-25.866128-35.199267-53.054895-37.097894-81.576968l-21.610217-1.610633a59.988084 59.988084 0 0 1-55.433511-56.585488l-0.319994-5.72788a34.932606 34.932606 0 0 1 43.124435-35.839254l0.949314-9.098477a608.008666 608.008666 0 0 1 40.031166-159.015354l10.389117-25.866127H655.026354l10.389117 25.866127a608.008666 608.008666 0 0 1 40.031166 159.015354l0.95998 9.098477a34.932606 34.932606 0 0 1 43.103102 35.839254l-0.309327 5.72788a59.988084 59.988084 0 0 1-55.433512 56.585488l-21.610217 1.610633c-1.909294 28.522072-14.271703 55.710839-37.097893 81.576968-34.239287 38.793858-77.054395 56.798817-122.717444 56.980146z" fill="#FFE7DB" p-id="11231"></path><path d="M546.911273 182.822858a10.666444 10.666444 0 0 1 1.429303 4.31991c0.533322 5.055895 0.714652 9.226474 0.533322 12.501073l-0.202662 2.346618 3.221266-0.543989c21.876878-3.733256 38.452532-9.877128 49.705631-18.452949l2.197288-1.73863a10.666444 10.666444 0 0 1 16.682319 3.98925c8.767817 20.650236 11.125102 40.681819 7.039853 60.116081l-0.373325 1.578633c4.746568 1.514635 9.589134 3.199933 14.506364 5.066562 27.882086 10.581113 57.769463 26.367451 76.883732 75.65709 20.212912 52.084248 18.826274 116.562905-4.149247 193.425304l-1.855961 6.101206H701.425387c-0.47999-51.732256-8.319827-90.526114-23.540843-116.392242-15.221016-25.866128-29.716714-46.185704-43.487094-60.969396-41.513802 10.399783-79.85967 15.914335-115.037603 16.564988l-6.997188 0.063998v0.191996c-37.065894 0-77.737047-5.546551-122.024124-16.628986-13.77038 10.954438-28.266078 31.220683-43.487094 60.7774-15.221016 29.556718-23.060853 68.414575-23.540843 116.584238h-11.114435c-24.746151-79.571676-26.740776-146.076957-6.005209-199.52651 8.746484-22.548864 19.732922-38.079207 31.764672-49.321639 18.079623-20.660903 40.180496-36.009916 66.302619-46.068374a424.716485 424.716485 0 0 1 32.319326-11.029103c25.25814-9.034478 44.991063-16.767651 59.209433-23.210183a366.221704 366.221704 0 0 0 29.151393-14.869024l7.359847-4.266578a10.666444 10.666444 0 0 1 14.623695 3.733256z" fill="#7D99C8" p-id="11232"></path></svg>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 73 73" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="#000000" stroke="#000000">
+
+<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+

example/App.qml

@@ -1,28 +0,0 @@
-import QtQuick
-import QtQuick.Window
-import QtQuick.Controls
-import QtQuick.Layouts
-import QtMultimedia
-import FluentUI
-
-Window {
-    id:app
-    color: "#00000000"
-    //初始化一个MediaPlayer，解决macos切换到T_MediaPalyer页面崩溃问题
-    MediaPlayer{}
-    Component.onCompleted: {
-        FluApp.init(app,properties)
-        FluTheme.frameless = ("windows" === Qt.platform.os)
-        FluTheme.dark = false
-        FluApp.routes = {
-            "/":"qrc:/page/MainPage.qml",
-            "/about":"qrc:/page/AboutPage.qml",
-            "/login":"qrc:/page/LoginPage.qml",
-            "/chat":"qrc:/page/ChatPage.qml",
-            "/media":"qrc:/page/MediaPage.qml",
-        }
-        FluApp.initialRoute = "/"
-        FluApp.run()
-    }
-
-}

example/CMakeLists.txt

@@ -1,86 +1,169 @@
-cmake_minimum_required(VERSION 3.16)
-project(example)
+cmake_minimum_required(VERSION 3.20)
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
-
-set(CMAKE_CXX_STANDARD 17)
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(platform 64)
-else()
-  set(platform 32)
-endif()
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin/debug)
-else()
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin/release)
-endif()
-
-find_package(Qt6 COMPONENTS Core Quick QuickControls2 Concurrent Network Multimedia REQUIRED)
-
-set(SOURCES
-    ChatController.cpp
-    main.cpp
-)
-
-set(HEADERS
-    ChatController.h
-)
-
-set(RESOURCES
-    qml.qrc
-)
-
-set(RC_ICONS
-    favicon.ico
-)
-
-qt_add_resources(QT_RESOURCES ${RESOURCES})
-
-add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS} ${QT_RESOURCES} ${RC_ICONS})
-
-if(WIN32)
-    if(platform EQUAL 32)
-        file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x86/*.dll)
-        add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy
-            ${DLL_FILES}
-            ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-        )
-    else()
-        file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x64/*.dll)
-        add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy
-            ${DLL_FILES}
-            ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-        )
-    endif()
-endif()
-
-target_compile_definitions(${PROJECT_NAME} PRIVATE
-    QT_DEPRECATED_WARNINGS
-    QT_NO_WARNING_OUTPUT
-)
-
-target_link_libraries(${PROJECT_NAME} PRIVATE
-    Qt6::Core
-    Qt6::Quick
-    Qt6::QuickControls2
-    Qt6::Concurrent
-    Qt6::Network
-    Qt6::Multimedia
-)
-
-if(WIN32)
-    target_compile_definitions(${PROJECT_NAME} PRIVATE UNICODE WIN32 _WINDOWS)
-    target_link_libraries(${PROJECT_NAME} PRIVATE dwmapi user32)
-endif()
+project(example VERSION 0.1 LANGUAGES CXX)
 
+#配置通用编译
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if(APPLE)
-    set_target_properties(${PROJECT_NAME} PROPERTIES
-        MACOSX_BUNDLE_INFO_PLIST Info.plist
+    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
+endif()
+
+#导入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)
+    add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)
+endif()
+
+#设置可执行文件输出目录
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/debug)
+else()
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/release)
+endif()
+
+#获取文件路径分隔符（解决执行命令的时候有些平台会报错）
+file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
+
+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()
+
+##生成版本信息头文件
+set(HEADER_FILE_VERSION_PATH ${FLUENTUI_DIRECTORY}/example/Version.h)
+configure_file(
+    ${FLUENTUI_DIRECTORY}/.cmake/Version.h.in
+    ${HEADER_FILE_VERSION_PATH}
+)
+
+#遍历所有Cpp文件
+file(GLOB_RECURSE CPP_FILES *.cpp *.h)
+foreach(filepath ${CPP_FILES})
+    string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
+    list(APPEND sources_files ${filename})
+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 "Qt${QT_VERSION_MAJOR}/")
+            string(REPLACE "qml-Qt${QT_VERSION_MAJOR}" "qml" filealias ${filename})
+            set_source_files_properties(${filename} PROPERTIES QT_RESOURCE_ALIAS ${filealias})
+            list(APPEND qml_files ${filename})
+        endif()
+    endforeach(filepath)
+
+    #遍历所有资源文件
+    file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp)
+    foreach(filepath ${RES_PATHS})
+        string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
+        list(APPEND resource_files ${filename})
+    endforeach(filepath)
+endif()
+
+#如果是Windows平台，则生成rc文件
+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}
     )
 endif()
+
+#添加可执行文件
+if (WIN32)
+    add_executable(example
+        ${sources_files}
+        ${EXAMPLE_VERSION_RC_PATH}
+    )
+else ()
+    add_executable(example
+        ${sources_files}
+    )
+endif ()
+
+#复制动态库到可执行文件同级目录下
+if(WIN32)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        set(DLLPATH ${CMAKE_SOURCE_DIR}/3rdparty/msvc/*.dll)
+    else()
+        set(DLLPATH ${CMAKE_SOURCE_DIR}/3rdparty/mingw/*.dll)
+    endif()
+    string(REPLACE "/" ${PATH_SEPARATOR} DLLPATH "${DLLPATH}")
+    file(GLOB DLL_FILES ${DLLPATH})
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy
+        ${DLL_FILES}
+        ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+    )
+endif()
+
+if(QT_VERSION VERSION_GREATER_EQUAL "6.2")
+    #添加qml模块
+    qt_add_qml_module(example
+        URI "example"
+        VERSION 1.0
+        QML_FILES ${qml_files}
+        RESOURCES ${resource_files}
+        RESOURCE_PREFIX "/"
+    )
+else()
+    target_include_directories(example PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+    target_sources(example PRIVATE resource.qrc)
+endif()
+
+#导入component头文件,不然通过QML_NAMED_ELEMENT生成的c++类会找不到头文件报错
+target_include_directories(example PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/component
+)
+
+#设置属性
+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
+)
+
+#链接库
+if (FLUENTUI_BUILD_STATIC_LIB)
+    target_link_libraries(example PRIVATE
+        Qt${QT_VERSION_MAJOR}::Quick
+        Qt${QT_VERSION_MAJOR}::Svg
+        Qt${QT_VERSION_MAJOR}::Network
+        fluentui
+        fluentuiplugin
+        FramelessHelper::Core
+        FramelessHelper::Quick
+    )
+else()
+    target_link_libraries(example PRIVATE
+        Qt${QT_VERSION_MAJOR}::Quick
+        Qt${QT_VERSION_MAJOR}::Svg
+        Qt${QT_VERSION_MAJOR}::Network
+        fluentuiplugin
+        FramelessHelper::Core
+        FramelessHelper::Quick
+    )
+endif()
+
+#安装
+install(TARGETS example
+    BUNDLE DESTINATION .
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)

example/ChatController.cpp

@@ -1,56 +0,0 @@
-#include "ChatController.h"
-
-ChatController::ChatController(QObject *parent)
-    : QObject{parent}
-{
-    isLoading(false);
-    networkManager = new QNetworkAccessManager(this);
-}
-
-
-void ChatController::sendMessage(const QString& text){
-    isLoading(true);
-    QUrl apiUrl("https://api.openai.com/v1/chat/completions");
-    QNetworkRequest request(apiUrl);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
-    request.setRawHeader("Authorization", QString::fromStdString("Bearer %1").arg(QString::fromUtf8(QByteArray::fromBase64(baseKey.toUtf8()))).toUtf8());
-    QJsonObject requestData;
-    requestData.insert("model", "gpt-3.5-turbo");
-    messages.append(createMessage("user",text));
-    requestData.insert("messages", messages);
-    QJsonDocument requestDoc(requestData);
-    QByteArray requestDataBytes = requestDoc.toJson();
-    QNetworkReply* reply = networkManager->post(request, requestDataBytes);
-    connect(reply, &QNetworkReply::finished,this, [=]() {
-        if (reply->error() == QNetworkReply::NoError) {
-            QString responseString = QString::fromUtf8(reply->readAll());
-            qDebug() << responseString;
-            QJsonDocument doc = QJsonDocument::fromJson(responseString.toUtf8());
-            QJsonObject jsonObj = doc.object();
-            QString text = jsonObj.value("choices").toArray().at(0).toObject().value("message").toObject().value("content").toString();
-            if(text.isEmpty()){
-                text = "响应错误：content为空数据";
-            }else{
-                messages.append(createMessage("assistant",text));
-            }
-            responseData(text.trimmed());
-        } else {
-            responseData("网络错误："+reply->errorString());
-        }
-        isLoading(false);
-        reply->deleteLater();
-    });
-}
-
-QJsonObject ChatController::createMessage(const QString& role,const QString& content){
-    QJsonObject message;
-    message.insert("role",role);
-    message.insert("content",content);
-    return message;
-}
-
-void ChatController::clipText(const QString& text){
-    qDebug()<<text;
-    QClipboard *clipboard = QGuiApplication::clipboard();
-    clipboard->setText(text);
-}

example/ChatController.h

@@ -1,35 +0,0 @@
-#ifndef CHATCONTROLLER_H
-#define CHATCONTROLLER_H
-
-#include <QObject>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QJsonObject>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QGuiApplication>
-#include <QClipboard>
-#include <QByteArray>
-#include <QFile>
-#include "stdafx.h"
-
-class ChatController : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY_AUTO(bool,isLoading)
-    Q_PROPERTY_AUTO(QString,responseData);
-public:
-    explicit ChatController(QObject *parent = nullptr);
-
-    Q_INVOKABLE void sendMessage(const QString& text);
-    Q_INVOKABLE void clipText(const QString& text);
-private:
-    QJsonObject createMessage(const QString& role,const QString& content);
-
-private:
-    QNetworkAccessManager* networkManager;
-    QJsonArray messages;
-    QString baseKey = "c2stbXgxWm5MQkZ5TzhNYzNmRWl6eDZUM0JsYmtGSnNBWjNiakJjSXB6WGN3QW9KSk11";
-};
-
-#endif // CHATCONTROLLER_H

example/Info.plist

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

example/T_Carousel.qml

@@ -1,50 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Window
-import QtQuick.Controls
-import FluentUI
-import "./component"
-
-FluScrollablePage{
-
-    title:"Carousel"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
-
-    FluArea{
-        Layout.fillWidth: true
-        height: 370
-        paddings: 10
-        Layout.topMargin: 20
-        Column{
-            spacing: 15
-            anchors{
-                verticalCenter: parent.verticalCenter
-                left:parent.left
-            }
-            FluText{
-                text:"轮播图，支持无限轮播，无限滑动，用ListView实现的组件"
-            }
-            FluCarousel{
-                id:carousel
-                Layout.topMargin: 20
-                Layout.leftMargin: 5
-                Component.onCompleted: {
-                    carousel.setData([{url:"qrc:/res/image/banner_1.jpg"},{url:"qrc:/res/image/banner_2.jpg"},{url:"qrc:/res/image/banner_3.jpg"}])
-                }
-            }
-        }
-    }
-    CodeExpander{
-        Layout.fillWidth: true
-        code:'FluCarousel{
-    width: 400
-    height: 300
-    Component.onCompleted: {
-        setData([{url:"qrc:/res/image/banner_1.jpg"},{url:"qrc:/res/image/banner_2.jpg"},{url:"qrc:/res/image/banner_3.jpg"}])
-    }
-}'
-    }
-}

example/T_CheckBox.qml

@@ -1,38 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Window
-import QtQuick.Controls
-import FluentUI
-import "./component"
-
-FluScrollablePage{
-
-    title:"CheckBox"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
-
-    FluArea{
-        Layout.fillWidth: true
-        height: 68
-        paddings: 10
-        Layout.topMargin: 20
-        Row{
-            spacing: 30
-            anchors.verticalCenter: parent.verticalCenter
-            FluCheckBox{
-            }
-            FluCheckBox{
-                text:"Text"
-            }
-        }
-    }
-    CodeExpander{
-        Layout.fillWidth: true
-        code:'FluCheckBox{
-    text:"Text"
-}'
-    }
-
-}

example/T_Dialog.qml

@@ -1,64 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Window
-import QtQuick.Controls
-import FluentUI
-import "./component"
-
-FluScrollablePage{
-
-    title:"Dialog"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
-
-    FluArea{
-        Layout.fillWidth: true
-        height: 68
-        paddings: 10
-        Layout.topMargin: 20
-            FluButton{
-                anchors.verticalCenter: parent.verticalCenter
-                Layout.topMargin: 20
-                text:"Show Dialog"
-                onClicked: {
-                    dialog.open()
-                }
-            }
-    }
-    CodeExpander{
-        Layout.fillWidth: true
-        code:'FluContentDialog{
-    id:dialog
-    title:"友情提示"
-    message:"确定要退出程序么？"
-    negativeText:"取消"
-    onNegativeClicked:{
-        showSuccess("点击取消按钮")
-    }
-    positiveText:"确定"
-    onPositiveClicked:{
-        showSuccess("点击确定按钮")
-    }
-}
-dialog.open()
-'
-    }
-
-    FluContentDialog{
-        id:dialog
-        title:"友情提示"
-        message:"确定要退出程序么？"
-        negativeText:"取消"
-        onNegativeClicked:{
-            showSuccess("点击取消按钮")
-        }
-        positiveText:"确定"
-        onPositiveClicked:{
-            showSuccess("点击确定按钮")
-        }
-    }
-
-
-}

example/T_MediaPlayer.qml

@@ -1,65 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import QtQuick.Window
-import FluentUI
-import "./component"
-
-FluScrollablePage{
-
-    title:"MediaPlayer"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
-
-    onVisibleChanged: {
-        if(visible){
-            player.play()
-        }else{
-            player.pause()
-        }
-    }
-    FluArea{
-        Layout.fillWidth: true
-        height: 320
-        Layout.topMargin: 20
-        paddings: 10
-        ColumnLayout{
-            anchors{
-                verticalCenter: parent.verticalCenter
-                left:parent.left
-            }
-            FluMediaPlayer{
-                id:player
-                source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"
-            }
-        }
-    }
-    CodeExpander{
-        Layout.fillWidth: true
-        code:'FluMediaPlayer{
-    id:player
-    source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"
-}
-'
-    }
-    FluArea{
-        Layout.fillWidth: true
-        height: 68
-        Layout.topMargin: 20
-        paddings: 10
-        FluButton{
-            text:"跳转到视频播放器窗口"
-            anchors.verticalCenter: parent.verticalCenter
-            onClicked:{
-                FluApp.navigate("/media",{source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"})
-            }
-        }
-    }
-
-
-
-
-}
-

example/T_Menu.qml

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

example/T_MultiWindow.qml

@@ -1,107 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Window
-import QtQuick.Controls
-import FluentUI
-import "./component"
-
-FluScrollablePage{
-
-    property string password: ""
-    property var loginPageRegister: registerForPageResult("/login")
-
-    title:"MultiWindow"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
-
-    Connections{
-        target: loginPageRegister
-        function onResult(data)
-        {
-            password = data.password
-        }
-    }
-
-    FluArea{
-        Layout.fillWidth: true
-        height: 100
-        paddings: 10
-        Layout.topMargin: 20
-        Column{
-            spacing: 15
-            anchors{
-                verticalCenter: parent.verticalCenter
-                left: parent.left
-            }
-            FluText{
-                text:"页面跳转，不携带任何参数"
-            }
-            FluButton{
-                text:"点击跳转"
-                onClicked: {
-                    FluApp.navigate("/about")
-                }
-            }
-        }
-    }
-    CodeExpander{
-        Layout.fillWidth: true
-        code:'FluButton{
-    text:"点击跳转"
-    onClicked: {
-        FluApp.navigate("/about")
-    }
-}
-'
-    }
-
-    FluArea{
-        Layout.fillWidth: true
-        height: 130
-        paddings: 10
-        Layout.topMargin: 20
-
-        Column{
-            spacing: 15
-            anchors{
-                verticalCenter: parent.verticalCenter
-                left: parent.left
-            }
-            FluText{
-                text:"页面跳转，并携带参数用户名：zhuzichu"
-            }
-            FluButton{
-                text:"点击跳转到登录"
-                onClicked: {
-                    loginPageRegister.launch({username:"zhuzichu"})
-                }
-            }
-            FluText{
-                text:"登录窗口返回过来的密码->"+password
-            }
-        }
-    }
-    CodeExpander{
-        Layout.fillWidth: true
-        code:'property var loginPageRegister: registerForPageResult("/login")
-
-Connections{
-    target: loginPageRegister
-    function onResult(data)
-    {
-        password = data.password
-    }
-}
-
-FluButton{
-    text:"点击跳转"
-    onClicked: {
-        loginPageRegister.launch({username:"zhuzichu"})
-    }
-}
-'
-    }
-
-}

example/T_Progress.qml

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

example/T_TabView.qml

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

example/T_ToggleSwitch.qml

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

example/component/CodeExpander.qml

@@ -1,43 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Window
-import QtQuick.Controls
-import FluentUI
-
-FluExpander{
-
-    property string code: ""
-
-    headerText: "Source"
-    contentHeight:content.height
-
-    FluMultilineTextBox{
-        id:content
-        width:parent.width
-        readOnly:true
-        text:code
-        focus:false
-        KeyNavigation.priority: KeyNavigation.BeforeItem
-        background:Rectangle{
-            radius: 4
-            color:FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
-            border.color: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
-            border.width: 1
-        }
-    }
-
-    FluIconButton{
-        iconSource:FluentIcons.Copy
-        anchors{
-            right: parent.right
-            top: parent.top
-            rightMargin: 5
-            topMargin: 5
-        }
-        onClicked:{
-            FluApp.clipText(content.text)
-            showSuccess("复制成功")
-        }
-    }
-
-}

example/example.pro

@@ -1,41 +0,0 @@
-QT += quick quickcontrols2 concurrent network multimedia
-CONFIG += c++17
-DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT
-
-HEADERS += \
-    ChatController.h
-
-SOURCES += \
-        ChatController.cpp \
-        main.cpp
-
-RESOURCES += qml.qrc
-
-RC_ICONS = favicon.ico
-
-QML_IMPORT_PATH =
-QML_DESIGNER_IMPORT_PATH =
-
-CONFIG(debug,debug|release) {
-    DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../bin/debug)
-} else {
-    DESTDIR = $$absolute_path($${_PRO_FILE_PWD_}/../bin/release)
-}
-
-win32 {
-contains(QT_ARCH, i386) {
-    COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x86/*.dll) $$DESTDIR
-    QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP)
-} else {
-    COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x64/*.dll) $$DESTDIR
-    QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP)
-}
-}
-
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
-
-mac: {
-    QMAKE_INFO_PLIST = Info.plist
-}

example/global/ItemsFooter.qml

@@ -1,21 +0,0 @@
-pragma Singleton
-
-import QtQuick
-import FluentUI
-
-FluObject{
-    id:footer_items
-    FluPaneItemSeparator{}
-    FluPaneItem{
-        title:"意见反馈"
-        onTap:{
-            Qt.openUrlExternally("https://github.com/zhuzichu520/FluentUI/issues/new")
-        }
-    }
-    FluPaneItem{
-        title:"关于"
-        onTap:{
-            FluApp.navigate("/about")
-        }
-    }
-}

example/global/ItemsOriginal.qml

@@ -1,305 +0,0 @@
-pragma Singleton
-
-import QtQuick
-import FluentUI
-
-FluObject{
-
-    property var navigationView
-
-    FluPaneItem{
-        title:"Home"
-        icon:FluentIcons.Home
-        onTap:{
-            navigationView.push("qrc:/T_Home.qml")
-        }
-    }
-
-    FluPaneItemExpander{
-        title:"Basic input"
-        icon:FluentIcons.CheckboxComposite
-        FluPaneItem{
-            title:"Buttons"
-            image:"qrc:/res/image/control/Button.png"
-            recentlyUpdated:true
-            desc:"A control that responds to user input and raisesa Click event."
-            onTap:{
-                navigationView.push("qrc:/T_Buttons.qml")
-            }
-        }
-        FluPaneItem{
-            title:"Slider"
-            image:"qrc:/res/image/control/Slider.png"
-            recentlyUpdated:true
-            desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack."
-            onTap:{
-                navigationView.push("qrc:/T_Slider.qml")
-            }
-        }
-        FluPaneItem{
-            title:"CheckBox"
-            image:"qrc:/res/image/control/Checkbox.png"
-            recentlyUpdated:true
-            desc:"A control that a user can select or clear."
-            onTap:{
-                navigationView.push("qrc:/T_CheckBox.qml")
-            }
-        }
-        FluPaneItem{
-            title:"ToggleSwitch"
-            onTap:{
-                navigationView.push("qrc:/T_ToggleSwitch.qml")
-            }
-        }
-    }
-
-    FluPaneItemExpander{
-        title:"Form"
-        icon:FluentIcons.GridView
-        FluPaneItem{
-            title:"TextBox"
-            onTap:{
-                navigationView.push("qrc:/T_TextBox.qml")
-            }
-        }
-        FluPaneItem{
-            title:"TimePicker"
-            onTap:{
-                navigationView.push("qrc:/T_TimePicker.qml")
-            }
-        }
-        FluPaneItem{
-            title:"DatePicker"
-            onTap:{
-                navigationView.push("qrc:/T_DatePicker.qml")
-            }
-        }
-        FluPaneItem{
-            title:"CalendarPicker"
-            onTap:{
-                navigationView.push("qrc:/T_CalendarPicker.qml")
-            }
-        }
-        FluPaneItem{
-            title:"ColorPicker"
-            onTap:{
-                navigationView.push("qrc:/T_ColorPicker.qml")
-            }
-        }
-    }
-
-    FluPaneItemExpander{
-        title:"Surface"
-        icon:FluentIcons.SurfaceHub
-        FluPaneItem{
-            title:"InfoBar"
-            image:"qrc:/res/image/control/InfoBar.png"
-            recentlyUpdated:true
-            desc:"An inline message to display app-wide statuschange information."
-            onTap:{
-                navigationView.push("qrc:/T_InfoBar.qml")
-            }
-        }
-        FluPaneItem{
-            title:"Progress"
-            onTap:{
-                navigationView.push("qrc:/T_Progress.qml")
-            }
-        }
-        FluPaneItem{
-            title:"Badge"
-            onTap:{
-                navigationView.push("qrc:/T_Badge.qml")
-            }
-        }
-        FluPaneItem{
-            title:"Rectangle"
-            onTap:{
-                navigationView.push("qrc:/T_Rectangle.qml")
-            }
-        }
-        FluPaneItem{
-            title:"Carousel"
-            onTap:{
-                navigationView.push("qrc:/T_Carousel.qml")
-            }
-        }
-        FluPaneItem{
-            title:"Expander"
-            onTap:{
-                navigationView.push("qrc:/T_Expander.qml")
-            }
-        }
-    }
-
-    FluPaneItemExpander{
-        title:"Popus"
-        icon:FluentIcons.ButtonMenu
-        FluPaneItem{
-            title:"Dialog"
-            onTap:{
-                navigationView.push("qrc:/T_Dialog.qml")
-            }
-        }
-        FluPaneItem{
-            title:"Tooltip"
-            onTap:{
-                navigationView.push("qrc:/T_Tooltip.qml")
-            }
-        }
-        FluPaneItem{
-            title:"Menu"
-            onTap:{
-                navigationView.push("qrc:/T_Menu.qml")
-            }
-        }
-    }
-
-    FluPaneItemExpander{
-        title:"Navigation"
-        icon:FluentIcons.AllApps
-        FluPaneItem{
-            title:"Pivot"
-            image:"qrc:/res/image/control/Pivot.png"
-            recentlyAdded:true
-            order:3
-            desc:"Presents information from different sources in atabbed view."
-            onTap:{
-                navigationView.push("qrc:/T_Pivot.qml")
-            }
-        }
-        FluPaneItem{
-            title:"TabView"
-            image:"qrc:/res/image/control/TabView.png"
-            recentlyAdded:true
-            order:1
-            desc:"A control that displays a collection of tabs thatcan be used to display several documents."
-            onTap:{
-                navigationView.push("qrc:/T_TabView.qml")
-            }
-        }
-        FluPaneItem{
-            title:"TreeView"
-            onTap:{
-                navigationView.push("qrc:/T_TreeView.qml")
-            }
-        }
-        FluPaneItem{
-            title:"MultiWindow"
-            onTap:{
-                navigationView.push("qrc:/T_MultiWindow.qml")
-            }
-        }
-        FluPaneItem{
-            title:"FlipView"
-            image:"qrc:/res/image/control/FlipView.png"
-            recentlyAdded:true
-            order:2
-            desc:"Presents a collection of items that the user canflip through, one item at a time."
-            onTap:{
-                navigationView.push("qrc:/T_FlipView.qml")
-            }
-        }
-    }
-
-    FluPaneItemExpander{
-        title:"Theming"
-        icon:FluentIcons.Brightness
-        FluPaneItem{
-            title:"Theme"
-            onTap:{
-                navigationView.push("qrc:/T_Theme.qml")
-            }
-        }
-        FluPaneItem{
-            title:"Typography"
-            onTap:{
-                navigationView.push("qrc:/T_Typography.qml")
-            }
-        }
-        FluPaneItem{
-            title:"Awesome"
-            onTap:{
-                navigationView.push("qrc:/T_Awesome.qml")
-            }
-        }
-    }
-
-    FluPaneItemExpander{
-        title:"Media"
-        icon:FluentIcons.Media
-        FluPaneItem{
-            title:"MediaPlayer"
-            image:"qrc:/res/image/control/MediaPlayerElement.png"
-            recentlyAdded:true
-            order:0
-            desc:"A control to display video and image content."
-            onTap:{
-                navigationView.push("qrc:/T_MediaPlayer.qml")
-            }
-        }
-    }
-
-    function getRecentlyAddedData(){
-        var arr = []
-        for(var i=0;i<children.length;i++){
-            var item = children[i]
-            if(item instanceof FluPaneItem && item.recentlyAdded){
-                arr.push(item)
-            }
-            if(item instanceof FluPaneItemExpander){
-                for(var j=0;j<item.children.length;j++){
-                    var itemChild = item.children[j]
-                    if(itemChild instanceof FluPaneItem && itemChild.recentlyAdded){
-                        arr.push(itemChild)
-                    }
-                }
-            }
-        }
-        arr.sort(function(o1,o2){ return o2.order-o1.order })
-        return arr
-    }
-
-    function getRecentlyUpdatedData(){
-        var arr = []
-        var items = navigationView.getItems();
-        for(var i=0;i<items.length;i++){
-            var item = items[i]
-            if(item instanceof FluPaneItem && item.recentlyUpdated){
-                arr.push(item)
-            }
-        }
-        return arr
-    }
-
-    function getSearchData(){
-        var arr = []
-        var items = navigationView.getItems();
-        for(var i=0;i<items.length;i++){
-            var item = items[i]
-            if(item instanceof FluPaneItem){
-                arr.push({title:item.title,key:item.key})
-            }
-        }
-        return arr
-    }
-
-    function startPageByItem(data){
-        var items = navigationView.getItems();
-        for(var i=0;i<items.length;i++){
-            var item =  items[i]
-            if(item.key === data.key){
-                if(navigationView.getCurrentIndex() === i){
-                    return
-                }
-                item.tap()
-                navigationView.setCurrentIndex(i)
-                if(item.parent){
-                    item.parent.isExpand = true
-                }
-                return
-            }
-        }
-    }
-
-}

example/main.cpp

@@ -1,43 +0,0 @@
-#include <QGuiApplication>
-#include <QQmlApplicationEngine>
-#include <QQmlContext>
-#include <QDir>
-#include <QQuickWindow>
-#include <QQuickStyle>
-#include <QProcess>
-#include "ChatController.h"
-
-QMap<QString, QVariant> properties(){
-    QMap<QString, QVariant> map;
-    //    map["installHelper"] = QVariant::fromValue(QVariant::fromValue(InstallHelper::getInstance()));
-    return map;
-}
-
-int main(int argc, char *argv[])
-{
-    QCoreApplication::setOrganizationName("ZhuZiChu");
-    QCoreApplication::setOrganizationDomain("https://zhuzichu520.github.io");
-    QCoreApplication::setApplicationName("FluentUI");
-    QQuickStyle::setStyle("Basic");
-    QGuiApplication app(argc, argv);
-    QQmlApplicationEngine engine;
-
-    qmlRegisterType<ChatController>("Controller",1,0,"ChatController");
-
-    QMapIterator<QString, QVariant> iterator(properties());
-    while (iterator.hasNext()) {
-        iterator.next();
-        QString key = iterator.key();
-        QVariant value = iterator.value();
-        engine.rootContext()->setContextProperty(key,value);
-    }
-    engine.rootContext()->setContextProperty("properties",properties());
-    const QUrl url(QStringLiteral("qrc:/App.qml"));
-    QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
-                     &app, [url](QObject *obj, const QUrl &objUrl) {
-        if (!obj && url == objUrl)
-            QCoreApplication::exit(-1);
-    }, Qt::QueuedConnection);
-    engine.load(url);
-    return app.exec();
-}

example/page/AboutPage.qml

@@ -1,95 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import QtQuick.Layouts
-import FluentUI
-
-FluWindow {
-
-    width: 500
-    height: 600
-    minimumWidth: 500
-    minimumHeight: 600
-    maximumWidth: 500
-    maximumHeight: 600
-
-    title:"关于"
-
-    FluAppBar{
-        id:appbar
-        title:"关于"
-        width:parent.width
-    }
-
-    ColumnLayout{
-        anchors{
-            top: appbar.bottom
-            left: parent.left
-            right: parent.right
-        }
-
-        RowLayout{
-            Layout.topMargin: 20
-            Layout.leftMargin: 15
-            spacing: 14
-            FluText{
-                text:"FluentUI"
-                fontStyle: FluText.Title
-            }
-            FluText{
-                text:"v1.2.0"
-                fontStyle: FluText.Body
-                Layout.alignment: Qt.AlignBottom
-            }
-        }
-
-        RowLayout{
-            spacing: 14
-            Layout.topMargin: 20
-            Layout.leftMargin: 15
-            FluText{
-                text:"作者："
-            }
-            FluText{
-                text:"朱子楚"
-                Layout.alignment: Qt.AlignBottom
-            }
-        }
-
-        RowLayout{
-            spacing: 14
-            Layout.topMargin: 20
-            Layout.leftMargin: 15
-            FluText{
-                text:"GitHub："
-            }
-            FluTextButton{
-                id:text_hublink
-                text:"https://github.com/zhuzichu520/FluentUI"
-                Layout.alignment: Qt.AlignBottom
-                onClicked: {
-                    Qt.openUrlExternally(text_hublink.text)
-                }
-            }
-        }
-        RowLayout{
-            spacing: 14
-            Layout.topMargin: 20
-            Layout.leftMargin: 15
-            FluText{
-                id:text_info
-                text:"如果该项目对你有作用，就请点击上方链接给一个免费的star吧！"
-                ColorAnimation {
-                    id: animation
-                    target: text_info
-                    property: "color"
-                    from: "red"
-                    to: "blue"
-                    duration: 1000
-                    running: true
-                    loops: Animation.Infinite
-                    easing.type: Easing.InOutQuad
-                }
-            }
-        }
-    }
-}

example/page/ChatPage.qml

@@ -1,262 +0,0 @@
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import FluentUI
-import Controller
-import QtQuick.Dialogs
-
-FluWindow {
-
-    width: 680
-    height: 600
-    minimumWidth: 500
-    minimumHeight: 600
-
-    title:"ChatGPT"
-
-    onInitArgument:
-        (argument)=>{
-            scrollview.focus = true
-        }
-
-    ChatController{
-        id:controller
-
-        onResponseDataChanged: {
-            appendMessage(false,responseData)
-        }
-
-    }
-
-    ListModel{
-        id:model_message
-        ListElement{
-            isMy:false
-            text:"欢迎使用ChatGPT"
-        }
-        ListElement{
-            isMy:true
-            text:"好的，3Q"
-        }
-    }
-
-    FluAppBar{
-        id:appbar
-        title:"ChatGPT"
-        width:parent.width
-    }
-
-    Component{
-        id:com_text
-        TextEdit {
-            id:item_text
-            text: message
-            wrapMode: Text.WrapAnywhere
-            readOnly: true
-            selectByMouse: true
-            selectByKeyboard: true
-            selectedTextColor: Qt.rgba(51,153,255,1)
-            color:FluColors.Black
-            selectionColor: {
-                if(FluTheme.dark){
-                    return FluTheme.primaryColor.lighter
-                }else{
-                    return FluTheme.primaryColor.dark
-                }
-            }
-            width: Math.min(list_message.width-200,600,implicitWidth)
-            TapHandler{
-                acceptedButtons: Qt.RightButton
-                onTapped: {
-                    menu_item.showMenu(item_text.selectedText)
-                }
-            }
-        }
-    }
-
-    FluArea{
-        id:layout_content
-        anchors{
-            top: appbar.bottom
-            left: parent.left
-            right: parent.right
-            bottom: layout_bottom.top
-            margins: 10
-        }
-        color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(245/255,245/255,245/255,1)
-        ListView{
-            id:list_message
-            anchors.fill: parent
-            model:model_message
-            clip: true
-            ScrollBar.vertical: FluScrollBar {}
-            preferredHighlightBegin: 0
-            preferredHighlightEnd: 0
-            highlightMoveDuration: 0
-            header:Item{
-                width: list_message.width
-                height:20
-            }
-            footer:Item{
-                width: list_message.width
-                height:20
-            }
-            delegate: Item{
-                width: ListView.view.width
-                height: childrenRect.height
-
-                FluRectangle{
-                    id:item_avatar
-                    width: 30
-                    height: 30
-                    radius:[15,15,15,15]
-                    anchors{
-                        right: isMy ? parent.right : undefined
-                        rightMargin: isMy ? 20 : undefined
-                        left: isMy ? undefined : parent.left
-                        leftMargin: isMy ? undefined : 20
-                        top:parent.top
-                    }
-                    Image {
-                        asynchronous: true
-                        anchors.fill: parent
-                        sourceSize: Qt.size(100,100)
-                        source: isMy ? "qrc:/res/svg/avatar_2.svg" : "qrc:/res/image/logo_openai.png"
-                    }
-                }
-
-                Rectangle{
-                    id:item_layout_content
-                    color: isMy ? "#FF95EC69" : "#FFFFFF"
-                    width: item_msg_loader.width+10
-                    height: item_msg_loader.height+10
-                    radius: 3
-                    anchors{
-                        top: item_avatar.top
-                        right: isMy ? item_avatar.left : undefined
-                        rightMargin: isMy ? 10 : undefined
-                        left: isMy ? undefined : item_avatar.right
-                        leftMargin: isMy ? undefined : 10
-
-                    }
-
-                    Loader{
-                        id:item_msg_loader
-                        property var message: model.text
-                        anchors.centerIn: parent
-                        sourceComponent: com_text
-                    }
-                }
-
-
-                Item{
-                    id:item_layout_bottom
-                    width: parent.width
-                    anchors.top: item_layout_content.bottom
-                    height: 20
-                }
-            }
-        }
-    }
-
-    FluArea{
-        id:layout_bottom
-        height: 90
-        anchors{
-            bottom: parent.bottom
-            bottomMargin: 10
-            left: parent.left
-            right: parent.right
-            leftMargin: 10
-            rightMargin: 10
-        }
-
-
-        ScrollView{
-            id:scrollview
-            anchors{
-                bottom: parent.bottom
-                left: parent.left
-                right: button_send.left
-                bottomMargin: 10
-                leftMargin: 10
-                rightMargin: 10
-            }
-            height: Math.min(textbox.implicitHeight,64)
-            FluMultilineTextBox{
-                id:textbox
-                focus:true
-                placeholderText: "请输入消息"
-            }
-        }
-
-        FluFilledButton{
-            id:button_send
-            text:controller.isLoading ? timer_loading.loadingText :"发送"
-            anchors{
-                bottom: parent.bottom
-                right: parent.right
-                bottomMargin: 10
-                rightMargin: 10
-            }
-            width: 60
-            disabled: controller.isLoading
-            onClicked:{
-                var text = textbox.text
-                appendMessage(true,text)
-                controller.sendMessage(text)
-                textbox.clear()
-            }
-
-            Timer{
-                id:timer_loading
-                property int count : 0
-                property string loadingText : ""
-                interval: 500
-                running: controller.isLoading
-                repeat: true
-                onTriggered: {
-                    switch(count%3){
-                    case 0:
-                        loadingText = "."
-                        break
-                    case 1:
-                        loadingText = ".."
-                        break
-                    case 2:
-                        loadingText = "..."
-                        break
-                    default:
-                        loadingText = ""
-                        break
-                    }
-                    count++
-                }
-            }
-
-        }
-    }
-
-    FluMenu{
-        id:menu_item
-        focus: false
-        property string selectedText: ""
-        FluMenuItem{
-            text:"复制"
-            onClicked: {
-                controller.clipText(menu_item.selectedText)
-                showSuccess("复制成功")
-            }
-        }
-        function showMenu(text){
-            menu_item.selectedText = text
-            menu_item.popup()
-        }
-    }
-
-    function appendMessage(isMy,text){
-        model_message.append({isMy:isMy,text:text})
-        list_message.positionViewAtEnd()
-    }
-
-}

example/page/MainPage.qml

@@ -1,49 +0,0 @@
-import QtQuick
-import QtQuick.Window
-import QtQuick.Controls
-import QtQuick.Layouts
-import "qrc:///global/"
-import FluentUI
-
-FluWindow {
-    id:rootwindow
-    width: 1000
-    height: 640
-    title: "FluentUI"
-    minimumWidth: 520
-    minimumHeight: 460
-
-    FluAppBar{
-        id:appbar
-        z:10
-        showDark: true
-        width:parent.width
-    }
-
-    FluNavigationView{
-        id:nav_view
-        anchors.fill: parent
-        items: ItemsOriginal
-        footerItems:ItemsFooter
-        logo: "qrc:/res/image/favicon.ico"
-        z: 11
-        title:"FluentUI"
-        autoSuggestBox:FluAutoSuggestBox{
-            width: 280
-            anchors.centerIn: parent
-            iconSource: FluentIcons.Zoom
-            items: ItemsOriginal.getSearchData()
-            placeholderText: "查找"
-            onItemClicked:
-                (data)=>{
-                    ItemsOriginal.startPageByItem(data)
-                }
-        }
-        Component.onCompleted: {
-            ItemsOriginal.navigationView = nav_view
-            nav_view.setCurrentIndex(0)
-            nav_view.push("qrc:/T_Home.qml")
-        }
-    }
-
-}

example/page/MediaPage.qml

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

example/qml-Qt6/App.qml

@@ -0,0 +1,44 @@
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+Window {
+    id: app
+    flags: Qt.SplashScreen
+
+    FluHttpInterceptor{
+        id:interceptor
+        function onIntercept(request){
+            if(request.method === "get"){
+                request.params["method"] = "get"
+            }
+            if(request.method === "post"){
+                request.params["method"] = "post"
+            }
+            request.headers["token"] ="yyds"
+            request.headers["os"] ="pc"
+            console.debug(JSON.stringify(request))
+            return request
+        }
+    }
+
+    Component.onCompleted: {
+        FluApp.init(app)
+        FluTheme.darkMode = FluThemeType.System
+        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"
+        }
+        FluApp.initialRoute = "/"
+        FluApp.httpInterceptor = interceptor
+        FluApp.run()
+    }
+}

example/qml-Qt6/component/CodeExpander.qml

@@ -0,0 +1,145 @@
+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",
+                    "FluItem",
+                    "FluMediaPlayer",
+                    "FluMenu",
+                    "FluMenuItem",
+                    "FluMultilineTextBox",
+                    "FluNavigationView",
+                    "FluObject",
+                    "FluPaneItem",
+                    "FluPaneItemExpander",
+                    "FluPaneItemHeader",
+                    "FluPaneItemSeparator",
+                    "FluPivot",
+                    "FluPivotItem",
+                    "FluProgressBar",
+                    "FluProgressRing",
+                    "FluRadioButton",
+                    "FluRectangle",
+                    "FluScrollablePage",
+                    "FluScrollBar",
+                    "FluShadow",
+                    "FluSlider",
+                    "FluTabView",
+                    "FluText",
+                    "FluTextArea",
+                    "FluTextBox",
+                    "FluTextBoxBackground",
+                    "FluTextBoxMenu",
+                    "FluTextButton",
+                    "FluTextFiled",
+                    "FluTimePicker",
+                    "FluToggleSwitch",
+                    "FluTooltip",
+                    "FluTreeView",
+                    "FluWindow",
+                    "FluWindowResize",
+                    "FluToggleButton",
+                    "FluTableView",
+                    "FluColors",
+                    "FluTheme",
+                    "FluStatusView",
+                    "FluRatingControl",
+                    "FluPasswordBox",
+                    "FluBreadcrumbBar",
+                    "FluCopyableText",
+                    "FluAcrylic",
+                    "FluRemoteLoader",
+                    "FluMenuBar",
+                    "FluPagination",
+                    "FluRadioButtons",
+                    "FluImage",
+                    "FluSpinBox",
+                    "FluHttp",
+                    "FluWatermark",
+                    "FluTour",
+                    "FluQRCode",
+                    "FluTimeline",
+                    "FluChart"
+                ];
+        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/component/CustomWindow.qml

@@ -0,0 +1,64 @@
+import QtQuick
+import QtQuick.Layouts
+import FluentUI
+import org.wangwenx190.FramelessHelper
+
+FluWindow {
+    id:window
+    property bool fixSize
+    property alias titleVisible: title_bar.titleVisible
+    property bool appBarVisible: true
+    default property alias content: container.data
+    FluAppBar {
+        id: title_bar
+        title: window.title
+        visible: window.appBarVisible
+        icon:"qrc:/example/res/image/favicon.ico"
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+        }
+        darkText: lang.dark_mode
+    }
+    Item{
+        id:container
+        anchors{
+            top: title_bar.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+        clip: true
+    }
+    FramelessHelper{
+        id:framless_helper
+        onReady: {
+            setTitleBarItem(title_bar)
+            moveWindowToDesktopCenter()
+            setHitTestVisible(title_bar.minimizeButton())
+            setHitTestVisible(title_bar.maximizeButton())
+            setHitTestVisible(title_bar.closeButton())
+            setWindowFixedSize(fixSize)
+            title_bar.maximizeButton.visible = !fixSize
+            if (blurBehindWindowEnabled)
+                window.background = undefined
+            window.show()
+        }
+    }
+    Connections{
+        target: FluTheme
+        function onDarkChanged(){
+            if (FluTheme.dark)
+                FramelessUtils.systemTheme = FramelessHelperConstants.Dark
+            else
+                FramelessUtils.systemTheme = FramelessHelperConstants.Light
+        }
+    }
+    function setHitTestVisible(com){
+        framless_helper.setHitTestVisible(com)
+    }
+    function setTitleBarItem(com){
+        framless_helper.setTitleBarItem(com)
+    }
+}

example/qml-Qt6/global/ItemsFooter.qml

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

example/qml-Qt6/global/ItemsOriginal.qml

@@ -0,0 +1,483 @@
+pragma Singleton
+
+import QtQuick
+import FluentUI
+
+FluObject{
+
+    property var navigationView
+
+    function rename(item, newName){
+        if(newName && newName.trim().length>0){
+            item.title = newName;
+        }
+    }
+
+    FluPaneItem{
+        id:item_home
+        count: 9
+        title:lang.home
+        infoBadge:FluBadge{
+            count: item_home.count
+        }
+        icon:FluentIcons.Home
+        onTap:{
+            if(navigationView.getCurrentUrl()){
+                item_home.count = 0
+            }
+            navigationView.push("qrc:/example/qml/page/T_Home.qml")
+        }
+        editDelegate: FluTextBox{
+            text:item_home.title
+        }
+        menuDelegate: FluMenu{
+            id:nav_item_right_menu
+            width: 120
+            FluMenuItem{
+                text: "重命名"
+                visible: true
+                onClicked: {
+                    item_home.showEdit = true
+                }
+            }
+        }
+    }
+
+    FluPaneItemExpander{
+        id:item_expander_basic_input
+        title:lang.basic_input
+        icon:FluentIcons.CheckboxComposite
+        editDelegate: FluTextBox{
+            text:item_expander_basic_input.title
+        }
+        menuDelegate: FluMenu{
+            FluMenuItem{
+                text: "重命名"
+                visible: true
+                onClicked: {
+                    item_expander_basic_input.showEdit = true
+                }
+            }
+        }
+        FluPaneItem{
+            id:item_buttons
+            count: 99
+            infoBadge:FluBadge{
+                count: item_buttons.count
+            }
+            title:"Buttons"
+            image:"qrc:/example/res/image/control/Button.png"
+            recentlyUpdated:true
+            desc:"A control that responds to user input and raisesa Click event."
+            onTap:{
+                item_buttons.count = 0
+                navigationView.push("qrc:/example/qml/page/T_Buttons.qml")
+            }
+        }
+        FluPaneItem{
+            id:item_text
+            title:"Text"
+            count: 5
+            infoBadge:FluBadge{
+                count: item_text.count
+                color: Qt.rgba(82/255,196/255,26/255,1)
+            }
+            onTap:{
+                item_text.count = 0
+                navigationView.push("qrc:/example/qml/page/T_Text.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Image"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Image.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Slider"
+            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."
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Slider.qml")
+            }
+        }
+        FluPaneItem{
+            title:"CheckBox"
+            image:"qrc:/example/res/image/control/Checkbox.png"
+            recentlyUpdated:true
+            desc:"A control that a user can select or clear."
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_CheckBox.qml")
+            }
+        }
+        FluPaneItem{
+            title:"RadioButton"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_RadioButton.qml")
+            }
+        }
+        FluPaneItem{
+            title:"ToggleSwitch"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_ToggleSwitch.qml")
+            }
+        }
+    }
+
+    FluPaneItemExpander{
+        title:lang.form
+        icon:FluentIcons.GridView
+        FluPaneItem{
+            title:"TextBox"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_TextBox.qml")
+            }
+        }
+        FluPaneItem{
+            title:"TimePicker"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_TimePicker.qml")
+            }
+        }
+        FluPaneItem{
+            title:"DatePicker"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_DatePicker.qml")
+            }
+        }
+        FluPaneItem{
+            title:"CalendarPicker"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_CalendarPicker.qml")
+            }
+        }
+        FluPaneItem{
+            title:"ColorPicker"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_ColorPicker.qml")
+            }
+        }
+    }
+
+    FluPaneItemExpander{
+        title:lang.surface
+        icon:FluentIcons.SurfaceHub
+        FluPaneItem{
+            title:"InfoBar"
+            image:"qrc:/example/res/image/control/InfoBar.png"
+            recentlyUpdated:true
+            desc:"An inline message to display app-wide statuschange information."
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_InfoBar.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Progress"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Progress.qml")
+            }
+        }
+        FluPaneItem{
+            title:"RatingControl"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_RatingControl.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Badge"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Badge.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Rectangle"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Rectangle.qml")
+            }
+        }
+        FluPaneItem{
+            title:"StatusView"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_StatusView.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Carousel"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Carousel.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Expander"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Expander.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Watermark"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Watermark.qml")
+            }
+        }
+    }
+
+    FluPaneItemExpander{
+        title:lang.popus
+        icon:FluentIcons.ButtonMenu
+        FluPaneItem{
+            title:"Dialog"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Dialog.qml")
+            }
+        }
+        FluPaneItem{
+            id:item_combobox
+            title:"ComboBox"
+            count: 9
+            infoBadge:FluBadge{
+                count: item_combobox.count
+                color: Qt.rgba(250/255,173/255,20/255,1)
+            }
+            onTap:{
+                item_combobox.count = 0
+                navigationView.push("qrc:/example/qml/page/T_ComboBox.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Tooltip"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Tooltip.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Menu"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Menu.qml")
+            }
+        }
+    }
+
+    FluPaneItemExpander{
+        title:lang.navigation
+        icon:FluentIcons.AllApps
+        FluPaneItem{
+            title:"Pivot"
+            image:"qrc:/example/res/image/control/Pivot.png"
+            recentlyAdded:true
+            order:3
+            desc:"Presents information from different sources in atabbed view."
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Pivot.qml")
+            }
+        }
+        FluPaneItem{
+            title:"BreadcrumbBar"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_BreadcrumbBar.qml")
+            }
+        }
+        FluPaneItem{
+            title:"TabView"
+            image:"qrc:/example/res/image/control/TabView.png"
+            recentlyAdded:true
+            order:1
+            desc:"A control that displays a collection of tabs thatcan be used to display several documents."
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_TabView.qml")
+            }
+        }
+        FluPaneItem{
+            title:"TreeView"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_TreeView.qml")
+            }
+        }
+        FluPaneItem{
+            title:"TableView"
+            image:"qrc:/example/res/image/control/DataGrid.png"
+            recentlyAdded:true
+            order:4
+            desc:"The TableView control provides a flexible way to display a collection of data in rows and columns"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_TableView.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Pagination"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Pagination.qml")
+            }
+        }
+        FluPaneItem{
+            title:"MultiWindow"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_MultiWindow.qml")
+            }
+        }
+        FluPaneItem{
+            title:"FlipView"
+            image:"qrc:/example/res/image/control/FlipView.png"
+            recentlyAdded:true
+            order:2
+            desc:"Presents a collection of items that the user canflip through, one item at a time."
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_FlipView.qml")
+            }
+        }
+    }
+
+    FluPaneItemExpander{
+        title:lang.theming
+        icon:FluentIcons.Brightness
+        FluPaneItem{
+            title:"Acrylic"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Acrylic.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Theme"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Theme.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Typography"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Typography.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Awesome"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Awesome.qml")
+            }
+        }
+    }
+
+    FluPaneItemSeparator{
+        spacing:10
+        size:1
+    }
+
+    FluPaneItemExpander{
+        title:lang.other
+        icon:FluentIcons.Shop
+        FluPaneItem{
+            title:"QRCode"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_QRCode.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Tour"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Tour.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Timeline"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Timeline.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Screenshot"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Screenshot.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Captcha"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Captcha.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Chart"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Chart.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Http"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Http.qml")
+            }
+        }
+        FluPaneItem{
+            id:item_other
+            title:"RemoteLoader"
+            count: 99
+            infoBadge:FluBadge{
+                count: item_other.count
+                color: Qt.rgba(82/255,196/255,26/255,1)
+            }
+            onTap:{
+                item_other.count = 0
+                navigationView.push("qrc:/example/qml/page/T_RemoteLoader.qml")
+            }
+        }
+        FluPaneItem{
+            title:"HotLoader"
+            tapFunc:function(){
+                FluApp.navigate("/hotload")
+            }
+        }
+    }
+
+    function getRecentlyAddedData(){
+        var arr = []
+        for(var i=0;i<children.length;i++){
+            var item = children[i]
+            if(item instanceof FluPaneItem && item.recentlyAdded){
+                arr.push(item)
+            }
+            if(item instanceof FluPaneItemExpander){
+                for(var j=0;j<item.children.length;j++){
+                    var itemChild = item.children[j]
+                    if(itemChild instanceof FluPaneItem && itemChild.recentlyAdded){
+                        arr.push(itemChild)
+                    }
+                }
+            }
+        }
+        arr.sort(function(o1,o2){ return o2.order-o1.order })
+        return arr
+    }
+
+    function getRecentlyUpdatedData(){
+        var arr = []
+        var items = navigationView.getItems();
+        for(var i=0;i<items.length;i++){
+            var item = items[i]
+            if(item instanceof FluPaneItem && item.recentlyUpdated){
+                arr.push(item)
+            }
+        }
+        return arr
+    }
+
+    function getSearchData(){
+        var arr = []
+        var items = navigationView.getItems();
+        for(var i=0;i<items.length;i++){
+            var item = items[i]
+            if(item instanceof FluPaneItem){
+                if (item.parent instanceof FluPaneItemExpander)
+                {
+                    arr.push({title:`${item.parent.title} -> ${item.title}`,key:item.key})
+                }
+                else
+                    arr.push({title:item.title,key:item.key})
+            }
+        }
+        return arr
+    }
+
+    function startPageByItem(data){
+        navigationView.startPageByItem(data)
+    }
+
+}

example/qml-Qt6/global/MainEvent.qml

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

example/qml-Qt6/global/qmldir

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

example/qml-Qt6/page/T_Acrylic.qml

@@ -0,0 +1,114 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "qrc:///example/qml/component"
+
+FluScrollablePage{
+
+    title:"Acrylic"
+
+    RowLayout{
+        spacing: 10
+        Layout.topMargin: 20
+        FluText{
+            text:"tintColor:"
+            Layout.alignment: Qt.AlignVCenter
+        }
+        FluColorPicker{
+            id:color_picker
+        }
+    }
+    RowLayout{
+        spacing: 10
+        FluText{
+            text:"tintOpacity:"
+            Layout.alignment: Qt.AlignVCenter
+        }
+        FluSlider{
+            id:slider_tint_opacity
+            value: 65
+        }
+    }
+    RowLayout{
+        spacing: 10
+        FluText{
+            text:"blurRadius:"
+            Layout.alignment: Qt.AlignVCenter
+        }
+        FluSlider{
+            id:slider_blur_radius
+            value: 32
+        }
+    }
+    FluArea{
+        Layout.fillWidth: true
+        height: 1200/4+20
+        paddings: 10
+        Layout.topMargin: 10
+        FluRectangle{
+            width: 1920/4
+            height: 1200/4
+            radius:[15,15,15,15]
+            Image {
+                id:image
+                asynchronous: true
+                source: "qrc:/example/res/image/bg_scenic.png"
+                anchors.fill: parent
+                sourceSize: Qt.size(2*width,2*height)
+            }
+            FluAcrylic {
+                id:acrylic
+                target: image
+                width: 200
+                height: 200
+                tintOpacity: slider_tint_opacity.value/100
+                tintColor: color_picker.colorValue
+                blurRadius: slider_blur_radius.value
+                x:(image.width-width)/2
+                y:(image.height-height)/2
+                FluText {
+                    anchors.centerIn: parent
+                    text: "Acrylic"
+                    color: "#FFFFFF"
+                    font.bold: true
+                }
+                MouseArea {
+                    property point clickPos: Qt.point(0,0)
+                    id:drag_area
+                    anchors.fill: parent
+                    onPressed: (mouse)=>{
+                                   clickPos = Qt.point(mouse.x, mouse.y)
+                               }
+                    onPositionChanged: (mouse)=>{
+                                           var delta = Qt.point(mouse.x - clickPos.x,mouse.y - clickPos.y)
+                                           acrylic.x = acrylic.x + delta.x
+                                           acrylic.y = acrylic.y + delta.y
+                                       }
+                }
+            }
+            Layout.topMargin: 20
+        }
+
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'Image{
+    id:image
+    width: 800
+    height: 600
+    source: "qrc:/example/res/image/image_huoyin.webp"
+    radius: 8
+    }
+    FluAcrylic{
+        target:image
+        width: 100
+        height: 100
+        anchors.centerIn: parent
+    }
+}'
+    }
+
+}

example/qml-Qt6/page/T_Awesome.qml

@@ -1,4 +1,4 @@
-import QtQuick
+import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
@@ -8,10 +8,6 @@ FluContentPage {
 
     title:"Awesome"
 
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-
     FluTextBox{
         id:text_box
         placeholderText: "请输入关键字"
@@ -37,6 +33,7 @@ FluContentPage {
         cellWidth: 80
         cellHeight: 80
         clip: true
+        boundsBehavior: GridView.StopAtBounds
         model:FluApp.awesomelist()
         ScrollBar.vertical: FluScrollBar {}
         anchors{
@@ -55,7 +52,7 @@ FluContentPage {
                 anchors.horizontalCenter: parent.horizontalCenter
                 onClicked: {
                     var text  ="FluentIcons."+modelData.name;
-                    FluApp.clipText(text)
+                    FluTools.clipText(text)
                     showSuccess("您复制了 "+text)
                 }
             }

example/qml-Qt6/page/T_Badge.qml

@@ -1,19 +1,14 @@
-import QtQuick
+import QtQuick
 import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "qrc:///example/qml/component"
 
 FluScrollablePage{
 
     title:"Badge"
 
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
-
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
@@ -38,6 +33,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         count:0
                     }
                 }
@@ -48,6 +45,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         count:5
                     }
                 }
@@ -57,6 +56,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         count:50
                     }
                 }
@@ -66,6 +67,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         count:100
                     }
                 }
@@ -75,6 +78,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         isDot:true
                     }
                 }
@@ -84,6 +89,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         count:99
                         color: Qt.rgba(250/255,173/255,20/255,1)
                     }
@@ -94,6 +101,8 @@ FluScrollablePage{
                     radius:  8
                     color: Qt.rgba(191/255,191/255,191/255,1)
                     FluBadge{
+                        topRight: true
+                        showZero: true
                         count:99
                         color: Qt.rgba(82/255,196/255,26/255,1)
                     }
@@ -103,6 +112,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'Rectangle{
     width: 40
     height: 40

example/qml-Qt6/page/T_BreadcrumbBar.qml

@@ -0,0 +1,94 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "qrc:///example/qml/component"
+
+FluScrollablePage{
+
+    title:"BreadcurmbBar"
+
+    Component.onCompleted: {
+        var items = []
+        for(var i=0;i<10;i++){
+            items.push({title:"Item_"+(i+1)})
+        }
+        breadcrumb_1.items = items
+        breadcrumb_2.items = items
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
+        Layout.topMargin: 20
+
+        FluBreadcrumbBar{
+            id:breadcrumb_1
+            width:parent.width
+            anchors.verticalCenter: parent.verticalCenter
+            onClickItem:
+                (model)=>{
+                    showSuccess(model.title)
+                }
+        }
+    }
+
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 100
+        paddings: 10
+        Layout.topMargin: 20
+
+        ColumnLayout{
+            anchors.verticalCenter: parent.verticalCenter
+            width:parent.width
+            spacing: 10
+
+            FluFilledButton{
+                text:"Reset sample"
+                onClicked:{
+                    var items = []
+                    for(var i=0;i<10;i++){
+                        items.push({title:"Item_"+(i+1)})
+                    }
+                     breadcrumb_2.items = items
+                }
+            }
+
+            FluBreadcrumbBar{
+                id:breadcrumb_2
+                separator:">"
+                spacing:8
+                textSize:18
+                Layout.fillWidth: true
+                onClickItem:
+                    (model)=>{
+                        //不是点击最后一个item元素
+                        if(model.index+1!==count()){
+                            breadcrumb_2.remove(model.index+1,count()-model.index-1)
+                        }
+                        showSuccess(model.title)
+                    }
+            }
+        }
+    }
+
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluBreadcrumbBar{
+    width:parent.width
+    separator:">"
+    spacing:8
+    textSize:18
+    onClickItem: (model)=>{
+
+    }
+}'
+    }
+
+
+}

example/qml-Qt6/page/T_Buttons.qml

@@ -1,17 +1,14 @@
-import QtQuick
+import QtQuick
 import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
+import QtQuick.Controls.Basic
 import FluentUI
-import "./component"
+import "qrc:///example/qml/component"
 
 FluScrollablePage{
-    title:"Buttons"
 
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
+    title:"Buttons"
 
     FluText{
         Layout.topMargin: 20
@@ -25,8 +22,9 @@ FluScrollablePage{
         Layout.topMargin: 20
 
         FluTextButton{
-            disabled:text_button_switch.selected
+            disabled:text_button_switch.checked
             text:"Text Button"
+            contentDescription: "文本按钮"
             onClicked: {
                 showInfo("点击Text Button")
             }
@@ -35,22 +33,18 @@ FluScrollablePage{
                 left: parent.left
             }
         }
-
-        Row{
-            spacing: 5
+        FluToggleSwitch{
+            id:text_button_switch
             anchors{
-                verticalCenter: parent.verticalCenter
                 right: parent.right
+                verticalCenter: parent.verticalCenter
             }
-            FluToggleSwitch{
-                id:text_button_switch
-                Layout.alignment: Qt.AlignRight
-                text:"Disabled"
-            }
+            text:"Disabled"
         }
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluTextButton{
     text:"Text Button"
     onClicked: {
@@ -66,7 +60,7 @@ FluScrollablePage{
         Layout.topMargin: 20
 
         FluButton{
-            disabled:button_switch.selected
+            disabled:button_switch.checked
             text:"Standard Button"
             onClicked: {
                 showInfo("点击StandardButton")
@@ -76,22 +70,18 @@ FluScrollablePage{
                 left: parent.left
             }
         }
-
-        Row{
-            spacing: 5
+        FluToggleSwitch{
+            id:button_switch
             anchors{
-                verticalCenter: parent.verticalCenter
                 right: parent.right
+                verticalCenter: parent.verticalCenter
             }
-            FluToggleSwitch{
-                id:button_switch
-                Layout.alignment: Qt.AlignRight
-                text:"Disabled"
-            }
+            text:"Disabled"
         }
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluButton{
     text:"Standard Button"
     onClicked: {
@@ -107,32 +97,28 @@ FluScrollablePage{
         paddings: 10
 
         FluFilledButton{
-            disabled:filled_button_switch.selected
+            disabled:filled_button_switch.checked
             text:"Filled Button"
             onClicked: {
-                showWarning("点击FilledButton")
+                showWarning("点击FilledButton"+height)
             }
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
         }
-
-        Row{
-            spacing: 5
+        FluToggleSwitch{
+            id:filled_button_switch
             anchors{
-                verticalCenter: parent.verticalCenter
                 right: parent.right
+                verticalCenter: parent.verticalCenter
             }
-            FluToggleSwitch{
-                id:filled_button_switch
-                Layout.alignment: Qt.AlignRight
-                text:"Disabled"
-            }
+            text:"Disabled"
         }
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluFilledButton{
     text:"Filled Button"
     onClicked: {
@@ -141,40 +127,114 @@ FluScrollablePage{
 }'
     }
 
-
     FluArea{
         Layout.fillWidth: true
         height: 68
-        paddings: 10
         Layout.topMargin: 20
-        FluIconButton{
-            iconSource:FluentIcons.ChromeCloseContrast
-            disabled:icon_button_switch.selected
-            iconSize: 15
+        paddings: 10
+
+        FluToggleButton{
+            disabled:toggle_button_switch.checked
+            text:"Toggle Button"
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-            onClicked:{
-                showSuccess("点击IconButton")
-            }
         }
-
-        Row{
-            spacing: 5
+        FluToggleSwitch{
+            id:toggle_button_switch
             anchors{
-                verticalCenter: parent.verticalCenter
                 right: parent.right
+                verticalCenter: parent.verticalCenter
             }
-            FluToggleSwitch{
-                id:icon_button_switch
-                Layout.alignment: Qt.AlignRight
-                text:"Disabled"
-            }
+            text:"Disabled"
         }
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluToggleButton{
+    text:"Toggle Button"
+    onClicked: {
+        checked = !checked
+    }
+}'
+    }
+
+
+    FluArea{
+        Layout.fillWidth: true
+        height: layout_icon_button.height + 30
+        paddings: 10
+        Layout.topMargin: 20
+        Flow{
+            id:layout_icon_button
+            spacing: 10
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+                right: icon_button_switch.left
+            }
+            FluIconButton{
+                disabled:icon_button_switch.checked
+                iconDelegate: Image{ sourceSize: Qt.size(40,40) ; width: 20; height: 20; source: "qrc:/example/res/image/ic_home_github.png" }
+                onClicked:{
+                    showSuccess("点击IconButton")
+                }
+            }
+            FluIconButton{
+                iconSource:FluentIcons.ChromeCloseContrast
+                disabled:icon_button_switch.checked
+                iconSize: 15
+                text:"IconOnly"
+                display: Button.IconOnly
+                onClicked:{
+                    showSuccess("Button.IconOnly")
+                }
+            }
+            FluIconButton{
+                iconSource:FluentIcons.ChromeCloseContrast
+                disabled:icon_button_switch.checked
+                iconSize: 15
+                text:"TextOnly"
+                display: Button.TextOnly
+                onClicked:{
+                    showSuccess("Button.TextOnly")
+                }
+            }
+            FluIconButton{
+                iconSource:FluentIcons.ChromeCloseContrast
+                disabled:icon_button_switch.checked
+                iconSize: 15
+                text:"TextBesideIcon"
+                display: Button.TextBesideIcon
+                onClicked:{
+                    showSuccess("Button.TextBesideIcon")
+                }
+            }
+            FluIconButton{
+                iconSource:FluentIcons.ChromeCloseContrast
+                disabled:icon_button_switch.checked
+                iconSize: 15
+                text:"TextUnderIcon"
+                display: Button.TextUnderIcon
+                onClicked:{
+                    showSuccess("Button.TextUnderIcon")
+                }
+            }
+        }
+        FluToggleSwitch{
+            id:icon_button_switch
+            anchors{
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            text:"Disabled"
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluIconButton{
     iconSource:FluentIcons.ChromeCloseContrast
     onClicked: {
@@ -189,58 +249,54 @@ FluScrollablePage{
         paddings: 10
         Layout.topMargin: 20
         FluDropDownButton{
-            disabled:drop_down_button_switch.selected
+            disabled:drop_down_button_switch.checked
             text:"DropDownButton"
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-            items:[
-                FluMenuItem{
-                    text:"Menu_1"
-                },
-                FluMenuItem{
-                    text:"Menu_2"
-                },
-                FluMenuItem{
-                    text:"Menu_3"
-                },
-                FluMenuItem{
-                    text:"Menu_4"
+            FluMenuItem{
+                text:"Menu_1"
+            }
+            FluMenuItem{
+                text:"Menu_2"
+            }
+            FluMenuItem{
+                text:"Menu_3"
+            }
+            FluMenuItem{
+                text:"Menu_4"
+                onClicked: {
+
                 }
-            ]
+            }
         }
-        Row{
-            spacing: 5
+        FluToggleSwitch{
+            id:drop_down_button_switch
             anchors{
-                verticalCenter: parent.verticalCenter
                 right: parent.right
+                verticalCenter: parent.verticalCenter
             }
-            FluToggleSwitch{
-                id:drop_down_button_switch
-                Layout.alignment: Qt.AlignRight
-                text:"Disabled"
-            }
+            text:"Disabled"
         }
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluDropDownButton{
     text:"DropDownButton"
-    items:[
-        FluMenuItem{
-            text:"Menu_1"
-        },
-        FluMenuItem{
-            text:"Menu_2"
-        },
-        FluMenuItem{
-            text:"Menu_3"
-        },
-        FluMenuItem{
-            text:"Menu_4"
-        }
-    ]
+    FluMenuItem{
+        text:"Menu_1"
+    },
+    FluMenuItem{
+        text:"Menu_2"
+    },
+    FluMenuItem{
+        text:"Menu_3"
+    },
+    FluMenuItem{
+        text:"Menu_4"
+    }
 }'
     }
 
@@ -249,45 +305,39 @@ FluScrollablePage{
         height: 100
         paddings: 10
         Layout.topMargin: 20
-        ColumnLayout{
+        FluRadioButtons{
             spacing: 8
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-            Repeater{
-                id:repeater
-                property int selecIndex : 0
-                model: 3
-                delegate:  FluRadioButton{
-                    selected : repeater.selecIndex===index
-                    disabled:radio_button_switch.selected
-                    text:"Radio Button_"+index
-                    onClicked:{
-                        repeater.selecIndex = index
-                    }
-                }
+            FluRadioButton{
+                disabled:radio_button_switch.checked
+                text:"Radio Button_1"
+            }
+            FluRadioButton{
+                disabled:radio_button_switch.checked
+                text:"Radio Button_2"
+            }
+            FluRadioButton{
+                disabled:radio_button_switch.checked
+                text:"Radio Button_3"
             }
         }
-
-
-        Row{
-            spacing: 5
+        FluToggleSwitch{
+            id:radio_button_switch
             anchors{
-                verticalCenter: parent.verticalCenter
                 right: parent.right
+                verticalCenter: parent.verticalCenter
             }
-            FluToggleSwitch{
-                id:radio_button_switch
-                Layout.alignment: Qt.AlignRight
-                text:"Disabled"
-            }
+            text:"Disabled"
         }
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluRadioButton{
-    selected:true
+    checked:true
     text:"Text Button"
     onClicked: {
 
@@ -295,37 +345,4 @@ FluScrollablePage{
 }'
     }
 
-
-    FluArea{
-        Layout.fillWidth: true
-        height: 68
-        paddings: 10
-        Layout.topMargin: 20
-        FluCheckBox{
-            disabled:check_box_switch.selected
-            text:"Check Box"
-            anchors{
-                verticalCenter: parent.verticalCenter
-                left: parent.left
-            }
-        }
-        Row{
-            spacing: 5
-            anchors{
-                verticalCenter: parent.verticalCenter
-                right: parent.right
-            }
-            FluToggleSwitch{
-                id:check_box_switch
-                Layout.alignment: Qt.AlignRight
-                text:"Disabled"
-            }
-        }
-    }
-    CodeExpander{
-        Layout.fillWidth: true
-        code:'FluCheckBox{
-    text:"Check Box"
-}'
-    }
 }

example/qml-Qt6/page/T_CalendarPicker.qml

@@ -1,17 +1,13 @@
-import QtQuick
+import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "qrc:///example/qml/component"
 
 FluScrollablePage{
 
     title:"CalendarPicker"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
@@ -23,6 +19,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluCalendarView{
 
 }'
@@ -39,11 +36,16 @@ FluScrollablePage{
                 left: parent.left
             }
             FluCalendarPicker{
+                current:Date.fromLocaleString("2013年7月11日 21:17:42")
+                onAccepted:{
+                    showSuccess(current.toLocaleString())
+                }
             }
         }
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluCalendarPicker{
 
 }'

example/qml-Qt6/page/T_Captcha.qml

@@ -0,0 +1,54 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "qrc:///example/qml/component"
+
+FluScrollablePage{
+
+    title:"Captcha"
+
+
+    FluCaptcha{
+        id:captcha
+        Layout.topMargin: 20
+        MouseArea{
+            anchors.fill: parent
+            cursorShape: Qt.PointingHandCursor
+            onClicked: {
+                captcha.refresh()
+            }
+        }
+    }
+
+    FluButton{
+        text:"Refresh"
+        Layout.topMargin: 20
+        onClicked: {
+            captcha.refresh()
+        }
+    }
+
+    RowLayout{
+        spacing: 10
+        Layout.topMargin: 10
+        FluTextBox{
+            id:text_box
+            placeholderText: "请输入验证码"
+        }
+        FluButton{
+            text:"verify"
+            onClicked: {
+                var success =  captcha.verify(text_box.text)
+                if(success){
+                    showSuccess("验证码正确")
+                }else{
+                    showError("错误验证，请重新输入")
+                }
+            }
+        }
+    }
+
+
+}

example/qml-Qt6/page/T_Carousel.qml

@@ -0,0 +1,132 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "qrc:///example/qml/component"
+
+FluScrollablePage{
+
+    title:"Carousel"
+
+    ListModel{
+        id:data_model
+        ListElement{
+            url:"qrc:/example/res/image/banner_1.jpg"
+        }
+        ListElement{
+            url:"qrc:/example/res/image/banner_2.jpg"
+        }
+        ListElement{
+            url:"qrc:/example/res/image/banner_3.jpg"
+        }
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 370
+        paddings: 10
+        Layout.topMargin: 20
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left:parent.left
+            }
+            FluText{
+                text:"轮播图，支持无限轮播，无限滑动，用ListView实现的组件"
+            }
+            FluCarousel{
+                radius:[5,5,5,5]
+                delegate: Component{
+                    Image {
+                        anchors.fill: parent
+                        source: model.url
+                        asynchronous: true
+                        fillMode:Image.PreserveAspectCrop
+                    }
+                }
+                Layout.topMargin: 20
+                Layout.leftMargin: 5
+                Component.onCompleted: {
+                    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"}]
+                }
+            }
+        }
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 340
+        paddings: 10
+        Layout.topMargin: 10
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left:parent.left
+            }
+            FluCarousel{
+                radius:[15,15,15,15]
+                loopTime:1500
+                indicatorGravity: Qt.AlignHCenter | Qt.AlignTop
+                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
+                                font.pixelSize: 15
+                            }
+                        }
+                    }
+                }
+                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
+                }
+            }
+        }
+    }
+
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluCarousel{
+    id:carousel
+    width: 400
+    height: 300
+    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-Qt6/page/T_Chart.qml

@@ -0,0 +1,331 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "qrc:///example/qml/component"
+
+FluScrollablePage{
+
+    title:"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
+                                },
+                            }],
+                    }
+                }
+            }
+        }
+    }
+
+    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: 'Dataset 1',
+                            backgroundColor: '#ff9999',
+                            stack: 'Stack 0',
+                            data: [
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor()
+                            ]
+                        }, {
+                            label: 'Dataset 2',
+                            backgroundColor: '#9999ff',
+                            stack: 'Stack 0',
+                            data: [
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor()
+                            ]
+                        }, {
+                            label: 'Dataset 3',
+                            backgroundColor: '#99ff99',
+                            stack: 'Stack 1',
+                            data: [
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor()
+                            ]
+                        }]
+                }
+            }
+
+            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: 'pie'
+            chartData: {return {
+                    datasets: [{
+                            data: [
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                            ],
+                            backgroundColor: [
+                                '#ffbbbb',
+                                '#ffddaa',
+                                '#ffffbb',
+                                '#bbffbb',
+                                '#bbbbff'
+                            ],
+                            label: 'Dataset 1'
+                        }],
+                    labels: [
+                        'Red',
+                        'Orange',
+                        'Yellow',
+                        'Green',
+                        'Blue'
+                    ]
+                }}
+            chartOptions: {return {maintainAspectRatio: false, responsive: true}}
+        }
+    }
+
+    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: 'Filled',
+                            fill: true,
+                            backgroundColor: 'rgba(192,222,255,0.3)',
+                            borderColor: 'rgba(128,192,255,255)',
+                            data: [
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor()
+                            ],
+                        }, {
+                            label: 'Dashed',
+                            fill: false,
+                            backgroundColor: 'rgba(0,0,0,0)',
+                            borderColor: '#009900',
+                            borderDash: [5, 5],
+                            data: [
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor()
+                            ],
+                        }, {
+                            label: 'Filled',
+                            backgroundColor: 'rgba(0,0,0,0)',
+                            borderColor: '#990000',
+                            data: [
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor(),
+                                randomScalingFactor()
+                            ],
+                            fill: false,
+                        }]
+                }
+            }
+
+            chartOptions: {return {
+                    maintainAspectRatio: false,
+                    responsive: true,
+                    title: {
+                        display: true,
+                        text: 'Chart.js Line Chart'
+                    },
+                    tooltips: {
+                        mode: 'index',
+                        intersect: false,
+                    },
+                    hover: {
+                        mode: 'nearest',
+                        intersect: true
+                    },
+                    scales: {
+                        xAxes: [{
+                                display: true,
+                                scaleLabel: {
+                                    display: true,
+                                    labelString: 'Month'
+                                }
+                            }],
+                        yAxes: [{
+                                display: true,
+                                scaleLabel: {
+                                    display: true,
+                                    labelString: 'Value'
+                                }
+                            }]
+                    }
+                }
+            }
+        }
+    }
+
+}

example/qml-Qt6/page/T_CheckBox.qml

@@ -0,0 +1,50 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "qrc:///example/qml/component"
+
+FluScrollablePage{
+
+    title:"CheckBox"
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
+        Layout.topMargin: 20
+        Row{
+            spacing: 30
+            anchors.verticalCenter: parent.verticalCenter
+            FluCheckBox{
+                disabled: check_box_switch.checked
+            }
+            FluCheckBox{
+                disabled: check_box_switch.checked
+                text:"Right"
+            }
+            FluCheckBox{
+                disabled: check_box_switch.checked
+                text:"Left"
+                textRight: false
+            }
+        }
+        FluToggleSwitch{
+            id:check_box_switch
+            anchors{
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+            }
+            text:"Disabled"
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluCheckBox{
+    text:"Text"
+}'
+    }
+
+}

example/qml-Qt6/page/T_ColorPicker.qml

@@ -1,17 +1,13 @@
-import QtQuick
+import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "qrc:///example/qml/component"
 
 FluScrollablePage{
 
     title:"ColorPicker"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
@@ -27,8 +23,6 @@ FluScrollablePage{
                 text:"此颜色组件是Github上的开源项目"
             }
             FluTextButton{
-                leftPadding: 0
-                rightPadding: 0
                 text:"https://github.com/rshest/qml-colorpicker"
                 onClicked: {
                     Qt.openUrlExternally(text)
@@ -41,6 +35,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluColorView{
 
 }'
@@ -64,6 +59,7 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluColorPicker{
 
 }'

example/qml-Qt6/page/T_ComboBox.qml

@@ -0,0 +1,81 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "qrc:///example/qml/component"
+
+FluScrollablePage{
+
+    title:"ComboBox"
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 80
+        paddings: 5
+        Layout.topMargin: 20
+        Column{
+            spacing: 5
+            anchors.verticalCenter: parent.verticalCenter
+            FluText{
+                text: "editable=false"
+                x:10
+            }
+            FluComboBox {
+                model: ListModel {
+                    id: model_1
+                    ListElement { text: "Banana" }
+                    ListElement { text: "Apple" }
+                    ListElement { text: "Coconut" }
+                }
+            }
+        }
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 80
+        paddings: 10
+        Layout.topMargin: 20
+        Column{
+            spacing: 5
+            anchors.verticalCenter: parent.verticalCenter
+            FluText{
+                text: "editable=true"
+                x:5
+            }
+            FluComboBox {
+                editable: true
+                font:FluTextStyle.BodyStrong
+                model: ListModel {
+                    id: model_2
+                    ListElement { text: "Banana" }
+                    ListElement { text: "Apple" }
+                    ListElement { text: "Coconut" }
+                }
+                onAccepted: {
+                    if (find(editText) === -1)
+                        model_2.append({text: editText})
+                }
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluComboBox{
+    editable: true
+    model: ListModel {
+        id: model
+        ListElement { text: "Banana" }
+        ListElement { text: "Apple" }
+        ListElement { text: "Coconut" }
+    }
+    onAccepted: {
+        if (find(editText) === -1)
+            model.append({text: editText})
+    }
+}'
+    }
+
+}

example/qml-Qt6/page/T_DatePicker.qml

@@ -1,17 +1,13 @@
-import QtQuick
+import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "qrc:///example/qml/component"
 
 FluScrollablePage{
 
     title:"TimePicker"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
@@ -27,11 +23,16 @@ FluScrollablePage{
                 text:"showYear=true"
             }
             FluDatePicker{
+                current: new Date()
+                onAccepted: {
+                    showSuccess(current.toLocaleDateString())
+                }
             }
         }
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluDatePicker{
 
 }'
@@ -50,15 +51,17 @@ FluScrollablePage{
             FluText{
                 text:"showYear=false"
             }
-
             FluDatePicker{
                 showYear:false
-
+                onAccepted: {
+                    showSuccess(current.toLocaleDateString())
+                }
             }
         }
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluDatePicker{
     showYear:false
 }'

example/qml-Qt6/page/T_Dialog.qml

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

example/qml-Qt6/page/T_Expander.qml

@@ -1,28 +1,24 @@
-import QtQuick
+import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "qrc:///example/qml/component"
 
 FluScrollablePage{
 
     title:"Expander"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
-        height: layout_column.height+40
+        height: layout_column.height+20
         paddings: 10
         Layout.topMargin: 20
         Column{
             id:layout_column
             spacing: 15
             anchors{
-                verticalCenter: parent.verticalCenter
+                top:parent.top
                 left:parent.left
             }
 
@@ -31,7 +27,7 @@ FluScrollablePage{
                 Layout.topMargin: 20
                 Item{
                     anchors.fill: parent
-                    ColumnLayout{
+                    FluRadioButtons{
                         spacing: 8
                         anchors{
                             top: parent.top
@@ -39,17 +35,14 @@ FluScrollablePage{
                             topMargin: 15
                             leftMargin: 15
                         }
-                        Repeater{
-                            id:repeater
-                            property int selecIndex : 0
-                            model: 3
-                            delegate:  FluRadioButton{
-                                selected : repeater.selecIndex===index
-                                text:"Radio Button_"+index
-                                onClicked:{
-                                    repeater.selecIndex = index
-                                }
-                            }
+                        FluRadioButton{
+                            text:"Radio Button_1"
+                        }
+                        FluRadioButton{
+                            text:"Radio Button_2"
+                        }
+                        FluRadioButton{
+                            text:"Radio Button_3"
                         }
                     }
                 }
@@ -77,12 +70,12 @@ FluScrollablePage{
                     }
                 }
             }
-
         }
     }
 
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluExpander{
     headerText:"打开一个单选框"
     Item{

example/qml-Qt6/page/T_FlipView.qml

@@ -1,17 +1,13 @@
-import QtQuick
+import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "qrc:///example/qml/component"
 
 FluScrollablePage{
 
     title:"FlipView"
-    leftPadding:10
-    rightPadding:10
-    bottomPadding:20
-    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
@@ -25,17 +21,17 @@ FluScrollablePage{
             }
             FluFlipView{
                 Image{
-                    source: "qrc:/res/image/banner_1.jpg"
+                    source: "qrc:/example/res/image/banner_1.jpg"
                     asynchronous: true
                     fillMode:Image.PreserveAspectCrop
                 }
                 Image{
-                    source: "qrc:/res/image/banner_2.jpg"
+                    source: "qrc:/example/res/image/banner_2.jpg"
                     asynchronous: true
                     fillMode:Image.PreserveAspectCrop
                 }
                 Image{
-                    source: "qrc:/res/image/banner_3.jpg"
+                    source: "qrc:/example/res/image/banner_3.jpg"
                     asynchronous: true
                     fillMode:Image.PreserveAspectCrop
                 }
@@ -44,19 +40,20 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluFlipView{
     Image{
-        source: "qrc:/res/image/banner_1.jpg"
+        source: "qrc:/example/res/image/banner_1.jpg"
         asynchronous: true
         fillMode:Image.PreserveAspectCrop
     }
     Image{
-        source: "qrc:/res/image/banner_1.jpg"
+        source: "qrc:/example/res/image/banner_1.jpg"
         asynchronous: true
         fillMode:Image.PreserveAspectCrop
     }
     Image{
-        source: "qrc:/res/image/banner_1.jpg"
+        source: "qrc:/example/res/image/banner_1.jpg"
         asynchronous: true
         fillMode:Image.PreserveAspectCrop
     }
@@ -77,18 +74,17 @@ FluScrollablePage{
             FluFlipView{
                 vertical:true
                 Image{
-                    source: "qrc:/res/image/banner_1.jpg"
-                    asynchronous: true
-                    sourceSize: Qt.size(400,300)
-                    fillMode:Image.PreserveAspectCrop
-                }
-                Image{
-                    source: "qrc:/res/image/banner_2.jpg"
+                    source: "qrc:/example/res/image/banner_1.jpg"
                     asynchronous: true
                     fillMode:Image.PreserveAspectCrop
                 }
                 Image{
-                    source: "qrc:/res/image/banner_3.jpg"
+                    source: "qrc:/example/res/image/banner_2.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/example/res/image/banner_3.jpg"
                     asynchronous: true
                     fillMode:Image.PreserveAspectCrop
                 }
@@ -97,20 +93,21 @@ FluScrollablePage{
     }
     CodeExpander{
         Layout.fillWidth: true
+        Layout.topMargin: -1
         code:'FluFlipView{
     vertical:true
     Image{
-        source: "qrc:/res/image/banner_1.jpg"
+        source: "qrc:/example/res/image/banner_1.jpg"
         asynchronous: true
         fillMode:Image.PreserveAspectCrop
     }
     Image{
-        source: "qrc:/res/image/banner_1.jpg"
+        source: "qrc:/example/res/image/banner_1.jpg"
         asynchronous: true
         fillMode:Image.PreserveAspectCrop
     }
     Image{
-        source: "qrc:/res/image/banner_1.jpg"
+        source: "qrc:/example/res/image/banner_1.jpg"
         asynchronous: true
         fillMode:Image.PreserveAspectCrop
     }