.github/workflows/windows-mingw.yml

@@ -91,14 +91,14 @@ jobs:
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: zhuzichu520/inno-setup-action@v1.0.1
         with:
-          filepath: ./package/InstallerScript.iss
+          filepath: ./action-cli/InstallerScript.iss
           
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ./package/installer.exe
+          file: ./action-cli/installer.exe
           asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.exe
           tag: ${{ github.ref }}
           overwrite: true

.github/workflows/windows-qt5.yml

@@ -78,14 +78,14 @@ jobs:
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: zhuzichu520/inno-setup-action@v1.0.1
         with:
-          filepath: ./package/InstallerScript.iss
+          filepath: ./action-cli/InstallerScript.iss
           
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ./package/installer.exe
+          file: ./action-cli/installer.exe
           asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.exe
           tag: ${{ github.ref }}
           overwrite: true

.github/workflows/windows.yml

@@ -85,14 +85,14 @@ jobs:
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: zhuzichu520/inno-setup-action@v1.0.1
         with:
-          filepath: ./package/InstallerScript.iss
+          filepath: ./action-cli/InstallerScript.iss
           
       - name: uploadRelease
         if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ./package/installer.exe
+          file: ./action-cli/installer.exe
           asset_name: ${{ env.fileName }}_${{ github.ref_name }}_${{ matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.exe
           tag: ${{ github.ref }}
           overwrite: true 

.gitignore

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

CMakeLists.txt

@@ -8,7 +8,7 @@ if (MSVC)
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
 endif()
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.cmake/)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/.cmake/)
 
 include(GetGitRevisionDescription)
 

example/CMakeLists.txt

@@ -69,7 +69,7 @@ if (WIN32)
     )
 configure_file(
     ${CMAKE_SOURCE_DIR}/.cmake/InstallerScript.iss.in
-            ${CMAKE_SOURCE_DIR}/package/InstallerScript.iss
+    ${CMAKE_SOURCE_DIR}/action-cli/InstallerScript.iss
 )
 endif()
 

example/example.qrc

@@ -127,6 +127,7 @@
         <file>qml/global/ItemsOriginal.qml</file>
         <file>qml/global/qmldir</file>
         <file>qml/page/T_Acrylic.qml</file>
+        <file>qml/page/T_Awesome.qml</file>
         <file>qml/page/T_Badge.qml</file>
         <file>qml/page/T_BreadcrumbBar.qml</file>
         <file>qml/page/T_Buttons.qml</file>
@@ -180,6 +181,7 @@
         <file>qml/window/PageWindow.qml</file>
         <file>qml/page/T_StaggeredLayout.qml</file>
         <file>qml/page/T_Clip.qml</file>
+        <file>qml/page/T_3D.qml</file>
         <file>qml/page/T_Network.qml</file>
         <file>qml/page/T_ShortcutPicker.qml</file>
         <file>qml/chart/T_BarChart.qml</file>
@@ -207,8 +209,5 @@
         <file>qml/page/T_GroupBox.qml</file>
         <file>res/image/bg_scenic.jpg</file>
         <file>qml/window/FluentInitializrWindow.qml</file>
-        <file>qml/page/T_OpenGL.qml</file>
-        <file>qml/page/T_Icons.qml</file>
     </qresource>
-    <qresource prefix="/"/>
 </RCC>

example/example_en_US.ts

@@ -87,22 +87,22 @@
 <context>
     <name>InitializrHelper</name>
     <message>
-        <location filename="src/helper/InitializrHelper.cpp" line="69"/>
+        <location filename="src/helper/InitializrHelper.cpp" line="77"/>
         <source>The name cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/helper/InitializrHelper.cpp" line="73"/>
+        <location filename="src/helper/InitializrHelper.cpp" line="81"/>
         <source>The creation path cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/helper/InitializrHelper.cpp" line="78"/>
+        <location filename="src/helper/InitializrHelper.cpp" line="86"/>
         <source>The path does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/helper/InitializrHelper.cpp" line="84"/>
+        <location filename="src/helper/InitializrHelper.cpp" line="92"/>
         <source>%1 folder already exists</source>
         <translation type="unfinished"></translation>
     </message>
@@ -425,7 +425,7 @@
     </message>
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="367"/>
-        <source>Icons</source>
+        <source>Awesome</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -475,44 +475,44 @@
     </message>
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="430"/>
-        <source>OpenGL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="436"/>
         <source>QRCode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="442"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="436"/>
         <source>Tour</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="448"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="442"/>
         <source>Timeline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="454"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="448"/>
         <source>Captcha</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="460"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="454"/>
         <source>Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="467"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="461"/>
         <source>Remote Loader</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="481"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="475"/>
         <source>Hot Loader</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="qml/global/ItemsOriginal.qml" line="481"/>
+        <source>3D</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="487"/>
         <source>Test Crash</source>
@@ -545,105 +545,105 @@
 </context>
 <context>
     <name>MainWindow</name>
-    <message>
-        <location filename="qml/window/MainWindow.qml" line="87"/>
-        <location filename="qml/window/MainWindow.qml" line="95"/>
-        <source>Quit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/window/MainWindow.qml" line="88"/>
-        <source>Are you sure you want to exit the program?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/window/MainWindow.qml" line="89"/>
-        <source>Minimize</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/window/MainWindow.qml" line="92"/>
-        <source>Friendly Reminder</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/window/MainWindow.qml" line="92"/>
-        <source>FluentUI is hidden from the tray, click on the tray to activate the window again</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/window/MainWindow.qml" line="96"/>
-        <location filename="qml/window/MainWindow.qml" line="340"/>
-        <source>Cancel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/window/MainWindow.qml" line="107"/>
-        <source>Open in Separate Window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/window/MainWindow.qml" line="204"/>
-        <source>Click Time</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/window/MainWindow.qml" line="214"/>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/window/MainWindow.qml" line="305"/>
-        <source>Finish</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/window/MainWindow.qml" line="306"/>
-        <source>Next</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="qml/window/MainWindow.qml" line="307"/>
-        <source>Previous</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/window/MainWindow.qml" line="311"/>
         <source>Dark Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="311"/>
+        <location filename="qml/window/MainWindow.qml" line="83"/>
+        <location filename="qml/window/MainWindow.qml" line="91"/>
+        <source>Quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/window/MainWindow.qml" line="84"/>
+        <source>Are you sure you want to exit the program?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/window/MainWindow.qml" line="85"/>
+        <source>Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/window/MainWindow.qml" line="88"/>
+        <source>Friendly Reminder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/window/MainWindow.qml" line="88"/>
+        <source>FluentUI is hidden from the tray, click on the tray to activate the window again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/window/MainWindow.qml" line="92"/>
+        <location filename="qml/window/MainWindow.qml" line="336"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/window/MainWindow.qml" line="103"/>
+        <source>Open in Separate Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/window/MainWindow.qml" line="200"/>
+        <source>Click Time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/window/MainWindow.qml" line="210"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/window/MainWindow.qml" line="301"/>
+        <source>Finish</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/window/MainWindow.qml" line="302"/>
+        <source>Next</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/window/MainWindow.qml" line="303"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/window/MainWindow.qml" line="307"/>
         <source>Here you can switch to night mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="313"/>
+        <location filename="qml/window/MainWindow.qml" line="309"/>
         <source>Hide Easter eggs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="313"/>
+        <location filename="qml/window/MainWindow.qml" line="309"/>
         <source>Try a few more clicks!!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="337"/>
+        <location filename="qml/window/MainWindow.qml" line="333"/>
         <source>Upgrade Tips</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="338"/>
+        <location filename="qml/window/MainWindow.qml" line="334"/>
         <source>FluentUI is currently up to date </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="338"/>
+        <location filename="qml/window/MainWindow.qml" line="334"/>
         <source> -- The current app version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="338"/>
+        <location filename="qml/window/MainWindow.qml" line="334"/>
         <source> 
 Now go and download the new version？
 
@@ -652,17 +652,17 @@ Updated content:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="341"/>
+        <location filename="qml/window/MainWindow.qml" line="337"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="368"/>
+        <location filename="qml/window/MainWindow.qml" line="364"/>
         <source>The current version is already the latest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="375"/>
+        <location filename="qml/window/MainWindow.qml" line="371"/>
         <source>The network is abnormal</source>
         <translation type="unfinished"></translation>
     </message>
@@ -769,6 +769,29 @@ Updated content:
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>T_Awesome</name>
+    <message>
+        <location filename="qml/page/T_Awesome.qml" line="9"/>
+        <source>Awesome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_Awesome.qml" line="13"/>
+        <source>Please enter a keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_Awesome.qml" line="20"/>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_Awesome.qml" line="55"/>
+        <source>You Copied </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>T_Badge</name>
     <message>
@@ -1084,6 +1107,46 @@ Updated content:
         <source>Click to Select a Color - &gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="22"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="23"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="24"/>
+        <source>Color Picker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="25"/>
+        <source>Edit Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="26"/>
+        <source>Red</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="27"/>
+        <source>Green</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="28"/>
+        <source>Blue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="29"/>
+        <source>Opacity</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>T_ComboBox</name>
@@ -1298,49 +1361,26 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 <context>
     <name>T_Home</name>
     <message>
-        <location filename="qml/page/T_Home.qml" line="19"/>
+        <location filename="qml/page/T_Home.qml" line="23"/>
         <source>FluentUI GitHub</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_Home.qml" line="20"/>
+        <location filename="qml/page/T_Home.qml" line="24"/>
         <source>The latest FluentUI controls and styles for your applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_Home.qml" line="28"/>
+        <location filename="qml/page/T_Home.qml" line="32"/>
         <source>FluentUI Initializr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_Home.qml" line="29"/>
+        <location filename="qml/page/T_Home.qml" line="33"/>
         <source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>T_Icons</name>
-    <message>
-        <location filename="qml/page/T_Icons.qml" line="9"/>
-        <source>Icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Icons.qml" line="13"/>
-        <source>Please enter a keyword</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Icons.qml" line="20"/>
-        <source>Search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Icons.qml" line="60"/>
-        <source>You Copied </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>T_Image</name>
     <message>
@@ -1581,14 +1621,6 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>T_OpenGL</name>
-    <message>
-        <location filename="qml/page/T_OpenGL.qml" line="11"/>
-        <source>OpenGL</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>T_Pagination</name>
     <message>
@@ -1925,6 +1957,26 @@ Some contents...</source>
         <source>StatusLayout</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="63"/>
+        <source>Loading...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="64"/>
+        <source>Empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="65"/>
+        <source>The page went wrong...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="66"/>
+        <source>Reload</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>T_TabView</name>
@@ -1968,7 +2020,7 @@ Some contents...</source>
     </message>
     <message>
         <location filename="qml/page/T_TableView.qml" line="177"/>
-        <location filename="qml/page/T_TableView.qml" line="499"/>
+        <location filename="qml/page/T_TableView.qml" line="478"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1988,57 +2040,57 @@ Some contents...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="358"/>
+        <location filename="qml/page/T_TableView.qml" line="337"/>
         <source>Age</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="433"/>
+        <location filename="qml/page/T_TableView.qml" line="412"/>
         <source>Clear All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="494"/>
+        <location filename="qml/page/T_TableView.qml" line="473"/>
         <source>Avatar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="512"/>
+        <location filename="qml/page/T_TableView.qml" line="491"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="520"/>
+        <location filename="qml/page/T_TableView.qml" line="498"/>
         <source>Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="527"/>
+        <location filename="qml/page/T_TableView.qml" line="505"/>
         <source>Long String</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="535"/>
+        <location filename="qml/page/T_TableView.qml" line="513"/>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="554"/>
+        <location filename="qml/page/T_TableView.qml" line="532"/>
         <source>&lt;Previous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="555"/>
+        <location filename="qml/page/T_TableView.qml" line="533"/>
         <source>Next&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="440"/>
+        <location filename="qml/page/T_TableView.qml" line="419"/>
         <source>Delete Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="464"/>
+        <location filename="qml/page/T_TableView.qml" line="443"/>
         <source>Add a row of Data</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2125,11 +2177,6 @@ Some contents...</source>
         <source>Open Animation</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="qml/page/T_Theme.qml" line="123"/>
-        <source>Open Blur Window</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_TimePicker</name>
@@ -2329,23 +2376,13 @@ Some contents...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TreeView.qml" line="183"/>
+        <location filename="qml/page/T_TreeView.qml" line="44"/>
-        <source>Title</source>
+        <source>Total %1 data, %2 data currently displayed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_TreeView.qml" line="187"/>
+        <location filename="qml/page/T_TreeView.qml" line="48"/>
-        <source>Name</source>
+        <source>A total of %1 data items are selected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="191"/>
-        <source>Avatar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="195"/>
-        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

example/example_zh_CN.ts

@@ -87,22 +87,22 @@
 <context>
     <name>InitializrHelper</name>
     <message>
-        <location filename="src/helper/InitializrHelper.cpp" line="69"/>
+        <location filename="src/helper/InitializrHelper.cpp" line="77"/>
         <source>The name cannot be empty</source>
         <translation type="unfinished">名称不能为空</translation>
     </message>
     <message>
-        <location filename="src/helper/InitializrHelper.cpp" line="73"/>
+        <location filename="src/helper/InitializrHelper.cpp" line="81"/>
         <source>The creation path cannot be empty</source>
         <translation type="unfinished">创建路径不能为空</translation>
     </message>
     <message>
-        <location filename="src/helper/InitializrHelper.cpp" line="78"/>
+        <location filename="src/helper/InitializrHelper.cpp" line="86"/>
         <source>The path does not exist</source>
         <translation type="unfinished">路径不存在</translation>
     </message>
     <message>
-        <location filename="src/helper/InitializrHelper.cpp" line="84"/>
+        <location filename="src/helper/InitializrHelper.cpp" line="92"/>
         <source>%1 folder already exists</source>
         <translation type="unfinished">%1 文件夹已经存在</translation>
     </message>
@@ -425,7 +425,7 @@
     </message>
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="367"/>
-        <source>Icons</source>
+        <source>Awesome</source>
         <translation type="unfinished">图标</translation>
     </message>
     <message>
@@ -475,47 +475,43 @@
     </message>
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="430"/>
-        <source>OpenGL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="436"/>
         <source>QRCode</source>
         <translation type="unfinished">二维码</translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="442"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="436"/>
         <source>Tour</source>
         <translation type="unfinished">游览</translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="448"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="442"/>
         <source>Timeline</source>
         <translation type="unfinished">时间轴</translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="454"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="448"/>
         <source>Captcha</source>
         <translation type="unfinished">验证码</translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="460"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="454"/>
         <source>Network</source>
         <translation type="unfinished">网络</translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="467"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="461"/>
         <source>Remote Loader</source>
         <translation type="unfinished">远程加载</translation>
     </message>
     <message>
-        <location filename="qml/global/ItemsOriginal.qml" line="481"/>
+        <location filename="qml/global/ItemsOriginal.qml" line="475"/>
         <source>Hot Loader</source>
         <translation type="unfinished">热加载</translation>
     </message>
     <message>
+        <location filename="qml/global/ItemsOriginal.qml" line="481"/>
         <source>3D</source>
-        <translation type="obsolete">3D</translation>
+        <translation type="unfinished">3D</translation>
     </message>
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="487"/>
@@ -550,104 +546,104 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="311"/>
+        <location filename="qml/window/MainWindow.qml" line="307"/>
         <source>Dark Mode</source>
         <translation type="unfinished">夜间模式</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="87"/>
+        <location filename="qml/window/MainWindow.qml" line="83"/>
-        <location filename="qml/window/MainWindow.qml" line="95"/>
+        <location filename="qml/window/MainWindow.qml" line="91"/>
         <source>Quit</source>
         <translation type="unfinished">退出</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="88"/>
+        <location filename="qml/window/MainWindow.qml" line="84"/>
         <source>Are you sure you want to exit the program?</source>
         <translation type="unfinished">您确定要退出程序吗</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="89"/>
+        <location filename="qml/window/MainWindow.qml" line="85"/>
         <source>Minimize</source>
         <translation type="unfinished">最小化</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="92"/>
+        <location filename="qml/window/MainWindow.qml" line="88"/>
         <source>Friendly Reminder</source>
         <translation type="unfinished">友情提示</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="92"/>
+        <location filename="qml/window/MainWindow.qml" line="88"/>
         <source>FluentUI is hidden from the tray, click on the tray to activate the window again</source>
         <translation type="unfinished">FluentUI 在托盘中处于隐藏状态，单击托盘以再次激活窗口</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="96"/>
+        <location filename="qml/window/MainWindow.qml" line="92"/>
-        <location filename="qml/window/MainWindow.qml" line="340"/>
+        <location filename="qml/window/MainWindow.qml" line="336"/>
         <source>Cancel</source>
         <translation type="unfinished">取消</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="107"/>
+        <location filename="qml/window/MainWindow.qml" line="103"/>
         <source>Open in Separate Window</source>
         <translation type="unfinished">在独立窗口中打开</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="204"/>
+        <location filename="qml/window/MainWindow.qml" line="200"/>
         <source>Click Time</source>
         <translation type="unfinished">点击次数</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="214"/>
+        <location filename="qml/window/MainWindow.qml" line="210"/>
         <source>Search</source>
         <translation type="unfinished">搜索</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="305"/>
+        <location filename="qml/window/MainWindow.qml" line="301"/>
         <source>Finish</source>
         <translation type="unfinished">完成</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="306"/>
+        <location filename="qml/window/MainWindow.qml" line="302"/>
         <source>Next</source>
         <translation type="unfinished">下一步</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="307"/>
+        <location filename="qml/window/MainWindow.qml" line="303"/>
         <source>Previous</source>
         <translation type="unfinished">上一步</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="311"/>
+        <location filename="qml/window/MainWindow.qml" line="307"/>
         <source>Here you can switch to night mode.</source>
         <translation type="unfinished">在这里，您可以切换到夜间模式。</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="313"/>
+        <location filename="qml/window/MainWindow.qml" line="309"/>
         <source>Hide Easter eggs</source>
         <translation type="unfinished">隐藏彩蛋</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="313"/>
+        <location filename="qml/window/MainWindow.qml" line="309"/>
         <source>Try a few more clicks!!</source>
         <translation type="unfinished">再试几下！！</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="337"/>
+        <location filename="qml/window/MainWindow.qml" line="333"/>
         <source>Upgrade Tips</source>
         <translation type="unfinished">升级提示</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="338"/>
+        <location filename="qml/window/MainWindow.qml" line="334"/>
         <source>FluentUI is currently up to date </source>
         <translation type="unfinished">FluentUI 目前最新版本 </translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="338"/>
+        <location filename="qml/window/MainWindow.qml" line="334"/>
         <source> -- The current app version</source>
         <translation type="unfinished"> -- 当前应用版本</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="338"/>
+        <location filename="qml/window/MainWindow.qml" line="334"/>
         <source> 
 Now go and download the new version？
 
@@ -660,17 +656,17 @@ Updated content:
 </translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="341"/>
+        <location filename="qml/window/MainWindow.qml" line="337"/>
         <source>OK</source>
         <translation type="unfinished">确定</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="368"/>
+        <location filename="qml/window/MainWindow.qml" line="364"/>
         <source>The current version is already the latest</source>
         <translation type="unfinished">当前版本已经是最新版本</translation>
     </message>
     <message>
-        <location filename="qml/window/MainWindow.qml" line="375"/>
+        <location filename="qml/window/MainWindow.qml" line="371"/>
         <source>The network is abnormal</source>
         <translation type="unfinished">网络异常</translation>
     </message>
@@ -780,20 +776,24 @@ Updated content:
 <context>
     <name>T_Awesome</name>
     <message>
+        <location filename="qml/page/T_Awesome.qml" line="9"/>
         <source>Awesome</source>
-        <translation type="obsolete">图标</translation>
+        <translation type="unfinished">图标</translation>
     </message>
     <message>
+        <location filename="qml/page/T_Awesome.qml" line="13"/>
         <source>Please enter a keyword</source>
-        <translation type="obsolete">请输入关键字</translation>
+        <translation type="unfinished">请输入关键字</translation>
     </message>
     <message>
+        <location filename="qml/page/T_Awesome.qml" line="20"/>
         <source>Search</source>
-        <translation type="obsolete">搜索</translation>
+        <translation type="unfinished">搜索</translation>
     </message>
     <message>
+        <location filename="qml/page/T_Awesome.qml" line="55"/>
         <source>You Copied </source>
-        <translation type="obsolete">您复制</translation>
+        <translation type="unfinished">您复制</translation>
     </message>
 </context>
 <context>
@@ -1112,36 +1112,44 @@ Updated content:
         <translation type="unfinished">点击选中颜色 - &gt;</translation>
     </message>
     <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="22"/>
         <source>Cancel</source>
-        <translation type="obsolete">取消</translation>
+        <translation type="unfinished">取消</translation>
     </message>
     <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="23"/>
         <source>OK</source>
-        <translation type="obsolete">确定</translation>
+        <translation type="unfinished">确定</translation>
     </message>
     <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="24"/>
         <source>Color Picker</source>
-        <translation type="obsolete">颜色选择器</translation>
+        <translation type="unfinished">颜色选择器</translation>
     </message>
     <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="25"/>
         <source>Edit Color</source>
-        <translation type="obsolete">编辑颜色</translation>
+        <translation type="unfinished">编辑颜色</translation>
     </message>
     <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="26"/>
         <source>Red</source>
-        <translation type="obsolete">红色</translation>
+        <translation type="unfinished">红色</translation>
     </message>
     <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="27"/>
         <source>Green</source>
-        <translation type="obsolete">绿色</translation>
+        <translation type="unfinished">绿色</translation>
     </message>
     <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="28"/>
         <source>Blue</source>
-        <translation type="obsolete">蓝色</translation>
+        <translation type="unfinished">蓝色</translation>
     </message>
     <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="29"/>
         <source>Opacity</source>
-        <translation type="obsolete">透明度</translation>
+        <translation type="unfinished">透明度</translation>
     </message>
 </context>
 <context>
@@ -1384,49 +1392,26 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 <context>
     <name>T_Home</name>
     <message>
-        <location filename="qml/page/T_Home.qml" line="19"/>
+        <location filename="qml/page/T_Home.qml" line="23"/>
         <source>FluentUI GitHub</source>
         <translation type="unfinished">FluentUI GitHub</translation>
     </message>
     <message>
-        <location filename="qml/page/T_Home.qml" line="20"/>
+        <location filename="qml/page/T_Home.qml" line="24"/>
         <source>The latest FluentUI controls and styles for your applications.</source>
         <translation type="unfinished">最新的 FluentUI 控件和样式</translation>
     </message>
     <message>
-        <location filename="qml/page/T_Home.qml" line="28"/>
+        <location filename="qml/page/T_Home.qml" line="32"/>
         <source>FluentUI Initializr</source>
         <translation type="unfinished">FluentUI脚手架</translation>
     </message>
     <message>
-        <location filename="qml/page/T_Home.qml" line="29"/>
+        <location filename="qml/page/T_Home.qml" line="33"/>
         <source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
         <translation type="unfinished">FluentUI 脚手架是一个快速创建项目工具，可帮助您创建和自定义具有各种选项的 Fluent UI 项目</translation>
     </message>
 </context>
-<context>
-    <name>T_Icons</name>
-    <message>
-        <location filename="qml/page/T_Icons.qml" line="9"/>
-        <source>Icons</source>
-        <translation type="unfinished">图标</translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Icons.qml" line="13"/>
-        <source>Please enter a keyword</source>
-        <translation type="unfinished">请输入关键字</translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Icons.qml" line="20"/>
-        <source>Search</source>
-        <translation type="unfinished">搜索</translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_Icons.qml" line="60"/>
-        <source>You Copied </source>
-        <translation type="unfinished">您复制</translation>
-    </message>
-</context>
 <context>
     <name>T_Image</name>
     <message>
@@ -1675,14 +1660,6 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished">网络</translation>
     </message>
 </context>
-<context>
-    <name>T_OpenGL</name>
-    <message>
-        <location filename="qml/page/T_OpenGL.qml" line="11"/>
-        <source>OpenGL</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>T_Pagination</name>
     <message>
@@ -2052,20 +2029,24 @@ Some contents...</source>
         <translation type="unfinished">状态布局</translation>
     </message>
     <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="63"/>
         <source>Loading...</source>
-        <translation type="obsolete">正在加载...</translation>
+        <translation type="unfinished">正在加载...</translation>
     </message>
     <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="64"/>
         <source>Empty</source>
-        <translation type="obsolete">空空如也</translation>
+        <translation type="unfinished">空空如也</translation>
     </message>
     <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="65"/>
         <source>The page went wrong...</source>
-        <translation type="obsolete">页面出错了...</translation>
+        <translation type="unfinished">页面出错了...</translation>
     </message>
     <message>
+        <location filename="qml/page/T_StatusLayout.qml" line="66"/>
         <source>Reload</source>
-        <translation type="obsolete">重新加载</translation>
+        <translation type="unfinished">重新加载</translation>
     </message>
 </context>
 <context>
@@ -2110,7 +2091,7 @@ Some contents...</source>
     </message>
     <message>
         <location filename="qml/page/T_TableView.qml" line="177"/>
-        <location filename="qml/page/T_TableView.qml" line="499"/>
+        <location filename="qml/page/T_TableView.qml" line="478"/>
         <source>Name</source>
         <translation type="unfinished">名称</translation>
     </message>
@@ -2130,57 +2111,57 @@ Some contents...</source>
         <translation type="unfinished">全选</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="358"/>
+        <location filename="qml/page/T_TableView.qml" line="337"/>
         <source>Age</source>
         <translation type="unfinished">年龄</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="433"/>
+        <location filename="qml/page/T_TableView.qml" line="412"/>
         <source>Clear All</source>
         <translation type="unfinished">清除所有</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="494"/>
+        <location filename="qml/page/T_TableView.qml" line="473"/>
         <source>Avatar</source>
         <translation type="unfinished">头像</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="512"/>
+        <location filename="qml/page/T_TableView.qml" line="491"/>
         <source>Address</source>
         <translation type="unfinished">地址</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="520"/>
+        <location filename="qml/page/T_TableView.qml" line="498"/>
         <source>Nickname</source>
         <translation type="unfinished">昵称</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="527"/>
+        <location filename="qml/page/T_TableView.qml" line="505"/>
         <source>Long String</source>
         <translation type="unfinished">长字符串</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="535"/>
+        <location filename="qml/page/T_TableView.qml" line="513"/>
         <source>Options</source>
         <translation type="unfinished">操作</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="554"/>
+        <location filename="qml/page/T_TableView.qml" line="532"/>
         <source>&lt;Previous</source>
         <translation type="unfinished">&lt;上一页</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="555"/>
+        <location filename="qml/page/T_TableView.qml" line="533"/>
         <source>Next&gt;</source>
         <translation type="unfinished">下一页&gt;</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="440"/>
+        <location filename="qml/page/T_TableView.qml" line="419"/>
         <source>Delete Selection</source>
         <translation type="unfinished">删除选中</translation>
     </message>
     <message>
-        <location filename="qml/page/T_TableView.qml" line="464"/>
+        <location filename="qml/page/T_TableView.qml" line="443"/>
         <source>Add a row of Data</source>
         <translation type="unfinished">添加一行数据</translation>
     </message>
@@ -2267,11 +2248,6 @@ Some contents...</source>
         <source>Open Animation</source>
         <translation type="unfinished">开启动画</translation>
     </message>
-    <message>
-        <location filename="qml/page/T_Theme.qml" line="123"/>
-        <source>Open Blur Window</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>T_TimePicker</name>
@@ -2483,32 +2459,14 @@ Some contents...</source>
         <translation type="unfinished">树</translation>
     </message>
     <message>
+        <location filename="qml/page/T_TreeView.qml" line="44"/>
         <source>Total %1 data, %2 data currently displayed</source>
-        <translation type="obsolete">共计%1条数据，当前显示的%2条数据</translation>
+        <translation type="unfinished">共计%1条数据，当前显示的%2条数据</translation>
     </message>
     <message>
+        <location filename="qml/page/T_TreeView.qml" line="48"/>
         <source>A total of %1 data items are selected</source>
-        <translation type="obsolete">共计选中%1条数据</translation>
+        <translation type="unfinished">共计选中%1条数据</translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="183"/>
-        <source>Title</source>
-        <translation type="unfinished">标题</translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="195"/>
-        <source>Address</source>
-        <translation type="unfinished">地址</translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="191"/>
-        <source>Avatar</source>
-        <translation type="unfinished">头像</translation>
-    </message>
-    <message>
-        <location filename="qml/page/T_TreeView.qml" line="187"/>
-        <source>Name</source>
-        <translation type="unfinished">名称</translation>
     </message>
 </context>
 <context>

example/qml/global/ItemsOriginal.qml

@@ -364,9 +364,9 @@ FluObject{
             onTap: { navigationView.push(url) }
         }
         FluPaneItem{
-            title: qsTr("Icons")
+            title: qsTr("Awesome")
             menuDelegate: paneItemMenu
-            url: "qrc:/example/qml/page/T_Icons.qml"
+            url: "qrc:/example/qml/page/T_Awesome.qml"
             onTap: { navigationView.push(url) }
         }
     }
