update

zhuzichu520 · Mar 12, 2024 · f4e3624 · f4e3624
1 parent dfc579e
commit f4e3624
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git 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
@@ -25,20 +25,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/CrashWindow.qml" line="48"/>
-        <location filename="qml-Qt6/window/CrashWindow.qml" line="48"/>
+        <location filename="qml/window/CrashWindow.qml" line="50"/>
+        <location filename="qml-Qt6/window/CrashWindow.qml" line="50"/>
         <source>We apologize for the inconvenience caused by an unexpected error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/CrashWindow.qml" line="60"/>
-        <location filename="qml-Qt6/window/CrashWindow.qml" line="60"/>
+        <location filename="qml/window/CrashWindow.qml" line="62"/>
+        <location filename="qml-Qt6/window/CrashWindow.qml" line="62"/>
         <source>Report Logs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/CrashWindow.qml" line="70"/>
-        <location filename="qml-Qt6/window/CrashWindow.qml" line="70"/>
+        <location filename="qml/window/CrashWindow.qml" line="72"/>
+        <location filename="qml-Qt6/window/CrashWindow.qml" line="72"/>
         <source>Restart Program</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts
@@ -25,20 +25,20 @@
         <translation type="unfinished">友情提示</translation>
     </message>
     <message>
-        <location filename="qml/window/CrashWindow.qml" line="48"/>
-        <location filename="qml-Qt6/window/CrashWindow.qml" line="48"/>
+        <location filename="qml/window/CrashWindow.qml" line="50"/>
+        <location filename="qml-Qt6/window/CrashWindow.qml" line="50"/>
         <source>We apologize for the inconvenience caused by an unexpected error</source>
         <translation type="unfinished">对于意外错误给您带来的不便，我们深表歉意</translation>
     </message>
     <message>
-        <location filename="qml/window/CrashWindow.qml" line="60"/>
-        <location filename="qml-Qt6/window/CrashWindow.qml" line="60"/>
+        <location filename="qml/window/CrashWindow.qml" line="62"/>
+        <location filename="qml-Qt6/window/CrashWindow.qml" line="62"/>
         <source>Report Logs</source>
         <translation type="unfinished">上报日志</translation>
     </message>
     <message>
-        <location filename="qml/window/CrashWindow.qml" line="70"/>
-        <location filename="qml-Qt6/window/CrashWindow.qml" line="70"/>
+        <location filename="qml/window/CrashWindow.qml" line="72"/>
+        <location filename="qml-Qt6/window/CrashWindow.qml" line="72"/>
         <source>Restart Program</source>
         <translation type="unfinished">重启程序</translation>
     </message>
@@ -497,7 +497,7 @@
         <location filename="qml/global/ItemsOriginal.qml" line="363"/>
         <location filename="qml-Qt6/global/ItemsOriginal.qml" line="363"/>
         <source>Chart</source>
-        <translation type="unfinished">表格</translation>
+        <translation type="unfinished">图表</translation>
     </message>
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="366"/>

diff --git 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
@@ -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
     }
 }