diff --git a/example/example.qrc b/example/example.qrc index 5ba33e1c..072a1dc0 100644 --- a/example/example.qrc +++ b/example/example.qrc @@ -211,6 +211,8 @@ qml/page/T_Icons.qml qml/window/HotkeyWindow.qml qml/page/T_CustomPlot.qml + res/image/logo_pro.png + qml/page/T_FluentPro.qml diff --git a/example/example_en_US.ts b/example/example_en_US.ts index 84b80013..ab94d9b6 100644 --- a/example/example_en_US.ts +++ b/example/example_en_US.ts @@ -175,6 +175,11 @@ Settings + + + FluentUI Pro + + ItemsOriginal @@ -1373,22 +1378,32 @@ My only desire is to be permitted to drive out the traitors and restore the Han. T_Home - + FluentUI GitHub - + The latest FluentUI controls and styles for your applications. - + + FluentUI Pro + + + + + The latest FluentUI Pro controls and styles for your applications. + + + + FluentUI Initializr - + FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options. diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts index 74375eb0..9efff7ff 100644 --- a/example/example_zh_CN.ts +++ b/example/example_zh_CN.ts @@ -175,6 +175,11 @@ Settings 设置 + + + FluentUI Pro + + ItemsOriginal @@ -1491,22 +1496,32 @@ My only desire is to be permitted to drive out the traitors and restore the Han. T_Home - + FluentUI GitHub FluentUI GitHub - + The latest FluentUI controls and styles for your applications. 最新的 FluentUI 控件和样式 - + + FluentUI Pro + + + + + The latest FluentUI Pro controls and styles for your applications. + + + + FluentUI Initializr FluentUI脚手架 - + FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options. FluentUI 脚手架是一个快速创建项目工具,可帮助您创建和自定义具有各种选项的 Fluent UI 项目 diff --git a/example/qml/global/ItemsFooter.qml b/example/qml/global/ItemsFooter.qml index 2a8e6d1d..a3aea23f 100644 --- a/example/qml/global/ItemsFooter.qml +++ b/example/qml/global/ItemsFooter.qml @@ -30,4 +30,13 @@ FluObject{ } } + FluPaneItem{ + title:qsTr("FluentUI Pro") + menuDelegate: paneItemMenu + icon: FluentIcons.Airplane + url:"qrc:/example/qml/page/T_FluentPro.qml" + onTap:{ + navigationView.push(url) + } + } } diff --git a/example/qml/page/T_FluentPro.qml b/example/qml/page/T_FluentPro.qml new file mode 100644 index 00000000..72dbed69 --- /dev/null +++ b/example/qml/page/T_FluentPro.qml @@ -0,0 +1,65 @@ +import QtQuick 2.15 +import QtQuick.Layouts 1.15 +import QtQuick.Controls 2.15 +import QtQuick.Window 2.15 +import FluentUI 1.0 +import "../component" + +FluContentPage{ + + title: "FluentUI Pro" + + Image{ + id: iamge_logo + width: 80 + height: 80 + source: "qrc:/example/res/image/logo_pro.png" + } + + Flickable{ + anchors{ + top: iamge_logo.bottom + left: parent.left + right: parent.right + bottom: parent.bottom + } + ScrollBar.vertical: FluScrollBar {} + ScrollBar.horizontal: FluScrollBar {} + contentWidth: text.width + contentHeight: text.height + clip: true + FluText{ + id: text + textFormat: Text.MarkdownText + onLinkActivated: + (link)=> { + Qt.openUrlExternally(link) + } + onLinkHovered: + (link)=> { + if(link === ""){ + FluTools.restoreOverrideCursor() + }else{ + FluTools.setOverrideCursor(Qt.PointingHandCursor) + } + } + text:' +基于[FluentUI](https://github.com/zhuzichu520/FluentUI)开源版本重新打造的项目,代码更加漂亮,API更加好用,界面更加细腻 + +## 与开源版本有啥不同? + +1. 开源版本支持Qt6与Qt5.15.2,Pro版本仅支持Qt6 +2. 开源版本所有组件都有Flu前缀,Pro版本去掉Flu前缀,只需添加一行```qputenv("QT_QUICK_CONTROLS_STYLE", "FluentUI");```代码,就能将原有Button换成FluentUI样式 +3. 项目整体架构不同,开源版本代码都写在一个模块下,Pro版本分为FluentUI,FluentUI.Controls,FluentUI.impl三个模块 +4. 开源版本不支持热加载,Pro版本支持热加载,运行之后修改代码可实时关注QML界面变化,支持一键关闭开启 +5. 开源版不支持wasm编译,Pro版本支持wasm编译 +6. 开源版本过于臃肿,Pro版本做了减法,去其糟粕,取其精华,重新打造 +7. 开源版默认动态库依赖,Pro版本默认静态库依赖 +8. 开源版MIT协议免费,Pro版本付费,如有需要请联系作者wx购买:FluentUI + +## 下载Pro版本 +[下载地址](https://github.com/zhuzichu520/FluentUI-Pro-Installer/releases)' + } + } + +} diff --git a/example/qml/page/T_Home.qml b/example/qml/page/T_Home.qml index 596bb55c..ef77b4f8 100644 --- a/example/qml/page/T_Home.qml +++ b/example/qml/page/T_Home.qml @@ -14,6 +14,15 @@ FluScrollablePage{ ListModel{ id: model_header + ListElement{ + icon: "qrc:/example/res/image/logo_pro.png" + title: qsTr("FluentUI Pro") + desc: qsTr("The latest FluentUI Pro controls and styles for your applications.") + url: "https://github.com/zhuzichu520/FluentUI-Pro-Installer" + clicked: function(model){ + Qt.openUrlExternally(model.url) + } + } ListElement{ icon: "qrc:/example/res/image/ic_home_github.png" title: qsTr("FluentUI GitHub") diff --git a/example/res/image/logo_pro.png b/example/res/image/logo_pro.png new file mode 100644 index 00000000..f9ec1ec5 Binary files /dev/null and b/example/res/image/logo_pro.png differ