Compare commits

..

No commits in common. "4e4016ae3fed7d1a3534760b44313e8fb0b8fd29" and "06775a97c7f75bd09e449aa0bf606d15f7c96d1b" have entirely different histories.

8 changed files with 9 additions and 126 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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}
#mingwlibxxxlib module "FluentUI" plugin "fluentuiplugin" not found #mingwlibxxxlib 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 dQt #MSVC Debug dQt