update

example/App.qml

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

example/CMakeLists.txt

@@ -24,23 +24,23 @@ endif()
 find_package(Qt6 COMPONENTS Core Quick QuickControls2 Concurrent Network Multimedia REQUIRED)
 
 set(SOURCES
-    ChatController.cpp
-    AppInfo.cpp
-    main.cpp
-    lang/Lang.cpp
-    lang/Zh.cpp
-    lang/En.cpp
-    IPC.cpp
+    src/controller/ChatController.cpp
+    src/AppInfo.cpp
+    src/main.cpp
+    src/lang/Lang.cpp
+    src/lang/Zh.cpp
+    src/lang/En.cpp
+    src/tool/IPC.cpp
 )
 
 set(HEADERS
-    ChatController.h
-    AppInfo.h
-    stdafx.h
-    lang/Lang.h
-    lang/Zh.h
-    lang/En.h
-    IPC.h
+    src/controller/ChatController.h
+    src/AppInfo.h
+    src/stdafx.h
+    src/lang/Lang.h
+    src/lang/Zh.h
+    src/lang/En.h
+    src/tool/IPC.h
 )
 
 set(RESOURCES

example/example.pro

@@ -3,22 +3,22 @@ CONFIG += c++17
 DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT
 
 HEADERS += \
-    lang/En.h \
-    lang/Lang.h \
-    lang/Zh.h \
-    stdafx.h \
-    ChatController.h \
-    AppInfo.h \
-    IPC.h
+    src/lang/En.h \
+    src/lang/Lang.h \
+    src/lang/Zh.h \
+    src/stdafx.h \
+    src/controller/ChatController.h \
+    src/AppInfo.h \
+    src/tool/IPC.h
 
 SOURCES += \
-        ChatController.cpp \
-        AppInfo.cpp \
-        lang/En.cpp \
-        lang/Lang.cpp \
-        lang/Zh.cpp \
-        main.cpp \
-        IPC.cpp
+        src/controller/ChatController.cpp \
+        src/AppInfo.cpp \
+        src/lang/En.cpp \
+        src/lang/Lang.cpp \
+        src/lang/Zh.cpp \
+        src/main.cpp \
+        src/tool/IPC.cpp
 
 RESOURCES += qml.qrc
 

example/qml.qrc

@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>App.qml</file>
         <file>res/image/image_huoyin.webp</file>
         <file>res/svg/avatar_1.svg</file>
         <file>res/svg/avatar_2.svg</file>
@@ -14,40 +13,11 @@
         <file>res/svg/avatar_10.svg</file>
         <file>res/svg/avatar_11.svg</file>
         <file>res/svg/avatar_12.svg</file>
-        <file>page/AboutPage.qml</file>
-        <file>page/MainPage.qml</file>
-        <file>page/LoginPage.qml</file>
-        <file>T_ToggleSwitch.qml</file>
-        <file>T_Typography.qml</file>
-        <file>T_Awesome.qml</file>
-        <file>T_Buttons.qml</file>
-        <file>T_Rectangle.qml</file>
-        <file>T_InfoBar.qml</file>
-        <file>T_Progress.qml</file>
-        <file>T_Slider.qml</file>
-        <file>T_TextBox.qml</file>
-        <file>T_Theme.qml</file>
-        <file>T_Dialog.qml</file>
-        <file>T_TreeView.qml</file>
-        <file>T_Expander.qml</file>
-        <file>T_TimePicker.qml</file>
-        <file>T_DatePicker.qml</file>
-        <file>T_MultiWindow.qml</file>
-        <file>T_Menu.qml</file>
         <file>res/image/banner_1.jpg</file>
         <file>res/image/banner_2.jpg</file>
         <file>res/image/banner_3.jpg</file>
         <file>res/image/logo_openai.png</file>
-        <file>page/ChatPage.qml</file>
-        <file>T_Tooltip.qml</file>
-        <file>T_Badge.qml</file>
-        <file>T_CalendarPicker.qml</file>
-        <file>T_ColorPicker.qml</file>
-        <file>T_Carousel.qml</file>
-        <file>T_MediaPlayer.qml</file>
-        <file>T_TabView.qml</file>
         <file>res/image/favicon.ico</file>
-        <file>T_Home.qml</file>
         <file>res/image/bg_home_header.png</file>
         <file>res/image/ic_home_github.png</file>
         <file>res/image/control/Acrylic.png</file>
@@ -148,25 +118,55 @@
         <file>res/image/control/Viewbox.png</file>
         <file>res/image/control/WebView.png</file>
         <file>res/image/control/XamlUICommand.png</file>
-        <file>T_CheckBox.qml</file>
-        <file>global/ItemsOriginal.qml</file>
-        <file>global/qmldir</file>
-        <file>global/ItemsFooter.qml</file>
-        <file>page/MediaPage.qml</file>
-        <file>T_FlipView.qml</file>
-        <file>T_Pivot.qml</file>
-        <file>component/CodeExpander.qml</file>
-        <file>T_TableView.qml</file>
-        <file>T_StatusView.qml</file>
-        <file>T_Settings.qml</file>
-        <file>global/MainEvent.qml</file>
         <file>res/svg/home.svg</file>
         <file>res/svg/home_dark.svg</file>
-        <file>page/StandardWindow.qml</file>
-        <file>page/SingleTaskWindow.qml</file>
-        <file>page/SingleInstanceWindow.qml</file>
-        <file>T_RatingControl.qml</file>
         <file>res/image/qrcode_wx.jpg</file>
         <file>res/image/qrcode_zfb.jpg</file>
+        <file>qml/component/CodeExpander.qml</file>
+        <file>qml/global/ItemsFooter.qml</file>
+        <file>qml/global/ItemsOriginal.qml</file>
+        <file>qml/global/MainEvent.qml</file>
+        <file>qml/global/qmldir</file>
+        <file>qml/App.qml</file>
+        <file>qml/window/AboutWindow.qml</file>
+        <file>qml/window/ChatWindow.qml</file>
+        <file>qml/window/LoginWindow.qml</file>
+        <file>qml/window/MainWindow.qml</file>
+        <file>qml/window/MediaWindow.qml</file>
+        <file>qml/window/SingleInstanceWindow.qml</file>
+        <file>qml/window/SingleTaskWindow.qml</file>
+        <file>qml/window/StandardWindow.qml</file>
+        <file>qml/page/T_Awesome.qml</file>
+        <file>qml/page/T_Badge.qml</file>
+        <file>qml/page/T_Buttons.qml</file>
+        <file>qml/page/T_CalendarPicker.qml</file>
+        <file>qml/page/T_Carousel.qml</file>
+        <file>qml/page/T_CheckBox.qml</file>
+        <file>qml/page/T_ColorPicker.qml</file>
+        <file>qml/page/T_DatePicker.qml</file>
+        <file>qml/page/T_Dialog.qml</file>
+        <file>qml/page/T_Expander.qml</file>
+        <file>qml/page/T_FlipView.qml</file>
+        <file>qml/page/T_Home.qml</file>
+        <file>qml/page/T_InfoBar.qml</file>
+        <file>qml/page/T_MediaPlayer.qml</file>
+        <file>qml/page/T_Menu.qml</file>
+        <file>qml/page/T_MultiWindow.qml</file>
+        <file>qml/page/T_Pivot.qml</file>
+        <file>qml/page/T_Progress.qml</file>
+        <file>qml/page/T_RatingControl.qml</file>
+        <file>qml/page/T_Rectangle.qml</file>
+        <file>qml/page/T_Settings.qml</file>
+        <file>qml/page/T_Slider.qml</file>
+        <file>qml/page/T_StatusView.qml</file>
+        <file>qml/page/T_TableView.qml</file>
+        <file>qml/page/T_TabView.qml</file>
+        <file>qml/page/T_TextBox.qml</file>
+        <file>qml/page/T_Theme.qml</file>
+        <file>qml/page/T_TimePicker.qml</file>
+        <file>qml/page/T_ToggleSwitch.qml</file>
+        <file>qml/page/T_Tooltip.qml</file>
+        <file>qml/page/T_TreeView.qml</file>
+        <file>qml/page/T_Typography.qml</file>
     </qresource>
 </RCC>

example/qml/App.qml

@@ -0,0 +1,26 @@
+import QtQuick
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+Window {
+    id:app
+    Component.onCompleted: {
+        FluApp.init(app)
+        FluTheme.frameless = ("windows" === Qt.platform.os)
+        FluTheme.darkMode = FluDarkMode.System
+        FluApp.routes = {
+            "/":"qrc:/qml/window/MainWindow.qml",
+            "/about":"qrc:/qml/window/AboutWindow.qml",
+            "/login":"qrc:/qml/window/LoginWindow.qml",
+            "/chat":"qrc:/qml/window/ChatWindow.qml",
+            "/media":"qrc:/qml/window/MediaWindow.qml",
+            "/singleTaskWindow":"qrc:/qml/window/SingleTaskWindow.qml",
+            "/standardWindow":"qrc:/qml/window/StandardWindow.qml",
+            "/singleInstanceWindow":"qrc:/qml/window/SingleInstanceWindow.qml"
+        }
+        FluApp.initialRoute = "/"
+        FluApp.run()
+    }
+}

example/qml/global/ItemsFooter.qml

@@ -20,7 +20,7 @@ FluObject{
         title:lang.settings
         icon:FluentIcons.Settings
         onTap:{
-            navigationView.push("qrc:/T_Settings.qml")
+            navigationView.push("qrc:/qml/page/T_Settings.qml")
         }
     }
 }

