diff --git a/example/qml/component/CodeExpander.qml b/example/qml/component/CodeExpander.qml index 746c395..4114843 100644 --- a/example/qml/component/CodeExpander.qml +++ b/example/qml/component/CodeExpander.qml @@ -134,7 +134,8 @@ FluExpander{ "FluPasswordBox", "FluBreadcrumbBar", "FluCopyableText", - "FluAcrylic" + "FluAcrylic", + "FluRemoteLoader" ]; code = code.replace(/\n/g, "
"); code = code.replace(/ /g, " "); diff --git a/example/qml/global/ItemsOriginal.qml b/example/qml/global/ItemsOriginal.qml index 31e1ac3..51bb0a2 100644 --- a/example/qml/global/ItemsOriginal.qml +++ b/example/qml/global/ItemsOriginal.qml @@ -291,6 +291,18 @@ FluObject{ navigationView.push("qrc:/example/qml/page/T_MediaPlayer.qml") } } + + } + + FluPaneItemExpander{ + title:lang.other + icon:FluentIcons.Media + FluPaneItem{ + title:"RemoteLoader" + onTap:{ + navigationView.push("qrc:/example/qml/page/T_RemoteLoader.qml") + } + } } function getRecentlyAddedData(){ diff --git a/example/qml/page/T_Acrylic.qml b/example/qml/page/T_Acrylic.qml index 37ff39b..6a09b27 100644 --- a/example/qml/page/T_Acrylic.qml +++ b/example/qml/page/T_Acrylic.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Badge.qml b/example/qml/page/T_Badge.qml index 7b183b7..159aa1d 100644 --- a/example/qml/page/T_Badge.qml +++ b/example/qml/page/T_Badge.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_BreadcrumbBar.qml b/example/qml/page/T_BreadcrumbBar.qml index 28d21e2..f6a1ba0 100644 --- a/example/qml/page/T_BreadcrumbBar.qml +++ b/example/qml/page/T_BreadcrumbBar.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Buttons.qml b/example/qml/page/T_Buttons.qml index 719c07f..90c67aa 100644 --- a/example/qml/page/T_Buttons.qml +++ b/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 "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_CalendarPicker.qml b/example/qml/page/T_CalendarPicker.qml index 865e95a..4cb6790 100644 --- a/example/qml/page/T_CalendarPicker.qml +++ b/example/qml/page/T_CalendarPicker.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Carousel.qml b/example/qml/page/T_Carousel.qml index 8dad6a2..6e9c46f 100644 --- a/example/qml/page/T_Carousel.qml +++ b/example/qml/page/T_Carousel.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_CheckBox.qml b/example/qml/page/T_CheckBox.qml index 9258bd8..5d27513 100644 --- a/example/qml/page/T_CheckBox.qml +++ b/example/qml/page/T_CheckBox.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_ColorPicker.qml b/example/qml/page/T_ColorPicker.qml index 05fce39..b7e391b 100644 --- a/example/qml/page/T_ColorPicker.qml +++ b/example/qml/page/T_ColorPicker.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_ComboBox.qml b/example/qml/page/T_ComboBox.qml index 5025882..22d7092 100644 --- a/example/qml/page/T_ComboBox.qml +++ b/example/qml/page/T_ComboBox.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_DatePicker.qml b/example/qml/page/T_DatePicker.qml index 3c9aeeb..ec57354 100644 --- a/example/qml/page/T_DatePicker.qml +++ b/example/qml/page/T_DatePicker.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Dialog.qml b/example/qml/page/T_Dialog.qml index bee679e..2f949ab 100644 --- a/example/qml/page/T_Dialog.qml +++ b/example/qml/page/T_Dialog.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Expander.qml b/example/qml/page/T_Expander.qml index 64a1288..d31b00a 100644 --- a/example/qml/page/T_Expander.qml +++ b/example/qml/page/T_Expander.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_FlipView.qml b/example/qml/page/T_FlipView.qml index 7493c06..0475f73 100644 --- a/example/qml/page/T_FlipView.qml +++ b/example/qml/page/T_FlipView.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Home.qml b/example/qml/page/T_Home.qml index 674bf86..5393328 100644 --- a/example/qml/page/T_Home.qml +++ b/example/qml/page/T_Home.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls -import "qrc:///example/qml/global/" +import "qrc:///example/qml/global" import FluentUI FluScrollablePage{ diff --git a/example/qml/page/T_InfoBar.qml b/example/qml/page/T_InfoBar.qml index 0c974fa..41b6d76 100644 --- a/example/qml/page/T_InfoBar.qml +++ b/example/qml/page/T_InfoBar.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_MediaPlayer.qml b/example/qml/page/T_MediaPlayer.qml index cd74434..b831f18 100644 --- a/example/qml/page/T_MediaPlayer.qml +++ b/example/qml/page/T_MediaPlayer.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Menu.qml b/example/qml/page/T_Menu.qml index 1669652..69b77dd 100644 --- a/example/qml/page/T_Menu.qml +++ b/example/qml/page/T_Menu.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_MultiWindow.qml b/example/qml/page/T_MultiWindow.qml index c3c5fb3..ec8ed94 100644 --- a/example/qml/page/T_MultiWindow.qml +++ b/example/qml/page/T_MultiWindow.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Pivot.qml b/example/qml/page/T_Pivot.qml index d171a1e..696860b 100644 --- a/example/qml/page/T_Pivot.qml +++ b/example/qml/page/T_Pivot.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Progress.qml b/example/qml/page/T_Progress.qml index 336f2a6..7c1f2d4 100644 --- a/example/qml/page/T_Progress.qml +++ b/example/qml/page/T_Progress.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_RatingControl.qml b/example/qml/page/T_RatingControl.qml index cf10258..4c39d38 100644 --- a/example/qml/page/T_RatingControl.qml +++ b/example/qml/page/T_RatingControl.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage { diff --git a/example/qml/page/T_Rectangle.qml b/example/qml/page/T_Rectangle.qml index 4c41da0..5001144 100644 --- a/example/qml/page/T_Rectangle.qml +++ b/example/qml/page/T_Rectangle.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Controls import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_RemoteLoader.qml b/example/qml/page/T_RemoteLoader.qml new file mode 100644 index 0000000..72831e2 --- /dev/null +++ b/example/qml/page/T_RemoteLoader.qml @@ -0,0 +1,12 @@ +import QtQuick +import QtQuick.Layouts +import QtQuick.Window +import QtQuick.Controls +import FluentUI +import "qrc:///example/qml/component" + +FluRemoteLoader{ + property int pageMode: FluNavigationView.Standard + property string url: '' + source: "https://zhu-zichu.gitee.io/T_RemoteLoader.qml" +} diff --git a/example/qml/page/T_Settings.qml b/example/qml/page/T_Settings.qml index 74a6e7d..7b8e15e 100644 --- a/example/qml/page/T_Settings.qml +++ b/example/qml/page/T_Settings.qml @@ -3,8 +3,8 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "qrc:///example/qml/global/" -import "../component" +import "qrc:///example/qml/global" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Slider.qml b/example/qml/page/T_Slider.qml index a09a6d3..3b5d822 100644 --- a/example/qml/page/T_Slider.qml +++ b/example/qml/page/T_Slider.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls -import "../component" +import "qrc:///example/qml/component" import FluentUI FluScrollablePage{ diff --git a/example/qml/page/T_StatusView.qml b/example/qml/page/T_StatusView.qml index db39780..5e2f459 100644 --- a/example/qml/page/T_StatusView.qml +++ b/example/qml/page/T_StatusView.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Controls import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_TabView.qml b/example/qml/page/T_TabView.qml index b0ddece..1233f7e 100644 --- a/example/qml/page/T_TabView.qml +++ b/example/qml/page/T_TabView.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_TableView.qml b/example/qml/page/T_TableView.qml index f14dce5..275854e 100644 --- a/example/qml/page/T_TableView.qml +++ b/example/qml/page/T_TableView.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Text.qml b/example/qml/page/T_Text.qml index a230606..c5624f6 100644 --- a/example/qml/page/T_Text.qml +++ b/example/qml/page/T_Text.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_TextBox.qml b/example/qml/page/T_TextBox.qml index 7a880c6..531f62c 100644 --- a/example/qml/page/T_TextBox.qml +++ b/example/qml/page/T_TextBox.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Theme.qml b/example/qml/page/T_Theme.qml index dbdef44..93c3e27 100644 --- a/example/qml/page/T_Theme.qml +++ b/example/qml/page/T_Theme.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_TimePicker.qml b/example/qml/page/T_TimePicker.qml index 9890ed8..1c76e96 100644 --- a/example/qml/page/T_TimePicker.qml +++ b/example/qml/page/T_TimePicker.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_ToggleSwitch.qml b/example/qml/page/T_ToggleSwitch.qml index f7ed68b..dc60b63 100644 --- a/example/qml/page/T_ToggleSwitch.qml +++ b/example/qml/page/T_ToggleSwitch.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_Tooltip.qml b/example/qml/page/T_Tooltip.qml index 9731519..1a05ef8 100644 --- a/example/qml/page/T_Tooltip.qml +++ b/example/qml/page/T_Tooltip.qml @@ -3,7 +3,7 @@ import QtQuick.Controls import QtQuick.Layouts import QtQuick.Window import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage{ diff --git a/example/qml/page/T_TreeView.qml b/example/qml/page/T_TreeView.qml index a56a085..7f0da11 100644 --- a/example/qml/page/T_TreeView.qml +++ b/example/qml/page/T_TreeView.qml @@ -3,7 +3,7 @@ import QtQuick.Layouts import QtQuick.Window import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" FluScrollablePage { diff --git a/example/qml/window/AboutWindow.qml b/example/qml/window/AboutWindow.qml index fb8fde9..82db5e8 100644 --- a/example/qml/window/AboutWindow.qml +++ b/example/qml/window/AboutWindow.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI -import "../component" +import "qrc:///example/qml/component" CustomWindow { diff --git a/example/qml/window/LoginWindow.qml b/example/qml/window/LoginWindow.qml index 30ac67f..9f3e25f 100644 --- a/example/qml/window/LoginWindow.qml +++ b/example/qml/window/LoginWindow.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Controls import FluentUI -import "../component" +import "qrc:///example/qml/component" CustomWindow { diff --git a/example/qml/window/MainWindow.qml b/example/qml/window/MainWindow.qml index 6bf62d7..a1441d7 100644 --- a/example/qml/window/MainWindow.qml +++ b/example/qml/window/MainWindow.qml @@ -4,8 +4,8 @@ import QtQuick.Controls import QtQuick.Layouts import Qt.labs.platform import FluentUI -import "../component" -import "qrc:///example/qml/global/" +import "qrc:///example/qml/component" +import "qrc:///example/qml/global" CustomWindow { @@ -110,20 +110,32 @@ CustomWindow { z:7 darkClickListener:(button)=>handleDarkChanged(button) } - FluIconButton{ - iconSource: FluentIcons.ChromeBack - width: 30 - height: 30 - iconSize: 13 + Row{ z:8 - onClicked: { - flipable.flipped = false + FluIconButton{ + iconSource: FluentIcons.ChromeBack + width: 30 + height: 30 + iconSize: 13 + onClicked: { + flipable.flipped = false + } + } + FluIconButton{ + iconSource: FluentIcons.Sync + width: 30 + height: 30 + iconSize: 13 + onClicked: { + loader.reload() + } } } - FluText{ - font: FluTextStyle.Title - text:"建设中..." - anchors.centerIn: parent + + FluRemoteLoader{ + id:loader + anchors.fill: parent + source: "https://zhu-zichu.gitee.io/RemoteComponent.qml" } } front: Item{ @@ -162,6 +174,7 @@ CustomWindow { onLoginClicked:{ clickCount += 1 if(clickCount === 1){ + loader.reload() flipable.flipped = true clickCount = 0 } diff --git a/example/qml/window/MediaWindow.qml b/example/qml/window/MediaWindow.qml index 1264ed0..1bc4bdf 100644 --- a/example/qml/window/MediaWindow.qml +++ b/example/qml/window/MediaWindow.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI -import "../component" +import "qrc:///example/qml/component" CustomWindow { diff --git a/example/qml/window/SingleInstanceWindow.qml b/example/qml/window/SingleInstanceWindow.qml index 9a23c2b..e6b855d 100644 --- a/example/qml/window/SingleInstanceWindow.qml +++ b/example/qml/window/SingleInstanceWindow.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI -import "../component" +import "qrc:///example/qml/component" CustomWindow { diff --git a/example/qml/window/SingleTaskWindow.qml b/example/qml/window/SingleTaskWindow.qml index a5bb073..d5bab17 100644 --- a/example/qml/window/SingleTaskWindow.qml +++ b/example/qml/window/SingleTaskWindow.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI -import "../component" +import "qrc:///example/qml/component" CustomWindow { diff --git a/example/qml/window/StandardWindow.qml b/example/qml/window/StandardWindow.qml index cf38c39..d122e9e 100644 --- a/example/qml/window/StandardWindow.qml +++ b/example/qml/window/StandardWindow.qml @@ -2,7 +2,7 @@ import QtQuick import QtQuick.Controls import QtQuick.Layouts import FluentUI -import "../component" +import "qrc:///example/qml/component" CustomWindow { diff --git a/example/src/lang/En.cpp b/example/src/lang/En.cpp index 67f754d..a24f08c 100644 --- a/example/src/lang/En.cpp +++ b/example/src/lang/En.cpp @@ -19,4 +19,5 @@ En::En(QObject *parent) settings("Settings"); locale("Locale"); navigation_view_display_mode("NavigationView Display Mode"); + other("Other"); } diff --git a/example/src/lang/Lang.h b/example/src/lang/Lang.h index 1cfe0af..ae44d45 100644 --- a/example/src/lang/Lang.h +++ b/example/src/lang/Lang.h @@ -22,6 +22,7 @@ class Lang : public QObject Q_PROPERTY_AUTO(QString,settings); Q_PROPERTY_AUTO(QString,navigation_view_display_mode); Q_PROPERTY_AUTO(QString,locale); + Q_PROPERTY_AUTO(QString,other); public: explicit Lang(QObject *parent = nullptr); diff --git a/example/src/lang/Zh.cpp b/example/src/lang/Zh.cpp index 09be06b..276d4a8 100644 --- a/example/src/lang/Zh.cpp +++ b/example/src/lang/Zh.cpp @@ -19,4 +19,5 @@ Zh::Zh(QObject *parent) settings("设置"); locale("语言环境"); navigation_view_display_mode("导航视图显示模式"); + other("其他"); } diff --git a/src/imports/FluentUI/Controls/FluContentPage.qml b/src/imports/FluentUI/Controls/FluContentPage.qml index 8a56b3d..1f0fd9a 100644 --- a/src/imports/FluentUI/Controls/FluContentPage.qml +++ b/src/imports/FluentUI/Controls/FluContentPage.qml @@ -16,7 +16,9 @@ Item { id:control FluText{ id:text_title - font: FluTextStyle.TitleLarge + visible: text !== "" + height: visible ? implicitHeight : 0 + font: FluTextStyle.Title anchors{ top: parent.top topMargin: control.topPadding diff --git a/src/imports/FluentUI/Controls/FluRemoteLoader.qml b/src/imports/FluentUI/Controls/FluRemoteLoader.qml new file mode 100644 index 0000000..bd63426 --- /dev/null +++ b/src/imports/FluentUI/Controls/FluRemoteLoader.qml @@ -0,0 +1,26 @@ +import QtQuick +import QtQuick.Controls +import FluentUI + +Item { + id:control + property url source: "" + + Loader{ + id:loader + anchors.fill: parent + source: control.source + asynchronous: true + } + + FluProgressRing{ + anchors.centerIn: parent + visible: loader.status === Loader.Loading + } + + function reload(){ + var timestamp = Date.now(); + loader.source = control.source+"?"+timestamp + } + +}