amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-07-03 00:25:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi
2024-02-23 12:26:10 +08:00
parent 438d1fe623
commit c330dc840e
25 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Def.h
View File

@ -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 {

4
src/FluentUI.cpp
View File

@ -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");

4
src/Qt5/imports/FluentUI/Controls/FluContentPage.qml
View File

@ -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

8
src/Qt5/imports/FluentUI/Controls/FluRemoteLoader.qml
View File

@ -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
}
}
}

4
src/Qt5/imports/FluentUI/Controls/FluScrollablePage.qml
View File

@ -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

20
src/Qt5/imports/FluentUI/Controls/FluStatusView.qml → src/Qt5/imports/FluentUI/Controls/FluStatusLayout.qml
View File

@ -7,7 +7,7 @@ import FluentUI 1.0
Item{
id:control
default property alias content: container.data
property int statusMode: FluStatusViewType.Loading
property int statusMode: FluStatusLayoutType.Loading
property string loadingText:"正在加载..."
property string emptyText: "空空如也"
property string errorText: "页面出错了.."
@ -21,20 +21,20 @@ Item{
Item{
id:container
anchors.fill: parent
visible: statusMode===FluStatusViewType.Success
visible: statusMode===FluStatusLayoutType.Success
}
FluLoader{
id:loader
anchors.fill: parent
visible: statusMode!==FluStatusViewType.Success
visible: statusMode!==FluStatusLayoutType.Success
sourceComponent: {
if(statusMode === FluStatusViewType.Loading){
if(statusMode === FluStatusLayoutType.Loading){
return loadingItem
}
if(statusMode === FluStatusViewType.Empty){
if(statusMode === FluStatusLayoutType.Empty){
return emptyItem
}
if(statusMode === FluStatusViewType.Error){
if(statusMode === FluStatusLayoutType.Error){
return errorItem
}
return undefined
@ -103,15 +103,15 @@ Item{
}
}
function showSuccessView(){
statusMode = FluStatusViewType.Success
statusMode = FluStatusLayoutType.Success
}
function showLoadingView(){
statusMode = FluStatusViewType.Loading
statusMode = FluStatusLayoutType.Loading
}
function showEmptyView(){
statusMode = FluStatusViewType.Empty
statusMode = FluStatusLayoutType.Empty
}
function showErrorView(){
statusMode = FluStatusViewType.Error
statusMode = FluStatusLayoutType.Error
}
}

8
src/Qt5/imports/FluentUI/plugins.qmltypes
View File

@ -158,8 +158,8 @@ Module {
}
}
Component {
name: "FluStatusViewType"
exports: ["FluentUI/FluStatusViewType 1.0"]
name: "FluStatusLayoutType"
exports: ["FluentUI/FluStatusLayoutType 1.0"]
isCreatable: false
exportMetaObjectRevisions: [0]
Enum {
@ -3521,8 +3521,8 @@ Module {
}
Component {
prototype: "QQuickItem"
name: "FluentUI/FluStatusView 1.0"
exports: ["FluentUI/FluStatusView 1.0"]
name: "FluentUI/FluStatusLayout 1.0"
exports: ["FluentUI/FluStatusLayout 1.0"]
exportMetaObjectRevisions: [0]
isComposite: true
defaultProperty: "content"

2
src/Qt5/imports/fluentui.qrc
View File

@ -70,7 +70,7 @@
<file>FluentUI/Controls/FluSlider.qml</file>
<file>FluentUI/Controls/FluSpinBox.qml</file>
<file>FluentUI/Controls/FluStaggeredLayout.qml</file>
<file>FluentUI/Controls/FluStatusView.qml</file>
<file>FluentUI/Controls/FluStatusLayout.qml</file>
<file>FluentUI/Controls/FluTableView.qml</file>
<file>FluentUI/Controls/FluTabView.qml</file>
<file>FluentUI/Controls/FluText.qml</file>

4
src/Qt6/imports/FluentUI/Controls/FluContentPage.qml
View File

@ -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

8
src/Qt6/imports/FluentUI/Controls/FluRemoteLoader.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls
import FluentUI
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
}
}
}

4
src/Qt6/imports/FluentUI/Controls/FluScrollablePage.qml
View File

@ -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

20
src/Qt6/imports/FluentUI/Controls/FluStatusView.qml → src/Qt6/imports/FluentUI/Controls/FluStatusLayout.qml
View File

@ -6,7 +6,7 @@ import FluentUI
Item{
id:control
default property alias content: container.data
property int statusMode: FluStatusViewType.Loading
property int statusMode: FluStatusLayoutType.Loading
property string loadingText:"正在加载..."
property string emptyText: "空空如也"
property string errorText: "页面出错了.."
@ -20,20 +20,20 @@ Item{
Item{
id:container
anchors.fill: parent
visible: statusMode===FluStatusViewType.Success
visible: statusMode===FluStatusLayoutType.Success
}
FluLoader{
id:loader
anchors.fill: parent
visible: statusMode!==FluStatusViewType.Success
visible: statusMode!==FluStatusLayoutType.Success
sourceComponent: {
if(statusMode === FluStatusViewType.Loading){
if(statusMode === FluStatusLayoutType.Loading){
return loadingItem
}
if(statusMode === FluStatusViewType.Empty){
if(statusMode === FluStatusLayoutType.Empty){
return emptyItem
}
if(statusMode === FluStatusViewType.Error){
if(statusMode === FluStatusLayoutType.Error){
return errorItem
}
return undefined
@ -102,15 +102,15 @@ Item{
}
}
function showSuccessView(){
statusMode = FluStatusViewType.Success
statusMode = FluStatusLayoutType.Success
}
function showLoadingView(){
statusMode = FluStatusViewType.Loading
statusMode = FluStatusLayoutType.Loading
}
function showEmptyView(){
statusMode = FluStatusViewType.Empty
statusMode = FluStatusLayoutType.Empty
}
function showErrorView(){
statusMode = FluStatusViewType.Error
statusMode = FluStatusLayoutType.Error
}
}