example/qml/global/ItemsOriginal.qml

@@ -18,7 +18,7 @@ FluObject{
             height: 18
         }
         onTap:{
-            navigationView.push("qrc:/T_Home.qml")
+            navigationView.push("qrc:/qml/page/T_Home.qml")
         }
     }
 
@@ -31,7 +31,7 @@ FluObject{
             recentlyUpdated:true
             desc:"A control that responds to user input and raisesa Click event."
             onTap:{
-                navigationView.push("qrc:/T_Buttons.qml")
+                navigationView.push("qrc:/qml/page/T_Buttons.qml")
             }
         }
         FluPaneItem{
@@ -40,7 +40,7 @@ FluObject{
             recentlyUpdated:true
             desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack."
             onTap:{
-                navigationView.push("qrc:/T_Slider.qml")
+                navigationView.push("qrc:/qml/page/T_Slider.qml")
             }
         }
         FluPaneItem{
@@ -49,13 +49,13 @@ FluObject{
             recentlyUpdated:true
             desc:"A control that a user can select or clear."
             onTap:{
-                navigationView.push("qrc:/T_CheckBox.qml")
+                navigationView.push("qrc:/qml/page/T_CheckBox.qml")
             }
         }
         FluPaneItem{
             title:"ToggleSwitch"
             onTap:{
-                navigationView.push("qrc:/T_ToggleSwitch.qml")
+                navigationView.push("qrc:/qml/page/T_ToggleSwitch.qml")
             }
         }
     }
@@ -66,31 +66,31 @@ FluObject{
         FluPaneItem{
             title:"TextBox"
             onTap:{
-                navigationView.push("qrc:/T_TextBox.qml")
+                navigationView.push("qrc:/qml/page/T_TextBox.qml")
             }
         }
         FluPaneItem{
             title:"TimePicker"
             onTap:{
-                navigationView.push("qrc:/T_TimePicker.qml")
+                navigationView.push("qrc:/qml/page/T_TimePicker.qml")
             }
         }
         FluPaneItem{
             title:"DatePicker"
             onTap:{
-                navigationView.push("qrc:/T_DatePicker.qml")
+                navigationView.push("qrc:/qml/page/T_DatePicker.qml")
             }
         }
         FluPaneItem{
             title:"CalendarPicker"
             onTap:{
-                navigationView.push("qrc:/T_CalendarPicker.qml")
+                navigationView.push("qrc:/qml/page/T_CalendarPicker.qml")
             }
         }
         FluPaneItem{
             title:"ColorPicker"
             onTap:{
-                navigationView.push("qrc:/T_ColorPicker.qml")
+                navigationView.push("qrc:/qml/page/T_ColorPicker.qml")
             }
         }
     }
@@ -104,49 +104,49 @@ FluObject{
             recentlyUpdated:true
             desc:"An inline message to display app-wide statuschange information."
             onTap:{
-                navigationView.push("qrc:/T_InfoBar.qml")
+                navigationView.push("qrc:/qml/page/T_InfoBar.qml")
             }
         }
         FluPaneItem{
             title:"Progress"
             onTap:{
-                navigationView.push("qrc:/T_Progress.qml")
+                navigationView.push("qrc:/qml/page/T_Progress.qml")
             }
         }
         FluPaneItem{
             title:"RatingControl"
             onTap:{
-                navigationView.push("qrc:/T_RatingControl.qml")
+                navigationView.push("qrc:/qml/page/T_RatingControl.qml")
             }
         }
         FluPaneItem{
             title:"Badge"
             onTap:{
-                navigationView.push("qrc:/T_Badge.qml")
+                navigationView.push("qrc:/qml/page/T_Badge.qml")
             }
         }
         FluPaneItem{
             title:"Rectangle"
             onTap:{
-                navigationView.push("qrc:/T_Rectangle.qml")
+                navigationView.push("qrc:/qml/page/T_Rectangle.qml")
             }
         }
         FluPaneItem{
             title:"StatusView"
             onTap:{
-                navigationView.push("qrc:/T_StatusView.qml")
+                navigationView.push("qrc:/qml/page/T_StatusView.qml")
             }
         }
         FluPaneItem{
             title:"Carousel"
             onTap:{
-                navigationView.push("qrc:/T_Carousel.qml")
+                navigationView.push("qrc:/qml/page/T_Carousel.qml")
             }
         }
         FluPaneItem{
             title:"Expander"
             onTap:{
-                navigationView.push("qrc:/T_Expander.qml")
+                navigationView.push("qrc:/qml/page/T_Expander.qml")
             }
         }
     }
