wuyize
/
FluentUI
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

main
zhuzihcu 2023-06-12 16:46:02 +08:00
parent 2fbc5696f7
commit 31bdea8d44
49 changed files with 125 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
example/qml/component/CodeExpander.qml
View File

@ -134,7 +134,8 @@ FluExpander{
"FluPasswordBox",
"FluBreadcrumbBar",
"FluCopyableText",
"FluAcrylic"
"FluAcrylic",
"FluRemoteLoader"
];
code = code.replace(/\n/g, "<br>");
code = code.replace(/ /g, "&nbsp;");

12
example/qml/global/ItemsOriginal.qml
View File

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

2
example/qml/page/T_Acrylic.qml
View File

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

2
example/qml/page/T_Badge.qml
View File

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

2
example/qml/page/T_BreadcrumbBar.qml
View File

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

2
example/qml/page/T_Buttons.qml
View File

@ -4,7 +4,7 @@ import QtQuick.Window
import QtQuick.Controls
import QtQuick.Controls.Basic
import FluentUI
import "../component"
import "qrc:///example/qml/component"
FluScrollablePage{

2
example/qml/page/T_CalendarPicker.qml
View File

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

2
example/qml/page/T_Carousel.qml
View File

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

2
example/qml/page/T_CheckBox.qml
View File

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

2
example/qml/page/T_ColorPicker.qml
View File

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

2
example/qml/page/T_ComboBox.qml
View File

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

2
example/qml/page/T_DatePicker.qml
View File

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

2
example/qml/page/T_Dialog.qml
View File

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

2
example/qml/page/T_Expander.qml
View File

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

2
example/qml/page/T_FlipView.qml
View File

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

2
example/qml/page/T_Home.qml
View File

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

2
example/qml/page/T_InfoBar.qml
View File

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

2
example/qml/page/T_MediaPlayer.qml
View File

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

2
example/qml/page/T_Menu.qml
View File

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

2
example/qml/page/T_MultiWindow.qml
View File

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

2
example/qml/page/T_Pivot.qml
View File

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

2
example/qml/page/T_Progress.qml
View File

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

2
example/qml/page/T_RatingControl.qml
View File

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

2
example/qml/page/T_Rectangle.qml
View File

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

12
example/qml/page/T_RemoteLoader.qml Normal file
View File

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

4
example/qml/page/T_Settings.qml
View File

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

2
example/qml/page/T_Slider.qml
View File

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

2
example/qml/page/T_StatusView.qml
View File

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

2
example/qml/page/T_TabView.qml
View File

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

2
example/qml/page/T_TableView.qml
View File

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

2
example/qml/page/T_Text.qml
View File

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

2
example/qml/page/T_TextBox.qml
View File

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

2
example/qml/page/T_Theme.qml
View File

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

2
example/qml/page/T_TimePicker.qml
View File

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

2
example/qml/page/T_ToggleSwitch.qml
View File

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

2
example/qml/page/T_Tooltip.qml
View File

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

2
example/qml/page/T_TreeView.qml
View File

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

2
example/qml/window/AboutWindow.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import FluentUI
import "../component"
import "qrc:///example/qml/component"
CustomWindow {

2
example/qml/window/LoginWindow.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import FluentUI
import "../component"
import "qrc:///example/qml/component"
CustomWindow {

39
example/qml/window/MainWindow.qml
View File

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

2
example/qml/window/MediaWindow.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import FluentUI
import "../component"
import "qrc:///example/qml/component"
CustomWindow {

2
example/qml/window/SingleInstanceWindow.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import FluentUI
import "../component"
import "qrc:///example/qml/component"
CustomWindow {

2
example/qml/window/SingleTaskWindow.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import FluentUI
import "../component"
import "qrc:///example/qml/component"
CustomWindow {

2
example/qml/window/StandardWindow.qml
View File

@ -2,7 +2,7 @@ import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import FluentUI
import "../component"
import "qrc:///example/qml/component"
CustomWindow {

1
example/src/lang/En.cpp
View File

@ -19,4 +19,5 @@ En::En(QObject *parent)
settings("Settings");
locale("Locale");
navigation_view_display_mode("NavigationView Display Mode");
other("Other");
}

1
example/src/lang/Lang.h
View File

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

1
example/src/lang/Zh.cpp
View File

@ -19,4 +19,5 @@ Zh::Zh(QObject *parent)
settings("设置");
locale("语言环境");
navigation_view_display_mode("导航视图显示模式");
other("其他");
}

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

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

26
src/imports/FluentUI/Controls/FluRemoteLoader.qml Normal file
View File

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