From f4e36241ba2ef952b31462c811b5f5196ffeea64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Tue, 12 Mar 2024 10:31:19 +0800 Subject: [PATCH] update --- example/CMakeLists.txt | 1 + example/example_en_US.ts | 12 ++++++------ example/example_zh_CN.ts | 14 +++++++------- src/Qt5/imports/FluentUI/Controls/FluDivider.qml | 4 ++-- src/Qt6/imports/FluentUI/Controls/FluDivider.qml | 4 ++-- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index c5909e20..148a22e0 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -137,6 +137,7 @@ if(WIN32) ) endif() +#复制FluentUI源码到运行目录下,用于脚手架生成 file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/source/) file(COPY ${CMAKE_SOURCE_DIR}/src/ DESTINATION ${APPLICATION_DIR_PATH}/source/) diff --git a/example/example_en_US.ts b/example/example_en_US.ts index 89ca73b5..8f833c00 100644 --- a/example/example_en_US.ts +++ b/example/example_en_US.ts @@ -25,20 +25,20 @@ - - + + We apologize for the inconvenience caused by an unexpected error - - + + Report Logs - - + + Restart Program diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts index 5112362e..4c020eb9 100644 --- a/example/example_zh_CN.ts +++ b/example/example_zh_CN.ts @@ -25,20 +25,20 @@ 友情提示 - - + + We apologize for the inconvenience caused by an unexpected error 对于意外错误给您带来的不便,我们深表歉意 - - + + Report Logs 上报日志 - - + + Restart Program 重启程序 @@ -497,7 +497,7 @@ Chart - 表格 + 图表 diff --git a/src/Qt5/imports/FluentUI/Controls/FluDivider.qml b/src/Qt5/imports/FluentUI/Controls/FluDivider.qml index 4bd4b2e0..2c466bf5 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluDivider.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluDivider.qml @@ -27,8 +27,8 @@ Item { height: d.isVertical ? d.parentHeight : spacing*2+size FluRectangle{ color: FluTheme.dividerColor - width: d.isVertical ? size : d.parentWidth - height: d.isVertical ? d.parentHeight : size + width: d.isVertical ? size : control.width + height: d.isVertical ? control.height : size anchors.centerIn: parent } } diff --git a/src/Qt6/imports/FluentUI/Controls/FluDivider.qml b/src/Qt6/imports/FluentUI/Controls/FluDivider.qml index e7b48bef..3c6748a1 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluDivider.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluDivider.qml @@ -27,8 +27,8 @@ Item { height: d.isVertical ? d.parentHeight : spacing*2+size FluRectangle{ color: FluTheme.dividerColor - width: d.isVertical ? size : d.parentWidth - height: d.isVertical ? d.parentHeight : size + width: d.isVertical ? size : control.width + height: d.isVertical ? control.height : size anchors.centerIn: parent } }