update

zhuzichu520 · Feb 23, 2024 · c330dc8 · c330dc8
1 parent 438d1fe
commit c330dc8
Show file tree

Hide file tree

Showing 25 changed files with 84 additions and 84 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest]
-        qt_ver: [6.6.1]
+        qt_ver: [6.6.2]
         qt_arch: [clang_64]
     env:
       targetName: example

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        qt_ver: [6.6.1]
+        qt_ver: [6.6.2]
         qt_arch: [gcc_64]
     env:
       targetName: example

diff --git a/.github/workflows/windows-mingw.yml b/.github/workflows/windows-mingw.yml
@@ -24,7 +24,7 @@ jobs:
         os: [windows-latest]
         include:
           - qt_arch: win64_mingw
-            qt_ver: 6.6.1
+            qt_ver: 6.6.2
             qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900"
             qt_tools_mingw_install: mingw900_64
     env:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         os: [windows-latest]
         include:
-          - qt_ver: 6.6.1        
+          - qt_ver: 6.6.2        
             qt_arch: win64_msvc2019_64
             msvc_arch: x64
             qt_arch_install: msvc2019_64  

diff --git a/example/example.qrc b/example/example.qrc
@@ -157,7 +157,7 @@
         <file>qml/page/T_Screenshot.qml</file>
         <file>qml/page/T_Settings.qml</file>
         <file>qml/page/T_Slider.qml</file>
-        <file>qml/page/T_StatusView.qml</file>
+        <file>qml/page/T_StatusLayout.qml</file>
         <file>qml/page/T_TableView.qml</file>
         <file>qml/page/T_TabView.qml</file>
         <file>qml/page/T_Text.qml</file>

