mirror of
https://github.com/zhuzichu520/FluentUI.git
synced 2025-03-15 08:29:41 +08:00
Compare commits
No commits in common. "4e4016ae3fed7d1a3534760b44313e8fb0b8fd29" and "06775a97c7f75bd09e449aa0bf606d15f7c96d1b" have entirely different histories.
4e4016ae3f
...
06775a97c7
@ -211,8 +211,6 @@
|
|||||||
<file>qml/page/T_Icons.qml</file>
|
<file>qml/page/T_Icons.qml</file>
|
||||||
<file>qml/window/HotkeyWindow.qml</file>
|
<file>qml/window/HotkeyWindow.qml</file>
|
||||||
<file>qml/page/T_CustomPlot.qml</file>
|
<file>qml/page/T_CustomPlot.qml</file>
|
||||||
<file>res/image/logo_pro.png</file>
|
|
||||||
<file>qml/page/T_FluentPro.qml</file>
|
|
||||||
</qresource>
|
</qresource>
|
||||||
<qresource prefix="/"/>
|
<qresource prefix="/"/>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
@ -175,11 +175,6 @@
|
|||||||
<source>Settings</source>
|
<source>Settings</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
|
||||||
<location filename="qml/global/ItemsFooter.qml" line="34"/>
|
|
||||||
<source>FluentUI Pro</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>ItemsOriginal</name>
|
<name>ItemsOriginal</name>
|
||||||
@ -1378,32 +1373,22 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
|
|||||||
<context>
|
<context>
|
||||||
<name>T_Home</name>
|
<name>T_Home</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_Home.qml" line="28"/>
|
<location filename="qml/page/T_Home.qml" line="19"/>
|
||||||
<source>FluentUI GitHub</source>
|
<source>FluentUI GitHub</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_Home.qml" line="29"/>
|
<location filename="qml/page/T_Home.qml" line="20"/>
|
||||||
<source>The latest FluentUI controls and styles for your applications.</source>
|
<source>The latest FluentUI controls and styles for your applications.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_Home.qml" line="19"/>
|
<location filename="qml/page/T_Home.qml" line="28"/>
|
||||||
<source>FluentUI Pro</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<location filename="qml/page/T_Home.qml" line="20"/>
|
|
||||||
<source>The latest FluentUI Pro controls and styles for your applications.</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<location filename="qml/page/T_Home.qml" line="37"/>
|
|
||||||
<source>FluentUI Initializr</source>
|
<source>FluentUI Initializr</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_Home.qml" line="38"/>
|
<location filename="qml/page/T_Home.qml" line="29"/>
|
||||||
<source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
|
<source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -175,11 +175,6 @@
|
|||||||
<source>Settings</source>
|
<source>Settings</source>
|
||||||
<translation type="unfinished">设置</translation>
|
<translation type="unfinished">设置</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
|
||||||
<location filename="qml/global/ItemsFooter.qml" line="34"/>
|
|
||||||
<source>FluentUI Pro</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
</context>
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>ItemsOriginal</name>
|
<name>ItemsOriginal</name>
|
||||||
@ -1496,32 +1491,22 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
|
|||||||
<context>
|
<context>
|
||||||
<name>T_Home</name>
|
<name>T_Home</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_Home.qml" line="28"/>
|
<location filename="qml/page/T_Home.qml" line="19"/>
|
||||||
<source>FluentUI GitHub</source>
|
<source>FluentUI GitHub</source>
|
||||||
<translation type="unfinished">FluentUI GitHub</translation>
|
<translation type="unfinished">FluentUI GitHub</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_Home.qml" line="29"/>
|
<location filename="qml/page/T_Home.qml" line="20"/>
|
||||||
<source>The latest FluentUI controls and styles for your applications.</source>
|
<source>The latest FluentUI controls and styles for your applications.</source>
|
||||||
<translation type="unfinished">最新的 FluentUI 控件和样式</translation>
|
<translation type="unfinished">最新的 FluentUI 控件和样式</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_Home.qml" line="19"/>
|
<location filename="qml/page/T_Home.qml" line="28"/>
|
||||||
<source>FluentUI Pro</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<location filename="qml/page/T_Home.qml" line="20"/>
|
|
||||||
<source>The latest FluentUI Pro controls and styles for your applications.</source>
|
|
||||||
<translation type="unfinished"></translation>
|
|
||||||
</message>
|
|
||||||
<message>
|
|
||||||
<location filename="qml/page/T_Home.qml" line="37"/>
|
|
||||||
<source>FluentUI Initializr</source>
|
<source>FluentUI Initializr</source>
|
||||||
<translation type="unfinished">FluentUI脚手架</translation>
|
<translation type="unfinished">FluentUI脚手架</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="qml/page/T_Home.qml" line="38"/>
|
<location filename="qml/page/T_Home.qml" line="29"/>
|
||||||
<source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
|
<source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
|
||||||
<translation type="unfinished">FluentUI 脚手架是一个快速创建项目工具,可帮助您创建和自定义具有各种选项的 Fluent UI 项目</translation>
|
<translation type="unfinished">FluentUI 脚手架是一个快速创建项目工具,可帮助您创建和自定义具有各种选项的 Fluent UI 项目</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -30,13 +30,4 @@ FluObject{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
FluPaneItem{
|
|
||||||
title:qsTr("FluentUI Pro")
|
|
||||||
menuDelegate: paneItemMenu
|
|
||||||
icon: FluentIcons.Airplane
|
|
||||||
url:"qrc:/example/qml/page/T_FluentPro.qml"
|
|
||||||
onTap:{
|
|
||||||
navigationView.push(url)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,65 +0,0 @@
|
|||||||
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)'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -14,15 +14,6 @@ FluScrollablePage{
|
|||||||
|
|
||||||
ListModel{
|
ListModel{
|
||||||
id: model_header
|
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{
|
ListElement{
|
||||||
icon: "qrc:/example/res/image/ic_home_github.png"
|
icon: "qrc:/example/res/image/ic_home_github.png"
|
||||||
title: qsTr("FluentUI GitHub")
|
title: qsTr("FluentUI GitHub")
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 31 KiB |
@ -20,7 +20,7 @@ else ()
|
|||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
#设置版本号
|
#设置版本号
|
||||||
add_definitions(-DFLUENTUI_VERSION=1,7,7,0)
|
add_definitions(-DFLUENTUI_VERSION=1,7,5,0)
|
||||||
|
|
||||||
if (FLUENTUI_BUILD_STATIC_LIB)
|
if (FLUENTUI_BUILD_STATIC_LIB)
|
||||||
add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)
|
add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)
|
||||||
@ -184,8 +184,6 @@ target_compile_definitions(${PROJECT_NAME}
|
|||||||
#去掉mingw生成的动态库libxxx前缀lib,不去掉前缀会导致 module "FluentUI" plugin "fluentuiplugin" not found
|
#去掉mingw生成的动态库libxxx前缀lib,不去掉前缀会导致 module "FluentUI" plugin "fluentuiplugin" not found
|
||||||
if (MINGW)
|
if (MINGW)
|
||||||
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
|
set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
|
||||||
#解决编译器报 too many sections的问题
|
|
||||||
target_compile_options(${PROJECT_NAME} PRIVATE -Wa,-mbig-obj)
|
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
#MSVC Debug 添加后缀d,与Qt插件风格保持一致
|
#MSVC Debug 添加后缀d,与Qt插件风格保持一致
|
||||||
|
Loading…
x
Reference in New Issue
Block a user