amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-22 19:00:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-04-23 00:31:20 +08:00
parent bc4510077f
commit e8d79e3c7b
14 changed files with 84 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
example/example_en_US.ts
View File

@ -1930,26 +1930,6 @@ Some contents...</source>
<source>StatusLayout</source> <source>StatusLayout</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="qml/page/T_StatusLayout.qml" line="63"/>
<source>Loading...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_StatusLayout.qml" line="64"/>
<source>Empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_StatusLayout.qml" line="65"/>
<source>The page went wrong...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_StatusLayout.qml" line="66"/>
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>T_TabView</name> <name>T_TabView</name>

12
example/example_zh_CN.ts
View File

@ -2053,24 +2053,20 @@ Some contents...</source>
<translation type="unfinished">状态布局</translation> <translation type="unfinished">状态布局</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_StatusLayout.qml" line="63"/>
<source>Loading...</source> <source>Loading...</source>
<translation type="unfinished">正在加载...</translation> <translation type="obsolete">正在加载...</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_StatusLayout.qml" line="64"/>
<source>Empty</source> <source>Empty</source>
<translation type="unfinished">空空如也</translation> <translation type="obsolete">空空如也</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_StatusLayout.qml" line="65"/>
<source>The page went wrong...</source> <source>The page went wrong...</source>
<translation type="unfinished">页面出错了...</translation> <translation type="obsolete">页面出错了...</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_StatusLayout.qml" line="66"/>
<source>Reload</source> <source>Reload</source>
<translation type="unfinished">重新加载</translation> <translation type="obsolete">重新加载</translation>
</message> </message>
</context> </context>
<context> <context>

1
example/qml/App.qml
View File