@@ -426,12 +426,6 @@ FluObject{
     FluPaneItemExpander{
         title: qsTr("Other")
         icon: FluentIcons.Shop
-        FluPaneItem{
-            title: qsTr("OpenGL")
-            menuDelegate: paneItemMenu
-            url: "qrc:/example/qml/page/T_OpenGL.qml"
-            onTap: { navigationView.push(url) }
-        }
         FluPaneItem{
             title: qsTr("QRCode")
             menuDelegate: paneItemMenu
@@ -483,6 +477,12 @@ FluObject{
                 FluRouter.navigate("/hotload")
             }
         }
+        FluPaneItem{
+            title: qsTr("3D")
+            menuDelegate: paneItemMenu
+            url: "qrc:/example/qml/page/T_3D.qml"
+            onTap: { navigationView.push(url) }
+        }
         FluPaneItem{
             title: qsTr("Test Crash")
             onTapListener: function(){

example/qml/page/T_3D.qml

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

example/qml/page/T_Awesome.qml

@@ -6,7 +6,7 @@ import FluentUI 1.0
 
 FluContentPage {
 
-    title: qsTr("Icons")
+    title: qsTr("Awesome")
 
     FluTextBox{
         id:text_box
@@ -24,16 +24,16 @@ FluContentPage {
             leftMargin: 14
         }
         onClicked: {
-            grid_view.model = FluApp.iconDatas(text_box.text)
+            grid_view.model = FluTheme.awesomeList(text_box.text)
         }
     }
     GridView{
         id:grid_view
-        cellWidth: 110
+        cellWidth: 80
-        cellHeight: 110
+        cellHeight: 80
         clip: true
         boundsBehavior: GridView.StopAtBounds
-        model: FluApp.iconDatas()
+        model:FluTheme.awesomeList()
         ScrollBar.vertical: FluScrollBar {}
         anchors{
             topMargin: 10
@@ -43,30 +43,28 @@ FluContentPage {
             bottom: parent.bottom
         }
         delegate: Item {
-            width: 100
+            width: 68
-            height: 100
+            height: 80
             FluIconButton{
                 id:item_icon
                 iconSource:modelData.icon
-                iconSize: 30
+                anchors.horizontalCenter: parent.horizontalCenter
-                padding: 0
-                verticalPadding: 0
-                horizontalPadding: 0
-                bottomPadding: 30
-                anchors.fill: parent
                 onClicked: {
                     var text  ="FluentIcons."+modelData.name;
                     FluTools.clipText(text)
                     showSuccess(qsTr("You Copied ")+text)
                 }
+            }
             FluText {
+                id:item_name
+                font.pixelSize: 10
+                font.family: FluTextStyle.family
+                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.top: item_icon.bottom
                 width:parent.width
-                    horizontalAlignment: Qt.AlignHCenter
                 wrapMode: Text.WrapAnywhere
                 text: modelData.name
-                    anchors.top: parent.top
+                horizontalAlignment: Text.AlignHCenter
-                    anchors.topMargin: 60
-                }
             }
         }
     }

example/qml/page/T_ColorPicker.qml

@@ -18,7 +18,16 @@ FluScrollablePage{
                 text: qsTr("Click to Select a Color - >")
                 Layout.alignment: Qt.AlignVCenter
             }
-            FluColorPicker{}
+            FluColorPicker{
+                cancelText: qsTr("Cancel")
+                okText: qsTr("OK")
+                titleText: qsTr("Color Picker")
+                editText: qsTr("Edit Color")
+                redText: qsTr("Red")
+                greenText: qsTr("Green")
+                blueText: qsTr("Blue")
+                opacityText: qsTr("Opacity")
+            }
         }
     }
     CodeExpander{

example/qml/page/T_Home.qml

@@ -12,6 +12,10 @@ FluScrollablePage{
     animationEnabled: false
     header: Item{}
 
+    FluentInitializrWindow{
+        id:fluent_Initializr
+    }
+
     ListModel{
         id: model_header
         ListElement{

example/qml/page/T_OpenGL.qml

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

example/qml/page/T_StatusLayout.qml

@@ -60,8 +60,12 @@ FluScrollablePage{
         FluStatusLayout{
             id:status_view
             anchors.fill: parent
+            loadingText: qsTr("Loading...")
+            emptyText: qsTr("Empty")
+            errorText: qsTr("The page went wrong...")
+            errorButtonText: qsTr("Reload")
             onErrorClicked:{
-                status_view.statusMode = FluStatusLayoutType.Loading
+                showError("Click Reload")
             }
             Rectangle {
                 anchors.fill: parent

example/qml/page/T_TableView.qml

@@ -280,27 +280,6 @@ FluContentPage{
         }
     }
 
-    Component{
-        id:com_auto_suggestbox
-        FluAutoSuggestBox {
-            id: textbox
-            anchors.fill: parent
-            focus: true
-            Component.onCompleted: {
-                var data = ["傲来国界花果山水帘洞","傲来国界坎源山脏水洞","大唐国界黑风山黑风洞","大唐国界黄风岭黄风洞","大唐国界骷髅山白骨洞","宝象国界碗子山波月洞","宝象国界平顶山莲花洞","宝象国界压龙山压龙洞","乌鸡国界号山枯松涧火云洞","乌鸡国界衡阳峪黑水河河神府"]
-                var result = data.map(function(item) {
-                    return {title: item};
-                });
-                items = result
-                textbox.text= String(display)
-            }
-            onCommit: {
-                editTextChaged(textbox.text)
-                tableView.closeEditor()
-            }
-        }
-    }
-
     Component{
         id:com_avatar
         Item{
@@ -511,7 +490,6 @@ FluContentPage{
             {
                 title: qsTr("Address"),
                 dataIndex: 'address',
-                editDelegate: com_auto_suggestbox,
                 width:200,
                 minimumWidth:100,
                 maximumWidth:250

example/qml/page/T_Theme.qml

@@ -13,7 +13,7 @@ FluScrollablePage{
 
     FluFrame{
         Layout.fillWidth: true
-        Layout.preferredHeight: 408
+        Layout.preferredHeight: 340
         padding: 10
 
         ColumnLayout{
@@ -119,17 +119,6 @@ FluScrollablePage{
                     FluTheme.animationEnabled = !FluTheme.animationEnabled
                 }
             }
-            FluText{
-                text: qsTr("Open Blur Window")
-                Layout.topMargin: 20
-            }
-            FluToggleSwitch{
-                Layout.topMargin: 5
-                checked: FluTheme.blurBehindWindowEnabled
-                onClicked: {
-                    FluTheme.blurBehindWindowEnabled = !FluTheme.blurBehindWindowEnabled
-                }
-            }
         }
     }
     CodeExpander{

example/qml/page/T_TreeView.qml

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

example/qml/window/FluentInitializrWindow.qml

@@ -20,7 +20,7 @@ FluWindowDialog {
                     showError(message)
                 }
                 function onSuccess(path){
-                    FluTools.showFileInFolder(path)
+                    FluTools.showFileInFolder(path+"/CMakeLists.txt")
                     window.close()
                 }
             }

example/qml/window/MainWindow.qml

@@ -15,7 +15,7 @@ FluWindow {
     title: "FluentUI"
     width: 1000
     height: 680
-    minimumWidth: 680
+    minimumWidth: 520
     minimumHeight: 200
     launchMode: FluWindowType.SingleTask
     fitsAppBarWindows: true
@@ -28,10 +28,6 @@ FluWindow {
         z:7
     }
 
-    FluentInitializrWindow{
-        id:fluent_Initializr
-    }
-
     FluEvent{
         name: "checkUpdate"
         onTriggered: {

example/src/AppInfo.cpp

@@ -1,15 +1,17 @@
 #include "AppInfo.h"
 
 #include <QQmlContext>
+#include <QDebug>
 #include <QGuiApplication>
 #include "Version.h"
 
 AppInfo::AppInfo(QObject *parent)
-        : QObject{parent} {
+    : QObject{parent}
+{
     version(APPLICATION_VERSION);
 }
 
-[[maybe_unused]] void AppInfo::testCrash() {
+void AppInfo::testCrash(){
     auto *crash = reinterpret_cast<volatile int *>(0);
     *crash = 0;
 }

example/src/AppInfo.h

@@ -1,18 +1,20 @@
-#pragma once
+#ifndef APPINFO_H
+#define APPINFO_H
 
 #include <QObject>
 #include <QQmlApplicationEngine>
 #include "stdafx.h"
 #include "singleton.h"
 
-class AppInfo : public QObject {
+class AppInfo : public QObject
+{
     Q_OBJECT
     Q_PROPERTY_AUTO(QString,version)
 private:
     explicit AppInfo(QObject *parent = nullptr);
-
 public:
     SINGLETON(AppInfo)
-
+    Q_INVOKABLE void testCrash();
-    [[maybe_unused]] Q_INVOKABLE void testCrash();
 };
+
+#endif // APPINFO_H

example/src/app_dmp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef APP_DUMP_H
+#define APP_DUMP_H
 
 #include <Windows.h>
 #include <DbgHelp.h>
@@ -11,22 +12,22 @@
 
 #pragma comment(lib, "Dbghelp.lib")
 
-static void
+static void miniDumpWriteDump(HANDLE hProcess,DWORD ProcessId,HANDLE hFile,MINIDUMP_TYPE DumpType,CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam){
-miniDumpWriteDump(HANDLE hProcess, DWORD ProcessId, HANDLE hFile, CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam, CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam) {
+    typedef HRESULT (WINAPI* MiniDumpWriteDumpPtr)(HANDLE hProcess,DWORD ProcessId,HANDLE hFile,MINIDUMP_TYPE DumpType,CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
-    typedef HRESULT (WINAPI *MiniDumpWriteDumpPtr)(HANDLE hProcess, DWORD ProcessId, HANDLE hFile, MINIDUMP_TYPE DumpType, CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
-                                                   CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam, CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam);
     HMODULE module = LoadLibraryW(L"Dbghelp.dll");
-    if (module) {
+    if (module)
+    {
         MiniDumpWriteDumpPtr mini_dump_write_dump;
         mini_dump_write_dump= reinterpret_cast<MiniDumpWriteDumpPtr>(GetProcAddress(module, "MiniDumpWriteDump"));
-        if (mini_dump_write_dump) {
+        if (mini_dump_write_dump)
-            mini_dump_write_dump(hProcess, ProcessId, hFile, static_cast<MINIDUMP_TYPE>(80), ExceptionParam, nullptr, CallbackParam);
+        {
+            mini_dump_write_dump(hProcess,ProcessId,hFile,DumpType,ExceptionParam,UserStreamParam,CallbackParam);
         }
     }
 }
 
 BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input, PMINIDUMP_CALLBACK_OUTPUT output) {
-    if (input == nullptr || output == nullptr)
+    if (input == NULL || output == NULL)
         return FALSE;
 
     BOOL ret = FALSE;
@@ -42,8 +43,7 @@ BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input, PM
             output->ModuleWriteFlags &= ~ModuleWriteModule;
         }
         ret = TRUE;
-        }
+    } break;
-            break;
     default:
         break;
     }
@@ -51,15 +51,16 @@ BOOL CALLBACK MyMiniDumpCallback(PVOID, const PMINIDUMP_CALLBACK_INPUT input, PM
 }
 
 void WriteDump(EXCEPTION_POINTERS* exp, const std::wstring& path) {
-    HANDLE h = ::CreateFileW(path.c_str(), GENERIC_WRITE | GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
+    HANDLE h = ::CreateFileW(path.c_str(), GENERIC_WRITE | GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
     MINIDUMP_EXCEPTION_INFORMATION info;
     info.ThreadId = ::GetCurrentThreadId();
     info.ExceptionPointers = exp;
     info.ClientPointers = FALSE;
     MINIDUMP_CALLBACK_INFORMATION mci;
     mci.CallbackRoutine = (MINIDUMP_CALLBACK_ROUTINE)MyMiniDumpCallback;
-    mci.CallbackParam = nullptr;
+    mci.CallbackParam = 0;
-    miniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), h, &info, &mci);
+    MINIDUMP_TYPE mdt = (MINIDUMP_TYPE)(MiniDumpWithIndirectlyReferencedMemory | MiniDumpScanMemory);
+    miniDumpWriteDump(GetCurrentProcess(), GetCurrentProcessId(), h, mdt, &info, NULL, &mci);
     ::CloseHandle(h);
 }
 
@@ -74,6 +75,8 @@ LONG WINAPI MyUnhandledExceptionFilter(EXCEPTION_POINTERS *exp) {
     WriteDump(exp, dumpFilePath.toStdWString());
     QStringList arguments;
     arguments << "-crashed=" + dumpFilePath;
-    QProcess::startDetached(QGuiApplication::applicationFilePath(), arguments);
+    QProcess::startDetached(qApp->applicationFilePath(), arguments);
     return EXCEPTION_EXECUTE_HANDLER;
 }
+
+#endif // APP_DUMP_H

example/src/component/CircularReveal.cpp

@@ -3,13 +3,12 @@
 #include <QQuickItemGrabResult>
 #include <QPainterPath>
 
-CircularReveal::CircularReveal(QQuickItem *parent) : QQuickPaintedItem(parent) {
+CircularReveal::CircularReveal(QQuickItem* parent) : QQuickPaintedItem(parent)
-    _target = nullptr;
+{
-    _radius = 0;
     _anim = new QPropertyAnimation(this, "radius", this);
+    setVisible(false);
     _anim->setDuration(333);
     _anim->setEasingCurve(QEasingCurve::OutCubic);
-    setVisible(false);
     connect(_anim, &QPropertyAnimation::finished,this,[=](){
         update();
         setVisible(false);
@@ -20,7 +19,8 @@ CircularReveal::CircularReveal(QQuickItem *parent) : QQuickPaintedItem(parent) {
     });
 }
 
-void CircularReveal::paint(QPainter *painter) {
+void CircularReveal::paint(QPainter* painter)
+{
     painter->save();
     painter->drawImage(QRect(0, 0, static_cast<int>(width()), static_cast<int>(height())), _source);
     QPainterPath path;
@@ -31,7 +31,7 @@ void CircularReveal::paint(QPainter *painter) {
     painter->restore();
 }
 
-[[maybe_unused]] void CircularReveal::start(int w, int h, const QPoint &center, int radius) {
+void CircularReveal::start(int w,int h,const QPoint& center,int radius){
     _anim->setStartValue(0);
     _anim->setEndValue(radius);
     _center = center;

example/src/component/CircularReveal.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef CIRCULARREVEAL_H
+#define CIRCULARREVEAL_H
 
 #include <QQuickItem>
 #include <QQuickPaintedItem>
@@ -6,26 +7,23 @@
 #include <QPropertyAnimation>
 #include "src/stdafx.h"
 
-class CircularReveal : public QQuickPaintedItem {
+class CircularReveal : public QQuickPaintedItem
+{
     Q_OBJECT
-Q_PROPERTY_AUTO_P(QQuickItem*, target)
+    Q_PROPERTY_AUTO(QQuickItem*,target)
     Q_PROPERTY_AUTO(int,radius)
 public:
-    explicit CircularReveal(QQuickItem *parent = nullptr);
+    CircularReveal(QQuickItem* parent = nullptr);
-
     void paint(QPainter* painter) override;
-
+    Q_INVOKABLE void start(int w,int h,const QPoint& center,int radius);
-    [[maybe_unused]] Q_INVOKABLE void start(int w, int h, const QPoint &center, int radius);
-
     Q_SIGNAL void imageChanged();
-
     Q_SIGNAL void animationFinished();
-
     Q_SLOT void handleGrabResult();
-
 private:
     QPropertyAnimation* _anim = nullptr;
     QImage _source;
     QPoint _center;
     QSharedPointer<QQuickItemGrabResult>  _grabResult;
 };
+
+#endif // CIRCULARREVEAL_H

example/src/component/FileWatcher.cpp

@@ -1,6 +1,8 @@
 #include "FileWatcher.h"
 
-FileWatcher::FileWatcher(QObject *parent) : QObject{parent} {
+FileWatcher::FileWatcher(QObject *parent)
+    : QObject{parent}
+{
     connect(&_watcher, &QFileSystemWatcher::fileChanged, this, [=](const QString &path){
         Q_EMIT fileChanged();
         clean();
@@ -16,8 +18,7 @@ FileWatcher::FileWatcher(QObject *parent) : QObject{parent} {
 }
 
 void FileWatcher::clean(){
-    for (int i = 0; i <= _watcher.files().size() - 1; ++i) {
+    foreach (const QString &item,  _watcher.files()) {
-        auto item = _watcher.files().at(i);
         _watcher.removePath(item);
     }
 }

example/src/component/FileWatcher.h

@@ -1,21 +1,22 @@
-#pragma once
+#ifndef FILEWATCHER_H
+#define FILEWATCHER_H
 
 #include <QObject>
 #include <QFileSystemWatcher>
 #include <QtQml/qqml.h>
 #include "src/stdafx.h"
 
-class FileWatcher : public QObject {
+class FileWatcher : public QObject
+{
     Q_OBJECT
     Q_PROPERTY_AUTO(QString,path);
 public:
     explicit FileWatcher(QObject *parent = nullptr);
-
     Q_SIGNAL void fileChanged();
-
 private:
     void clean();
-
 private:
     QFileSystemWatcher _watcher;
 };
+
+#endif // FILEWATCHER_H

example/src/component/FpsItem.cpp

@@ -3,9 +3,9 @@
 #include <QTimer>
 #include <QQuickWindow>
 
-FpsItem::FpsItem() {
+FpsItem::FpsItem()
-    _fps = 0;
+{
-    auto *timer = new QTimer(this);
+    QTimer *timer = new QTimer(this);
     connect(timer, &QTimer::timeout, this, [this]{
         fps(_frameCount);
         _frameCount = 0;

example/src/component/FpsItem.h

@@ -1,9 +1,11 @@
-#pragma once
+#ifndef FPSITEM_H
+#define FPSITEM_H
 
 #include <QQuickItem>
 #include "src/stdafx.h"
 
-class FpsItem : public QQuickItem {
+class FpsItem : public QQuickItem
+{
     Q_OBJECT
     Q_PROPERTY_AUTO(int,fps)
 public:
@@ -13,3 +15,5 @@ private:
     int _frameCount = 0;
 
 };
+
+#endif // FPSITEM_H

example/src/component/OpenGLItem.cpp

@@ -1,93 +0,0 @@
-#include "OpenGLItem.h"
-
-#include <QOpenGLFramebufferObjectFormat>
-#include <QOpenGLShaderProgram>
-
-class FBORenderer : public QQuickFramebufferObject::Renderer, protected QOpenGLFunctions {
-public:
-    explicit FBORenderer(const OpenGLItem *item);
-
-    void render() override;
-
-    QOpenGLFramebufferObject *createFramebufferObject(const QSize &size) override;
-
-    QOpenGLShaderProgram program;
-    const OpenGLItem *item = nullptr;
-};
-
-FBORenderer::FBORenderer(const OpenGLItem *item) {
-    this->item = item;
-    initializeOpenGLFunctions();
-    program.addCacheableShaderFromSourceCode(QOpenGLShader::Vertex,
-                                             "attribute highp vec4 vertices;"
-                                             "varying highp vec2 coords;"
-                                             "void main() {"
-                                             "    gl_Position = vertices;"
-                                             "    coords = vertices.xy;"
-                                             "}");
-    program.addCacheableShaderFromSourceCode(QOpenGLShader::Fragment,
-                                             "uniform lowp float t;"
-                                             "varying highp vec2 coords;"
-                                             "void main() {"
-                                             "    lowp float i = 1. - (pow(abs(coords.x), 4.) + pow(abs(coords.y), 4.));"
-                                             "    i = smoothstep(t - 0.8, t + 0.8, i);"
-                                             "    i = floor(i * 20.) / 20.;"
-                                             "    gl_FragColor = vec4(coords * .5 + .5, i, i);"
-                                             "}");
-
-    program.bindAttributeLocation("vertices", 0);
-    program.link();
-}
-
-QOpenGLFramebufferObject *FBORenderer::createFramebufferObject(const QSize &size) {
-    QOpenGLFramebufferObjectFormat format;
-    format.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil);
-    format.setSamples(4);
-    return new QOpenGLFramebufferObject(size, format);
-}
-
-void FBORenderer::render() {
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
-    glEnable(GL_DEPTH_TEST);
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-    program.bind();
-    program.enableAttributeArray(0);
-    float values[] = {
-            -1, -1,
-            1, -1,
-            -1, 1,
-            1, 1
-    };
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-    program.setAttributeArray(0, GL_FLOAT, values, 2);
-    program.setUniformValue("t", (float) item->t());
-    glViewport(0, 0, qRound(item->width()), qRound(item->height()));
-    glDisable(GL_DEPTH_TEST);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
-    program.disableAttributeArray(0);
-    program.release();
-}
-
-
-OpenGLItem::OpenGLItem(QQuickItem *parent) : QQuickFramebufferObject(parent) {
-    setMirrorVertically(true);
-    startTimer(1);
-}
-
-void OpenGLItem::timerEvent(QTimerEvent *) {
-    update();
-}
-
-void OpenGLItem::setT(qreal t) {
-    if (t == m_t)
-        return;
-    m_t = t;
-    emit tChanged();
-}
-
-
-QQuickFramebufferObject::Renderer *OpenGLItem::createRenderer() const {
-    return new FBORenderer(this);
-}

example/src/component/OpenGLItem.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include <QtQuick/QQuickItem>
-#include <QOpenGLFunctions>
-#include <QQuickFramebufferObject>
-
-class FBORenderer;
-
-class OpenGLItem : public QQuickFramebufferObject, protected QOpenGLFunctions {
-Q_OBJECT
-    Q_PROPERTY(qreal t READ t WRITE setT NOTIFY tChanged)
-public:
-    explicit OpenGLItem(QQuickItem *parent = nullptr);
-
-    [[nodiscard]] QQuickFramebufferObject::Renderer *createRenderer() const override;
-
-    void timerEvent(QTimerEvent *) override;
-
-    [[nodiscard]] qreal t() const { return m_t; }
-
-    void setT(qreal t);
-
-signals:
-
-    void tChanged();
-
-private:
-    qreal m_t{};
-};

example/src/helper/InitializrHelper.cpp

@@ -3,31 +3,39 @@
 #include <QDir>
 #include <QGuiApplication>
 
-[[maybe_unused]] InitializrHelper::InitializrHelper(QObject *parent) : QObject(parent) {
+InitializrHelper::InitializrHelper(QObject *parent) : QObject(parent)
+{
 
 }
 
 InitializrHelper::~InitializrHelper() = default;
 
 bool InitializrHelper::copyDir(const QDir& fromDir, const QDir& toDir, bool coverIfFileExists){
-    const QDir &_formDir = fromDir;
+    QDir _formDir = fromDir;
     QDir _toDir = toDir;
-    if (!_toDir.exists()) {
+    if(!_toDir.exists())
+    {
         if(!_toDir.mkdir(toDir.absolutePath()))
             return false;
     }
     QFileInfoList fileInfoList = _formDir.entryInfoList();
-            foreach(QFileInfo fileInfo, fileInfoList) {
+    foreach(QFileInfo fileInfo, fileInfoList)
+    {
         if(fileInfo.fileName() == "." || fileInfo.fileName() == "..")
             continue;
-            if (fileInfo.isDir()) {
+        if(fileInfo.isDir())
+        {
             if(!copyDir(fileInfo.filePath(), _toDir.filePath(fileInfo.fileName()),true))
                 return false;
-            } else {
+        }
-                if (coverIfFileExists && _toDir.exists(fileInfo.fileName())) {
+        else
+        {
+            if(coverIfFileExists && _toDir.exists(fileInfo.fileName()))
+            {
                 _toDir.remove(fileInfo.fileName());
             }
-                if (!QFile::copy(fileInfo.filePath(), _toDir.filePath(fileInfo.fileName()))) {
+            if(!QFile::copy(fileInfo.filePath(), _toDir.filePath(fileInfo.fileName())))
+            {
                 return false;
             }
         }
@@ -64,7 +72,7 @@ void InitializrHelper::copyFile(const QString &source, const QString &dest) {
     QFile::setPermissions(dest, QFile::WriteOwner | QFile::WriteUser | QFile::WriteGroup | QFile::WriteOther);
 }
 
-[[maybe_unused]] void InitializrHelper::generate(const QString &name, const QString &path) {
+void InitializrHelper::generate(const QString& name,const QString& path){
     if(name.isEmpty()){
         error(tr("The name cannot be empty"));
         return;
@@ -97,5 +105,5 @@ void InitializrHelper::copyFile(const QString &source, const QString &dest) {
     copyFile(":/example/res/template/src/qml.qrc.in",projectDir.filePath("src/qml.qrc"));
     copyFile(":/example/res/template/src/logo.ico.in",projectDir.filePath("src/logo.ico"));
     copyFile(":/example/res/template/src/README.md.in",projectDir.filePath("src/README.md"));
-    return this->success(projectPath+"/CMakeLists.txt");
+    return this->success(projectPath);
 }

example/src/helper/InitializrHelper.h

@@ -1,30 +1,26 @@
-#pragma once
+#ifndef INITIALIZRHELPER_H
+#define INITIALIZRHELPER_H
 
 #include <QObject>
 #include <QtQml/qqml.h>
 #include <QDir>
 #include "src/singleton.h"
 
-class InitializrHelper : public QObject {
+class InitializrHelper : public QObject
+{
     Q_OBJECT
 private:
-    [[maybe_unused]] explicit InitializrHelper(QObject *parent = nullptr);
+    explicit InitializrHelper(QObject* parent = nullptr);
-
     bool copyDir(const QDir& fromDir, const QDir& toDir, bool coverIfFileExists = true);
-
+    void copyFile(const QString& source,const QString& dest);
-    static void copyFile(const QString &source, const QString &dest);
-
     template <typename...Args>
     void templateToFile(const QString& source,const QString& dest,Args &&...args);
-
 public:
     SINGLETON(InitializrHelper)
-
     ~InitializrHelper() override;
-
+    Q_INVOKABLE void generate(const QString& name,const QString& path);
-    [[maybe_unused]] Q_INVOKABLE void generate(const QString &name, const QString &path);
-
     Q_SIGNAL void error(const QString& message);
-
     Q_SIGNAL void success(const QString& path);
 };
+
+#endif // INITIALIZRHELPER_H

example/src/helper/Log.cpp

@@ -11,11 +11,8 @@
 #include <QSettings>
 #include <QRegularExpression>
 #include "Version.h"
-
 #ifdef WIN32
-
 #include <process.h>
-
 #else
 #include <unistd.h>
 #endif
@@ -45,7 +42,8 @@ std::map<QtMsgType, int> logLevelMap = {
     {QtDebugMsg,4}
 };
 
-QString Log::prettyProductInfoWrapper() {
+QString Log::prettyProductInfoWrapper()
+{
     auto productName = QSysInfo::prettyProductName();
 #if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 #if defined(Q_OS_MACOS)
@@ -72,17 +70,20 @@ QString Log::prettyProductInfoWrapper() {
 #endif
 #endif
 #if defined(Q_OS_WIN)
-    QSettings regKey{QString::fromUtf8(R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)"), QSettings::NativeFormat};
+    QSettings regKey {QString::fromUtf8("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), QSettings::NativeFormat};
     if (regKey.contains(QString::fromUtf8("CurrentBuildNumber"))) {
         auto buildNumber = regKey.value(QString::fromUtf8("CurrentBuildNumber")).toInt();
         if (buildNumber > 0) {
             if (buildNumber < 9200) {
                 productName = QString::fromUtf8("Windows 7 build %1").arg(buildNumber);
-            } else if (buildNumber < 10240) {
+            }
+            else if (buildNumber < 10240) {
                 productName = QString::fromUtf8("Windows 8 build %1").arg(buildNumber);
-            } else if (buildNumber < 22000) {
+            }
+            else if (buildNumber < 22000) {
                 productName = QString::fromUtf8("Windows 10 build %1").arg(buildNumber);
-            } else {
+            }
+            else {
                 productName = QString::fromUtf8("Windows 11 build %1").arg(buildNumber);
             }
         }
@@ -91,7 +92,8 @@ QString Log::prettyProductInfoWrapper() {
     return productName;
 }
 
-static inline void messageHandler(const QtMsgType type, const QMessageLogContext &context, const QString &message) {
+static inline void messageHandler(const QtMsgType type, const QMessageLogContext &context, const QString &message)
+{
     if(message == "Could not get the INetworkConnection instance for the adapter GUID."){
         return;
     }
@@ -166,7 +168,8 @@ static inline void messageHandler(const QtMsgType type, const QMessageLogContext
     }
 }
 
-void Log::setup(char *argv[], const QString &app, int level) {
+void Log::setup(char *argv[],const QString &app,int level)
+{
     Q_ASSERT(!app.isEmpty());
     if (app.isEmpty()) {
         return;

example/src/helper/Log.h

@@ -1,9 +1,11 @@
-#pragma once
+#ifndef LOG_H
-
+#define LOG_H
 #include <QtCore/qstring.h>
 
-namespace Log {
+namespace Log
+{
     QString prettyProductInfoWrapper();
-
     void setup(char *argv[], const QString &app,int level = 4);
 }
+
+#endif // LOG_H

example/src/helper/Network.cpp

@@ -17,14 +17,12 @@
 #include <QCryptographicHash>
 #include <QEventLoop>
 #include <QGuiApplication>
-#include <utility>
-
 
 NetworkCallable::NetworkCallable(QObject *parent):QObject{parent}{
 
 }
 
-QString NetworkParams::method2String() const {
+QString NetworkParams::method2String(){
     switch (_method) {
     case METHOD_GET:
         return "GET";
@@ -43,21 +41,21 @@ QString NetworkParams::method2String() const {
     }
 }
 
-int NetworkParams::getTimeout() const {
+int NetworkParams::getTimeout(){
     if(_timeout != -1){
         return _timeout;
     }
     return Network::getInstance()->timeout();
 }
 
-int NetworkParams::getRetry() const {
+int NetworkParams::getRetry(){
     if(_retry != -1){
         return _retry;
     }
     return Network::getInstance()->retry();
 }
 
-bool NetworkParams::getOpenLog() const {
+bool NetworkParams::getOpenLog(){
     if(!_openLog.isNull()){
         return _openLog.toBool();
     }
@@ -65,49 +63,52 @@ bool NetworkParams::getOpenLog() const {
 }
 
 FluDownloadParam::FluDownloadParam(QObject *parent)
-        : QObject{parent} {
+    : QObject{parent}
+{
 }
 
 FluDownloadParam::FluDownloadParam(QString destPath,bool append,QObject *parent)
-        : QObject{parent} {
+    : QObject{parent}
-    this->_destPath = std::move(destPath);
+{
+    this->_destPath = destPath;
     this->_append = append;
 }
 
-NetworkParams::NetworkParams(QObject *parent) : QObject{parent} {
+NetworkParams::NetworkParams(QObject *parent)
-    _method = NetworkParams::Method::METHOD_GET;
+    : QObject{parent}
-    _type = NetworkParams::Type::TYPE_BODY;
+{
 }
 
 NetworkParams::NetworkParams(QString url,Type type,Method method,QObject *parent)
-        : QObject{parent} {
+    : QObject{parent}
+{
     this->_method = method;
-    this->_url = std::move(url);
+    this->_url = url;
     this->_type = type;
 }
 
-NetworkParams *NetworkParams::add(const QString &key, const QVariant &val) {
+NetworkParams* NetworkParams::add(QString key,QVariant val){
     _paramMap.insert(key,val);
     return this;
 }
 
-NetworkParams *NetworkParams::addFile(const QString &key, const QVariant &val) {
+NetworkParams* NetworkParams::addFile(QString key,QVariant val){
     _fileMap.insert(key,val);
     return this;
 }
 
-NetworkParams *NetworkParams::addHeader(const QString &key, const QVariant &val) {
+NetworkParams* NetworkParams::addHeader(QString key,QVariant val){
     _headerMap.insert(key,val);
     return this;
 }
 
-NetworkParams *NetworkParams::addQuery(const QString &key, const QVariant &val) {
+NetworkParams* NetworkParams::addQuery(QString key,QVariant val){
     _queryMap.insert(key,val);
     return this;
 }
 
 NetworkParams* NetworkParams::setBody(QString val){
-    _body = std::move(val);
+    _body = val;
     return this;
 }
 
@@ -127,7 +128,7 @@ NetworkParams *NetworkParams::setCacheMode(int val) {
 }
 
 NetworkParams* NetworkParams::toDownload(QString destPath,bool append){
-    _downloadParam = new FluDownloadParam(std::move(destPath), append, this);
+    _downloadParam = new FluDownloadParam(destPath,append,this);
     return this;
 }
 
@@ -137,11 +138,11 @@ NetworkParams *NetworkParams::bind(QObject *target) {
 }
 
 NetworkParams* NetworkParams::openLog(QVariant val){
-    _openLog = std::move(val);
+    _openLog = val;
     return this;
 }
 
-QString NetworkParams::buildCacheKey() const {
+QString NetworkParams::buildCacheKey(){
     QJsonObject obj;
     obj.insert("url",_url);
     obj.insert("method",method2String());
@@ -195,19 +196,19 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
         manager.setTransferTimeout(params->getTimeout());
         QEventLoop loop;
         connect(&manager,&QNetworkAccessManager::finished,&manager,[&loop](QNetworkReply *reply){loop.quit();});
-        for (int i = 0; i <= params->getRetry() - 1; ++i) {
+        for (int i = 0; i < params->getRetry(); ++i) {
             QUrl url(params->_url);
             addQueryParam(&url,params->_queryMap);
             QNetworkRequest request(url);
             addHeaders(&request,params->_headerMap);
             QNetworkReply* reply;
             sendRequest(&manager,request,params,reply,i==0,callable);
-            if (!QPointer<QCoreApplication>(QGuiApplication::instance())) {
+            if(!QPointer<QGuiApplication>(qApp)){
                 reply->deleteLater();
                 reply = nullptr;
                 return;
             }
-            auto abortCallable = [reply, &i, params] {
+            auto abortCallable = [&loop,reply,&i,params]{
                 if(reply){
                     i = params->getRetry();
                     reply->abort();
@@ -218,7 +219,7 @@ void Network::handle(NetworkParams *params, NetworkCallable *c) {
             if(params->_target){
                 conn_destroyed =  connect(params->_target,&QObject::destroyed,&manager,abortCallable);
             }
-            conn_quit = connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager, abortCallable);
+            conn_quit = connect(qApp,&QGuiApplication::aboutToQuit,&manager, abortCallable);
             loop.exec();
             if(conn_destroyed){
                 disconnect(conn_destroyed);
@@ -281,14 +282,14 @@ void Network::handleDownload(NetworkParams *params, NetworkCallable *c) {
         addHeaders(&request,params->_headerMap);
         QString cachePath = getCacheFilePath(cacheKey);
         QString destPath = params->_downloadParam->_destPath;
-        auto *destFile = new QFile(destPath);
+        QFile* destFile = new QFile(destPath);
-        auto *cacheFile = new QFile(cachePath);
+        QFile* cacheFile = new QFile(cachePath);
-        bool isOpen;
+        bool isOpen = false;
-        qint64 seek;
+        qint64 seek = 0;
         if(cacheFile->exists() && destFile->exists() && params->_downloadParam->_append){
             QJsonObject cacheInfo = QJsonDocument::fromJson(readCache(cacheKey).toUtf8()).object();
-            qint64 fileSize = qRound(cacheInfo.value("fileSize").toDouble());
+            qint64 fileSize = cacheInfo.value("fileSize").toDouble();
-            qint64 contentLength = qRound(cacheInfo.value("contentLength").toDouble());
+            qint64 contentLength = cacheInfo.value("contentLength").toDouble();
             if(fileSize == contentLength && destFile->size() == contentLength){
                 if(!callable.isNull()){
                     callable->downloadProgress(fileSize,contentLength);
@@ -315,7 +316,8 @@ void Network::handleDownload(NetworkParams *params, NetworkCallable *c) {
             return;
         }
         if(params->_downloadParam->_append){
-            if (!cacheFile->open(QIODevice::WriteOnly | QIODevice::Truncate)) {
+            if (!cacheFile->open(QIODevice::WriteOnly|QIODevice::Truncate))
+            {
                 if(!callable.isNull()){
                     callable->error(-1,"cache file device not open","");
                     callable->finish();
@@ -327,21 +329,22 @@ void Network::handleDownload(NetworkParams *params, NetworkCallable *c) {
         QNetworkReply *reply = manager.get(request);
         destFile->setParent(reply);
         cacheFile->setParent(reply);
-        auto abortCallable = [reply] {
+        auto abortCallable = [&loop,reply,params]{
             if(reply){
                 reply->abort();
             }
         };
         connect(&manager,&QNetworkAccessManager::finished,&manager,[&loop](QNetworkReply *reply){loop.quit();});
-        connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager, [&loop, reply]() { reply->abort(), loop.quit(); });
+        connect(qApp,&QGuiApplication::aboutToQuit,&manager, [&loop,reply](){reply->abort(),loop.quit();});
         QMetaObject::Connection conn_destroyed = {};
         QMetaObject::Connection conn_quit = {};
         if(params->_target){
             conn_destroyed =  connect(params->_target,&QObject::destroyed,&manager,abortCallable);
         }
-        conn_quit = connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, &manager, abortCallable);
+        conn_quit = connect(qApp,&QGuiApplication::aboutToQuit,&manager, abortCallable);
         connect(reply,&QNetworkReply::readyRead,reply,[reply,seek,destFile,cacheFile,callable]{
-            if (!reply || !destFile || reply->error() != QNetworkReply::NoError) {
+            if (!reply || !destFile || reply->error() != QNetworkReply::NoError)
+            {
                 return;
             }
             QMap<QString, QVariant> downInfo;
@@ -430,29 +433,31 @@ QString Network::map2String(const QMap<QString, QVariant> &map) {
     return parameters.join(" ");
 }
 
-void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest request, NetworkParams *params, QNetworkReply *&reply, bool isFirst, const QPointer<NetworkCallable> &callable) {
+void Network::sendRequest(QNetworkAccessManager* manager,QNetworkRequest request,NetworkParams* params,QNetworkReply*& reply,bool isFirst,QPointer<NetworkCallable> callable){
     QByteArray verb = params->method2String().toUtf8();
     switch (params->_type) {
     case NetworkParams::TYPE_FORM:{
         bool isFormData = !params->_fileMap.isEmpty();
         if(isFormData){
-                auto *multiPart = new QHttpMultiPart();
+            QHttpMultiPart *multiPart = new QHttpMultiPart();
             multiPart->setContentType(QHttpMultiPart::FormDataType);
-                for (const auto &each: params->_paramMap.toStdMap()) {
+            for (const auto& each : params->_paramMap.toStdMap())
+            {
                 QHttpPart part;
                 part.setHeader(QNetworkRequest::ContentDispositionHeader, QString("form-data; name=\"%1\"").arg(each.first));
                 part.setBody(each.second.toByteArray());
                 multiPart->append(part);
             }
-                for (const auto &each: params->_fileMap.toStdMap()) {
+            for (const auto& each : params->_fileMap.toStdMap())
+            {
                 QString filePath = each.second.toString();
                 QString name = each.first;
-                    auto *file = new QFile(filePath);
+                QFile *file = new QFile(filePath);
                 QString fileName = QFileInfo(filePath).fileName();
                 file->open(QIODevice::ReadOnly);
                 file->setParent(multiPart);
                 QHttpPart part;
-                    part.setHeader(QNetworkRequest::ContentDispositionHeader, QString(R"(form-data; name="%1"; filename="%2")").arg(name, fileName));
+                part.setHeader(QNetworkRequest::ContentDispositionHeader, QString("form-data; name=\"%1\"; filename=\"%2\"").arg(name,fileName));
                 part.setBodyDevice(file);
                 multiPart->append(part);
             }
@@ -466,7 +471,8 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
         }else{
             request.setHeader(QNetworkRequest::ContentTypeHeader, QString("application/x-www-form-urlencoded"));
             QString value;
-                for (const auto &each: params->_paramMap.toStdMap()) {
+            for (const auto& each : params->_paramMap.toStdMap())
+            {
                 value += QString("%1=%2").arg(each.first,each.second.toString());
                 value += "&";
             }
@@ -481,7 +487,8 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
     case NetworkParams::TYPE_JSON:{
         request.setHeader(QNetworkRequest::ContentTypeHeader, QString("application/json;charset=utf-8"));
         QJsonObject json;
-            for (const auto &each: params->_paramMap.toStdMap()) {
+        for (const auto& each : params->_paramMap.toStdMap())
+        {
             json.insert(each.first,each.second.toJsonValue());
         }
         QByteArray data = QJsonDocument(json).toJson(QJsonDocument::Compact);
@@ -491,7 +498,8 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
     case NetworkParams::TYPE_JSONARRAY:{
         request.setHeader(QNetworkRequest::ContentTypeHeader, QString("application/json;charset=utf-8"));
         QJsonArray jsonArray;
-            for (const auto &each: params->_paramMap.toStdMap()) {
+        for (const auto& each : params->_paramMap.toStdMap())
+        {
             QJsonObject json;
             json.insert(each.first,each.second.toJsonValue());
             jsonArray.append(json);
@@ -515,7 +523,7 @@ void Network::sendRequest(QNetworkAccessManager *manager, QNetworkRequest reques
     }
 }
 
-void Network::printRequestStartLog(const QNetworkRequest &request, NetworkParams *params) {
+void Network::printRequestStartLog(QNetworkRequest request,NetworkParams* params){
     if(!params->getOpenLog()){
         return;
     }
@@ -543,7 +551,7 @@ void Network::printRequestStartLog(const QNetworkRequest &request, NetworkParams
     }
 }
 
-void Network::printRequestEndLog(const QNetworkRequest &request, NetworkParams *params, QNetworkReply *&reply, const QString &response) {
+void Network::printRequestEndLog(QNetworkRequest request,NetworkParams* params,QNetworkReply*& reply,const QString& response){
     if(!params->getOpenLog()){
         return;
     }
@@ -552,10 +560,11 @@ void Network::printRequestEndLog(const QNetworkRequest &request, NetworkParams *
     qDebug()<<"<Result>"<<qUtf8Printable(response);
 }
 
-void Network::saveResponse(const QString &key, const QString &response) {
+void Network::saveResponse(QString key,QString response){
     QSharedPointer<QFile> file(new QFile(getCacheFilePath(key)));
     QIODevice::OpenMode mode = QIODevice::WriteOnly|QIODevice::Truncate;
-    if (!file->open(mode)) {
+    if (!file->open(mode))
+    {
         return;
     }
     file->write(response.toUtf8().toBase64());
@@ -564,7 +573,8 @@ void Network::saveResponse(const QString &key, const QString &response) {
 void Network::addHeaders(QNetworkRequest* request,const QMap<QString, QVariant>& headers){
     request->setHeader(QNetworkRequest::UserAgentHeader,QString::fromStdString("Mozilla/5.0 %1/%2").arg(QGuiApplication::applicationName(),QGuiApplication::applicationVersion()));
     QMapIterator<QString, QVariant> iter(headers);
-    while (iter.hasNext()) {
+    while (iter.hasNext())
+    {
         iter.next();
         request->setRawHeader(iter.key().toUtf8(), iter.value().toString().toUtf8());
     }
@@ -573,18 +583,20 @@ void Network::addHeaders(QNetworkRequest *request, const QMap<QString, QVariant>
 void Network::addQueryParam(QUrl* url,const QMap<QString, QVariant>& params){
     QMapIterator<QString, QVariant> iter(params);
     QUrlQuery urlQuery(*url);
-    while (iter.hasNext()) {
+    while (iter.hasNext())
+    {
         iter.next();
         urlQuery.addQueryItem(iter.key(), iter.value().toString());
     }
     url->setQuery(urlQuery);
 }
 
-Network::Network(QObject *parent) : QObject{parent} {
+Network::Network(QObject *parent): QObject{parent}
-    _timeout = 5000;
+{
-    _retry = 3;
+    timeout(5000);
-    _openLog = false;
+    retry(3);
-    _cacheDir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation).append(QDir::separator()).append("network");
+    openLog(false);
+    cacheDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation).append(QDir::separator()).append("network"));
 }
 
 NetworkParams* Network::get(const QString& url){
@@ -660,5 +672,5 @@ NetworkParams *Network::deleteJsonArray(const QString &url) {
 }
 
 void Network::setInterceptor(QJSValue interceptor){
-    this->_interceptor = std::move(interceptor);
+    this->_interceptor = interceptor;
 }

example/src/helper/Network.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef NETWORK_H
+#define NETWORK_H
 
 #include <QObject>
 #include <QtQml/qqml.h>
@@ -18,9 +19,7 @@ namespace NetworkType {
     IfNoneCacheRequest = 0x0002,
     FirstCacheThenRequest = 0x0004,
 };
-
 Q_ENUM_NS(CacheMode)
-
 QML_NAMED_ELEMENT(NetworkType)
 }
 
@@ -32,19 +31,12 @@ Q_OBJECT
     QML_NAMED_ELEMENT(NetworkCallable)
 public:
     explicit NetworkCallable(QObject *parent = nullptr);
-
     Q_SIGNAL void start();
-
     Q_SIGNAL void finish();
-
     Q_SIGNAL void error(int status,QString errorString,QString result);
-
     Q_SIGNAL void success(QString result);
-
     Q_SIGNAL void cache(QString result);
-
     Q_SIGNAL void uploadProgress(qint64 sent, qint64 total);
-
     Q_SIGNAL void downloadProgress(qint64 recv, qint64 total);
 };
 
@@ -55,18 +47,17 @@ class FluDownloadParam : public QObject {
     Q_OBJECT
 public:
     explicit FluDownloadParam(QObject *parent = nullptr);
-
     FluDownloadParam(QString destPath,bool append,QObject *parent = nullptr);
-
 public:
     QString _destPath;
-    bool _append{};
+    bool _append;
 };
 
 /**
  * @brief The NetworkParams class
  */
-class NetworkParams : public QObject {
+class NetworkParams : public QObject
+{
     Q_OBJECT
     QML_NAMED_ELEMENT(NetworkParams)
 public:
@@ -85,45 +76,25 @@ public:
         TYPE_JSONARRAY,
         TYPE_BODY
     };
-
     explicit NetworkParams(QObject *parent = nullptr);
-
     NetworkParams(QString url,Type type,Method method,QObject *parent = nullptr);
-
+    Q_INVOKABLE NetworkParams* addQuery(QString key,QVariant val);
-    Q_INVOKABLE NetworkParams *addQuery(const QString &key, const QVariant &val);
+    Q_INVOKABLE NetworkParams* addHeader(QString key,QVariant val);
-
+    Q_INVOKABLE NetworkParams* add(QString key,QVariant val);
-    Q_INVOKABLE NetworkParams *addHeader(const QString &key, const QVariant &val);
+    Q_INVOKABLE NetworkParams* addFile(QString key,QVariant val);
-
-    Q_INVOKABLE NetworkParams *add(const QString &key, const QVariant &val);
-
-    Q_INVOKABLE NetworkParams *addFile(const QString &key, const QVariant &val);
-
     Q_INVOKABLE NetworkParams* setBody(QString val);
-
     Q_INVOKABLE NetworkParams* setTimeout(int val);
-
     Q_INVOKABLE NetworkParams* setRetry(int val);
-
     Q_INVOKABLE NetworkParams* setCacheMode(int val);
-
     Q_INVOKABLE NetworkParams* toDownload(QString destPath,bool append = false);
-
     Q_INVOKABLE NetworkParams* bind(QObject* target);
-
     Q_INVOKABLE NetworkParams* openLog(QVariant val);
-
     Q_INVOKABLE void go(NetworkCallable* result);
-
+    QString buildCacheKey();
-    QString buildCacheKey() const;
+    QString method2String();
-
+    int getTimeout();
-    QString method2String() const;
+    int getRetry();
-
+    bool getOpenLog();
-    int getTimeout() const;
-
-    int getRetry() const;
-
-    bool getOpenLog() const;
-
 public:
     FluDownloadParam* _downloadParam = nullptr;
     QObject* _target = nullptr;
@@ -144,7 +115,8 @@ public:
 /**
  * @brief The Network class
  */
-class Network : public QObject {
+class Network : public QObject
+{
     Q_OBJECT
     Q_PROPERTY_AUTO(int,timeout)
     Q_PROPERTY_AUTO(int,retry)
@@ -152,80 +124,46 @@ Q_PROPERTY_AUTO(QString, cacheDir)
     Q_PROPERTY_AUTO(bool,openLog)
     QML_NAMED_ELEMENT(Network)
     QML_SINGLETON
-
 private:
     explicit Network(QObject *parent = nullptr);
-
 public:
     SINGLETON(Network)
-
     static Network *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine){return getInstance();}
-
     Q_INVOKABLE NetworkParams* get(const QString& url);
-
     Q_INVOKABLE NetworkParams* head(const QString& url);
-
     Q_INVOKABLE NetworkParams* postBody(const QString& url);
-
     Q_INVOKABLE NetworkParams* putBody(const QString& url);
-
     Q_INVOKABLE NetworkParams* patchBody(const QString& url);
-
     Q_INVOKABLE NetworkParams* deleteBody(const QString& url);
-
     Q_INVOKABLE NetworkParams* postForm(const QString& url);
-
     Q_INVOKABLE NetworkParams* putForm(const QString& url);
-
     Q_INVOKABLE NetworkParams* patchForm(const QString& url);
-
     Q_INVOKABLE NetworkParams* deleteForm(const QString& url);
-
     Q_INVOKABLE NetworkParams* postJson(const QString& url);
-
     Q_INVOKABLE NetworkParams* putJson(const QString& url);
-
     Q_INVOKABLE NetworkParams* patchJson(const QString& url);
-
     Q_INVOKABLE NetworkParams* deleteJson(const QString& url);
-
     Q_INVOKABLE NetworkParams* postJsonArray(const QString& url);
-
     Q_INVOKABLE NetworkParams* putJsonArray(const QString& url);
-
     Q_INVOKABLE NetworkParams* patchJsonArray(const QString& url);
-
     Q_INVOKABLE NetworkParams* deleteJsonArray(const QString& url);
-
     Q_INVOKABLE void setInterceptor(QJSValue interceptor);
-
     void handle(NetworkParams* params,NetworkCallable* result);
-
     void handleDownload(NetworkParams* params,NetworkCallable* result);
-
 private:
-    static void sendRequest(QNetworkAccessManager *manager, QNetworkRequest request, NetworkParams *params, QNetworkReply *&reply, bool isFirst, const QPointer<NetworkCallable> &callable);
+    void sendRequest(QNetworkAccessManager* manager,QNetworkRequest request,NetworkParams* params,QNetworkReply*& reply,bool isFirst,QPointer<NetworkCallable> callable);
-
+    void addQueryParam(QUrl* url,const QMap<QString, QVariant>& params);
-    static void addQueryParam(QUrl *url, const QMap<QString, QVariant> &params);
+    void addHeaders(QNetworkRequest* request,const QMap<QString, QVariant>& headers);
-
+    void saveResponse(QString key,QString response);
-    static void addHeaders(QNetworkRequest *request, const QMap<QString, QVariant> &headers);
-
-    void saveResponse(const QString &key, const QString &response);
-
     QString readCache(const QString& key);
-
     bool cacheExists(const QString& key);
-
     QString getCacheFilePath(const QString& key);
-
+    QString map2String(const QMap<QString, QVariant>& map);
-    static QString headerList2String(const QList<QNetworkReply::RawHeaderPair> &data);
+    QString headerList2String(const QList<QNetworkReply::RawHeaderPair>& data);
-
+    void printRequestStartLog(QNetworkRequest request,NetworkParams* params);
-    static void printRequestStartLog(const QNetworkRequest &request, NetworkParams *params);
+    void printRequestEndLog(QNetworkRequest request,NetworkParams* params,QNetworkReply*& reply,const QString& response);
-
-    static void printRequestEndLog(const QNetworkRequest &request, NetworkParams *params, QNetworkReply *&reply, const QString &response);
-
-    static QString map2String(const QMap<QString, QVariant> &map);
-
 public:
     QJSValue _interceptor;
 };
+
+#endif // Network_H

example/src/helper/SettingsHelper.cpp

@@ -3,13 +3,15 @@
 #include <QDataStream>
 #include <QStandardPaths>
 
-SettingsHelper::SettingsHelper(QObject *parent) : QObject(parent) {
+SettingsHelper::SettingsHelper(QObject *parent) : QObject(parent)
+{
 
 }
 
 SettingsHelper::~SettingsHelper() = default;
 
-void SettingsHelper::save(const QString &key, QVariant val) {
+void SettingsHelper::save(const QString& key,QVariant val)
+{
     m_settings->setValue(key, val);
 }
 

example/src/helper/SettingsHelper.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef SETTINGSHELPER_H
+#define SETTINGSHELPER_H
 
 #include <QtCore/qobject.h>
 #include <QtQml/qqml.h>
@@ -9,35 +10,26 @@
 #include <QDir>
 #include "src/singleton.h"
 
-class SettingsHelper : public QObject {
+class SettingsHelper : public QObject
+{
     Q_OBJECT
 private:
     explicit SettingsHelper(QObject* parent = nullptr);
-
 public:
     SINGLETON(SettingsHelper)
-
     ~SettingsHelper() override;
-
     void init(char *argv[]);
-
     Q_INVOKABLE void saveDarkMode(int darkModel){save("darkMode",darkModel);}
-
     Q_INVOKABLE int getDarkMode(){return get("darkMode",QVariant(0)).toInt();}
-
     Q_INVOKABLE void saveUseSystemAppBar(bool useSystemAppBar){save("useSystemAppBar",useSystemAppBar);}
-
     Q_INVOKABLE bool getUseSystemAppBar(){return get("useSystemAppBar",QVariant(false)).toBool();}
-
+    Q_INVOKABLE void saveLanguage(QString language){save("language",language);}
-    Q_INVOKABLE void saveLanguage(const QString &language) { save("language", language); }
-
     Q_INVOKABLE QString getLanguage(){return get("language",QVariant("en_US")).toString();}
-
 private:
     void save(const QString& key,QVariant val);
-
     QVariant get(const QString& key,QVariant def={});
-
 private:
     QScopedPointer<QSettings> m_settings;
 };
+
+#endif // SETTINGSHELPER_H

example/src/helper/TranslateHelper.cpp

@@ -5,7 +5,8 @@
 
 #include "SettingsHelper.h"
 
-[[maybe_unused]] TranslateHelper::TranslateHelper(QObject *parent) : QObject(parent) {
+TranslateHelper::TranslateHelper(QObject *parent) : QObject(parent)
+{
     _languages<<"en_US";
     _languages<<"zh_CN";
     _current = SettingsHelper::getInstance()->getLanguage();
@@ -16,7 +17,7 @@ TranslateHelper::~TranslateHelper() = default;
 void TranslateHelper::init(QQmlEngine* engine){
     _engine = engine;
     _translator = new QTranslator(this);
-    QGuiApplication::installTranslator(_translator);
+    qApp->installTranslator(_translator);
     QString translatorPath = QGuiApplication::applicationDirPath()+"/i18n";
     if(_translator->load(QString::fromStdString("%1/example_%2.qm").arg(translatorPath,_current))){
         _engine->retranslate();

example/src/helper/TranslateHelper.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef TRANSLATEHELPER_H
+#define TRANSLATEHELPER_H
 
 #include <QObject>
 #include <QtQml/qqml.h>
@@ -6,21 +7,20 @@
 #include "src/singleton.h"
 #include "src/stdafx.h"
 
-class TranslateHelper : public QObject {
+class TranslateHelper : public QObject
+{
     Q_OBJECT
     Q_PROPERTY_AUTO(QString,current)
     Q_PROPERTY_READONLY_AUTO(QStringList,languages)
 private:
-    [[maybe_unused]] explicit TranslateHelper(QObject *parent = nullptr);
+    explicit TranslateHelper(QObject* parent = nullptr);
-
 public:
     SINGLETON(TranslateHelper)
-
     ~TranslateHelper() override;
-
     void init(QQmlEngine* engine);
-
 private:
     QQmlEngine* _engine = nullptr;
     QTranslator* _translator = nullptr;
 };
+
+#endif // TRANSLATEHELPER_H

example/src/main.cpp

@@ -14,7 +14,6 @@
 #include "src/component/CircularReveal.h"
 #include "src/component/FileWatcher.h"
 #include "src/component/FpsItem.h"
-#include "src/component/OpenGLItem.h"
 #include "src/helper/SettingsHelper.h"
 #include "src/helper/InitializrHelper.h"
 #include "src/helper/TranslateHelper.h"
@@ -54,7 +53,7 @@ int main(int argc, char *argv[])
     QGuiApplication::setOrganizationName("ZhuZiChu");
     QGuiApplication::setOrganizationDomain("https://zhuzichu520.github.io");
     QGuiApplication::setApplicationName("FluentUI");
-    QGuiApplication::setApplicationDisplayName("FluentUI Example");
+    QGuiApplication::setApplicationDisplayName("FluentUI Exmaple");
     QGuiApplication::setApplicationVersion(APPLICATION_VERSION);
     QGuiApplication::setQuitOnLastWindowClosed(false);
     SettingsHelper::getInstance()->init(argv);
@@ -76,9 +75,6 @@ int main(int argc, char *argv[])
     qmlRegisterType<FpsItem>(uri, major, minor, "FpsItem");
     qmlRegisterType<NetworkCallable>(uri,major,minor,"NetworkCallable");
     qmlRegisterType<NetworkParams>(uri,major,minor,"NetworkParams");
-    qmlRegisterType<OpenGLItem>(uri,major,minor,"OpenGLItem");
-    qmlRegisterUncreatableMetaObject(NetworkType::staticMetaObject, uri, major, minor, "NetworkType", "Access to enums & flags only");
-
     QQmlApplicationEngine engine;
     TranslateHelper::getInstance()->init(&engine);
     engine.rootContext()->setContextProperty("AppInfo",AppInfo::getInstance());

example/src/singleton.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef SINGLETON_H
+#define SINGLETON_H
 
 /**
  * @brief The Singleton class
@@ -22,3 +23,5 @@ private:                                        \
     static Class* getInstance() {               \
         return Singleton<Class>::getInstance(); \
 }
+
+#endif // SINGLETON_H

example/src/stdafx.h

@@ -1,6 +1,7 @@
-#pragma once
+#ifndef STDAFX_H
+#define STDAFX_H
 
-#define Q_PROPERTY_AUTO_P(TYPE, M)                                                                                   \
+#define Q_PROPERTY_AUTO(TYPE, M)                                                                                       \
 Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed)                                                                     \
     public:                                                                                                                \
     Q_SIGNAL void M##Changed();                                                                                          \
@@ -14,30 +15,14 @@ Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed)
         return _##M;                                                                                                       \
 }                                                                                                                    \
     private:                                                                                                               \
-    TYPE _##M;
+    TYPE _##M;                                                                                                           \
-
-#define Q_PROPERTY_AUTO(TYPE, M)                                                                                     \
-Q_PROPERTY(TYPE M MEMBER _##M NOTIFY M##Changed)                                                                     \
-    public:                                                                                                          \
-    Q_SIGNAL void M##Changed();                                                                                      \
-    void M(const TYPE& in_##M)                                                                                       \
-{                                                                                                                    \
-        _##M = in_##M;                                                                                               \
-        Q_EMIT M##Changed();                                                                                         \
-}                                                                                                                    \
-    TYPE M()                                                                                                         \
-{                                                                                                                    \
-        return _##M;                                                                                                 \
-}                                                                                                                    \
-    private:                                                                                                         \
-    TYPE _##M;
 
 
 #define Q_PROPERTY_READONLY_AUTO(TYPE, M)                                                                              \
 Q_PROPERTY(TYPE M READ M NOTIFY M##Changed FINAL)                                                                    \
     public:                                                                                                                \
     Q_SIGNAL void M##Changed();                                                                                          \
-    void M(const TYPE& in_##M)                                                                                       \
+    void M(TYPE in_##M)                                                                                                  \
 {                                                                                                                    \
         _##M = in_##M;                                                                                                     \
         Q_EMIT M##Changed();                                                                                               \
@@ -47,4 +32,6 @@ Q_PROPERTY(TYPE M READ M NOTIFY M##Changed FINAL)
         return _##M;                                                                                                       \
 }                                                                                                                    \
     private:                                                                                                               \
-    TYPE _##M;
+    TYPE _##M;                                                                                                           \
+
+#endif  // STDAFX_H

src/CMakeLists.txt

@@ -13,7 +13,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 #设置版本号
-add_definitions(-DFLUENTUI_VERSION=1,7,5,0)
+add_definitions(-DFLUENTUI_VERSION=1,7,4,0)
 
 if (FLUENTUI_BUILD_STATIC_LIB)
     add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)
@@ -24,7 +24,7 @@ option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF)
 
 #导入Qt相关依赖包
 find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core Quick Qml)
-find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick)
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Quick Qml)
 
 set(QT_SDK_DIR "${Qt${QT_VERSION_MAJOR}_DIR}/../../..")
 cmake_path(SET QT_SDK_DIR NORMALIZE ${QT_SDK_DIR})
@@ -59,7 +59,7 @@ file(GLOB QM_FILE_PATHS ${CMAKE_CURRENT_LIST_DIR}/ *.qm)
 file(COPY ${QM_FILE_PATHS} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/Qt${QT_VERSION_MAJOR}/imports/FluentUI/i18n")
 
 #遍历所有Cpp文件
-file(GLOB_RECURSE CPP_FILES *.cpp *.h *.cxx)
+file(GLOB_RECURSE CPP_FILES *.cpp *.h)
 foreach(filepath ${CPP_FILES})
     string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
     list(APPEND sources_files ${filename})
@@ -143,7 +143,11 @@ if (QT_VERSION VERSION_GREATER_EQUAL "6.2")
         RESOURCE_PREFIX "/qt/qml"
     )
 else()
-    qt_add_resources(QRC_RESOURCES Qt5/imports/fluentui.qrc)
+    #加快qrc编译
+    set(QRC_FILE Qt5/imports/fluentui.qrc)
+    qt_add_big_resources(QRC_RESOURCES ${QRC_FILE})
+    list(APPEND QRC_RESOURCES ${QRC_FILE})
+    set_property(SOURCE ${QRC_FILE} PROPERTY SKIP_AUTORCC ON)
     #如果是Qt6.2版本以下，则使用add_qmlplugin函数添加资源文件，这是个自定义的函数，详情见.cmake/QmlPlugin.cmake
     include(QmlPlugin)
     add_qmlplugin(${PROJECT_NAME}

src/Def.cpp

@@ -0,0 +1 @@
+#include "Def.h"

src/FluAccentColor.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FLUACCENTCOLOR_H
+#define FLUACCENTCOLOR_H
 
 #include <QObject>
 #include <QtQml/qqml.h>
@@ -8,9 +9,9 @@
 /**
  * @brief The FluAccentColor class
  */
-class FluAccentColor : public QObject {
+class FluAccentColor : public QObject
+{
     Q_OBJECT
-
     Q_PROPERTY_AUTO(QColor,darkest)
     Q_PROPERTY_AUTO(QColor,darker)
     Q_PROPERTY_AUTO(QColor,dark)
@@ -22,3 +23,5 @@ Q_PROPERTY_AUTO(QColor, lightest)
 public:
     explicit FluAccentColor(QObject *parent = nullptr);
 };
+
+#endif // FLUACCENTCOLOR_H

src/FluApp.cpp

@@ -2,26 +2,26 @@
 
 #include <QQmlEngine>
 #include <QGuiApplication>
+#include <QQmlContext>
 #include <QQuickItem>
 #include <QTimer>
 #include <QUuid>
 #include <QFontDatabase>
 #include <QClipboard>
 #include <QTranslator>
-#include <utility>
-#include "FluentIconDef.h"
 
 FluApp::FluApp(QObject *parent):QObject{parent}{
-    _useSystemAppBar = false;
+    useSystemAppBar(false);
 }
 
-FluApp::~FluApp() = default;
+FluApp::~FluApp(){
+}
 
 void FluApp::init(QObject *target,QLocale locale){
-    _locale = std::move(locale);
+    _locale = locale;
     _engine = qmlEngine(target);
     _translator = new QTranslator(this);
-    QGuiApplication::installTranslator(_translator);
+    qApp->installTranslator(_translator);
     const QStringList uiLanguages = _locale.uiLanguages();
     for (const QString &name : uiLanguages) {
         const QString baseName = "fluentui_" + QLocale(name).name();
@@ -31,19 +31,3 @@ void FluApp::init(QObject *target, QLocale locale) {
         }
     }
 }
-
-[[maybe_unused]] QJsonArray FluApp::iconDatas(const QString &keyword) {
-    QJsonArray arr;
-    QMetaEnum enumType = Fluent_Icons::staticMetaObject.enumerator(Fluent_Icons::staticMetaObject.indexOfEnumerator("Fluent_IconType"));
-    for (int i = 0; i <= enumType.keyCount() - 1; ++i) {
-        QString name = enumType.key(i);
-        int icon = enumType.value(i);
-        if (keyword.isEmpty() || name.contains(keyword)) {
-            QJsonObject obj;
-            obj.insert("name", name);
-            obj.insert("icon", icon);
-            arr.append(obj);
-        }
-    }
-    return arr;
-}

src/FluApp.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FLUAPP_H
+#define FLUAPP_H
 
 #include <QObject>
 #include <QWindow>
@@ -8,37 +9,30 @@
 #include <QQmlEngine>
 #include <QTranslator>
 #include <QQuickWindow>
-#include <QJsonArray>
 #include "stdafx.h"
 #include "singleton.h"
 
 /**
  * @brief The FluApp class
  */
-class FluApp : public QObject {
+class FluApp : public QObject
+{
     Q_OBJECT
-
+    Q_PROPERTY_AUTO(bool,useSystemAppBar);
-Q_PROPERTY_AUTO(bool, useSystemAppBar)
+    Q_PROPERTY_AUTO(QString,windowIcon);
-Q_PROPERTY_AUTO(QString, windowIcon)
+    Q_PROPERTY_AUTO(QLocale,locale);
-Q_PROPERTY_AUTO(QLocale, locale)
     QML_NAMED_ELEMENT(FluApp)
     QML_SINGLETON
-
 private:
     explicit FluApp(QObject *parent = nullptr);
-
+    ~FluApp();
-    ~FluApp() override;
-
 public:
     SINGLETON(FluApp)
-
+    static FluApp *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine){return getInstance();}
-    static FluApp *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
-
     Q_INVOKABLE void init(QObject *target,QLocale locale = QLocale::system());
-
-    [[maybe_unused]] Q_INVOKABLE static QJsonArray iconDatas(const QString &keyword = "");
-
 private:
-    QQmlEngine *_engine{};
+    QQmlEngine *_engine;
     QTranslator* _translator = nullptr;
 };
+
+#endif // FLUAPP_H

src/FluCaptcha.cpp

@@ -3,20 +3,14 @@
 #include <QChar>
 #include <QPainter>
 #include <QRandomGenerator>
-
+#include <qmath.h>
-int generaNumber(int number) {
-    return QRandomGenerator::global()->bounded(0, number);
-}
 
 FluCaptcha::FluCaptcha(QQuickItem *parent):QQuickPaintedItem(parent){
-    _ignoreCase = false;
+    ignoreCase(true);
-    QFont fontStyle;
+    QFont fontStype;
-#ifdef Q_OS_WIN
+    fontStype.setPixelSize(28);
-    fontStyle.setFamily("微软雅黑");
+    fontStype.setBold(true);
-#endif
+    font(fontStype);
-    fontStyle.setPixelSize(28);
-    fontStyle.setBold(true);
-    font(fontStyle);
     setWidth(180);
     setHeight(80);
     refresh();
@@ -27,42 +21,55 @@ void FluCaptcha::paint(QPainter *painter) {
     painter->fillRect(boundingRect().toRect(),QColor(255,255,255,255));
     QPen pen;
     painter->setFont(_font);
-    for (int i = 0; i < 100; i++) {
+    for(int i=0;i<100;i++)
-        pen = QPen(QColor(generaNumber(256), generaNumber(256), generaNumber(256)));
+    {
+        pen = QPen(QColor(_generaNumber(256),_generaNumber(256),_generaNumber(256)));
         painter->setPen(pen);
-        painter->drawPoint(generaNumber(180), generaNumber(80));
+        painter->drawPoint(_generaNumber(180),_generaNumber(80));
     }
-    for (int i = 0; i < 5; i++) {
+    for(int i=0;i<5;i++)
-        pen = QPen(QColor(generaNumber(256), generaNumber(256), generaNumber(256)));
+    {
+        pen = QPen(QColor(_generaNumber(256),_generaNumber(256),_generaNumber(256)));
         painter->setPen(pen);
-        painter->drawLine(generaNumber(180), generaNumber(80), generaNumber(180), generaNumber(80));
+        painter->drawLine(_generaNumber(180),_generaNumber(80),_generaNumber(180),_generaNumber(80));
     }
-    for (int i = 0; i < 4; i++) {
+    for(int i=0;i<4;i++)
-        pen = QPen(QColor(generaNumber(255), generaNumber(255), generaNumber(255)));
+    {
+        pen = QPen(QColor(_generaNumber(255),_generaNumber(255),_generaNumber(255)));
         painter->setPen(pen);
-        painter->drawText(15 + 35 * i, 10 + generaNumber(15), 30, 40, Qt::AlignCenter, QString(_code[i]));
+        painter->drawText(15+35*i,10+_generaNumber(15),30,40,Qt::AlignCenter, QString(_code[i]));
     }
     painter->restore();
 }
 
+int FluCaptcha::_generaNumber(int number){
+    return QRandomGenerator::global()->bounded(0,number);
+}
+
 void FluCaptcha::refresh(){
     this->_code.clear();
-    for (int i = 0; i < 4; ++i) {
+    for(int i = 0;i < 4;++i)
-        int num = generaNumber(3);
+    {
-        if (num == 0) {
+        int num = _generaNumber(3);
-            this->_code += QString::number(generaNumber(10));
+        if(num == 0)
-        } else if (num == 1) {
+        {
+            this->_code += QString::number(_generaNumber(10));
+        }
+        else if(num == 1)
+        {
             int temp = 'A';
-            this->_code += static_cast<QChar>(temp + generaNumber(26));
+            this->_code += static_cast<QChar>(temp + _generaNumber(26));
-        } else if (num == 2) {
+        }
+        else if(num == 2)
+        {
             int temp = 'a';
-            this->_code += static_cast<QChar>(temp + generaNumber(26));
+            this->_code += static_cast<QChar>(temp + _generaNumber(26));
         }
     }
     update();
 }
 
-[[maybe_unused]] bool FluCaptcha::verify(const QString &code) {
+bool FluCaptcha::verify(const QString& code){
     if(_ignoreCase){
         return this->_code.toUpper() == code.toUpper();
     }

src/FluCaptcha.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FLUCAPTCHA_H
+#define FLUCAPTCHA_H
 
 #include <QQuickItem>
 #include <QQuickPaintedItem>
@@ -8,22 +9,21 @@
 /**
  * @brief The FluCaptcha class
  */
-class FluCaptcha : public QQuickPaintedItem {
+class FluCaptcha : public QQuickPaintedItem
+{
     Q_OBJECT
-
     Q_PROPERTY_AUTO(QFont,font);
     Q_PROPERTY_AUTO(bool,ignoreCase);
     QML_NAMED_ELEMENT(FluCaptcha)
-
+private:
+    int _generaNumber(int number);
 public:
     explicit FluCaptcha(QQuickItem *parent = nullptr);
-
     void paint(QPainter* painter) override;
-
     Q_INVOKABLE void refresh();
-
+    Q_INVOKABLE bool verify(const QString& code);
-    [[maybe_unused]] Q_INVOKABLE bool verify(const QString &code);
-
 private:
     QString _code;
 };
+
+#endif // FLUCAPTCHA_H

src/FluColors.cpp

@@ -2,33 +2,34 @@
 #include "FluTools.h"
 
 FluColors::FluColors(QObject *parent):QObject{parent}{
-    _Transparent = QColor(0, 0, 0, 0);
+    Transparent(QColor(0, 0, 0, 0));
-    _Black = QColor(0, 0, 0);
+    Black(QColor(0, 0, 0));
-    _White = QColor(255, 255, 255);
+    White(QColor(255, 255, 255));
-    _Grey10 = QColor(250, 249, 248);
+    Grey10(QColor(250, 249, 248));
-    _Grey20 = QColor(243, 242, 241);
+    Grey20(QColor(243, 242, 241));
-    _Grey30 = QColor(237, 235, 233);
+    Grey30(QColor(237, 235, 233));
-    _Grey40 = QColor(225, 223, 221);
+    Grey40(QColor(225, 223, 221));
-    _Grey50 = QColor(210, 208, 206);
+    Grey50(QColor(210, 208, 206));
-    _Grey60 = QColor(200, 198, 196);
+    Grey60(QColor(200, 198, 196));
-    _Grey70 = QColor(190, 185, 184);
+    Grey70(QColor(190, 185, 184));
-    _Grey80 = QColor(179, 176, 173);
+    Grey80(QColor(179, 176, 173));
-    _Grey90 = QColor(161, 159, 157);
+    Grey90(QColor(161, 159, 157));
-    _Grey100 = QColor(151, 149, 146);
+    Grey100(QColor(151, 149, 146));
-    _Grey110 = QColor(138, 136, 134);
+    Grey110(QColor(138, 136, 134));
-    _Grey120 = QColor(121, 119, 117);
+    Grey120(QColor(121, 119, 117));
-    _Grey130 = QColor(96, 94, 92);
+    Grey130(QColor(96, 94, 92));
-    _Grey140 = QColor(72, 70, 68);
+    Grey140(QColor(72, 70, 68));
-    _Grey150 = QColor(59, 58, 57);
+    Grey150(QColor(59, 58, 57));
-    _Grey160 = QColor(50, 49, 48);
+    Grey160(QColor(50, 49, 48));
-    _Grey170 = QColor(41, 40, 39);
+    Grey170(QColor(41, 40, 39));
-    _Grey180 = QColor(37, 36, 35);
+    Grey180(QColor(37, 36, 35));
-    _Grey190 = QColor(32, 31, 30);
+    Grey190(QColor(32, 31, 30));
-    _Grey200 = QColor(27, 26, 25);
+    Grey200(QColor(27, 26, 25));
-    _Grey210 = QColor(22, 21, 20);
+    Grey210(QColor(22, 21, 20));
-    _Grey220 = QColor(17, 16, 15);
+    Grey220(QColor(17, 16, 15));
 
-    auto yellow = new FluAccentColor(this);
+
+    FluAccentColor *yellow = new FluAccentColor(this);
     yellow->darkest(QColor(249, 168, 37));
     yellow->darker(QColor(251, 192, 45));
     yellow->dark(QColor(253, 212, 53));
@@ -36,9 +37,9 @@ FluColors::FluColors(QObject *parent) : QObject{parent} {
     yellow->light(QColor(255, 238, 88));
     yellow->lighter(QColor(255, 241, 118));
     yellow->lightest(QColor(255, 245, 155));
-    _Yellow = yellow;
+    Yellow(yellow);
 
-    auto orange = new FluAccentColor(this);
+    FluAccentColor *orange = new FluAccentColor(this);
     orange->darkest(QColor(153, 61, 7));
     orange->darker(QColor(172, 68, 8));
     orange->dark(QColor(209, 88, 10));
@@ -46,9 +47,9 @@ FluColors::FluColors(QObject *parent) : QObject{parent} {
     orange->light(QColor(248, 122, 48));
     orange->lighter(QColor(249, 145, 84));
     orange->lightest(QColor(250, 192, 106));
-    _Orange = orange;
+    Orange(orange);
 
-    auto red = new FluAccentColor(this);
+    FluAccentColor *red = new FluAccentColor(this);
     red->darkest(QColor(143, 10, 21));
     red->darker(QColor(162, 11, 24));
     red->dark(QColor(185, 13, 28));
@@ -56,9 +57,9 @@ FluColors::FluColors(QObject *parent) : QObject{parent} {
     red->light(QColor(236, 64, 79));
     red->lighter(QColor(238, 88, 101));
     red->lightest(QColor(240, 107, 118));
-    _Red = red;
+    Red(red);
 
-    auto magenta = new FluAccentColor(this);
+    FluAccentColor *magenta = new FluAccentColor(this);
     magenta->darkest(QColor(111, 0, 79));
     magenta->darker(QColor(160, 7, 108));
     magenta->dark(QColor(181, 13, 125));
@@ -66,9 +67,9 @@ FluColors::FluColors(QObject *parent) : QObject{parent} {
     magenta->light(QColor(234, 77, 168));
     magenta->lighter(QColor(238, 110, 193));
     magenta->lightest(QColor(241, 140, 213));
-    _Magenta = magenta;
+    Magenta(magenta);
 
-    auto purple = new FluAccentColor(this);
+    FluAccentColor *purple = new FluAccentColor(this);
     purple->darkest(QColor(44, 15, 118));
     purple->darker(QColor(61, 15, 153));
     purple->dark(QColor(78, 17, 174));
@@ -76,9 +77,9 @@ FluColors::FluColors(QObject *parent) : QObject{parent} {
     purple->light(QColor(123, 76, 157));
     purple->lighter(QColor(141, 110, 189));
     purple->lightest(QColor(158, 142, 217));
-    _Purple = purple;
+    Purple(purple);
 
-    auto blue = new FluAccentColor(this);
+    FluAccentColor *blue = new FluAccentColor(this);
     blue->darkest(QColor(0, 74, 131));
     blue->darker(QColor(0, 84, 148));
     blue->dark(QColor(0, 102, 180));
@@ -86,9 +87,9 @@ FluColors::FluColors(QObject *parent) : QObject{parent} {
     blue->light(QColor(38, 140, 220));
     blue->lighter(QColor(76, 160, 224));
     blue->lightest(QColor(96, 171, 228));
-    _Blue = blue;
+    Blue(blue);
 
-    auto teal = new FluAccentColor(this);
+    FluAccentColor *teal = new FluAccentColor(this);
     teal->darkest(QColor(0, 110, 91));
     teal->darker(QColor(0, 124, 103));
     teal->dark(QColor(0, 151, 125));
@@ -96,9 +97,9 @@ FluColors::FluColors(QObject *parent) : QObject{parent} {
     teal->light(QColor(38, 189, 164));
     teal->lighter(QColor(77, 201, 180));
     teal->lightest(QColor(96, 207, 188));
-    _Teal = teal;
+    Teal(teal);
 
-    auto green = new FluAccentColor(this);
+    FluAccentColor *green = new FluAccentColor(this);
     green->darkest(QColor(9, 76, 9));
     green->darker(QColor(12, 93, 12));
     green->dark(QColor(14, 111, 14));
@@ -106,17 +107,17 @@ FluColors::FluColors(QObject *parent) : QObject{parent} {
     green->light(QColor(39, 137, 57));
     green->lighter(QColor(76, 156, 76));
     green->lightest(QColor(106, 173, 106));
-    _Green = green;
+    Green(green);
 }
 
-[[maybe_unused]] FluAccentColor *FluColors::createAccentColor(const QColor &primaryColor) {
+FluAccentColor* FluColors::createAccentColor(QColor primaryColor){
-    auto accentColor = new FluAccentColor(this);
+    FluAccentColor *accentColor = new FluAccentColor(this);
-    accentColor->normal(primaryColor);
+    accentColor->darkest(FluTools::getInstance()->withOpacity(primaryColor,0.7));
+    accentColor->darker(FluTools::getInstance()->withOpacity(primaryColor,0.8));
     accentColor->dark(FluTools::getInstance()->withOpacity(primaryColor,0.9));
+    accentColor->normal(primaryColor);
     accentColor->light(FluTools::getInstance()->withOpacity(primaryColor,0.9));
-    accentColor->darker(FluTools::getInstance()->withOpacity(accentColor->dark(), 0.8));
+    accentColor->lighter(FluTools::getInstance()->withOpacity(primaryColor,0.8));
-    accentColor->lighter(FluTools::getInstance()->withOpacity(accentColor->light(), 0.8));
+    accentColor->lightest(FluTools::getInstance()->withOpacity(primaryColor,0.7));
-    accentColor->darkest(FluTools::getInstance()->withOpacity(accentColor->darker(), 0.7));
-    accentColor->lightest(FluTools::getInstance()->withOpacity(accentColor->lighter(), 0.7));
     return accentColor;
 }

src/FluColors.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FLUCOLORS_H
+#define FLUCOLORS_H
 
 #include <QObject>
 #include <QtQml/qqml.h>
@@ -10,9 +11,9 @@
 /**
  * @brief The FluColors class
  */
-class FluColors : public QObject {
+class FluColors : public QObject
+{
     Q_OBJECT
-
     Q_PROPERTY_AUTO(QColor,Transparent);
     Q_PROPERTY_AUTO(QColor,Black);
     Q_PROPERTY_AUTO(QColor,White);
@@ -38,24 +39,22 @@ Q_PROPERTY_AUTO(QColor, Grey190);
     Q_PROPERTY_AUTO(QColor,Grey200);
     Q_PROPERTY_AUTO(QColor,Grey210);
     Q_PROPERTY_AUTO(QColor,Grey220);
-Q_PROPERTY_AUTO_P(FluAccentColor*, Yellow);
+    Q_PROPERTY_AUTO(FluAccentColor*,Yellow);
-Q_PROPERTY_AUTO_P(FluAccentColor*, Orange);
+    Q_PROPERTY_AUTO(FluAccentColor*,Orange);
-Q_PROPERTY_AUTO_P(FluAccentColor*, Red);
+    Q_PROPERTY_AUTO(FluAccentColor*,Red);
-Q_PROPERTY_AUTO_P(FluAccentColor*, Magenta);
+    Q_PROPERTY_AUTO(FluAccentColor*,Magenta);
-Q_PROPERTY_AUTO_P(FluAccentColor*, Purple);
+    Q_PROPERTY_AUTO(FluAccentColor*,Purple);
-Q_PROPERTY_AUTO_P(FluAccentColor*, Blue);
+    Q_PROPERTY_AUTO(FluAccentColor*,Blue);
-Q_PROPERTY_AUTO_P(FluAccentColor*, Teal);
+    Q_PROPERTY_AUTO(FluAccentColor*,Teal);
-Q_PROPERTY_AUTO_P(FluAccentColor*, Green);
+    Q_PROPERTY_AUTO(FluAccentColor*,Green);
     QML_NAMED_ELEMENT(FluColors)
     QML_SINGLETON
-
 private:
     explicit FluColors(QObject *parent = nullptr);
-
 public:
     SINGLETON(FluColors)
-
+    Q_INVOKABLE FluAccentColor* createAccentColor(QColor primaryColor);
-    [[maybe_unused]] Q_INVOKABLE FluAccentColor *createAccentColor(const QColor &primaryColor);
+    static FluColors *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine){return getInstance();}
-
-    static FluColors *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
 };
+
+#endif // FLUCOLORS_H

src/FluFrameless.cpp

@@ -4,74 +4,58 @@
 #include <QGuiApplication>
 #include <QScreen>
 #include <QDateTime>
-#include "FluTools.h"
 
 #ifdef Q_OS_WIN
 #pragma comment (lib,"user32.lib")
 #pragma comment (lib,"dwmapi.lib")
-
 #include <windows.h>
 #include <windowsx.h>
 #include <dwmapi.h>
-
+static inline QByteArray qtNativeEventType()
-
+{
-static inline QByteArray qtNativeEventType() {
     static const auto result = "windows_generic_MSG";
     return result;
 }
-
 static inline bool isCompositionEnabled(){
     typedef HRESULT (WINAPI* DwmIsCompositionEnabledPtr)(BOOL *pfEnabled);
     HMODULE module = ::LoadLibraryW(L"dwmapi.dll");
-    if (module) {
+    if (module)
+    {
         BOOL composition_enabled = false;
         DwmIsCompositionEnabledPtr dwm_is_composition_enabled;
         dwm_is_composition_enabled= reinterpret_cast<DwmIsCompositionEnabledPtr>(::GetProcAddress(module, "DwmIsCompositionEnabled"));
-        if (dwm_is_composition_enabled) {
+        if (dwm_is_composition_enabled)
+        {
             dwm_is_composition_enabled(&composition_enabled);
         }
         return composition_enabled;
     }
     return false;
 }
-
 #endif
 
-bool containsCursorToItem(QQuickItem *item) {
+FluFrameless::FluFrameless(QQuickItem *parent)
-    if (!item || !item->isVisible()) {
+    : QQuickItem{parent}
-        return false;
+{
-    }
+    appbar(nullptr);
-    auto point = QCursor::pos();
+    maximizeButton(nullptr);
-    auto rect = QRectF(item->mapToGlobal(QPoint(0, 0)), item->size());
+    minimizedButton(nullptr);
-    if (point.x() > rect.x() && point.x() < (rect.x() + rect.width()) && point.y() > rect.y() && point.y() < (rect.y() + rect.height())) {
+    closeButton(nullptr);
-        return true;
+    topmost(false);
-    }
+    disabled(false);
-    return false;
 }
 
-FluFrameless::FluFrameless(QQuickItem *parent) : QQuickItem{parent} {
+FluFrameless::~FluFrameless(){
-    _fixSize = false;
-    _appbar = nullptr;
-    _maximizeButton = nullptr;
-    _minimizedButton = nullptr;
-    _closeButton = nullptr;
-    _topmost = false;
-    _disabled = false;
-    _isWindows11OrGreater = FluTools::getInstance()->isWindows11OrGreater();
 }
 
-FluFrameless::~FluFrameless() = default;
+void FluFrameless::onDestruction(){
-
+    qApp->removeNativeEventFilter(this);
-[[maybe_unused]] void FluFrameless::onDestruction() {
-    QGuiApplication::instance()->removeNativeEventFilter(this);
 }
 
 void FluFrameless::componentComplete(){
     if(_disabled){
         return;
     }
-    int w = window()->width();
-    int h = window()->height();
     _current = window()->winId();
     window()->setFlags(( window()->flags()) | Qt::CustomizeWindowHint | Qt::WindowMinimizeButtonHint | Qt::WindowCloseButtonHint | Qt::FramelessWindowHint);
 #if QT_VERSION < QT_VERSION_CHECK(6,0,0)
@@ -83,7 +67,7 @@ void FluFrameless::componentComplete() {
         window()->setFlag(Qt::WindowMaximizeButtonHint);
     }
     window()->installEventFilter(this);
-    QGuiApplication::instance()->installNativeEventFilter(this);
+    qApp->installNativeEventFilter(this);
     if(_maximizeButton){
         setHitTestVisible(_maximizeButton);
     }
@@ -98,8 +82,8 @@ void FluFrameless::componentComplete() {
     DWORD style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
     if(_fixSize){
         ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME);
-        for (int i = 0; i <= QGuiApplication::screens().count() - 1; ++i) {
+        for (int i = 0; i < qApp->screens().count(); ++i) {
-            connect(QGuiApplication::screens().at(i), &QScreen::logicalDotsPerInchChanged, this, [=] {
+            connect( qApp->screens().at(i),&QScreen::logicalDotsPerInchChanged,this,[=]{
                 SetWindowPos(hwnd,nullptr,0,0,0,0,SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_FRAMECHANGED);
             });
         }
@@ -108,44 +92,40 @@ void FluFrameless::componentComplete() {
     }
     SetWindowPos(hwnd,nullptr,0,0,0,0,SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
     connect(window(),&QQuickWindow::screenChanged,this,[hwnd]{
-        ::SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOOWNERZORDER);
+        ::SetWindowPos(hwnd,0,0,0,0,0,SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED | SWP_NOOWNERZORDER);
-        ::RedrawWindow(hwnd, nullptr, nullptr, RDW_INVALIDATE | RDW_UPDATENOW);
+        ::RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW);
     });
 #endif
-    h = qRound(h + _appbar->height());
-    if (_fixSize) {
-        window()->setMaximumSize(QSize(w, h));
-        window()->setMinimumSize(QSize(w, h));
-    }
-    window()->resize(QSize(w, h));
     connect(this,&FluFrameless::topmostChanged,this,[this]{
         _setWindowTopmost(topmost());
     });
     _setWindowTopmost(topmost());
 }
 
-[[maybe_unused]] bool FluFrameless::nativeEventFilter(const QByteArray &eventType, void *message, QT_NATIVE_EVENT_RESULT_TYPE *result) {
+bool FluFrameless::nativeEventFilter(const QByteArray &eventType, void *message, QT_NATIVE_EVENT_RESULT_TYPE *result){
 #ifdef Q_OS_WIN
     if ((eventType != qtNativeEventType()) || !message) {
         return false;
     }
     const auto msg = static_cast<const MSG *>(message);
-    auto hwnd = msg->hwnd;
+    const HWND hwnd = msg->hwnd;
-    if (!hwnd) {
+    if (!hwnd || !msg) {
         return false;
     }
-    const quint64 wid = reinterpret_cast<qint64>(hwnd);
+    const qint64 wid = reinterpret_cast<qint64>(hwnd);
     if(wid != _current){
         return false;
     }
-    const auto uMsg = msg->message;
+    const UINT uMsg = msg->message;
-    const auto wParam = msg->wParam;
+    const WPARAM wParam = msg->wParam;
-    const auto lParam = msg->lParam;
+    const LPARAM lParam = msg->lParam;
+    static QPoint offsetXY;
     if(uMsg == WM_WINDOWPOSCHANGING){
-        auto *wp = reinterpret_cast<WINDOWPOS *>(lParam);
+        WINDOWPOS* wp = reinterpret_cast<WINDOWPOS*>(lParam);
-        if (wp != nullptr && (wp->flags & SWP_NOSIZE) == 0) {
+        if (wp != nullptr && (wp->flags & SWP_NOSIZE) == 0)
+        {
             wp->flags |= SWP_NOCOPYBITS;
-            *result = static_cast<QT_NATIVE_EVENT_RESULT_TYPE>(::DefWindowProcW(hwnd, uMsg, wParam, lParam));
+            *result = ::DefWindowProcW(hwnd, uMsg, wParam, lParam);
             return true;
         }
         return false;
@@ -157,11 +137,12 @@ void FluFrameless::componentComplete() {
         const LONG originalBottom = clientRect->bottom;
         const LRESULT hitTestResult = ::DefWindowProcW(hwnd, WM_NCCALCSIZE, wParam, lParam);
         if ((hitTestResult != HTERROR) && (hitTestResult != HTNOWHERE)) {
-            *result = static_cast<QT_NATIVE_EVENT_RESULT_TYPE>(hitTestResult);
+            *result = hitTestResult;
             return true;
         }
-        int offsetSize;
+        int offsetSize = 0;
         bool isMaximum = ::IsZoomed(hwnd);
+        offsetXY = QPoint(abs(clientRect->left - originalLeft),abs(clientRect->top - originalTop));
         if(isMaximum || _isFullScreen()){
             offsetSize = 0;
         }else{
@@ -170,15 +151,16 @@ void FluFrameless::componentComplete() {
         if(!isCompositionEnabled()){
             offsetSize = 0;
         }
+        if (!isMaximum || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) {
             clientRect->top = originalTop + offsetSize;
             clientRect->bottom = originalBottom - offsetSize;
             clientRect->left = originalLeft + offsetSize;
             clientRect->right = originalRight - offsetSize;
+        }
         _setMaximizeHovered(false);
         *result = WVR_REDRAW;
         return true;
     }else if(uMsg == WM_NCHITTEST){
-        if (_isWindows11OrGreater) {
         if(_hitMaximizeButton()){
             if (*result == HTNOWHERE) {
                 *result = HTZOOM;
@@ -188,7 +170,6 @@ void FluFrameless::componentComplete() {
         }
         _setMaximizeHovered(false);
         _setMaximizePressed(false);
-        }
         *result = 0;
         POINT nativeGlobalPos{GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)};
         POINT nativeLocalPos = nativeGlobalPos;
@@ -230,14 +211,14 @@ void FluFrameless::componentComplete() {
         }
         *result = HTCLIENT;
         return true;
-    } else if (_isWindows11OrGreater && (uMsg == WM_NCLBUTTONDBLCLK || uMsg == WM_NCLBUTTONDOWN)) {
+    }else if(uMsg == WM_NCLBUTTONDBLCLK || uMsg == WM_NCLBUTTONDOWN){
         if(_hitMaximizeButton()){
             QMouseEvent event = QMouseEvent(QEvent::MouseButtonPress, QPoint(), QPoint(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
             QGuiApplication::sendEvent(_maximizeButton,&event);
             _setMaximizePressed(true);
             return true;
         }
-    } else if (_isWindows11OrGreater && (uMsg == WM_NCLBUTTONUP || uMsg == WM_NCRBUTTONUP)) {
+    }else if(uMsg == WM_NCLBUTTONUP || uMsg == WM_NCRBUTTONUP){
         if(_hitMaximizeButton()){
             QMouseEvent event = QMouseEvent(QEvent::MouseButtonRelease, QPoint(), QPoint(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
             QGuiApplication::sendEvent(_maximizeButton,&event);
@@ -248,18 +229,18 @@ void FluFrameless::componentComplete() {
         *result = FALSE;
         return true;
     }else if(uMsg == WM_NCACTIVATE){
-        *result = static_cast<QT_NATIVE_EVENT_RESULT_TYPE>(::DefWindowProcW(hwnd, WM_NCACTIVATE, wParam, -1));
+        *result = ::DefWindowProcW(hwnd, WM_NCACTIVATE, wParam, -1);
         return true;
     }else if(uMsg == WM_GETMINMAXINFO){
-        auto *minmaxInfo = reinterpret_cast<MINMAXINFO *>(lParam);
+        MINMAXINFO* minmaxInfo = reinterpret_cast<MINMAXINFO *>(lParam);
         auto pixelRatio = window()->devicePixelRatio();
         auto geometry = window()->screen()->availableGeometry();
         RECT rect;
         SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0);
-        minmaxInfo->ptMaxPosition.x = rect.left;
+        minmaxInfo->ptMaxPosition.x = rect.left - offsetXY.x();
-        minmaxInfo->ptMaxPosition.y = rect.top;
+        minmaxInfo->ptMaxPosition.y = rect.top - offsetXY.x();
-        minmaxInfo->ptMaxSize.x = qRound(geometry.width() * pixelRatio);
+        minmaxInfo->ptMaxSize.x = geometry.width()*pixelRatio + offsetXY.x() * 2;
-        minmaxInfo->ptMaxSize.y = qRound(geometry.height() * pixelRatio);
+        minmaxInfo->ptMaxSize.y = geometry.height()*pixelRatio + offsetXY.y() * 2;
         return false;
     }else if(uMsg == WM_NCRBUTTONDOWN){
         if (wParam == HTCAPTION) {
@@ -270,25 +251,22 @@ void FluFrameless::componentComplete() {
         const bool spacePressed = ((wParam == VK_SPACE) || (::GetKeyState(VK_SPACE) < 0));
         if (altPressed && spacePressed) {
             auto pos = window()->position();
-            _showSystemMenu(QPoint(pos.x(), qRound(pos.y() + _appbar->height())));
+            _showSystemMenu(QPoint(pos.x(),pos.y()+_appbar->height()));
         }
     }else if(uMsg == WM_SYSCOMMAND){
         if(wParam == SC_MINIMIZE){
             if(window()->transientParent()){
-                auto _hwnd = reinterpret_cast<HWND>(window()->transientParent()->winId());
+                window()->transientParent()->showMinimized();
-                ::ShowWindow(_hwnd, 2);
             }else{
-                auto _hwnd = reinterpret_cast<HWND>(window()->winId());
+                window()->showMinimized();
-                ::ShowWindow(_hwnd, 2);
             }
             return true;
         }
         return false;
     }
     return false;
-#else
-    return false;
 #endif
+    return false;
 }
 
 bool FluFrameless::_isMaximized(){
@@ -304,7 +282,7 @@ void FluFrameless::_showSystemMenu(QPoint point) {
     HWND hwnd = reinterpret_cast<HWND>(window()->winId());
     DWORD style = ::GetWindowLongPtr(hwnd,GWL_STYLE);
     ::SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_SYSMENU);
-    auto hMenu = ::GetSystemMenu(hwnd, FALSE);
+    const HMENU hMenu = ::GetSystemMenu(hwnd, FALSE);
     if(_isMaximized() || _isFullScreen()){
         ::EnableMenuItem(hMenu,SC_MOVE,MFS_DISABLED);
         ::EnableMenuItem(hMenu,SC_RESTORE,MFS_ENABLED);
@@ -319,8 +297,7 @@ void FluFrameless::_showSystemMenu(QPoint point) {
         ::EnableMenuItem(hMenu,SC_SIZE,MFS_DISABLED);
         ::EnableMenuItem(hMenu,SC_MAXIMIZE,MFS_DISABLED);
     }
-    const int result = ::TrackPopupMenu(hMenu, (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)), qRound(point.x() * window()->devicePixelRatio()),
+    const int result = ::TrackPopupMenu(hMenu, (TPM_RETURNCMD | (QGuiApplication::isRightToLeft() ? TPM_RIGHTALIGN : TPM_LEFTALIGN)), point.x()*window()->devicePixelRatio(), point.y()*window()->devicePixelRatio(), 0, hwnd, nullptr);
-                                        qRound(point.y() * window()->devicePixelRatio()), 0, hwnd, nullptr);
     if (result != FALSE) {
         ::PostMessageW(hwnd, WM_SYSCOMMAND, result, 0);
     }
@@ -328,21 +305,32 @@ void FluFrameless::_showSystemMenu(QPoint point) {
 #endif
 }
 
+bool FluFrameless::_containsCursorToItem(QQuickItem* item){
+    if(!item || !item->isVisible()){
+        return false;
+    }
+    auto point = QCursor::pos();
+    auto rect =  QRectF(item->mapToGlobal(QPoint(0,0)),item->size());
+    if(point.x()>rect.x() && point.x()<(rect.x()+rect.width()) && point.y()>rect.y() && point.y()<(rect.y()+rect.height())){
+        return true;
+    }
+    return false;
+}
+
 bool FluFrameless::_hitAppBar(){
-    for (int i = 0; i <= _hitTestList.size() - 1; ++i) {
+    foreach (auto item, _hitTestList) {
-        auto item = _hitTestList.at(i);
+        if(_containsCursorToItem(item)){
-        if (containsCursorToItem(item)) {
             return false;
         }
     }
-    if (containsCursorToItem(_appbar)) {
+    if(_containsCursorToItem(_appbar)){
         return true;
     }
     return false;
 }
 
 bool FluFrameless::_hitMaximizeButton(){
-    if (containsCursorToItem(_maximizeButton)) {
+    if(_containsCursorToItem(_maximizeButton)){
         return true;
     }
     return false;
@@ -377,12 +365,10 @@ void FluFrameless::_updateCursor(int edges) {
     case Qt::LeftEdge | Qt::BottomEdge:
         window()->setCursor(Qt::SizeBDiagCursor);
         break;
-        default:
-            break;
     }
 }
 
-[[maybe_unused]] void FluFrameless::showFullScreen() {
+void FluFrameless::showFullScreen(){
     window()->showFullScreen();
 }
 
@@ -391,21 +377,16 @@ void FluFrameless::showMaximized() {
     HWND hwnd = reinterpret_cast<HWND>(window()->winId());
     ::ShowWindow(hwnd,3);
 #else
-    window()->setVisibility(QQuickWindow::Maximized);
+    window()->showMaximized();
 #endif
 }
 
-[[maybe_unused]] void FluFrameless::showMinimized() {
+void FluFrameless::showMinimized(){
-#ifdef Q_OS_WIN
+    window()->showMinimized();
-    HWND hwnd = reinterpret_cast<HWND>(window()->winId());
-    ::ShowWindow(hwnd, 2);
-#else
-    window()->setVisibility(QQuickWindow::Minimized);
-#endif
 }
 
 void FluFrameless::showNormal(){
-    window()->setVisibility(QQuickWindow::Windowed);
+    window()->showNormal();
 }
 
 void FluFrameless::setHitTestVisible(QQuickItem* val){
@@ -414,6 +395,7 @@ void FluFrameless::setHitTestVisible(QQuickItem *val) {
     }
 }
 
+
 void FluFrameless::_setWindowTopmost(bool topmost){
 #ifdef Q_OS_WIN
     HWND hwnd = reinterpret_cast<HWND>(window()->winId());

src/FluFrameless.h

@@ -1,9 +1,9 @@
-#pragma once
+#ifndef FLUFRAMELESS_H
+#define FLUFRAMELESS_H
 
 #include <QObject>
 #include <QQuickItem>
 #include <QAbstractNativeEventFilter>
-#include <QQmlProperty>
 #include "stdafx.h"
 
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
@@ -15,64 +15,47 @@ using QT_ENTER_EVENT_TYPE = QEvent;
 #endif
 
 
-class FluFrameless : public QQuickItem, QAbstractNativeEventFilter {
+class FluFrameless : public QQuickItem,QAbstractNativeEventFilter
+{
     Q_OBJECT
-Q_PROPERTY_AUTO_P(QQuickItem*, appbar)
+    Q_PROPERTY_AUTO(QQuickItem*,appbar)
-Q_PROPERTY_AUTO_P(QQuickItem*, maximizeButton)
-Q_PROPERTY_AUTO_P(QQuickItem*, minimizedButton)
-Q_PROPERTY_AUTO_P(QQuickItem*, closeButton)
     Q_PROPERTY_AUTO(bool,topmost)
+    Q_PROPERTY_AUTO(QQuickItem*,maximizeButton)
+    Q_PROPERTY_AUTO(QQuickItem*,minimizedButton)
+    Q_PROPERTY_AUTO(QQuickItem*,closeButton)
     Q_PROPERTY_AUTO(bool,disabled)
     Q_PROPERTY_AUTO(bool,fixSize)
     QML_NAMED_ELEMENT(FluFrameless)
 public:
     explicit FluFrameless(QQuickItem* parent = nullptr);
-
+    ~FluFrameless();
-    ~FluFrameless() override;
-
     void componentComplete() override;
-
+    bool nativeEventFilter(const QByteArray &eventType, void *message, QT_NATIVE_EVENT_RESULT_TYPE *result) override;
-    [[maybe_unused]] bool nativeEventFilter(const QByteArray &eventType, void *message, QT_NATIVE_EVENT_RESULT_TYPE *result) override;
+    Q_INVOKABLE void showFullScreen();
-
-    [[maybe_unused]] Q_INVOKABLE void showFullScreen();
-
     Q_INVOKABLE void showMaximized();
-
+    Q_INVOKABLE void showMinimized();
-    [[maybe_unused]] Q_INVOKABLE void showMinimized();
-
     Q_INVOKABLE void showNormal();
-
     Q_INVOKABLE void setHitTestVisible(QQuickItem*);
-
+    Q_INVOKABLE void onDestruction();
-    [[maybe_unused]] Q_INVOKABLE void onDestruction();
-
 protected:
     bool eventFilter(QObject *obj, QEvent *event) override;
-
 private:
     bool _isFullScreen();
-
     bool _isMaximized();
-
     void _updateCursor(int edges);
-
     void _setWindowTopmost(bool topmost);
-
     void _showSystemMenu(QPoint point);
-
+    bool _containsCursorToItem(QQuickItem* item);
     bool _hitAppBar();
-
     bool _hitMaximizeButton();
-
     void _setMaximizePressed(bool val);
-
     void _setMaximizeHovered(bool val);
-
 private:
-    quint64 _current = 0;
+    qint64 _current;
     int _edges = 0;
     int _margins = 8;
-    quint64 _clickTimer = 0;
+    qint64 _clickTimer = 0;
-    bool _isWindows11OrGreater = false;
     QList<QPointer<QQuickItem>> _hitTestList;
 };
+
+#endif // FLUFRAMELESS_H

src/FluQrCodeItem.cpp

@@ -3,9 +3,9 @@
 #include "qrcode/qrencode.h"
 
 FluQrCodeItem::FluQrCodeItem(QQuickItem* parent):QQuickPaintedItem(parent){
-    _color = QColor(0, 0, 0, 255);
+    color(QColor(0,0,0,255));
-    _bgColor = QColor(255, 255, 255, 255);
+    bgColor(QColor(255,255,255,255));
-    _size = 100;
+    size(100);
     setWidth(_size);
     setHeight(_size);
     connect(this,&FluQrCodeItem::textChanged,this,[=]{update();});
@@ -18,6 +18,7 @@ FluQrCodeItem::FluQrCodeItem(QQuickItem *parent) : QQuickPaintedItem(parent) {
     });
 }
 
+
 void FluQrCodeItem::paint(QPainter* painter){
     if(_text.isEmpty()){
         return;
@@ -27,8 +28,8 @@ void FluQrCodeItem::paint(QPainter *painter) {
     }
     painter->save();
     QRcode *qrcode = QRcode_encodeString(_text.toUtf8().constData(), 2, QR_ECLEVEL_Q, QR_MODE_8, 1);
-    auto w = qint32(width());
+    qint32 w = width();
-    auto h = qint32(height());
+    qint32 h = height();
     qint32 qrcodeW = qrcode->width > 0 ? qrcode->width : 1;
     double scaleX = (double)w / (double)qrcodeW;
     double scaleY = (double)h / (double)qrcodeW;
@@ -38,10 +39,13 @@ void FluQrCodeItem::paint(QPainter *painter) {
     p.setPen(Qt::NoPen);
     p.drawRect(0, 0, w, h);
     p.setBrush(_color);
-    for (qint32 y = 0; y < qrcodeW; y++) {
+    for (qint32 y = 0; y < qrcodeW; y++)
-        for (qint32 x = 0; x < qrcodeW; x++) {
+    {
+        for (qint32 x = 0; x < qrcodeW; x++)
+        {
             unsigned char b = qrcode->data[y*qrcodeW + x];
-            if (b & 0x01) {
+            if (b & 0x01)
+            {
                 QRectF r(x * scaleX,y * scaleY, scaleX, scaleY);
                 p.drawRects(&r, 1);
             }

src/FluQrCodeItem.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FLUQRCODEITEM_H
+#define FLUQRCODEITEM_H
 
 #include <QQuickItem>
 #include <QQuickPaintedItem>
@@ -8,9 +9,9 @@
 /**
  * @brief The FluQrCodeItem class
  */
-class FluQrCodeItem : public QQuickPaintedItem {
+class FluQrCodeItem : public QQuickPaintedItem
+{
     Q_OBJECT
-
     Q_PROPERTY_AUTO(QString,text)
     Q_PROPERTY_AUTO(QColor,color)
     Q_PROPERTY_AUTO(QColor,bgColor)
@@ -18,6 +19,7 @@ Q_PROPERTY_AUTO(int, size);
     QML_NAMED_ELEMENT(FluQrCodeItem)
 public:
     explicit FluQrCodeItem(QQuickItem *parent = nullptr);
-
     void paint(QPainter* painter) override;
 };
+
+#endif // FLUQRCODEITEM_H

src/FluRectangle.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FLURECTANGLE_H
+#define FLURECTANGLE_H
 
 #include <QQuickItem>
 #include <QQuickPaintedItem>
@@ -8,13 +9,15 @@
 /**
  * @brief The FluRectangle class
  */
-class FluRectangle : public QQuickPaintedItem {
+class FluRectangle : public QQuickPaintedItem
+{
     Q_OBJECT
     Q_PROPERTY_AUTO(QColor,color)
     Q_PROPERTY_AUTO(QList<int>,radius)
     QML_NAMED_ELEMENT(FluRectangle)
 public:
     explicit FluRectangle(QQuickItem *parent = nullptr);
-
     void paint(QPainter* painter) override;
 };
+
+#endif // FLURECTANGLE_H

src/FluTableSortProxyModel.cpp

@@ -2,7 +2,9 @@
 
 #include <QJSValueList>
 
-FluTableSortProxyModel::FluTableSortProxyModel(QSortFilterProxyModel *parent) : QSortFilterProxyModel{parent} {
+FluTableSortProxyModel::FluTableSortProxyModel(QSortFilterProxyModel *parent)
+    : QSortFilterProxyModel {parent}
+{
     _model = nullptr;
     connect(this,&FluTableSortProxyModel::modelChanged,this,[=]{
         setSourceModel(this->model());
@@ -39,7 +41,7 @@ bool FluTableSortProxyModel::lessThan(const QModelIndex &source_left, const QMod
     }
 }
 
-[[maybe_unused]] void FluTableSortProxyModel::setComparator(const QJSValue &comparator) {
+void FluTableSortProxyModel::setComparator(QJSValue comparator){
     int column = 0;
     if(comparator.isUndefined()){
         column = -1;
@@ -52,22 +54,22 @@ bool FluTableSortProxyModel::lessThan(const QModelIndex &source_left, const QMod
     }
 }
 
-[[maybe_unused]] void FluTableSortProxyModel::setFilter(const QJSValue &filter) {
+void FluTableSortProxyModel::setFilter(QJSValue filter){
     this->_filter = filter;
     invalidateFilter();
 }
 
-[[maybe_unused]] QVariant FluTableSortProxyModel::getRow(int rowIndex) {
+QVariant FluTableSortProxyModel::getRow(int rowIndex){
     QVariant result;
     QMetaObject::invokeMethod(_model, "getRow",Q_RETURN_ARG(QVariant, result),Q_ARG(int, mapToSource(index(rowIndex,0)).row()));
     return result;
 }
 
-[[maybe_unused]] void FluTableSortProxyModel::setRow(int rowIndex, const QVariant &val) {
+void FluTableSortProxyModel::setRow(int rowIndex,QVariant val){
     QMetaObject::invokeMethod(_model, "setRow",Q_ARG(int, mapToSource(index(rowIndex,0)).row()),Q_ARG(QVariant,val));
 }
 
-[[maybe_unused]] void FluTableSortProxyModel::removeRow(int rowIndex, int rows) {
+void FluTableSortProxyModel::removeRow(int rowIndex,int rows){
     QMetaObject::invokeMethod(_model, "removeRow",Q_ARG(int, mapToSource(index(rowIndex,0)).row()),Q_ARG(int,rows));
 }
 

src/FluTableSortProxyModel.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FLUTABLESORTPROXYMODEL_H
+#define FLUTABLESORTPROXYMODEL_H
 
 #include <QSortFilterProxyModel>
 #include <QAbstractTableModel>
@@ -6,30 +7,24 @@
 #include <QJSValue>
 #include "stdafx.h"
 
-class FluTableSortProxyModel : public QSortFilterProxyModel {
+class FluTableSortProxyModel : public QSortFilterProxyModel
+{
     Q_OBJECT
-Q_PROPERTY_AUTO_P(QAbstractTableModel*, model)
+    Q_PROPERTY_AUTO(QAbstractTableModel*,model)
     QML_NAMED_ELEMENT(FluTableSortProxyModel)
 public:
     explicit FluTableSortProxyModel(QSortFilterProxyModel *parent = nullptr);
-
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
-
     bool filterAcceptsColumn(int sourceColumn, const QModelIndex &sourceParent) const override;
-
     bool lessThan(const QModelIndex &sourceLeft, const QModelIndex &sourceRight) const override;
-
+    Q_INVOKABLE QVariant getRow(int rowIndex);
-    [[maybe_unused]] Q_INVOKABLE QVariant getRow(int rowIndex);
+    Q_INVOKABLE void setRow(int rowIndex,QVariant val);
-
+    Q_INVOKABLE void removeRow(int rowIndex,int rows);
-    [[maybe_unused]] Q_INVOKABLE void setRow(int rowIndex, const QVariant &val);
+    Q_INVOKABLE void setComparator(QJSValue comparator);
-
+    Q_INVOKABLE void setFilter(QJSValue filter);
-    [[maybe_unused]] Q_INVOKABLE void removeRow(int rowIndex, int rows);
-
-    [[maybe_unused]] Q_INVOKABLE void setComparator(const QJSValue &comparator);
-
-    [[maybe_unused]] Q_INVOKABLE void setFilter(const QJSValue &filter);
-
 private:
     QJSValue _filter;
     QJSValue _comparator;
 };
+
+#endif // FLUTABLESORTPROXYMODEL_H

src/FluTextStyle.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FLUTEXTSTYLE_H
+#define FLUTEXTSTYLE_H
 
 #include <QObject>
 #include <QtQml/qqml.h>
@@ -9,7 +10,8 @@
 /**
  * @brief The FluTextStyle class
  */
-class FluTextStyle : public QObject {
+class FluTextStyle : public QObject
+{
     Q_OBJECT
 public:
     Q_PROPERTY_AUTO(QString,family)
@@ -22,12 +24,11 @@ Q_PROPERTY_AUTO(QFont, TitleLarge);
     Q_PROPERTY_AUTO(QFont,Display);
     QML_NAMED_ELEMENT(FluTextStyle)
     QML_SINGLETON
-
 private:
     explicit FluTextStyle(QObject *parent = nullptr);
-
 public:
     SINGLETON(FluTextStyle)
-
+    static FluTextStyle *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine){return getInstance();}
-    static FluTextStyle *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
 };
+
+#endif // FLUTEXTSTYLE_H

src/FluTheme.cpp

@@ -2,38 +2,21 @@
 
 #include <QGuiApplication>
 #include <QPalette>
-#include <QImage>
-#include <QThreadPool>
 #include "Def.h"
 #include "FluColors.h"
-#include "FluTools.h"
-
-bool systemDark() {
-    QPalette palette = QGuiApplication::palette();
-    QColor color = palette.color(QPalette::Window).rgb();
-    return color.red() * 0.2126 + color.green() * 0.7152 + color.blue() * 0.0722 <= 255.0f / 2;
-}
 
 FluTheme::FluTheme(QObject *parent):QObject{parent}{
-    _accentColor = FluColors::getInstance()->Blue();
-    _darkMode = FluThemeType::DarkMode::Light;
-    _nativeText = false;
-    _animationEnabled = true;
-    _systemDark = systemDark();
-    _desktopImagePath = "";
-    _blurBehindWindowEnabled = false;
-    QGuiApplication::instance()->installEventFilter(this);
-    refreshColors();
     connect(this,&FluTheme::darkModeChanged,this,[=]{
         Q_EMIT darkChanged();
     });
     connect(this,&FluTheme::darkChanged,this,[=]{refreshColors();});
     connect(this,&FluTheme::accentColorChanged,this,[=]{refreshColors();});
-    connect(&_watcher, &QFileSystemWatcher::fileChanged, this, [=](const QString &path) {
+    accentColor(FluColors::getInstance()->Blue());
-        Q_EMIT desktopImagePathChanged();
+    darkMode(FluThemeType::DarkMode::Light);
-    });
+    nativeText(false);
-    connect(this, &FluTheme::blurBehindWindowEnabledChanged, this, [=] { checkUpdateDesktopImage(); });
+    animationEnabled(true);
-    startTimer(1000);
+    _systemDark = systemDark();
+    qApp->installEventFilter(this);
 }
 
 void FluTheme::refreshColors(){
@@ -47,15 +30,15 @@ void FluTheme::refreshColors() {
     fontSecondaryColor(isDark ? QColor(222,222,222,255) : QColor(102,102,102,255));
     fontTertiaryColor(isDark ? QColor(200,200,200,255) : QColor(153,153,153,255));
     itemNormalColor(isDark ? QColor(255,255,255,0) : QColor(0,0,0,0));
-    frameColor(isDark ? QColor(56, 56, 56, qRound(255 * 0.8)) : QColor(243, 243, 243, qRound(255 * 0.8)));
+    itemHoverColor(isDark ? QColor(255,255,255,255*0.06) : QColor(0,0,0,255*0.03));
-    frameActiveColor(isDark ? QColor(48, 48, 48, qRound(255 * 0.8)) : QColor(255, 255, 255, qRound(255 * 0.8)));
+    itemPressColor(isDark ? QColor(255,255,255,255*0.09) : QColor(0,0,0,255*0.06));
-    itemHoverColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.06)) : QColor(0, 0, 0, qRound(255 * 0.03)));
+    itemCheckColor(isDark ? QColor(255,255,255,255*0.12) : QColor(0,0,0,255*0.09));
-    itemPressColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.09)) : QColor(0, 0, 0, qRound(255 * 0.06)));
-    itemCheckColor(isDark ? QColor(255, 255, 255, qRound(255 * 0.12)) : QColor(0, 0, 0, qRound(255 * 0.09)));
 }
 
-bool FluTheme::eventFilter(QObject *, QEvent *event) {
+bool FluTheme::eventFilter(QObject *obj, QEvent *event){
-    if (event->type() == QEvent::ApplicationPaletteChange || event->type() == QEvent::ThemeChange) {
+    Q_UNUSED(obj);
+    if (event->type() == QEvent::ApplicationPaletteChange || event->type() == QEvent::ThemeChange)
+    {
         _systemDark = systemDark();
         Q_EMIT darkChanged();
         event->accept();
@@ -64,34 +47,36 @@ bool FluTheme::eventFilter(QObject *, QEvent *event) {
     return false;
 }
 
-bool FluTheme::dark() const {
+QJsonArray FluTheme::awesomeList(const QString& keyword){
+    QJsonArray arr;
+    QMetaEnum enumType = Fluent_Awesome::staticMetaObject.enumerator(Fluent_Awesome::staticMetaObject.indexOfEnumerator("Fluent_AwesomeType"));
+    for(int i=0; i < enumType.keyCount(); ++i){
+        QString name = enumType.key(i);
+        int icon = enumType.value(i);
+        if(keyword.isEmpty() || name.contains(keyword)){
+            QJsonObject obj;
+            obj.insert("name",name);
+            obj.insert("icon",icon);
+            arr.append(obj);
+        }
+    }
+    return arr;
+}
+
+bool FluTheme::systemDark(){
+    QPalette palette = qApp->palette();
+    QColor color = palette.color(QPalette::Window).rgb();
+    return !(color.red() * 0.2126 + color.green() * 0.7152 + color.blue() * 0.0722 > 255 / 2);
+}
+
+bool FluTheme::dark(){
     if(_darkMode == FluThemeType::DarkMode::Dark){
         return true;
+    }else if(_darkMode == FluThemeType::DarkMode::Light){
+        return false;
     }else if(_darkMode == FluThemeType::DarkMode::System){
         return _systemDark;
     }else{
         return false;
     }
 }
-
-void FluTheme::checkUpdateDesktopImage() {
-    if (!_blurBehindWindowEnabled) {
-        return;
-    }
-    QThreadPool::globalInstance()->start([=]() {
-        _mutex.lock();
-        auto path = FluTools::getInstance()->getWallpaperFilePath();
-        if (_desktopImagePath != path) {
-            if (!_desktopImagePath.isEmpty()) {
-                _watcher.removePath(_desktopImagePath);
-            }
-            desktopImagePath(path);
-            _watcher.addPath(path);
-        }
-        _mutex.unlock();
-    });
-}
-
-void FluTheme::timerEvent(QTimerEvent *event) {
-    checkUpdateDesktopImage();
-}

src/FluTheme.h

@@ -1,13 +1,11 @@
-#pragma once
+#ifndef FLUTHEME_H
+#define FLUTHEME_H
 
 #include <QObject>
 #include <QtQml/qqml.h>
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QColor>
-#include <QTimer>
-#include <QFileSystemWatcher>
-#include <QMutex>
 #include "FluAccentColor.h"
 #include "stdafx.h"
 #include "singleton.h"
@@ -15,10 +13,11 @@
 /**
  * @brief The FluTheme class
  */
-class FluTheme : public QObject {
+class FluTheme : public QObject
+{
     Q_OBJECT
     Q_PROPERTY(bool dark READ dark NOTIFY darkChanged)
-Q_PROPERTY_AUTO_P(FluAccentColor*, accentColor);
+    Q_PROPERTY_AUTO(FluAccentColor*,accentColor);
     Q_PROPERTY_AUTO(QColor,primaryColor);
     Q_PROPERTY_AUTO(QColor,backgroundColor);
     Q_PROPERTY_AUTO(QColor,dividerColor);
@@ -28,43 +27,27 @@ Q_PROPERTY_AUTO(QColor, fontPrimaryColor);
     Q_PROPERTY_AUTO(QColor,fontSecondaryColor);
     Q_PROPERTY_AUTO(QColor,fontTertiaryColor);
     Q_PROPERTY_AUTO(QColor,itemNormalColor);
-Q_PROPERTY_AUTO(QColor, frameColor);
-Q_PROPERTY_AUTO(QColor, frameActiveColor);
     Q_PROPERTY_AUTO(QColor,itemHoverColor);
     Q_PROPERTY_AUTO(QColor,itemPressColor);
     Q_PROPERTY_AUTO(QColor,itemCheckColor);
-Q_PROPERTY_AUTO(QString, desktopImagePath);
     Q_PROPERTY_AUTO(int,darkMode);
     Q_PROPERTY_AUTO(bool,nativeText);
     Q_PROPERTY_AUTO(bool,animationEnabled);
-Q_PROPERTY_AUTO(bool, blurBehindWindowEnabled);
     QML_NAMED_ELEMENT(FluTheme)
     QML_SINGLETON
-
 private:
     explicit FluTheme(QObject *parent = nullptr);
-
+    bool eventFilter(QObject *obj, QEvent *event);
-    bool eventFilter(QObject *obj, QEvent *event) override;
+    bool systemDark();
-
     void refreshColors();
-
-protected:
-
-    void timerEvent(QTimerEvent *event) override;
-
-    void checkUpdateDesktopImage();
-
 public:
     SINGLETON(FluTheme)
-
+    Q_INVOKABLE QJsonArray awesomeList(const QString& keyword = "");
     Q_SIGNAL void darkChanged();
-
+    static FluTheme *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine){return getInstance();}
-    static FluTheme *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
+    bool dark();
-
-    bool dark() const;
-
 private:
     bool _systemDark;
-    QFileSystemWatcher _watcher;
-    QMutex _mutex;
 };
+
+#endif // FLUTHEME_H

src/FluTools.cpp

@@ -16,14 +16,6 @@
 #include <QDateTime>
 #include <QSettings>
 
-#ifdef Q_OS_WIN
-#pragma comment (lib, "user32.lib")
-
-#include <windows.h>
-#include <windowsx.h>
-
-#endif
-
 FluTools::FluTools(QObject *parent):QObject{parent}{
 
 }
@@ -83,20 +75,21 @@ int FluTools::qtMinor() {
 }
 
 void FluTools::setQuitOnLastWindowClosed(bool val){
-    QGuiApplication::setQuitOnLastWindowClosed(val);
+    qApp->setQuitOnLastWindowClosed(val);
 }
 
 void FluTools::setOverrideCursor(Qt::CursorShape shape){
-    QGuiApplication::setOverrideCursor(QCursor(shape));
+    qApp->setOverrideCursor(QCursor(shape));
 }
 
 void FluTools::restoreOverrideCursor(){
-    QGuiApplication::restoreOverrideCursor();
+    qApp->restoreOverrideCursor();
 }
 
 void FluTools::deleteLater(QObject *p){
     if(p){
         p->deleteLater();
+        p = nullptr;
     }
 }
 
@@ -115,11 +108,11 @@ QString FluTools::html2PlantText(const QString &html) {
 }
 
 QRect FluTools::getVirtualGeometry(){
-    return QGuiApplication::primaryScreen()->virtualGeometry();
+    return qApp->primaryScreen()->virtualGeometry();
 }
 
 QString FluTools::getApplicationDirPath(){
-    return QGuiApplication::applicationDirPath();
+    return qApp->applicationDirPath();
 }
 
 QUrl FluTools::getUrlByFilePath(const QString& path){
@@ -131,33 +124,33 @@ QColor FluTools::withOpacity(const QColor &color, qreal opacity) {
     return QColor::fromRgba((alpha << 24) | (color.rgba() & 0xffffff));
 }
 
-QString FluTools::md5(const QString &text) {
+QString FluTools::md5(QString text){
     return QCryptographicHash::hash(text.toUtf8(), QCryptographicHash::Md5).toHex();
 }
 
-QString FluTools::toBase64(const QString &text) {
+QString FluTools::toBase64(QString text){
     return text.toUtf8().toBase64();
 }
 
-QString FluTools::fromBase64(const QString &text) {
+QString FluTools::fromBase64(QString text){
     return QByteArray::fromBase64(text.toUtf8());
 }
 
-bool FluTools::removeDir(const QString &dirPath) {
+bool FluTools::removeDir(QString dirPath){
     QDir qDir(dirPath);
     return qDir.removeRecursively();
 }
 
-bool FluTools::removeFile(const QString &filePath) {
+bool FluTools::removeFile(QString filePath){
     QFile file(filePath);
     return file.remove();
 }
 
-QString FluTools::sha256(const QString &text) {
+QString FluTools::sha256(QString text){
     return QCryptographicHash::hash(text.toUtf8(), QCryptographicHash::Sha256).toHex();
 }
 
-void FluTools::showFileInFolder(const QString &path) {
+void FluTools::showFileInFolder(QString path){
 #if defined(Q_OS_WIN)
     QProcess::startDetached("explorer.exe", {"/select,", QDir::toNativeSeparators(path)});
 #endif
@@ -191,11 +184,11 @@ QIcon FluTools::windowIcon() {
 
 int FluTools::cursorScreenIndex(){
     int screenIndex = 0;
-    int screenCount = QGuiApplication::screens().count();
+    int screenCount = qApp->screens().count();
     if (screenCount > 1) {
         QPoint pos = QCursor::pos();
-        for (int i = 0; i <= screenCount - 1; ++i) {
+        for (int i = 0; i < screenCount; ++i) {
-            if (QGuiApplication::screens().at(i)->geometry().contains(pos)) {
+            if (qApp->screens().at(i)->geometry().contains(pos)) {
                 screenIndex = i;
                 break;
             }
@@ -206,7 +199,7 @@ int FluTools::cursorScreenIndex() {
 
 int FluTools::windowBuildNumber(){
 #if defined(Q_OS_WIN)
-    QSettings regKey{QString::fromUtf8(R"(HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion)"), QSettings::NativeFormat};
+    QSettings regKey {QString::fromUtf8("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"), QSettings::NativeFormat};
     if (regKey.contains(QString::fromUtf8("CurrentBuildNumber"))) {
         auto buildNumber = regKey.value(QString::fromUtf8("CurrentBuildNumber")).toInt();
         return buildNumber;
@@ -252,66 +245,3 @@ bool FluTools::isWindows10OrGreater() {
 QRect FluTools::desktopAvailableGeometry(QQuickWindow* window){
     return window->screen()->availableGeometry();
 }
-
-QString FluTools::getWallpaperFilePath() {
-#if defined(Q_OS_WIN)
-    wchar_t path[MAX_PATH] = {};
-    if (::SystemParametersInfoW(SPI_GETDESKWALLPAPER, MAX_PATH, path, FALSE) == FALSE) {
-        return {};
-    }
-    return QString::fromWCharArray(path);
-#elif defined(Q_OS_LINUX)
-    auto type = QSysInfo::productType();
-    if (type == "uos") {
-        QProcess process;
-        QStringList args;
-        args << "--session";
-        args << "--type=method_call";
-        args << "--print-reply";
-        args << "--dest=com.deepin.wm";
-        args << "/com/deepin/wm";
-        args << "com.deepin.wm.GetCurrentWorkspaceBackgroundForMonitor";
-        args << QString("string:'%1'").arg(currentTimestamp());
-        process.start("dbus-send", args);
-        process.waitForFinished();
-        QByteArray result = process.readAllStandardOutput().trimmed();
-        int startIndex = result.indexOf("file:///");
-        if (startIndex != -1) {
-            auto path = result.mid(startIndex + 7, result.length() - startIndex - 8);
-            return path;
-        }
-    }
-#elif defined(Q_OS_MACOS)
-    QProcess process;
-    QStringList args;
-    args << "-e";
-    args << R"(tell application "Finder" to get POSIX path of (desktop picture as alias))";
-    process.start("osascript", args);
-    process.waitForFinished();
-    QByteArray result = process.readAllStandardOutput().trimmed();
-    if(result.isEmpty()){
-        return "/System/Library/CoreServices/DefaultDesktop.heic";
-    }
-    return result;
-#else
-    return {};
-#endif
-}
-
-QColor FluTools::imageMainColor(const QImage &image, double bright) {
-    int step = 20;
-    int t = 0;
-    int r = 0, g = 0, b = 0;
-    for (int i = 0; i < image.width(); i += step) {
-        for (int j = 0; j < image.height(); j += step) {
-            if (image.valid(i, j)) {
-                t++;
-                QColor c = image.pixel(i, j);
-                r += c.red();
-                b += c.blue();
-                g += c.green();
-            }
-        }
-    }
-    return QColor(int(bright * r / t) > 255 ? 255 : int(bright * r / t), int(bright * g / t) > 255 ? 255 : int(bright * g / t), int(bright * b / t) > 255 ? 255 : int(bright * b / t));
-}

src/FluTools.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FLUTOOLS_H
+#define FLUTOOLS_H
 
 #include <QObject>
 #include <QFile>
@@ -10,90 +11,51 @@
 /**
  * @brief The FluTools class
  */
-class FluTools : public QObject {
+class FluTools : public QObject
+{
     Q_OBJECT
     QML_NAMED_ELEMENT(FluTools)
     QML_SINGLETON
-
 private:
     explicit FluTools(QObject *parent = nullptr);
-
 public:
     SINGLETON(FluTools)
-
+    static FluTools *create(QQmlEngine *qmlEngine, QJSEngine *jsEngine){return getInstance();}
-    static FluTools *create(QQmlEngine *, QJSEngine *) { return getInstance(); }
-
     Q_INVOKABLE int qtMajor();
-
     Q_INVOKABLE int qtMinor();
-
     Q_INVOKABLE bool isMacos();
-
     Q_INVOKABLE bool isLinux();
-
     Q_INVOKABLE bool isWin();
-
     Q_INVOKABLE void clipText(const QString& text);
-
     Q_INVOKABLE QString uuid();
-
     Q_INVOKABLE QString readFile(const QString& fileName);
-
     Q_INVOKABLE void setQuitOnLastWindowClosed(bool val);
-
     Q_INVOKABLE void setOverrideCursor(Qt::CursorShape shape);
-
     Q_INVOKABLE void restoreOverrideCursor();
-
     Q_INVOKABLE QString html2PlantText(const QString& html);
-
     Q_INVOKABLE QString toLocalPath(const QUrl& url);
-
     Q_INVOKABLE void deleteLater(QObject *p);
-
     Q_INVOKABLE QString getFileNameByUrl(const QUrl& url);
-
     Q_INVOKABLE QRect getVirtualGeometry();
-
     Q_INVOKABLE QString getApplicationDirPath();
-
     Q_INVOKABLE QUrl getUrlByFilePath(const QString& path);
-
     Q_INVOKABLE QColor withOpacity(const QColor&,qreal alpha);
-
+    Q_INVOKABLE QString md5(QString text);
-    Q_INVOKABLE QString md5(const QString &text);
+    Q_INVOKABLE QString sha256(QString text);
-
+    Q_INVOKABLE QString toBase64(QString text);
-    Q_INVOKABLE QString sha256(const QString &text);
+    Q_INVOKABLE QString fromBase64(QString text);
-
+    Q_INVOKABLE bool removeDir(QString dirPath);
-    Q_INVOKABLE QString toBase64(const QString &text);
+    Q_INVOKABLE bool removeFile(QString filePath);
-
+    Q_INVOKABLE void showFileInFolder(QString path);
-    Q_INVOKABLE QString fromBase64(const QString &text);
-
-    Q_INVOKABLE bool removeDir(const QString &dirPath);
-
-    Q_INVOKABLE bool removeFile(const QString &filePath);
-
-    Q_INVOKABLE void showFileInFolder(const QString &path);
-
     Q_INVOKABLE bool isSoftware();
-
     Q_INVOKABLE qint64 currentTimestamp();
-
     Q_INVOKABLE QPoint cursorPos();
-
     Q_INVOKABLE QIcon windowIcon();
-
     Q_INVOKABLE int cursorScreenIndex();
-
     Q_INVOKABLE int windowBuildNumber();
-
     Q_INVOKABLE bool isWindows11OrGreater();
-
     Q_INVOKABLE bool isWindows10OrGreater();
-
     Q_INVOKABLE QRect desktopAvailableGeometry(QQuickWindow* window);
-
-    Q_INVOKABLE QString getWallpaperFilePath();
-
-    Q_INVOKABLE QColor imageMainColor(const QImage& image, double bright = 1);
 };
+
+#endif // FLUTOOLS_H

src/FluTreeModel.cpp

@@ -1,55 +1,49 @@
 #include "FluTreeModel.h"
 
 #include <QMetaEnum>
-#include <utility>
 
 FluTreeNode::FluTreeNode(QObject *parent): QObject{parent}{
 }
 
 FluTreeModel::FluTreeModel(QObject *parent): QAbstractItemModel{parent}{
-    _dataSourceSize = 0;
+    dataSourceSize(0);
 }
 
 QModelIndex FluTreeModel::parent(const QModelIndex &child) const{
-    return {};
+    return QModelIndex();
 }
 
 QModelIndex FluTreeModel::index(int row, int column,const QModelIndex &parent) const{
     if (!hasIndex(row, column, parent) || parent.isValid())
-        return {};
+        return QModelIndex();
     return createIndex(row, column, _rows.at(row));
 }
 
 int FluTreeModel::rowCount(const QModelIndex &parent) const {
     return _rows.count();
-}
+};
 
 int FluTreeModel::columnCount(const QModelIndex &parent) const {
-    return this->_columnSource.size();
+    return 1;;
-}
+};
 
 QVariant FluTreeModel::data(const QModelIndex &index, int role) const {
     switch (role) {
-        case TreeModelRoles::RowModel:
+    case Qt::DisplayRole:
         return  QVariant::fromValue(_rows.at(index.row()));
-        case TreeModelRoles::ColumnModel:
-            return QVariant::fromValue(_columnSource.at(index.column()));
     default:
         break;
     }
-    return {};
+    return QVariant();
-}
+};
 
 QHash<int, QByteArray> FluTreeModel::roleNames() const {
-    return {
+    return { {Qt::DisplayRole, "dataModel"} };
-            {TreeModelRoles::RowModel,    "rowModel"},
-            {TreeModelRoles::ColumnModel, "columnModel"}
 };
-}
 
 void FluTreeModel::setData(QList<FluTreeNode*> data){
     beginResetModel();
-    _rows = std::move(data);
+    _rows = data;
     endResetModel();
 }
 
@@ -65,9 +59,9 @@ void FluTreeModel::removeRows(int row, int count) {
     endRemoveRows();
 }
 
-void FluTreeModel::insertRows(int row, const QList<FluTreeNode *> &data) {
+void FluTreeModel::insertRows(int row,QList<FluTreeNode*> data){
-    if (row < 0 || row > _rows.size() || data.empty())
+    if (row < 0 || row > _rows.size() || data.size() == 0)
-        return;
+        return;;
     beginInsertRows(QModelIndex(), row, row + data.size() - 1);
     QList<FluTreeNode*> firstPart = _rows.mid(0, row);
     QList<FluTreeNode*> secondPart = _rows.mid(row);
@@ -82,11 +76,6 @@ QObject *FluTreeModel::getRow(int row) {
     return _rows.at(row);
 }
 
-void FluTreeModel::setRow(int row, QVariantMap data) {
-    _rows.at(row)->_data = std::move(data);
-    Q_EMIT dataChanged(index(row, 0), index(row, columnCount() - 1));
-}
-
 void FluTreeModel::checkRow(int row,bool checked){
     auto itemData = _rows.at(row);
     if(itemData->hasChildren()){
@@ -113,7 +102,15 @@ void FluTreeModel::checkRow(int row, bool checked) {
         itemData->_checked = checked;
     }
     Q_EMIT dataChanged(index(0,0),index(rowCount()-1,0));
-
+    QList<FluTreeNode*> data;
+    foreach (auto item, _dataSource) {
+        if(!item->hasChildren()){
+            if(item->_checked){
+                data.append(item);
+            }
+        }
+    }
+    selectionModel(data);
 }
 
 void FluTreeModel::setDataSource(QList<QMap<QString,QVariant>> data){
@@ -127,10 +124,11 @@ void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {
     while (data.count() > 0) {
         auto item = data.at(data.count()-1);
         data.pop_back();
-        auto *node = new FluTreeNode(this);
+        FluTreeNode* node = new FluTreeNode(this);
+        node->_title = item.value("title").toString();
+        node->_key = item.value("key").toString();
         node->_depth = item.value("__depth").toInt();
         node->_parent = item.value("__parent").value<FluTreeNode*>();
-        node->_data = item;
         node->_isExpanded = true;
         if(node->_parent){
             node->_parent->_children.append(node);
@@ -143,9 +141,9 @@ void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {
             QList<QVariant> children = item.value("children").toList();
             if(!children.isEmpty()){
                 std::reverse(children.begin(), children.end());
-                for (int i = 0; i <= children.count() - 1; ++i) {
+                for (int i = 0; i < children.count(); ++i) {
                     auto child = children.at(i).toMap();
-                    child.insert("__depth", item.value("__depth").toInt(nullptr) + 1);
+                    child.insert("__depth",item.value("__depth").toInt(0)+1);
                     child.insert("__parent",QVariant::fromValue(node));
                     data.append(child);
                 }
@@ -203,6 +201,110 @@ void FluTreeModel::expand(int row) {
     insertRows(row+1,insertData);
 }
 
+void FluTreeModel::dragAndDrop(int dragIndex,int dropIndex,bool isDropTopArea){
+    if(dropIndex>_rows.count() || dropIndex<0){
+        return;
+    }
+    auto dragItem = _rows[dragIndex];
+    auto dropItem = _rows[dropIndex];
+    int targetIndex;
+    if(dropIndex > dragIndex){
+        if(isDropTopArea){
+            targetIndex = dropIndex;
+        }else{
+            targetIndex = dropIndex+1;
+        }
+    }else{
+        if(isDropTopArea){
+            targetIndex = dropIndex;
+        }else{
+            targetIndex = dropIndex+1;
+        }
+    }
+    if (!beginMoveRows(QModelIndex(), dragIndex, dragIndex, QModelIndex(), targetIndex)) {
+        return;
+    }
+    if(dropIndex > dragIndex){
+        if(isDropTopArea){
+            targetIndex = dropIndex-1;
+        }else{
+            targetIndex = dropIndex;
+        }
+    }else{
+        if(isDropTopArea){
+            targetIndex = dropIndex;
+        }else{
+            targetIndex = dropIndex+1;
+        }
+    }
+    _rows.move(dragIndex,targetIndex);
+    endMoveRows();
+
+    Q_EMIT layoutAboutToBeChanged();
+    if(dragItem->_parent == dropItem->_parent){
+        QList<FluTreeNode*>* children = &(dragItem->_parent->_children);
+        int srcIndex = children->indexOf(dragItem);
+        int destIndex = children->indexOf(dropItem);
+        if(dropIndex > dragIndex){
+            if(isDropTopArea){
+                targetIndex = destIndex-1;
+            }else{
+                targetIndex = destIndex;
+            }
+        }else{
+            if(isDropTopArea){
+                targetIndex = destIndex;
+            }else{
+                targetIndex = destIndex+1;
+            }
+        }
+        children->move(srcIndex,targetIndex);
+    }else{
+        QList<FluTreeNode*>* srcChildren = &(dragItem->_parent->_children);
+        QList<FluTreeNode*>* destChildren = &(dropItem->_parent->_children);
+        int srcIndex = srcChildren->indexOf(dragItem);
+        int destIndex = destChildren->indexOf(dropItem);
+        dragItem->_depth = dropItem->_depth;
+        dragItem->_parent = dropItem->_parent;
+        if(dragItem->hasChildren()){
+            QList<FluTreeNode*> stack = dragItem->_children;
+            foreach (auto node, stack) {
+                node->_depth = dragItem->_depth+1;
+            }
+            std::reverse(stack.begin(), stack.end());
+            while (stack.count() > 0) {
+                auto item = stack.at(stack.count()-1);
+                stack.pop_back();
+                QList<FluTreeNode*> children = item->_children;
+                if(!children.isEmpty()){
+                    std::reverse(children.begin(), children.end());
+                    foreach (auto c, children) {
+                        c->_depth = item->_depth+1;
+                        stack.append(c);
+                    }
+                }
+            }
+        }
+        srcChildren->removeAt(srcIndex);
+        if(dropIndex > dragIndex){
+            if(isDropTopArea){
+                targetIndex = destIndex;
+            }else{
+                targetIndex = destIndex + 1;
+            }
+        }else{
+            if(isDropTopArea){
+                targetIndex = destIndex;
+            }else{
+                targetIndex = destIndex + 1;
+            }
+        }
+        destChildren->insert(targetIndex,dragItem);
+    }
+    changePersistentIndex(index(qMin(dragIndex,dropIndex),0),index(qMax(dragIndex,dropIndex),0));
+    Q_EMIT dataChanged(index(0,0),index(rowCount()-1,0));
+}
+
 bool FluTreeModel::hitHasChildrenExpanded(int row){
     auto itemData = _rows.at(row);
     if(itemData->hasChildren() && itemData->_isExpanded){
@@ -213,7 +315,7 @@ bool FluTreeModel::hitHasChildrenExpanded(int row) {
 
 void FluTreeModel::refreshNode(int row){
     Q_EMIT dataChanged(index(row,0),index(row,0));
-}
+};
 
 FluTreeNode* FluTreeModel::getNode(int row){
     return _rows.at(row);
@@ -242,7 +344,6 @@ void FluTreeModel::allExpand() {
     _rows = data;
     endResetModel();
 }
-
 void FluTreeModel::allCollapse(){
     beginResetModel();
     QList<FluTreeNode*> stack = _root->_children;
@@ -264,13 +365,3 @@ void FluTreeModel::allCollapse() {
     _rows = _root->_children;
     endResetModel();
 }
-
-QVariant FluTreeModel::selectionModel(){
-    QList<FluTreeNode *> data;
-    foreach (auto item, _dataSource) {
-        if (item->checked()) {
-            data.append(item);
-        }
-    }
-    return QVariant::fromValue(data);
-}

src/FluTreeModel.h

@@ -1,9 +1,9 @@
-#pragma once
+#ifndef FLUTREEMODEL_H
+#define FLUTREEMODEL_H
 
 #include <QObject>
 #include <QAbstractTableModel>
 #include <QJsonArray>
-#include <QVariant>
 #include <QtQml/qqml.h>
 #include "stdafx.h"
 
@@ -12,24 +12,21 @@
  */
 class FluTreeNode : public QObject{
     Q_OBJECT
-    Q_PROPERTY(QVariantMap data READ data CONSTANT)
+    Q_PROPERTY(QString key READ key CONSTANT)
+    Q_PROPERTY(QString title READ title CONSTANT)
     Q_PROPERTY(int depth READ depth CONSTANT)
     Q_PROPERTY(bool isExpanded READ isExpanded CONSTANT)
     Q_PROPERTY(bool checked READ checked CONSTANT)
 public:
     explicit FluTreeNode(QObject *parent = nullptr);
-
+    Q_INVOKABLE QString key(){return _key;};
-    [[nodiscard]] Q_INVOKABLE int depth() const { return _depth; };
+    Q_INVOKABLE QString title(){return _title;};
-
+    Q_INVOKABLE int depth(){return _depth;};
-    [[nodiscard]] Q_INVOKABLE bool isExpanded() const { return _isExpanded; };
+    Q_INVOKABLE bool isExpanded(){return _isExpanded;};
-
+    Q_INVOKABLE bool hasChildren(){ return !_children.isEmpty();};
-    [[nodiscard]] Q_INVOKABLE QVariantMap data() const { return _data; };
-
-    [[nodiscard]] Q_INVOKABLE bool hasChildren() const { return !_children.isEmpty(); };
-
     Q_INVOKABLE bool hasNextNodeByIndex(int index){
         FluTreeNode* p = this;
-        for (int i = 0; i <= _depth - index - 1; i++) {
+        for(int i=0;i<(_depth - index -1);i++){
             p = p->_parent;
         }
         if(p->_parent->_children.indexOf(p) == p->_parent->_children.count()-1){
@@ -37,20 +34,18 @@ public:
         }
         return true;
     }
-
+    Q_INVOKABLE bool checked(){
-    [[nodiscard]] Q_INVOKABLE bool checked() const {
         if(!hasChildren()){
             return _checked;
         }
-        for (int i = 0; i <= _children.size() - 1; ++i) {
+        foreach (auto item, _children) {
-            auto item = _children.at(i);
             if(!item->checked()){
+
                 return false;
             }
         }
         return true;
     };
-    
     Q_INVOKABLE bool hideLineFooter(){
         if(_parent){
             auto childIndex =  _parent->_children.indexOf(this);
@@ -64,8 +59,7 @@ public:
         }
         return false;
     };
-
+    bool isShown(){
-    [[nodiscard]] bool isShown() const {
         auto p = _parent;
         while (p) {
             if(!p->_isExpanded){
@@ -75,75 +69,50 @@ public:
         }
         return true;
     }
-
 public:
+    QString _key="";
     QString _title="";
     int _depth=0;
     bool _checked = false;
     bool _isExpanded=true;
-    QVariantMap _data;
     QList<FluTreeNode*> _children;
     FluTreeNode* _parent = nullptr;
 };
 
-class FluTreeModel : public QAbstractItemModel {
+class FluTreeModel : public QAbstractItemModel
+{
     Q_OBJECT
     Q_PROPERTY_AUTO(int,dataSourceSize)
-Q_PROPERTY_AUTO(QList<QVariantMap>, columnSource)
+    Q_PROPERTY_AUTO(QList<FluTreeNode*>,selectionModel)
     QML_NAMED_ELEMENT(FluTreeModel)
     QML_ADDED_IN_MINOR_VERSION(1)
 public:
-    enum TreeModelRoles {
-        RowModel = 0x0101,
-        ColumnModel = 0x0102
-    };
-
     explicit FluTreeModel(QObject *parent = nullptr);
-
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
-    [[nodiscard]] int rowCount(const QModelIndex &parent = {}) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
-
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    [[nodiscard]] int columnCount(const QModelIndex &parent = {}) const override;
+    QHash<int, QByteArray> roleNames() const override;
-
+    QModelIndex parent(const QModelIndex &child) const override;
-    [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    QModelIndex index(int row, int column,const QModelIndex &parent = QModelIndex()) const override;
-
-    [[nodiscard]] QHash<int, QByteArray> roleNames() const override;
-
-    [[nodiscard]] QModelIndex parent(const QModelIndex &child) const override;
-
-    [[nodiscard]] QModelIndex index(int row, int column, const QModelIndex &parent = {}) const override;
 
     Q_INVOKABLE void removeRows(int row,int count);
-
+    Q_INVOKABLE void insertRows(int row,QList<FluTreeNode*> data);
-    Q_INVOKABLE void insertRows(int row, const QList<FluTreeNode *> &data);
-
     Q_INVOKABLE QObject* getRow(int row);
-
-    Q_INVOKABLE void setRow(int row, QVariantMap data);
-
     Q_INVOKABLE void setData(QList<FluTreeNode*> data);
-
     Q_INVOKABLE void setDataSource(QList<QMap<QString,QVariant>> data);
-
     Q_INVOKABLE void collapse(int row);
-
     Q_INVOKABLE void expand(int row);
-
+    Q_INVOKABLE void dragAndDrop(int dragIndex,int dropIndex,bool isDropTopArea);
     Q_INVOKABLE FluTreeNode* getNode(int row);
-
     Q_INVOKABLE void refreshNode(int row);
-
     Q_INVOKABLE void checkRow(int row,bool checked);
-
     Q_INVOKABLE bool hitHasChildrenExpanded(int row);
-
     Q_INVOKABLE void allExpand();
-
     Q_INVOKABLE void allCollapse();
-
-    Q_INVOKABLE QVariant selectionModel();
-
 private:
     QList<FluTreeNode*> _rows;
     QList<FluTreeNode*> _dataSource;
     FluTreeNode* _root = nullptr;
 };
+
+#endif // FLUTREEMODEL_H

src/FluWatermark.cpp

@@ -1,14 +1,12 @@
 #include "FluWatermark.h"
 
-#include "FluTextStyle.h"
-
 FluWatermark::FluWatermark(QQuickItem* parent) : QQuickPaintedItem(parent){
-    _gap = QPoint(100, 100);
+    gap(QPoint(100,100));
-    _offset = QPoint(_gap.x() / 2, _gap.y() / 2);
+    offset(QPoint(_gap.x()/2,_gap.y()/2));
-    _rotate = 22;
+    rotate(22);
-    _textColor = QColor(222, 222, 222, 222);
-    _textSize = 16;
     setZ(9999);
+    textColor(QColor(222,222,222,222));
+    textSize(16);
     connect(this,&FluWatermark::textColorChanged,this,[=]{update();});
     connect(this,&FluWatermark::gapChanged,this,[=]{update();});
     connect(this,&FluWatermark::offsetChanged,this,[=]{update();});
@@ -19,19 +17,20 @@ FluWatermark::FluWatermark(QQuickItem *parent) : QQuickPaintedItem(parent) {
 
 void FluWatermark::paint(QPainter* painter){
     QFont font;
-    font.setFamily(FluTextStyle::getInstance()->family());
     font.setPixelSize(_textSize);
     painter->setFont(font);
     painter->setPen(_textColor);
     QFontMetricsF fontMetrics(font);
     qreal fontWidth = fontMetrics.horizontalAdvance(_text);
     qreal fontHeight = fontMetrics.height();
-    int stepX = qRound(fontWidth + _gap.x());
+    int stepX =  fontWidth + _gap.x();
-    int stepY = qRound(fontHeight + _gap.y());
+    int stepY =  fontHeight + _gap.y();
-    int rowCount = qRound(width() / stepX + 1);
+    int rowCount = width() / stepX+1;
-    int colCount = qRound(height() / stepY + 1);
+    int colCount = height() / stepY+1;
-    for (int r = 0; r < rowCount; r++) {
+    for (int r = 0; r < rowCount; r++)
-        for (int c = 0; c < colCount; c++) {
+    {
+        for (int c = 0; c < colCount; c++)
+        {
             qreal centerX = stepX * r + _offset.x() + fontWidth / 2.0;
             qreal centerY = stepY * c + _offset.y() + fontHeight / 2.0;
             painter->save();

src/FluWatermark.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FLUWATERMARK_H
+#define FLUWATERMARK_H
 
 #include <QQuickItem>
 #include <QQuickPaintedItem>
@@ -8,7 +9,8 @@
 /**
  * @brief The FluWatermark class
  */
-class FluWatermark : public QQuickPaintedItem {
+class FluWatermark : public QQuickPaintedItem
+{
     Q_OBJECT
     Q_PROPERTY_AUTO(QString,text)
     Q_PROPERTY_AUTO(QPoint,gap)
@@ -19,6 +21,7 @@ Q_PROPERTY_AUTO(int, textSize);
     QML_NAMED_ELEMENT(FluWatermark)
 public:
     explicit FluWatermark(QQuickItem *parent = nullptr);
-
     void paint(QPainter* painter) override;
 };
+
+#endif // FLUWATERMARK_H

src/FluentUI.cpp

@@ -2,7 +2,6 @@
 
 #include <QGuiApplication>
 #include "Def.h"
-#include "FluentIconDef.h"
 #include "FluApp.h"
 #include "FluColors.h"
 #include "FluTheme.h"
@@ -17,15 +16,14 @@
 #include "FluFrameless.h"
 
 void FluentUI::registerTypes(QQmlEngine *engine){
-    initializeEngine(engine, _uri);
+    initializeEngine(engine,uri);
-    registerTypes(_uri);
+    registerTypes(uri);
 }
 
-void FluentUI::registerTypes(const char *uri) const {
+void FluentUI::registerTypes(const char *uri){
 #if (QT_VERSION < QT_VERSION_CHECK(6, 2, 0))
     Q_INIT_RESOURCE(fluentui);
-    int major = _major;
+
-    int minor = _minor;
     //@uri FluentUI
     qmlRegisterType<FluQrCodeItem>(uri,major,minor,"FluQrCodeItem");
     qmlRegisterType<FluCaptcha>(uri,major,minor,"FluCaptcha");
@@ -132,7 +130,7 @@ void FluentUI::registerTypes(const char *uri) const {
     qmlRegisterSingletonType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluRouter.qml"),uri,major,minor,"FluRouter");
     qmlRegisterSingletonType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluEventBus.qml"),uri,major,minor,"FluEventBus");
 
-    qmlRegisterUncreatableMetaObject(Fluent_Icons::staticMetaObject, uri, major, minor, "FluentIcons", "Access to enums & flags only");
+    qmlRegisterUncreatableMetaObject(Fluent_Awesome::staticMetaObject,  uri,major,minor,"FluentIcons", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluThemeType::staticMetaObject,  uri,major,minor,"FluThemeType", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluPageType::staticMetaObject,  uri,major,minor,"FluPageType", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluWindowType::staticMetaObject,  uri,major,minor,"FluWindowType", "Access to enums & flags only");
@@ -150,7 +148,7 @@ void FluentUI::registerTypes(const char *uri) const {
 #endif
 }
 
-void FluentUI::initializeEngine(QQmlEngine *engine, [[maybe_unused]] const char *uri) {
+void FluentUI::initializeEngine(QQmlEngine *engine, const char *uri){
     engine->rootContext()->setContextProperty("FluApp",FluApp::getInstance());
     engine->rootContext()->setContextProperty("FluColors",FluColors::getInstance());
     engine->rootContext()->setContextProperty("FluTheme",FluTheme::getInstance());

src/FluentUI.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef FLUENTUI_H
+#define FLUENTUI_H
 
 #include <QObject>
 #include <QQmlEngine>
@@ -7,20 +8,18 @@
 /**
  * @brief The FluentUI class
  */
-class FluentUI : public QObject {
+class FluentUI : public QObject
+{
     Q_OBJECT
-
 public:
     SINGLETON(FluentUI)
-
     Q_DECL_EXPORT void registerTypes(QQmlEngine *engine);
-
+    void registerTypes(const char *uri);
-    void registerTypes(const char *uri) const;
+    void initializeEngine(QQmlEngine *engine, const char *uri);
-
-    void initializeEngine(QQmlEngine *engine, [[maybe_unused]] const char *uri);
-
 private:
-    const int _major = 1;
+    const int major = 1;
-    const int _minor = 0;
+    const int minor = 0;
-    const char *_uri = "FluentUI";
+    const char *uri = "FluentUI";
 };
+
+#endif // FLUENTUI_H

src/Qt5/imports/FluentUI/Controls/FluAcrylic.qml

@@ -10,7 +10,8 @@ Item {
     property real noiseOpacity: 0.02
     property alias target: effect_source.sourceItem
     property int blurRadius: 32
-    property rect targetRect: Qt.rect(control.x, control.y, control.width,control.height)
+    property rect targetRect: Qt.rect(control.x, control.y, control.width,
+                                      control.height)
     ShaderEffectSource {
         id: effect_source
         anchors.fill: parent
@@ -33,7 +34,7 @@ Item {
     }
     Image {
         anchors.fill: parent
-        source: "qrc:/qt/qml/FluentUI/Image/noise.png"
+        source: "../Image/noise.png"
         fillMode: Image.Tile
         opacity: control.noiseOpacity
     }

src/Qt5/imports/FluentUI/Controls/FluAppBar.qml

@@ -14,7 +14,7 @@ Rectangle{
     property string closeText : qsTr("Close")
     property string stayTopText : qsTr("Sticky on Top")
     property string stayTopCancelText : qsTr("Sticky on Top cancelled")
-    property color textColor: FluTheme.fontPrimaryColor
+    property color textColor: FluTheme.dark ? "#FFFFFF" : "#000000"
     property color minimizeNormalColor: FluTheme.itemNormalColor
     property color minimizeHoverColor: FluTheme.itemHoverColor
     property color minimizePressColor: FluTheme.itemPressColor

src/Qt5/imports/FluentUI/Controls/FluAutoSuggestBox.qml

@@ -7,7 +7,6 @@ FluTextBox{
     property var items:[]
     property string emptyText: qsTr("No results found")
     property int autoSuggestBoxReplacement: FluentIcons.Search
-    property string textRole: "title"
     property var filter: function(item){
         if(item.title.indexOf(control.text)!==-1){
             return true
@@ -26,7 +25,7 @@ FluTextBox{
         function handleClick(modelData){
             control_popup.visible = false
             control.itemClicked(modelData)
-            control.updateText(modelData[textRole])
+            control.updateText(modelData.title)
         }
         function loadData(){
             var result = []
@@ -49,6 +48,7 @@ FluTextBox{
     }
     Popup{
         id:control_popup
+        y:control.height
         focus: false
         padding: 0
         enter: Transition {
@@ -59,8 +59,12 @@ FluTextBox{
                 duration: FluTheme.animationEnabled ? 83 : 0
             }
         }
-        contentItem: FluClip{
+        contentItem: FluRectangle{
-            radius: [5,5,5,5]
+            radius: [4,4,4,4]
+            FluShadow{
+                radius: 4
+            }
+            color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
             ListView{
                 id:list_view
                 anchors.fill: parent
@@ -93,17 +97,14 @@ FluTextBox{
                             radius:4
                         }
                         color:  {
-                            if(pressed){
-                                return FluTheme.itemPressColor
-                            }
                             if(hovered){
-                                return FluTheme.itemHoverColor
+                                return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
                             }
-                            return FluTheme.itemNormalColor
+                            return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
                         }
                     }
                     contentItem: FluText{
-                        text: modelData[textRole]
+                        text:modelData.title
                         leftPadding: 10
                         rightPadding: 10
                         verticalAlignment : Qt.AlignVCenter
@@ -111,28 +112,22 @@ FluTextBox{
                 }
             }
         }
-        background:Rectangle{
+        background: Item{
-            id: rect_background
+            id:container
             implicitWidth: control.width
             implicitHeight: 38*Math.min(Math.max(list_view.count,1),8)
-            radius: 5
-            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
-            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
-            FluShadow{
-                radius: 5
-            }
         }
     }
     onTextChanged: {
         d.loadData()
         if(d.flagVisible){
             var pos = control.mapToItem(null, 0, 0)
-            if(d.window.height>pos.y+control.height+rect_background.implicitHeight){
+            if(d.window.height>pos.y+control.height+container.implicitHeight){
-                control_popup.y = Qt.binding(function(){return control.height})
+                control_popup.y = control.height
-            } else if(pos.y>rect_background.implicitHeight){
+            } else if(pos.y>container.implicitHeight){
-                control_popup.y = -rect_background.implicitHeight
+                control_popup.y = -container.implicitHeight
             } else {
-                control_popup.y = d.window.height-(pos.y+rect_background.implicitHeight) - 1
+                control_popup.y = d.window.height-(pos.y+container.implicitHeight)
             }
             control_popup.visible = true
         }

src/Qt5/imports/FluentUI/Controls/FluBreadcrumbBar.qml

@@ -57,12 +57,12 @@ Item {
                     Layout.alignment: Qt.AlignVCenter
                     color: {
                         if(item_mouse.pressed){
-                            return FluTheme.dark ? Qt.rgba(150/255,150/255,150/255,1) : Qt.rgba(134/255,134/255,134/255,1)
+                            return FluTheme.dark ? Qt.rgba(150/255,150/255,150/235,1) : Qt.rgba(134/255,134/255,134/235,1)
                         }
                         if(item_mouse.containsMouse){
-                            return FluTheme.dark ? Qt.rgba(204/255,204/255,204/255,1) : Qt.rgba(92/255,92/255,92/255,1)
+                            return FluTheme.dark ? Qt.rgba(204/255,204/255,204/235,1) : Qt.rgba(92/255,92/255,92/235,1)
                         }
-                        return FluTheme.dark ? Qt.rgba(255/255,255/255,255/255,1) :  Qt.rgba(26/255,26/255,26/255,1)
+                        return FluTheme.dark ? Qt.rgba(255/255,255/255,255/235,1) :  Qt.rgba(26/255,26/255,26/235,1)
                     }
                     MouseArea{
                         id:item_mouse

src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml

@@ -53,6 +53,8 @@ FluButton {
     }
     Menu{
         id:popup
+        height: container.height
+        width: container.width
         modal: true
         Overlay.modal: Item {}
         enter: Transition {
@@ -73,9 +75,11 @@ FluButton {
             }
         }
         contentItem: Item{
+            clip: true
+            FluFrame{
                 id:container
-            implicitWidth: 300
+                width: 300
-            implicitHeight: 360
+                height: 360
                 ColumnLayout  {
                     anchors.fill: parent
                     spacing: 0
@@ -605,10 +609,8 @@ FluButton {
                     }
                 }
             }
-        background:Rectangle{
+        }
-            radius: 5
+        background: Item{
-            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
-            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
             FluShadow{
                 radius: 5
             }
@@ -616,12 +618,13 @@ FluButton {
         function showPopup() {
             var pos = control.mapToItem(null, 0, 0)
             if(d.window.height>pos.y+control.height+container.height){
-                popup.y = control.height - 1
+                popup.y = control.height
             } else if(pos.y>container.height){
                 popup.y = -container.height
             } else {
                 popup.y = d.window.height-(pos.y+container.height)
             }
+            popup.x = -(popup.width-control.width)/2
             popup.open()
         }
     }

src/Qt5/imports/FluentUI/Controls/FluColorPicker.qml

@@ -13,15 +13,16 @@ Button{
     property color current : Qt.rgba(1,1,1,1)
     signal accepted()
     property int colorHandleRadius: 8
-    property string cancelText: qsTr("Cancel")
+    property string cancelText: "取消"
-    property string okText: qsTr("OK")
+    property string okText: "确定"
-    property string titleText: qsTr("Color Picker")
+    property string titleText: "颜色选择器"
-    property string editText: qsTr("Edit Color")
+    property string editText: "编辑颜色"
-    property string redText: qsTr("Red")
+    property string redText: "红色"
-    property string greenText: qsTr("Green")
+    property string greenText: "绿色"
-    property string blueText: qsTr("Blue")
+    property string blueText: "蓝色"
-    property string opacityText: qsTr("Opacity")
+    property string opacityText: "透明度"
-    background: Rectangle{
+    background:
+        Rectangle{
         id:layout_color
         radius: 5
         color:"#00000000"

src/Qt5/imports/FluentUI/Controls/FluComboBox.qml

@@ -134,9 +134,10 @@ T.ComboBox {
             }
         }
         background:Rectangle{
+            color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(249/255,249/255,249/255,1)
+            border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
+            border.width: 1
             radius: 5
-            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
-            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
             FluShadow{
                 radius: 5
             }

src/Qt5/imports/FluentUI/Controls/FluDatePicker.qml

@@ -4,6 +4,7 @@ import QtQuick.Layouts 1.15
 import QtQuick.Window 2.15
 import FluentUI 1.0
 
+
 FluButton {
     property bool showYear: true
     property var current
@@ -95,6 +96,8 @@ FluButton {
     Menu{
         id:popup
         modal: true
+        width: container.width
+        height: container.height
         Overlay.modal: Item {}
         enter: Transition {
             reversible: true
@@ -113,26 +116,30 @@ FluButton {
                 duration: FluTheme.animationEnabled ? 83 : 0
             }
         }
-        background:Rectangle{
+        background:Item{
-            radius: 5
-            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
-            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
             FluShadow{
-                radius: 5
+                radius: 4
             }
         }
         contentItem: Item{
+            clip: true
+            Rectangle{
                 id:container
-            implicitHeight: 340
+                radius: 4
-            implicitWidth: 300
+                width: 300
+                height: 340
+                color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
                 MouseArea{
                     anchors.fill: parent
                 }
+                FluShadow{
+                    radius: 4
+                }
                 RowLayout{
                     id:layout_content
                     spacing: 0
                     width: parent.width
-                height: 280
+                    height: 300
                     Component{
                         id:list_delegate
                         Item{
@@ -159,7 +166,7 @@ FluButton {
                                     if(item_mouse.containsMouse){
                                         return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
                                     }
-                                return Qt.rgba(0,0,0,0)
+                                    return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
                                 }
                                 radius: 3
                                 MouseArea{
@@ -207,9 +214,8 @@ FluButton {
                     }
                     ListView{
                         id:list_view_1
-                    Layout.preferredWidth: 100
+                        width: 100
-                    Layout.preferredHeight: parent.height - 2
+                        height: parent.height
-                    Layout.alignment: Qt.AlignVCenter
                         boundsBehavior:Flickable.StopAtBounds
                         ScrollBar.vertical: FluScrollBar {}
                         model: generateYearArray(1924,2048)
@@ -226,16 +232,14 @@ FluButton {
                         }
                     }
                     Rectangle{
-                    Layout.preferredWidth: 1
+                        width: 1
-                    Layout.preferredHeight: parent.height
+                        height: parent.height
                         color: control.dividerColor
-                    visible: showYear
                     }
                     ListView{
                         id:list_view_2
-                    Layout.preferredWidth: showYear ? 99 : 150
+                        width: showYear ? 100 : 150
-                    Layout.preferredHeight: parent.height - 2
+                        height: parent.height
-                    Layout.alignment: Qt.AlignVCenter
                         clip: true
                         ScrollBar.vertical: FluScrollBar {}
                         preferredHighlightBegin: 0
@@ -250,20 +254,20 @@ FluButton {
                         }
                     }
                     Rectangle{
-                    Layout.preferredWidth: 1
+                        width: 1
-                    Layout.preferredHeight: parent.height
+                        height: parent.height
                         color: control.dividerColor
                     }
                     ListView{
                         id:list_view_3
-                    Layout.preferredWidth: showYear ? 99 : 150
+                        width:  showYear ? 100 : 150
-                    Layout.preferredHeight: parent.height - 2
+                        height: parent.height
-                    Layout.alignment: Qt.AlignVCenter
                         clip: true
                         preferredHighlightBegin: 0
                         preferredHighlightEnd: 0
                         highlightMoveDuration: 0
                         ScrollBar.vertical: FluScrollBar {}
+                        Layout.alignment: Qt.AlignVCenter
                         boundsBehavior:Flickable.StopAtBounds
                         delegate: FluLoader{
                             property var model: modelData
@@ -273,12 +277,17 @@ FluButton {
                         }
                     }
                 }
+                Rectangle{
+                    width: parent.width
+                    height: 1
+                    anchors.top: layout_content.bottom
+                    color: control.dividerColor
+                }
                 Rectangle{
                     id:layout_actions
-                height: 60
+                    height: 40
-                color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
-                border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
                     radius: 5
+                    color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
                     anchors{
                         bottom:parent.bottom
                         left: parent.left
@@ -331,6 +340,7 @@ FluButton {
                     }
                 }
             }
+        }
         y:35
         function showPopup() {
             d.changeFlag = true
@@ -351,7 +361,7 @@ FluButton {
             text_day.text = day
             var pos = control.mapToItem(null, 0, 0)
             if(d.window.height>pos.y+control.height+container.height){
-                popup.y = control.height-1
+                popup.y = control.height
             } else if(pos.y>container.height){
                 popup.y = -container.height
             } else {

src/Qt5/imports/FluentUI/Controls/FluDropDownButton.qml

@@ -19,20 +19,16 @@ FluButton {
         }
         iconColor:control.textColor
     }
-    Item{
-        id: d
-        property var window: Window.window
-    }
     onClicked: {
         if(menu.count !==0){
             var pos = control.mapToItem(null, 0, 0)
             var containerHeight = menu.count*36
-            if(d.window.height>pos.y+control.height+containerHeight){
+            if(window.height>pos.y+control.height+containerHeight){
                 menu.y = control.height
             }else if(pos.y>containerHeight){
                 menu.y = -containerHeight
             }else{
-                menu.y = d.window.height-(pos.y+containerHeight)
+                menu.y = window.height-(pos.y+containerHeight)
             }
             menu.open()
         }

src/Qt5/imports/FluentUI/Controls/FluExpander.qml

@@ -27,12 +27,7 @@ Item {
         height: 45
         radius: 4
         border.color: FluTheme.dividerColor
-        color: {
+        color: FluTheme.dark ? Window.active ?  Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
-            if(Window.active){
-                return FluTheme.frameActiveColor
-            }
-            return FluTheme.frameColor
-        }
         MouseArea{
             id:control_mouse
             anchors.fill: parent
@@ -89,18 +84,12 @@ Item {
         height: contentHeight+container.anchors.topMargin
         width: parent.width
         z:-999
-        clip: true
         Rectangle{
             id:container
             anchors.fill: parent
             radius: 4
             clip: true
-            color: {
+            color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
-                if(Window.active){
-                    return FluTheme.frameActiveColor
-                }
-                return FluTheme.frameColor
-            }
             border.color: FluTheme.dividerColor
             anchors.topMargin: -contentHeight
             states: [

src/Qt5/imports/FluentUI/Controls/FluFrame.qml

@@ -19,11 +19,6 @@ T.Frame {
         id:d
         radius: 4
         border.color: FluTheme.dividerColor
-        color: {
+        color: FluTheme.dark ? Window.active ?  Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(251/255,251/255,253/255,1)
-            if(Window.active){
-                return FluTheme.frameActiveColor
-            }
-            return FluTheme.frameColor
-        }
     }
 }

src/Qt5/imports/FluentUI/Controls/FluGroupBox.qml

@@ -8,13 +8,8 @@ import FluentUI 1.0
 T.GroupBox {
     id: control
     property int borderWidth : 1
-    property color borderColor : FluTheme.dividerColor
+    property color borderColor : FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
-    property color color: {
+    property color color: FluTheme.dark ? Window.active ?  Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
-        if(Window.active){
-            return FluTheme.frameActiveColor
-        }
-        return FluTheme.frameColor
-    }
     property int radius: 4
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
                             contentWidth + leftPadding + rightPadding,

src/Qt5/imports/FluentUI/Controls/FluIcon.qml

@@ -7,15 +7,13 @@ Text {
     property int iconSize: 20
     property color iconColor: FluTheme.dark ? "#FFFFFF" : "#000000"
     id:control
-    font.family: font_loader.name
+    font.family: "Segoe Fluent Icons"
     font.pixelSize: iconSize
     horizontalAlignment: Text.AlignHCenter
     verticalAlignment: Text.AlignVCenter
     color: iconColor
     text: (String.fromCharCode(iconSource).toString(16))
-    opacity: iconSource>0
     FontLoader{
-        id: font_loader
+        source: "../Font/Segoe_Fluent_Icons.ttf"
-        source: "qrc:/qt/qml/FluentUI/Font/FluentIcons.ttf"
     }
 }

src/Qt5/imports/FluentUI/Controls/FluMenu.qml

@@ -44,8 +44,8 @@ T.Menu {
     background: Rectangle {
         implicitWidth: 150
         implicitHeight: 36
-        color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(252/255,252/255,252/255,1)
+        color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(240/255,240/255,240/255,1)
-        border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
+        border.color: FluTheme.dark ? Window.active ? Qt.rgba(55/255,55/255,55/255,1):Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
         border.width: 1
         radius: 5
         FluShadow{}

src/Qt5/imports/FluentUI/Controls/FluSpinBox.qml

@@ -21,7 +21,6 @@ T.SpinBox {
         bottom: Math.min(control.from, control.to)
         top: Math.max(control.from, control.to)
     }
-    font: FluTextStyle.Body
 
     contentItem: TextInput {
         property color normalColor: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)

src/Qt5/imports/FluentUI/Controls/FluStatusLayout.qml

@@ -8,11 +8,11 @@ Item{
     id:control
     default property alias content: container.data
     property int statusMode: FluStatusLayoutType.Loading
-    property string loadingText: qsTr("Loading...")
+    property string loadingText:"正在加载..."
-    property string emptyText: qsTr("Empty")
+    property string emptyText: "空空如也"
-    property string errorText: qsTr("Error")
+    property string errorText: "页面出错了.."
-    property string errorButtonText: qsTr("Reload")
+    property string errorButtonText: "重新加载"
-    property color color: Qt.rgba(0,0,0,0)
+    property color color: FluTheme.dark ? Window.active ?  Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
     signal errorClicked
     property Component loadingItem : com_loading
     property Component emptyItem : com_empty

src/Qt5/imports/FluentUI/Controls/FluTableView.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.15
-import QtQuick.Window 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import Qt.labs.qmlmodels 1.0
@@ -18,12 +17,7 @@ Rectangle {
     property color selectedBorderColor: FluTheme.primaryColor
     property color selectedColor: FluTools.withOpacity(FluTheme.primaryColor,0.3)
     id:control
-    color: {
+    color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
-        if(Window.active){
-            return FluTheme.frameActiveColor
-        }
-        return FluTheme.frameColor
-    }
     onColumnSourceChanged: {
         if(columnSource.length!==0){
             var columns= []
@@ -96,7 +90,7 @@ Rectangle {
                 if(!readOnly){
                     editTextChaged(text_box.text)
                 }
-                control.closeEditor()
+                tableView.closeEditor()
             }
         }
     }
@@ -125,7 +119,7 @@ Rectangle {
                         if(!readOnly){
                             editTextChaged(text_box.text)
                         }
-                        control.closeEditor()
+                        tableView.closeEditor()
                     }
                 }
             }
@@ -196,11 +190,6 @@ Rectangle {
         id:com_table_delegate
         MouseArea{
             id:item_table_mouse
-            TableView.onPooled: {
-                if(d.editPosition && d.editPosition.row === row && d.editPosition.column === column){
-                    control.closeEditor()
-                }
-            }
             property var rowObject : control.getRow(row)
             property var itemModel: model
             property bool editVisible: {
@@ -269,7 +258,7 @@ Rectangle {
                     anchors.fill: parent
                     acceptedButtons: Qt.LeftButton
                     onPressed:{
-                        control.closeEditor()
+                        closeEditor()
                     }
                     onCanceled: {
                     }
@@ -279,14 +268,14 @@ Rectangle {
                         if(typeof(display) == "object"){
                             return
                         }
-                        loader_edit.display = display
                         d.editDelegate = d.getEditDelegate(column)
                         updateEditPosition()
+                        loader_edit.display = display
                     }
                     onClicked:
                         (event)=>{
                             d.current = rowObject
-                            control.closeEditor()
+                            closeEditor()
                             event.accepted = true
                         }
                 }
@@ -392,7 +381,6 @@ Rectangle {
             clip: true
             onRowsChanged: {
                 control.closeEditor()
-                table_view.flick(0,1)
             }
             delegate: com_table_delegate
             FluLoader{
@@ -783,9 +771,9 @@ Rectangle {
             timer_vertical_force_layout.restart()
         }
         Connections{
-            target: table_view
+            target: table_model
-            function onRowsChanged(){
+            function onRowCountChanged(){
-                header_row_model.rows = Array.from({length: table_view.rows}, (_, i) => ({rowIndex:i+1}))
+                header_row_model.rows = Array.from({length: table_model.rows.length}, (_, i) => ({rowIndex:i+1}))
             }
         }
         Timer{

src/Qt5/imports/FluentUI/Controls/FluTextBoxBackground.qml

@@ -23,27 +23,16 @@ FluControlBackground{
         GradientStop { position: 1 - d.offsetSize/control.height; color: d.startColor }
         GradientStop { position: 1.0; color: d.endColor }
     }
-    bottomMargin: 1
+    bottomMargin: inputItem && inputItem.activeFocus ? 2 : 1
     QtObject{
         id:d
-        property int offsetSize :  3
+        property int offsetSize  : inputItem && inputItem.activeFocus ? 2 : 3
         property color startColor: FluTheme.dark ? Qt.rgba(66/255,66/255,66/255,1) : Qt.rgba(232/255,232/255,232/255,1)
         property color endColor: {
             if(!control.enabled){
                 return d.startColor
             }
-            return  FluTheme.dark ? Qt.rgba(123/255,123/255,123/255,1) : Qt.rgba(132/255,132/255,132/255,1)
+            return inputItem && inputItem.activeFocus ? FluTheme.primaryColor : FluTheme.dark ? Qt.rgba(123/255,123/255,123/255,1) : Qt.rgba(132/255,132/255,132/255,1)
-        }
-    }
-    FluClip{
-        anchors.fill: parent
-        radius: [control.radius,control.radius,control.radius,control.radius]
-        visible: inputItem && inputItem.activeFocus
-        Rectangle{
-            width: parent.width
-            height: 2
-            anchors.bottom: parent.bottom
-            color: FluTheme.primaryColor
         }
     }
 }

src/Qt5/imports/FluentUI/Controls/FluTimePicker.qml

@@ -111,6 +111,8 @@ FluButton {
     }
     Menu{
         id:popup
+        width: container.width
+        height: container.height
         modal: true
         Overlay.modal: Item {}
         enter: Transition {
@@ -130,18 +132,19 @@ FluButton {
                 duration: FluTheme.animationEnabled ? 83 : 0
             }
         }
-        background:Rectangle{
+        background:Item{
-            radius: 5
-            color: FluTheme.dark ? Qt.rgba(43/255,43/255,43/255,1) : Qt.rgba(1,1,1,1)
-            border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
             FluShadow{
-                radius: 5
+                radius: 4
             }
         }
         contentItem: Item{
+            clip: true
+            Rectangle{
                 id:container
-            implicitHeight: 340
+                height: 340
-            implicitWidth: 300
+                width: 300
+                radius: 4
+                color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
                 MouseArea{
                     anchors.fill: parent
                 }
@@ -149,7 +152,7 @@ FluButton {
                     id:layout_content
                     spacing: 0
                     width: parent.width
-                height: 280
+                    height: 300
                     Component{
                         id:list_delegate
                         Item{
@@ -176,7 +179,7 @@ FluButton {
                                     if(item_mouse.containsMouse){
                                         return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
                                     }
-                                return Qt.rgba(0,0,0,0)
+                                    return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
                                 }
                                 radius: 3
                                 MouseArea{
@@ -216,9 +219,8 @@ FluButton {
                     }
                     ListView{
                         id:list_view_1
-                    Layout.preferredWidth: isH ? 100 : 150
+                        width: isH ? 100 : 150
-                    Layout.preferredHeight: parent.height-2
+                        height: parent.height
-                    Layout.alignment: Qt.AlignVCenter
                         boundsBehavior:Flickable.StopAtBounds
                         ScrollBar.vertical: FluScrollBar {}
                         preferredHighlightBegin: 0
@@ -234,15 +236,14 @@ FluButton {
                         }
                     }
                     Rectangle{
-                    Layout.preferredWidth: 1
+                        width: 1
-                    Layout.preferredHeight: parent.height
+                        height: parent.height
                         color: control.dividerColor
                     }
                     ListView{
                         id:list_view_2
-                    Layout.preferredWidth: isH ? 99 : 150
+                        width:  isH ? 100 : 150
-                    Layout.preferredHeight: parent.height-2
+                        height: parent.height
-                    Layout.alignment: Qt.AlignVCenter
                         model: generateArray(0,59)
                         clip: true
                         preferredHighlightBegin: 0
@@ -265,8 +266,8 @@ FluButton {
                     }
                     ListView{
                         id:list_view_3
-                    Layout.preferredWidth: 100
+                        width: 100
-                    Layout.preferredHeight: 76
+                        height: 76
                         model: [control.amText,control.pmText]
                         clip: true
                         visible: isH
@@ -284,12 +285,17 @@ FluButton {
                         }
                     }
                 }
+                Rectangle{
+                    width: parent.width
+                    height: 1
+                    anchors.top: layout_content.bottom
+                    color: control.dividerColor
+                }
                 Rectangle{
                     id:layout_actions
-                height: 60
+                    height: 40
-                color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
-                border.color: FluTheme.dark ? Qt.rgba(26/255,26/255,26/255,1) : Qt.rgba(191/255,191/255,191/255,1)
                     radius: 5
+                    color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
                     anchors{
                         bottom:parent.bottom
                         left: parent.left
@@ -347,6 +353,7 @@ FluButton {
                     }
                 }
             }
+        }
         y:35
         function showPopup() {
             d.changeFlag = true
@@ -380,7 +387,7 @@ FluButton {
             }
             var pos = control.mapToItem(null, 0, 0)
             if(d.window.height>pos.y+control.height+container.height){
-                popup.y = control.height-1
+                popup.y = control.height
             } else if(pos.y>container.height){
                 popup.y = -container.height
             } else {

src/Qt5/imports/FluentUI/Controls/FluWindow.qml

@@ -109,56 +109,9 @@ Window {
     }
     Component{
         id:com_background
-        Item{
         Rectangle{
-                anchors.fill: parent
             color: window.backgroundColor
         }
-            Image{
-                id:img_back
-                visible: false
-                cache: false
-                fillMode: Image.PreserveAspectCrop
-                asynchronous: true
-                Component.onCompleted: {
-                    var geometry = FluTools.desktopAvailableGeometry(window)
-                    width = geometry.width
-                    height =  geometry.height
-                    sourceSize = Qt.size(width,height)
-                    source = FluTools.getUrlByFilePath(FluTheme.desktopImagePath)
-                }
-                Connections{
-                    target: FluTheme
-                    function onDesktopImagePathChanged(){
-                        timer_update_image.restart()
-                    }
-                    function onBlurBehindWindowEnabledChanged(){
-                        if(FluTheme.blurBehindWindowEnabled){
-                            img_back.source = FluTools.getUrlByFilePath(FluTheme.desktopImagePath)
-                        }else{
-                            img_back.source = ""
-                        }
-                    }
-                }
-                Timer{
-                    id:timer_update_image
-                    interval: 500
-                    onTriggered: {
-                        img_back.source = ""
-                        img_back.source = FluTools.getUrlByFilePath(FluTheme.desktopImagePath)
-                    }
-                }
-            }
-            FluAcrylic{
-                anchors.fill: parent
-                target: img_back
-                tintOpacity: FluTheme.dark ? 0.80 : 0.75
-                blurRadius: 64
-                visible: window.active && FluTheme.blurBehindWindowEnabled
-                tintColor: FluTheme.dark ? Qt.rgba(0, 0, 0, 1)  : Qt.rgba(1, 1, 1, 1)
-                targetRect: Qt.rect(window.x,window.y,window.width,window.height)
-            }
-        }
     }
     Component{
         id:com_app_bar
@@ -330,12 +283,6 @@ Window {
     function showMaximized(){
         frameless.showMaximized()
     }
-    function showMinimized(){
-        frameless.showMinimized()
-    }
-    function showNormal(){
-        frameless.showNormal()
-    }
     function showLoading(text = "",cancel = true){
         if(text===""){
             text = qsTr("Loading...")

src/Qt5/imports/FluentUI/Controls/FluWindowDialog.qml

@@ -32,9 +32,9 @@ FluWindow {
             }
         }
     }
-    function showDialog(offsetX=0,offsetY=0){
+    function showDialog(){
-        var x = transientParent.x + (transientParent.width - width)/2 + offsetX
+        var x = transientParent.x + (transientParent.width - width)/2
-        var y = transientParent.y + (transientParent.height - height)/2 + offsetY
+        var y = transientParent.y + (transientParent.height - height)/2
         control.stayTop = Qt.binding(function(){return transientParent.stayTop})
         control.setGeometry(x,y,width,height)
         control.visibility = Window.Windowed

src/Qt5/imports/FluentUI/plugins.qmltypes

@@ -21,30 +21,6 @@ Module {
         Property { name: "lighter"; type: "QColor" }
         Property { name: "lightest"; type: "QColor" }
     }
-    Component {
-        name: "FluApp"
-        prototype: "QObject"
-        exports: ["FluentUI/FluApp 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "useSystemAppBar"; type: "bool" }
-        Property { name: "windowIcon"; type: "string" }
-        Property { name: "locale"; type: "QLocale" }
-        Method {
-            name: "init"
-            Parameter { name: "target"; type: "QObject"; isPointer: true }
-            Parameter { name: "locale"; type: "QLocale" }
-        }
-        Method {
-            name: "init"
-            Parameter { name: "target"; type: "QObject"; isPointer: true }
-        }
-        Method {
-            name: "iconDatas"
-            type: "QJsonArray"
-            Parameter { name: "keyword"; type: "string" }
-        }
-        Method { name: "iconDatas"; type: "QJsonArray" }
-    }
     Component {
         name: "FluCalendarViewType"
         exports: ["FluentUI/FluCalendarViewType 1.0"]
@@ -74,50 +50,6 @@ Module {
             Parameter { name: "code"; type: "string" }
         }
     }
-    Component {
-        name: "FluColors"
-        prototype: "QObject"
-        exports: ["FluentUI/FluColors 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "Transparent"; type: "QColor" }
-        Property { name: "Black"; type: "QColor" }
-        Property { name: "White"; type: "QColor" }
-        Property { name: "Grey10"; type: "QColor" }
-        Property { name: "Grey20"; type: "QColor" }
-        Property { name: "Grey30"; type: "QColor" }
-        Property { name: "Grey40"; type: "QColor" }
-        Property { name: "Grey50"; type: "QColor" }
-        Property { name: "Grey60"; type: "QColor" }
-        Property { name: "Grey70"; type: "QColor" }
-        Property { name: "Grey80"; type: "QColor" }
-        Property { name: "Grey90"; type: "QColor" }
-        Property { name: "Grey100"; type: "QColor" }
-        Property { name: "Grey110"; type: "QColor" }
-        Property { name: "Grey120"; type: "QColor" }
-        Property { name: "Grey130"; type: "QColor" }
-        Property { name: "Grey140"; type: "QColor" }
-        Property { name: "Grey150"; type: "QColor" }
-        Property { name: "Grey160"; type: "QColor" }
-        Property { name: "Grey170"; type: "QColor" }
-        Property { name: "Grey180"; type: "QColor" }
-        Property { name: "Grey190"; type: "QColor" }
-        Property { name: "Grey200"; type: "QColor" }
-        Property { name: "Grey210"; type: "QColor" }
-        Property { name: "Grey220"; type: "QColor" }
-        Property { name: "Yellow"; type: "FluAccentColor"; isPointer: true }
-        Property { name: "Orange"; type: "FluAccentColor"; isPointer: true }
-        Property { name: "Red"; type: "FluAccentColor"; isPointer: true }
-        Property { name: "Magenta"; type: "FluAccentColor"; isPointer: true }
-        Property { name: "Purple"; type: "FluAccentColor"; isPointer: true }
-        Property { name: "Blue"; type: "FluAccentColor"; isPointer: true }
-        Property { name: "Teal"; type: "FluAccentColor"; isPointer: true }
-        Property { name: "Green"; type: "FluAccentColor"; isPointer: true }
-        Method {
-            name: "createAccentColor"
-            type: "FluAccentColor*"
-            Parameter { name: "primaryColor"; type: "QColor" }
-        }
-    }
     Component {
         name: "FluContentDialogType"
         exports: ["FluentUI/FluContentDialogType 1.0"]
@@ -139,10 +71,10 @@ Module {
         exports: ["FluentUI/FluFrameless 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "appbar"; type: "QQuickItem"; isPointer: true }
+        Property { name: "topmost"; type: "bool" }
         Property { name: "maximizeButton"; type: "QQuickItem"; isPointer: true }
         Property { name: "minimizedButton"; type: "QQuickItem"; isPointer: true }
         Property { name: "closeButton"; type: "QQuickItem"; isPointer: true }
-        Property { name: "topmost"; type: "bool" }
         Property { name: "disabled"; type: "bool" }
         Property { name: "fixSize"; type: "bool" }
         Method { name: "showFullScreen" }
@@ -294,47 +226,6 @@ Module {
             Parameter { name: "filter"; type: "QJSValue" }
         }
     }
-    Component {
-        name: "FluTextStyle"
-        prototype: "QObject"
-        exports: ["FluentUI/FluTextStyle 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "family"; type: "string" }
-        Property { name: "Caption"; type: "QFont" }
-        Property { name: "Body"; type: "QFont" }
-        Property { name: "BodyStrong"; type: "QFont" }
-        Property { name: "Subtitle"; type: "QFont" }
-        Property { name: "Title"; type: "QFont" }
-        Property { name: "TitleLarge"; type: "QFont" }
-        Property { name: "Display"; type: "QFont" }
-    }
-    Component {
-        name: "FluTheme"
-        prototype: "QObject"
-        exports: ["FluentUI/FluTheme 1.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "dark"; type: "bool"; isReadonly: true }
-        Property { name: "accentColor"; type: "FluAccentColor"; isPointer: true }
-        Property { name: "primaryColor"; type: "QColor" }
-        Property { name: "backgroundColor"; type: "QColor" }
-        Property { name: "dividerColor"; type: "QColor" }
-        Property { name: "windowBackgroundColor"; type: "QColor" }
-        Property { name: "windowActiveBackgroundColor"; type: "QColor" }
-        Property { name: "fontPrimaryColor"; type: "QColor" }
-        Property { name: "fontSecondaryColor"; type: "QColor" }
-        Property { name: "fontTertiaryColor"; type: "QColor" }
-        Property { name: "itemNormalColor"; type: "QColor" }
-        Property { name: "frameColor"; type: "QColor" }
-        Property { name: "frameActiveColor"; type: "QColor" }
-        Property { name: "itemHoverColor"; type: "QColor" }
-        Property { name: "itemPressColor"; type: "QColor" }
-        Property { name: "itemCheckColor"; type: "QColor" }
-        Property { name: "desktopImagePath"; type: "string" }
-        Property { name: "darkMode"; type: "int" }
-        Property { name: "nativeText"; type: "bool" }
-        Property { name: "animationEnabled"; type: "bool" }
-        Property { name: "blurBehindWindowEnabled"; type: "bool" }
-    }
     Component {
         name: "FluThemeType"
         exports: ["FluentUI/FluThemeType 1.0"]
@@ -376,134 +267,13 @@ Module {
             }
         }
     }
-    Component {
-        name: "FluTools"
-        prototype: "QObject"
-        exports: ["FluentUI/FluTools 1.0"]
-        exportMetaObjectRevisions: [0]
-        Method { name: "qtMajor"; type: "int" }
-        Method { name: "qtMinor"; type: "int" }
-        Method { name: "isMacos"; type: "bool" }
-        Method { name: "isLinux"; type: "bool" }
-        Method { name: "isWin"; type: "bool" }
-        Method {
-            name: "clipText"
-            Parameter { name: "text"; type: "string" }
-        }
-        Method { name: "uuid"; type: "string" }
-        Method {
-            name: "readFile"
-            type: "string"
-            Parameter { name: "fileName"; type: "string" }
-        }
-        Method {
-            name: "setQuitOnLastWindowClosed"
-            Parameter { name: "val"; type: "bool" }
-        }
-        Method {
-            name: "setOverrideCursor"
-            Parameter { name: "shape"; type: "Qt::CursorShape" }
-        }
-        Method { name: "restoreOverrideCursor" }
-        Method {
-            name: "html2PlantText"
-            type: "string"
-            Parameter { name: "html"; type: "string" }
-        }
-        Method {
-            name: "toLocalPath"
-            type: "string"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-        Method {
-            name: "deleteLater"
-            Parameter { name: "p"; type: "QObject"; isPointer: true }
-        }
-        Method {
-            name: "getFileNameByUrl"
-            type: "string"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-        Method { name: "getVirtualGeometry"; type: "QRect" }
-        Method { name: "getApplicationDirPath"; type: "string" }
-        Method {
-            name: "getUrlByFilePath"
-            type: "QUrl"
-            Parameter { name: "path"; type: "string" }
-        }
-        Method {
-            name: "withOpacity"
-            type: "QColor"
-            Parameter { type: "QColor" }
-            Parameter { name: "alpha"; type: "double" }
-        }
-        Method {
-            name: "md5"
-            type: "string"
-            Parameter { name: "text"; type: "string" }
-        }
-        Method {
-            name: "sha256"
-            type: "string"
-            Parameter { name: "text"; type: "string" }
-        }
-        Method {
-            name: "toBase64"
-            type: "string"
-            Parameter { name: "text"; type: "string" }
-        }
-        Method {
-            name: "fromBase64"
-            type: "string"
-            Parameter { name: "text"; type: "string" }
-        }
-        Method {
-            name: "removeDir"
-            type: "bool"
-            Parameter { name: "dirPath"; type: "string" }
-        }
-        Method {
-            name: "removeFile"
-            type: "bool"
-            Parameter { name: "filePath"; type: "string" }
-        }
-        Method {
-            name: "showFileInFolder"
-            Parameter { name: "path"; type: "string" }
-        }
-        Method { name: "isSoftware"; type: "bool" }
-        Method { name: "currentTimestamp"; type: "qlonglong" }
-        Method { name: "cursorPos"; type: "QPoint" }
-        Method { name: "windowIcon"; type: "QIcon" }
-        Method { name: "cursorScreenIndex"; type: "int" }
-        Method { name: "windowBuildNumber"; type: "int" }
-        Method { name: "isWindows11OrGreater"; type: "bool" }
-        Method { name: "isWindows10OrGreater"; type: "bool" }
-        Method {
-            name: "desktopAvailableGeometry"
-            type: "QRect"
-            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
-        }
-        Method { name: "getWallpaperFilePath"; type: "string" }
-        Method {
-            name: "imageMainColor"
-            type: "QColor"
-            Parameter { name: "image"; type: "QImage" }
-            Parameter { name: "bright"; type: "double" }
-        }
-        Method {
-            name: "imageMainColor"
-            type: "QColor"
-            Parameter { name: "image"; type: "QImage" }
-        }
-    }
     Component {
         name: "FluTreeModel"
         prototype: "QAbstractItemModel"
         exports: ["FluentUI/FluTreeModel 1.0"]
         exportMetaObjectRevisions: [0]
         Property { name: "dataSourceSize"; type: "int" }
-        Property { name: "columnSource"; type: "QList<QVariantMap>" }
+        Property { name: "selectionModel"; type: "QList<FluTreeNode*>" }
         Method {
             name: "removeRows"
             Parameter { name: "row"; type: "int" }
@@ -519,11 +289,6 @@ Module {
             type: "QObject*"
             Parameter { name: "row"; type: "int" }
         }
-        Method {
-            name: "setRow"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "data"; type: "QVariantMap" }
-        }
         Method {
             name: "setData"
             Parameter { name: "data"; type: "QList<FluTreeNode*>" }
@@ -540,6 +305,12 @@ Module {
             name: "expand"
             Parameter { name: "row"; type: "int" }
         }
+        Method {
+            name: "dragAndDrop"
+            Parameter { name: "dragIndex"; type: "int" }
+            Parameter { name: "dropIndex"; type: "int" }
+            Parameter { name: "isDropTopArea"; type: "bool" }
+        }
         Method {
             name: "getNode"
             type: "FluTreeNode*"
@@ -561,7 +332,6 @@ Module {
         }
         Method { name: "allExpand" }
         Method { name: "allCollapse" }
-        Method { name: "selectionModel"; type: "QVariant" }
     }
     Component {
         name: "FluTreeViewType"
@@ -605,12 +375,12 @@ Module {
         }
     }
     Component {
-        name: "Fluent_Icons"
+        name: "Fluent_Awesome"
         exports: ["FluentUI/FluentIcons 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
         Enum {
-            name: "Fluent_IconType"
+            name: "Fluent_AwesomeType"
             values: {
                 "GlobalNavButton": 59136,
                 "Wifi": 59137,
@@ -2442,37 +2212,37 @@ Module {
         Property { name: "darkClickListener"; type: "QVariant" }
         Property {
             name: "buttonStayTop"
-            type: "FluIconButton_QMLTYPE_20"
+            type: "FluIconButton_QMLTYPE_19"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "buttonMinimize"
-            type: "FluIconButton_QMLTYPE_20"
+            type: "FluIconButton_QMLTYPE_19"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "buttonMaximize"
-            type: "FluIconButton_QMLTYPE_20"
+            type: "FluIconButton_QMLTYPE_19"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "buttonClose"
-            type: "FluIconButton_QMLTYPE_20"
+            type: "FluIconButton_QMLTYPE_19"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "buttonDark"
-            type: "FluIconButton_QMLTYPE_20"
+            type: "FluIconButton_QMLTYPE_19"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "layoutMacosButtons"
-            type: "FluLoader_QMLTYPE_14"
+            type: "FluLoader_QMLTYPE_13"
             isReadonly: true
             isPointer: true
         }
@@ -3162,15 +2932,15 @@ Module {
         defaultProperty: "data"
         Property { name: "logo"; type: "QUrl" }
         Property { name: "title"; type: "string" }
-        Property { name: "items"; type: "FluObject_QMLTYPE_172"; isPointer: true }
+        Property { name: "items"; type: "FluObject_QMLTYPE_137"; isPointer: true }
-        Property { name: "footerItems"; type: "FluObject_QMLTYPE_172"; isPointer: true }
+        Property { name: "footerItems"; type: "FluObject_QMLTYPE_137"; isPointer: true }
         Property { name: "displayMode"; type: "int" }
         Property { name: "autoSuggestBox"; type: "QQmlComponent"; isPointer: true }
         Property { name: "actionItem"; type: "QQmlComponent"; isPointer: true }
         Property { name: "topPadding"; type: "int" }
         Property { name: "pageMode"; type: "int" }
-        Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_33"; isPointer: true }
+        Property { name: "navItemRightMenu"; type: "FluMenu_QMLTYPE_38"; isPointer: true }
-        Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_33"; isPointer: true }
+        Property { name: "navItemExpanderRightMenu"; type: "FluMenu_QMLTYPE_38"; isPointer: true }
         Property { name: "navCompactWidth"; type: "int" }
         Property { name: "navTopMargin"; type: "int" }
         Property { name: "cellHeight"; type: "int" }
@@ -3178,13 +2948,13 @@ Module {
         Property { name: "hideNavAppBar"; type: "bool" }
         Property {
             name: "buttonMenu"
-            type: "FluIconButton_QMLTYPE_20"
+            type: "FluIconButton_QMLTYPE_19"
             isReadonly: true
             isPointer: true
         }
         Property {
             name: "buttonBack"
-            type: "FluIconButton_QMLTYPE_20"
+            type: "FluIconButton_QMLTYPE_19"
             isReadonly: true
             isPointer: true
         }
@@ -3996,23 +3766,21 @@ Module {
         Property { name: "previousText"; type: "string" }
     }
     Component {
-        prototype: "QQuickRectangle"
+        prototype: "QQuickItem"
         name: "FluentUI/FluTreeView 1.0"
         exports: ["FluentUI/FluTreeView 1.0"]
         exportMetaObjectRevisions: [0]
         isComposite: true
         defaultProperty: "data"
+        Property { name: "currentIndex"; type: "int" }
         Property { name: "dataSource"; type: "QVariant" }
-        Property { name: "columnSource"; type: "QVariant" }
         Property { name: "showLine"; type: "bool" }
+        Property { name: "draggable"; type: "bool" }
         Property { name: "cellHeight"; type: "int" }
         Property { name: "depthPadding"; type: "int" }
         Property { name: "checkable"; type: "bool" }
         Property { name: "lineColor"; type: "QColor" }
-        Property { name: "borderColor"; type: "QColor" }
+        Method { name: "selectionModel"; type: "QVariant" }
-        Property { name: "selectedBorderColor"; type: "QColor" }
-        Property { name: "selectedColor"; type: "QColor" }
-        Property { name: "current"; type: "QVariant"; isReadonly: true }
         Method { name: "count"; type: "QVariant" }
         Method { name: "visibleCount"; type: "QVariant" }
         Method {
@@ -4027,14 +3795,6 @@ Module {
         }
         Method { name: "allExpand"; type: "QVariant" }
         Method { name: "allCollapse"; type: "QVariant" }
-        Method {
-            name: "customItem"
-            type: "QVariant"
-            Parameter { name: "comId"; type: "QVariant" }
-            Parameter { name: "options"; type: "QVariant" }
-        }
-        Method { name: "closeEditor"; type: "QVariant" }
-        Method { name: "selectionModel"; type: "QVariant" }
     }
     Component {
         prototype: "QQuickWindowQmlImpl"

src/Qt5/imports/fluentui.qrc

@@ -2,6 +2,7 @@
     <qresource prefix="/qt/qml">
         <file>FluentUI/JS/Chart.js</file>
         <file>FluentUI/Image/noise.png</file>
+        <file>FluentUI/Font/Segoe_Fluent_Icons.ttf</file>
         <file>FluentUI/Controls/FluAcrylic.qml</file>
         <file>FluentUI/Controls/FluAppBar.qml</file>
         <file>FluentUI/Controls/FluAutoSuggestBox.qml</file>
@@ -109,6 +110,5 @@
         <file>FluentUI/Controls/FluSheet.qml</file>
         <file>FluentUI/Controls/FluGroupBox.qml</file>
         <file>FluentUI/Controls/FluControlBackground.qml</file>
-        <file>FluentUI/Font/FluentIcons.ttf</file>
     </qresource>
 </RCC>

src/Qt6/imports/FluentUI/Controls/FluAcrylic.qml

@@ -8,15 +8,15 @@ Item {
     property real tintOpacity: 0.65
     property real luminosity: 0.01
     property real noiseOpacity: 0.02
-    property var target
+    property alias target: effect_source.sourceItem
     property int blurRadius: 32
-    property rect targetRect: Qt.rect(control.x, control.y, control.width,control.height)
+    property rect targetRect: Qt.rect(control.x, control.y, control.width,
+                                      control.height)
     ShaderEffectSource {
         id: effect_source
         anchors.fill: parent
         visible: false
         sourceRect: control.targetRect
-        sourceItem: control.target
     }
     FastBlur {
         id: fast_blur
@@ -34,7 +34,7 @@ Item {
     }
     Image {
         anchors.fill: parent
-        source: "qrc:/qt/qml/FluentUI/Image/noise.png"
+        source: "../Image/noise.png"
         fillMode: Image.Tile
         opacity: control.noiseOpacity
     }