diff --git a/example/qml-Qt6/component/CodeExpander.qml b/example/qml-Qt6/component/CodeExpander.qml
@@ -118,7 +118,7 @@ FluExpander{
                     "FluTableView",
                     "FluColors",
                     "FluTheme",
-                    "FluStatusView",
+                    "FluStatusLayout",
                     "FluRatingControl",
                     "FluPasswordBox",
                     "FluBreadcrumbBar",

diff --git a/example/qml-Qt6/global/ItemsOriginal.qml b/example/qml-Qt6/global/ItemsOriginal.qml
@@ -192,12 +192,6 @@ FluObject{
             url:"qrc:/example/qml/page/T_Clip.qml"
             onTap:{ navigationView.push(url) }
         }
-        FluPaneItem{
-            title:"StatusView"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_StatusView.qml"
-            onTap:{ navigationView.push(url) }
-        }
         FluPaneItem{
             title:"Carousel"
             menuDelegate: paneItemMenu
@@ -233,6 +227,12 @@ FluObject{
             url:"qrc:/example/qml/page/T_SplitLayout.qml"
             onTap:{ navigationView.push(url) }
         }
+        FluPaneItem{
+            title:"StatusLayout"
+            menuDelegate: paneItemMenu
+            url:"qrc:/example/qml/page/T_StatusLayout.qml"
+            onTap:{ navigationView.push(url) }
+        }
     }
 
     FluPaneItemExpander{

diff --git a/example/qml-Qt6/page/T_StatusView.qml → example/qml-Qt6/page/T_StatusLayout.qml b/example/qml-Qt6/page/T_StatusView.qml → example/qml-Qt6/page/T_StatusLayout.qml
@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"StatusView"
+    title:"StatusLayout"
 
     FluArea{
         id:layout_actions
@@ -25,28 +25,28 @@ FluScrollablePage{
                     text:"Loading"
                     onClicked: {
                         btn_status_mode.text = text
-                        status_view.statusMode = FluStatusViewType.Loading
+                        status_view.statusMode = FluStatusLayoutType.Loading
                     }
                 }
                 FluMenuItem{
                     text:"Empty"
                     onClicked: {
                         btn_status_mode.text = text
-                        status_view.statusMode = FluStatusViewType.Empty
+                        status_view.statusMode = FluStatusLayoutType.Empty
                     }
                 }
                 FluMenuItem{
                     text:"Error"
                     onClicked: {
                         btn_status_mode.text = text
-                        status_view.statusMode = FluStatusViewType.Error
+                        status_view.statusMode = FluStatusLayoutType.Error
                     }
                 }
                 FluMenuItem{
                     text:"Success"
                     onClicked: {
                         btn_status_mode.text = text
-                        status_view.statusMode = FluStatusViewType.Success
+                        status_view.statusMode = FluStatusLayoutType.Success
                     }
                 }
             }
@@ -58,7 +58,7 @@ FluScrollablePage{
         Layout.topMargin: 10
         height: 380
         paddings: 10
-        FluStatusView{
+        FluStatusLayout{
             id:status_view
             anchors.fill: parent
             onErrorClicked:{
@@ -73,9 +73,9 @@ FluScrollablePage{
     CodeExpander{
         Layout.fillWidth: true
         Layout.topMargin: -1
-        code:'FluStatusView{
+        code:'FluStatusLayout{
     anchors.fill: parent
-    statusMode: FluStatusViewType.Loading
+    statusMode: FluStatusLayoutType.Loading
     Rectangle{
         anchors.fill: parent
         color:FluTheme.primaryColor

diff --git a/example/qml-Qt6/window/HotloadWindow.qml b/example/qml-Qt6/window/HotloadWindow.qml
@@ -25,7 +25,7 @@ FluWindow {
         FluRemoteLoader{
             id:loader
             anchors.fill: parent
-            statusMode: FluStatusViewType.Success
+            statusMode: FluStatusLayoutType.Success
             lazy: true
             errorItem: Item{
                 FluText{
@@ -43,7 +43,7 @@ FluWindow {
             text:"拖入qml文件"
             font.pixelSize: 26
             anchors.centerIn: parent
-            visible: !loader.itemLodaer().item && loader.statusMode === FluStatusViewType.Success
+            visible: !loader.itemLodaer().item && loader.statusMode === FluStatusLayoutType.Success
         }
         Rectangle{
             radius: 4

diff --git a/example/qml/component/CodeExpander.qml b/example/qml/component/CodeExpander.qml
@@ -118,7 +118,7 @@ FluExpander{
                     "FluTableView",
                     "FluColors",
                     "FluTheme",
-                    "FluStatusView",
+                    "FluStatusLayout",
                     "FluRatingControl",
                     "FluPasswordBox",
                     "FluBreadcrumbBar",

diff --git a/example/qml/global/ItemsOriginal.qml b/example/qml/global/ItemsOriginal.qml
@@ -192,12 +192,6 @@ FluObject{
             url:"qrc:/example/qml/page/T_Clip.qml"
             onTap:{ navigationView.push(url) }
         }
-        FluPaneItem{
-            title:"StatusView"
-            menuDelegate: paneItemMenu
-            url:"qrc:/example/qml/page/T_StatusView.qml"
-            onTap:{ navigationView.push(url) }
-        }
         FluPaneItem{
             title:"Carousel"
             menuDelegate: paneItemMenu
@@ -233,6 +227,12 @@ FluObject{
             url:"qrc:/example/qml/page/T_SplitLayout.qml"
             onTap:{ navigationView.push(url) }
         }
+        FluPaneItem{
+            title:"StatusLayout"
+            menuDelegate: paneItemMenu
+            url:"qrc:/example/qml/page/T_StatusLayout.qml"
+            onTap:{ navigationView.push(url) }
+        }
     }
 
     FluPaneItemExpander{

diff --git a/example/qml/page/T_StatusView.qml → example/qml/page/T_StatusLayout.qml b/example/qml/page/T_StatusView.qml → example/qml/page/T_StatusLayout.qml
@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"StatusView"
+    title:"StatusLayout"
 
     FluArea{
         id:layout_actions
@@ -25,28 +25,28 @@ FluScrollablePage{
                     text:"Loading"
                     onClicked: {
                         btn_status_mode.text = text
-                        status_view.statusMode = FluStatusViewType.Loading
+                        status_view.statusMode = FluStatusLayoutType.Loading
                     }
                 }
                 FluMenuItem{
                     text:"Empty"
                     onClicked: {
                         btn_status_mode.text = text
-                        status_view.statusMode = FluStatusViewType.Empty
+                        status_view.statusMode = FluStatusLayoutType.Empty
                     }
                 }
                 FluMenuItem{
                     text:"Error"
                     onClicked: {
                         btn_status_mode.text = text
-                        status_view.statusMode = FluStatusViewType.Error
+                        status_view.statusMode = FluStatusLayoutType.Error
                     }
                 }
                 FluMenuItem{
                     text:"Success"
                     onClicked: {
                         btn_status_mode.text = text
-                        status_view.statusMode = FluStatusViewType.Success
+                        status_view.statusMode = FluStatusLayoutType.Success
                     }
                 }
             }
@@ -58,7 +58,7 @@ FluScrollablePage{
         Layout.topMargin: 10
         height: 380
         paddings: 10
-        FluStatusView{
+        FluStatusLayout{
             id:status_view
             anchors.fill: parent
             onErrorClicked:{
@@ -73,9 +73,9 @@ FluScrollablePage{
     CodeExpander{
         Layout.fillWidth: true
         Layout.topMargin: -1
-        code:'FluStatusView{
+        code:'FluStatusLayout{
     anchors.fill: parent
-    statusMode: FluStatusViewType.Loading
+    statusMode: FluStatusLayoutType.Loading
     Rectangle{
         anchors.fill: parent
         color:FluTheme.primaryColor

diff --git a/example/qml/window/HotloadWindow.qml b/example/qml/window/HotloadWindow.qml
@@ -25,7 +25,7 @@ FluWindow {
         FluRemoteLoader{
             id:loader
             anchors.fill: parent
-            statusMode: FluStatusViewType.Success
+            statusMode: FluStatusLayoutType.Success
             lazy: true
             errorItem: Item{
                 FluText{
@@ -43,7 +43,7 @@ FluWindow {
             text:"拖入qml文件"
             font.pixelSize: 26
             anchors.centerIn: parent
-            visible: !loader.itemLodaer().item && loader.statusMode === FluStatusViewType.Success
+            visible: !loader.itemLodaer().item && loader.statusMode === FluStatusLayoutType.Success
         }
         Rectangle{
             radius: 4

diff --git a/src/Def.h b/src/Def.h
@@ -92,7 +92,7 @@ Q_ENUM_NS(SelectionMode)
 QML_NAMED_ELEMENT(FluTreeViewType)
 }
 
-namespace FluStatusViewType {
+namespace FluStatusLayoutType {
 Q_NAMESPACE
 enum StatusMode {
     Loading = 0x0000,
@@ -101,7 +101,7 @@ enum StatusMode {
     Success = 0x0004
 };
 Q_ENUM_NS(StatusMode)
-QML_NAMED_ELEMENT(FluStatusViewType)
+QML_NAMED_ELEMENT(FluStatusLayoutType)
 }
 
 namespace FluContentDialogType {

diff --git a/src/FluentUI.cpp b/src/FluentUI.cpp
@@ -114,7 +114,7 @@ void FluentUI::registerTypes(const char *uri){
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluShadow.qml"),uri,major,minor,"FluShadow");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluSlider.qml"),uri,major,minor,"FluSlider");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluSpinBox.qml"),uri,major,minor,"FluSpinBox");
-    qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluStatusView.qml"),uri,major,minor,"FluStatusView");
+    qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluStatusLayout.qml"),uri,major,minor,"FluStatusLayout");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluTabView.qml"),uri,major,minor,"FluTabView");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluTableView.qml"),uri,major,minor,"FluTableView");
     qmlRegisterType(QUrl("qrc:/qt/qml/FluentUI/Controls/FluText.qml"),uri,major,minor,"FluText");
@@ -144,7 +144,7 @@ void FluentUI::registerTypes(const char *uri){
     qmlRegisterUncreatableMetaObject(FluPageType::staticMetaObject,  uri,major,minor,"FluPageType", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluWindowType::staticMetaObject,  uri,major,minor,"FluWindowType", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluTreeViewType::staticMetaObject,  uri,major,minor,"FluTreeViewType", "Access to enums & flags only");
-    qmlRegisterUncreatableMetaObject(FluStatusViewType::staticMetaObject,  uri,major,minor,"FluStatusViewType", "Access to enums & flags only");
+    qmlRegisterUncreatableMetaObject(FluStatusLayoutType::staticMetaObject,  uri,major,minor,"FluStatusLayoutType", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluContentDialogType::staticMetaObject,  uri,major,minor,"FluContentDialogType", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluTimePickerType::staticMetaObject,  uri,major,minor,"FluTimePickerType", "Access to enums & flags only");
     qmlRegisterUncreatableMetaObject(FluCalendarViewType::staticMetaObject,  uri,major,minor,"FluCalendarViewType", "Access to enums & flags only");

diff --git a/src/Qt5/imports/FluentUI/Controls/FluContentPage.qml b/src/Qt5/imports/FluentUI/Controls/FluContentPage.qml
@@ -37,10 +37,10 @@ FluPage {
             rightMargin: control.rightPadding
         }
     }
-    FluStatusView{
+    FluStatusLayout{
         id:status_view
         color: "#00000000"
-        statusMode: FluStatusViewType.Success
+        statusMode: FluStatusLayoutType.Success
         onErrorClicked: control.errorClicked()
         anchors{
             left: parent.left

diff --git a/src/Qt5/imports/FluentUI/Controls/FluRemoteLoader.qml b/src/Qt5/imports/FluentUI/Controls/FluRemoteLoader.qml
@@ -2,7 +2,7 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import FluentUI 1.0
 
-FluStatusView {
+FluStatusLayout {
     property url source: ""
     property bool lazy: false
     color:"transparent"
@@ -21,11 +21,11 @@ FluStatusView {
         asynchronous: true
         onStatusChanged: {
             if(status === Loader.Error){
-                control.statusMode = FluStatusViewType.Error
+                control.statusMode = FluStatusLayoutType.Error
             }else if(status === Loader.Loading){
-                control.statusMode = FluStatusViewType.Loading
+                control.statusMode = FluStatusLayoutType.Loading
             }else{
-                control.statusMode = FluStatusViewType.Success
+                control.statusMode = FluStatusLayoutType.Success
             }
         }
     }

diff --git a/src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml b/src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml
@@ -38,10 +38,10 @@ FluPage {
             rightMargin: control.rightPadding
         }
     }
-    FluStatusView{
+    FluStatusLayout{
         id:status_view
         color: "#00000000"
-        statusMode: FluStatusViewType.Success
+        statusMode: FluStatusLayoutType.Success
         onErrorClicked: control.errorClicked()
         anchors{
             left: parent.left