@ -34,6 +34,7 @@ FluLauncher {
FluApp.useSystemAppBar = SettingsHelper.getUseSystemAppBar() FluApp.useSystemAppBar = SettingsHelper.getUseSystemAppBar()
FluTheme.darkMode = SettingsHelper.getDarkMode() FluTheme.darkMode = SettingsHelper.getDarkMode()
FluTheme.animationEnabled = true FluTheme.animationEnabled = true
FluTheme.blurBehindWindowEnabled = true
FluRouter.routes = { FluRouter.routes = {
"/":"qrc:/example/qml/window/MainWindow.qml", "/":"qrc:/example/qml/window/MainWindow.qml",
"/about":"qrc:/example/qml/window/AboutWindow.qml", "/about":"qrc:/example/qml/window/AboutWindow.qml",

6
example/qml/page/T_StatusLayout.qml
View File

@ -60,12 +60,8 @@ FluScrollablePage{
FluStatusLayout{ FluStatusLayout{
id:status_view id:status_view
anchors.fill: parent anchors.fill: parent
loadingText: qsTr("Loading...")
emptyText: qsTr("Empty")
errorText: qsTr("The page went wrong...")
errorButtonText: qsTr("Reload")
onErrorClicked:{ onErrorClicked:{
showError("Click Reload") status_view.statusMode = FluStatusLayoutType.Loading
} }
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent

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

@ -20,7 +20,7 @@ FluWindowDialog {
showError(message) showError(message)
} }
function onSuccess(path){ function onSuccess(path){
FluTools.showFileInFolder(path+"/CMakeLists.txt") FluTools.showFileInFolder(path)
window.close() window.close()
} }
} }

2
example/src/helper/InitializrHelper.cpp
View File

@ -97,5 +97,5 @@ void InitializrHelper::copyFile(const QString &source, const QString &dest) {
copyFile(":/example/res/template/src/qml.qrc.in", projectDir.filePath("src/qml.qrc")); copyFile(":/example/res/template/src/qml.qrc.in", projectDir.filePath("src/qml.qrc"));
copyFile(":/example/res/template/src/logo.ico.in", projectDir.filePath("src/logo.ico")); copyFile(":/example/res/template/src/logo.ico.in", projectDir.filePath("src/logo.ico"));
copyFile(":/example/res/template/src/README.md.in", projectDir.filePath("src/README.md")); copyFile(":/example/res/template/src/README.md.in", projectDir.filePath("src/README.md"));
return this->success(projectPath); return this->success(projectPath+"/CMakeLists.txt");
} }

2
example/src/main.cpp
View File

@ -54,7 +54,7 @@ int main(int argc, char *argv[])
QGuiApplication::setOrganizationName("ZhuZiChu"); QGuiApplication::setOrganizationName("ZhuZiChu");
QGuiApplication::setOrganizationDomain("https://zhuzichu520.github.io"); QGuiApplication::setOrganizationDomain("https://zhuzichu520.github.io");
QGuiApplication::setApplicationName("FluentUI"); QGuiApplication::setApplicationName("FluentUI");
QGuiApplication::setApplicationDisplayName("FluentUI Exmaple"); QGuiApplication::setApplicationDisplayName("FluentUI Example");
QGuiApplication::setApplicationVersion(APPLICATION_VERSION); QGuiApplication::setApplicationVersion(APPLICATION_VERSION);
QGuiApplication::setQuitOnLastWindowClosed(false); QGuiApplication::setQuitOnLastWindowClosed(false);
SettingsHelper::getInstance()->init(argv); SettingsHelper::getInstance()->init(argv);

6
src/FluTheme.cpp
View File

@ -32,6 +32,7 @@ FluTheme::FluTheme(QObject *parent) : QObject{parent} {
connect(&_watcher, &QFileSystemWatcher::fileChanged, this, [=](const QString &path){ connect(&_watcher, &QFileSystemWatcher::fileChanged, this, [=](const QString &path){
Q_EMIT desktopImagePathChanged(); Q_EMIT desktopImagePathChanged();
}); });
connect(this, &FluTheme::blurBehindWindowEnabledChanged, this, [=] {checkUpdateDesktopImage();});
startTimer(1000); startTimer(1000);
} }
@ -74,6 +75,9 @@ bool FluTheme::dark() const {
} }
void FluTheme::checkUpdateDesktopImage(){ void FluTheme::checkUpdateDesktopImage(){
if(!_blurBehindWindowEnabled){
return;
}
QThreadPool::globalInstance()->start([=]() { QThreadPool::globalInstance()->start([=]() {
_mutex.lock(); _mutex.lock();
auto path = FluTools::getInstance()->getWallpaperFilePath(); auto path = FluTools::getInstance()->getWallpaperFilePath();
@ -90,7 +94,5 @@ void FluTheme::checkUpdateDesktopImage(){
void FluTheme::timerEvent(QTimerEvent *event) void FluTheme::timerEvent(QTimerEvent *event)
{ {
if(_blurBehindWindowEnabled){
checkUpdateDesktopImage(); checkUpdateDesktopImage();
} }
}

6
src/Qt5/imports/FluentUI/Controls/FluBreadcrumbBar.qml
View File

@ -57,12 +57,12 @@ Item {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
color: { color: {
if(item_mouse.pressed){ if(item_mouse.pressed){
return FluTheme.dark ? Qt.rgba(150/255,150/255,150/235,1) : Qt.rgba(134/255,134/255,134/235,1) return FluTheme.dark ? Qt.rgba(150/255,150/255,150/255,1) : Qt.rgba(134/255,134/255,134/255,1)
} }
if(item_mouse.containsMouse){ if(item_mouse.containsMouse){
return FluTheme.dark ? Qt.rgba(204/255,204/255,204/235,1) : Qt.rgba(92/255,92/255,92/235,1) return FluTheme.dark ? Qt.rgba(204/255,204/255,204/255,1) : Qt.rgba(92/255,92/255,92/255,1)
} }
return FluTheme.dark ? Qt.rgba(255/255,255/255,255/235,1) : Qt.rgba(26/255,26/255,26/235,1) return FluTheme.dark ? Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(26/255,26/255,26/255,1)
} }
MouseArea{ MouseArea{
id:item_mouse id:item_mouse

10
src/Qt5/imports/FluentUI/Controls/FluStatusLayout.qml
View File

@ -8,11 +8,11 @@ Item{
id:control id:control
default property alias content: container.data default property alias content: container.data
property int statusMode: FluStatusLayoutType.Loading property int statusMode: FluStatusLayoutType.Loading
property string loadingText:"正在加载..." property string loadingText: qsTr("Loading...")
property string emptyText: "空空如也" property string emptyText: qsTr("Empty")
property string errorText: "页面出错了.." property string errorText: qsTr("Error")
property string errorButtonText: "重新加载" property string errorButtonText: qsTr("Reload")
property color color: FluTheme.dark ? Window.active ? Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1) property color color: Qt.rgba(0,0,0,0)
signal errorClicked signal errorClicked
property Component loadingItem : com_loading property Component loadingItem : com_loading
property Component emptyItem : com_empty property Component emptyItem : com_empty

6
src/Qt6/imports/FluentUI/Controls/FluBreadcrumbBar.qml
View File

@ -57,12 +57,12 @@ Item {
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
color: { color: {
if(item_mouse.pressed){ if(item_mouse.pressed){
return FluTheme.dark ? Qt.rgba(150/255,150/255,150/235,1) : Qt.rgba(134/255,134/255,134/235,1) return FluTheme.dark ? Qt.rgba(150/255,150/255,150/255,1) : Qt.rgba(134/255,134/255,134/255,1)
} }
if(item_mouse.containsMouse){ if(item_mouse.containsMouse){
return FluTheme.dark ? Qt.rgba(204/255,204/255,204/235,1) : Qt.rgba(92/255,92/255,92/235,1) return FluTheme.dark ? Qt.rgba(204/255,204/255,204/255,1) : Qt.rgba(92/255,92/255,92/255,1)
} }
return FluTheme.dark ? Qt.rgba(255/255,255/255,255/235,1) : Qt.rgba(26/255,26/255,26/235,1) return FluTheme.dark ? Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(26/255,26/255,26/255,1)
} }
MouseArea{ MouseArea{
id:item_mouse id:item_mouse

10
src/Qt6/imports/FluentUI/Controls/FluStatusLayout.qml
View File

@ -7,11 +7,11 @@ Item{
id:control id:control
default property alias content: container.data default property alias content: container.data
property int statusMode: FluStatusLayoutType.Loading property int statusMode: FluStatusLayoutType.Loading
property string loadingText:"正在加载..." property string loadingText: qsTr("Loading...")
property string emptyText: "空空如也" property string emptyText: qsTr("Empty")
property string errorText: "页面出错了.." property string errorText: qsTr("Error")
property string errorButtonText: "重新加载" property string errorButtonText: qsTr("Reload")
property color color: FluTheme.dark ? Window.active ? Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1) property color color: Qt.rgba(0,0,0,0)
signal errorClicked signal errorClicked
property Component loadingItem : com_loading property Component loadingItem : com_loading
property Component emptyItem : com_empty property Component emptyItem : com_empty

27
src/fluentui_en_US.ts
View File

@ -232,6 +232,33 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>FluStatusLayout</name>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="11"/>
<location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="10"/>
<source>Loading...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="12"/>
<location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="11"/>
<source>Empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="13"/>
<location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="12"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="14"/>
<location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="13"/>
<source>Reload</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>FluTextBoxMenu</name> <name>FluTextBoxMenu</name>
<message> <message>

27
src/fluentui_zh_CN.ts
View File

@ -232,6 +232,33 @@
<translation type="unfinished">重置</translation> <translation type="unfinished">重置</translation>
</message> </message>
</context> </context>
<context>
<name>FluStatusLayout</name>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="11"/>
<location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="10"/>
<source>Loading...</source>
<translation type="unfinished">加载中...</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="12"/>
<location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="11"/>
<source>Empty</source>
<translation type="unfinished">空空如也</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="13"/>
<location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="12"/>
<source>Error</source>
<translation type="unfinished">似乎出了点问题</translation>
</message>
<message>
<location filename="Qt5/imports/FluentUI/Controls/FluStatusLayout.qml" line="14"/>
<location filename="Qt6/imports/FluentUI/Controls/FluStatusLayout.qml" line="13"/>
<source>Reload</source>
<translation type="unfinished">重新加载</translation>
</message>
</context>
<context> <context>
<name>FluTextBoxMenu</name> <name>FluTextBoxMenu</name>
<message> <message>