@@ -157,19 +157,19 @@ FluObject{
         FluPaneItem{
             title:"Dialog"
             onTap:{
-                navigationView.push("qrc:/T_Dialog.qml")
+                navigationView.push("qrc:/qml/page/T_Dialog.qml")
             }
         }
         FluPaneItem{
             title:"Tooltip"
             onTap:{
-                navigationView.push("qrc:/T_Tooltip.qml")
+                navigationView.push("qrc:/qml/page/T_Tooltip.qml")
             }
         }
         FluPaneItem{
             title:"Menu"
             onTap:{
-                navigationView.push("qrc:/T_Menu.qml")
+                navigationView.push("qrc:/qml/page/T_Menu.qml")
             }
         }
     }
@@ -184,7 +184,7 @@ FluObject{
             order:3
             desc:"Presents information from different sources in atabbed view."
             onTap:{
-                navigationView.push("qrc:/T_Pivot.qml")
+                navigationView.push("qrc:/qml/page/T_Pivot.qml")
             }
         }
         FluPaneItem{
@@ -194,13 +194,13 @@ FluObject{
             order:1
             desc:"A control that displays a collection of tabs thatcan be used to display several documents."
             onTap:{
-                navigationView.push("qrc:/T_TabView.qml")
+                navigationView.push("qrc:/qml/page/T_TabView.qml")
             }
         }
         FluPaneItem{
             title:"TreeView"
             onTap:{
-                navigationView.push("qrc:/T_TreeView.qml")
+                navigationView.push("qrc:/qml/page/T_TreeView.qml")
             }
         }
         FluPaneItem{
@@ -210,13 +210,13 @@ FluObject{
             order:4
             desc:"The TableView control provides a flexible way to display a collection of data in rows and columns"
             onTap:{
-                navigationView.push("qrc:/T_TableView.qml")
+                navigationView.push("qrc:/qml/page/T_TableView.qml")
             }
         }
         FluPaneItem{
             title:"MultiWindow"
             onTap:{
-                navigationView.push("qrc:/T_MultiWindow.qml")
+                navigationView.push("qrc:/qml/page/T_MultiWindow.qml")
             }
         }
         FluPaneItem{
@@ -226,7 +226,7 @@ FluObject{
             order:2
             desc:"Presents a collection of items that the user canflip through, one item at a time."
             onTap:{
-                navigationView.push("qrc:/T_FlipView.qml")
+                navigationView.push("qrc:/qml/page/T_FlipView.qml")
             }
         }
     }
@@ -237,19 +237,19 @@ FluObject{
         FluPaneItem{
             title:"Theme"
             onTap:{
-                navigationView.push("qrc:/T_Theme.qml")
+                navigationView.push("qrc:/qml/page/T_Theme.qml")
             }
         }
         FluPaneItem{
             title:"Typography"
             onTap:{
-                navigationView.push("qrc:/T_Typography.qml")
+                navigationView.push("qrc:/qml/page/T_Typography.qml")
             }
         }
         FluPaneItem{
             title:"Awesome"
             onTap:{
-                navigationView.push("qrc:/T_Awesome.qml")
+                navigationView.push("qrc:/qml/page/T_Awesome.qml")
             }
         }
     }
@@ -264,7 +264,7 @@ FluObject{
             order:0
             desc:"A control to display video and image content."
             onTap:{
-                navigationView.push("qrc:/T_MediaPlayer.qml")
+                navigationView.push("qrc:/qml/page/T_MediaPlayer.qml")
             }
         }
     }

example/qml/page/T_Badge.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Buttons.qml

@@ -4,7 +4,7 @@ import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Controls.Basic
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
     title:"Buttons"

example/qml/page/T_CalendarPicker.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Carousel.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_CheckBox.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_ColorPicker.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_DatePicker.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Dialog.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Expander.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_FlipView.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Home.qml

@@ -2,7 +2,7 @@
 import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
-import "qrc:///global/"
+import "qrc:///qml/global/"
 import FluentUI
 
 FluScrollablePage{

example/qml/page/T_InfoBar.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_MediaPlayer.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Menu.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_MultiWindow.qml

@@ -3,12 +3,12 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 
     property string password: ""
-    property var loginPageRegister: registerForPageResult("/login")
+    property var loginPageRegister: registerForWindowResult("/login")
 
     title:"MultiWindow"
     leftPadding:10
@@ -168,7 +168,7 @@ FluScrollablePage{
     CodeExpander{
         Layout.fillWidth: true
         Layout.topMargin: -1
-        code:'property var loginPageRegister: registerForPageResult("/login")
+        code:'property var loginPageRegister: registerForWindowResult("/login")
 
 Connections{
     target: loginPageRegister

example/qml/page/T_Pivot.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Progress.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_RatingControl.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Rectangle.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Settings.qml

@@ -3,8 +3,8 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "qrc:///global/"
-import "./component"
+import "qrc:///qml/global/"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Slider.qml

@@ -2,7 +2,7 @@
 import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
-import "./component"
+import "../component"
 import FluentUI
 
 FluScrollablePage{

example/qml/page/T_StatusView.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_TabView.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_TableView.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_TextBox.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Theme.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_TimePicker.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_ToggleSwitch.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_Tooltip.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage{
 

example/qml/page/T_TreeView.qml

@@ -3,7 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
-import "./component"
+import "../component"
 
 FluScrollablePage {
 

example/qml/window/MainWindow.qml

@@ -4,7 +4,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt.labs.platform
 import FluentUI
-import "qrc:///global/"
+import "qrc:///qml/global/"
 
 FluWindow {
     id:window

example/src/AppInfo.cpp

@@ -2,7 +2,6 @@
 #include "lang/En.h"
 #include "lang/Zh.h"
 
-
 AppInfo::AppInfo(QObject *parent)
     : QObject{parent}
 {

example/src/controller/ChatController.h

@@ -11,7 +11,7 @@
 #include <QClipboard>
 #include <QByteArray>
 #include <QFile>
-#include "stdafx.h"
+#include "../stdafx.h"
 
 class ChatController : public QObject
 {

example/src/main.cpp

@@ -6,8 +6,8 @@
 #include <QProcess>
 #include "lang/Lang.h"
 #include "AppInfo.h"
-#include "ChatController.h"
-#include "IPC.h"
+#include "controller/ChatController.h"
+#include "tool/IPC.h"
 
 int main(int argc, char *argv[])
 {
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
         context->setContextProperty("lang",appInfo->lang());
     });
     context->setContextProperty("appInfo",appInfo);
-    const QUrl url(QStringLiteral("qrc:/App.qml"));
+    const QUrl url(QStringLiteral("qrc:/qml/App.qml"));
     QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,
         &app, [url](QObject *obj, const QUrl &objUrl) {
             if (!obj && url == objUrl)

src/controls/FluIconButton.qml

@@ -39,7 +39,6 @@ Button {
     id:control
     width: 30
     height: 30
-    clip: true
     implicitWidth: width
     implicitHeight: height
     padding: 0

src/controls/FluNavigationView.qml

@@ -509,6 +509,7 @@ Item {
                 onClicked: {
                     d.enableNavigationPanel = !d.enableNavigationPanel
                 }
+                visible: Layout.preferredWidth !== 0
                 Behavior on Layout.preferredWidth{
                     NumberAnimation{
                         duration: 167
@@ -639,7 +640,7 @@ Item {
             width: layout_list.width
             clip: true
             y:nav_app_bar.height
-            height: 38
+            height: autoSuggestBox ? 38 : 0
             Loader{
                 id:loader_auto_suggest_box
                 anchors.centerIn: parent

src/controls/FluTextBoxBackground.qml

@@ -48,7 +48,9 @@ Rectangle{
         }
         Behavior on height{
             NumberAnimation{
-                duration: 200
+                duration: 167
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: [ 1, 0, 0, 0 ]
             }
         }
     }

src/controls/FluWindow.qml

@@ -90,7 +90,7 @@ ApplicationWindow {
         infoBar.showError(text,duration,moremsg);
     }
 
-    function registerForPageResult(path){
+    function registerForWindowResult(path){
         return helper.createRegister(window,path)
     }