update

zhuzichu520 · Mar 15, 2024 · f8dee13 · f8dee13
1 parent d2de626
commit f8dee13
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 49 deletions.
diff --git a/example/example_en_US.ts b/example/example_en_US.ts
@@ -47,39 +47,39 @@
     <name>FluentInitalizrWindow</name>
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="11"/>
-        <location filename="qml/window/FluentInitalizrWindow.qml" line="32"/>
+        <location filename="qml/window/FluentInitalizrWindow.qml" line="30"/>
         <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="11"/>
-        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="32"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="30"/>
         <source>FluentUI Initalizr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/FluentInitalizrWindow.qml" line="53"/>
-        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="53"/>
+        <location filename="qml/window/FluentInitalizrWindow.qml" line="51"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="51"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/FluentInitalizrWindow.qml" line="61"/>
-        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="61"/>
+        <location filename="qml/window/FluentInitalizrWindow.qml" line="59"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="59"/>
         <source>Create In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/FluentInitalizrWindow.qml" line="65"/>
-        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="65"/>
+        <location filename="qml/window/FluentInitalizrWindow.qml" line="63"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="63"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/FluentInitalizrWindow.qml" line="95"/>
-        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="95"/>
+        <location filename="qml/window/FluentInitalizrWindow.qml" line="93"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="93"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/window/FluentInitalizrWindow.qml" line="103"/>
-        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="103"/>
+        <location filename="qml/window/FluentInitalizrWindow.qml" line="101"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="101"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1594,26 +1594,26 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 <context>
     <name>T_Home</name>
     <message>
-        <location filename="qml/page/T_Home.qml" line="17"/>
-        <location filename="qml-Qt6/page/T_Home.qml" line="17"/>
+        <location filename="qml/page/T_Home.qml" line="22"/>
+        <location filename="qml-Qt6/page/T_Home.qml" line="23"/>
         <source>FluentUI GitHub</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_Home.qml" line="18"/>
-        <location filename="qml-Qt6/page/T_Home.qml" line="18"/>
+        <location filename="qml/page/T_Home.qml" line="23"/>
+        <location filename="qml-Qt6/page/T_Home.qml" line="24"/>
         <source>The latest FluentUI controls and styles for your applications.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_Home.qml" line="26"/>
-        <location filename="qml-Qt6/page/T_Home.qml" line="26"/>
+        <location filename="qml/page/T_Home.qml" line="31"/>
+        <location filename="qml-Qt6/page/T_Home.qml" line="32"/>
         <source>FluentUI Initalizr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="qml/page/T_Home.qml" line="27"/>
-        <location filename="qml-Qt6/page/T_Home.qml" line="27"/>
+        <location filename="qml/page/T_Home.qml" line="32"/>
+        <location filename="qml-Qt6/page/T_Home.qml" line="33"/>
         <source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts
@@ -47,39 +47,39 @@
     <name>FluentInitalizrWindow</name>
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="11"/>
-        <location filename="qml/window/FluentInitalizrWindow.qml" line="32"/>
+        <location filename="qml/window/FluentInitalizrWindow.qml" line="30"/>
         <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="11"/>
-        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="32"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="30"/>
         <source>FluentUI Initalizr</source>
         <translation type="unfinished">FluentUI脚手架</translation>
     </message>
     <message>
-        <location filename="qml/window/FluentInitalizrWindow.qml" line="53"/>
-        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="53"/>
+        <location filename="qml/window/FluentInitalizrWindow.qml" line="51"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="51"/>
         <source>Name</source>
         <translation type="unfinished">名称</translation>
     </message>
     <message>
-        <location filename="qml/window/FluentInitalizrWindow.qml" line="61"/>
-        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="61"/>
+        <location filename="qml/window/FluentInitalizrWindow.qml" line="59"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="59"/>
         <source>Create In</source>
         <translation type="unfinished">创建路径</translation>
     </message>
     <message>
-        <location filename="qml/window/FluentInitalizrWindow.qml" line="65"/>
-        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="65"/>
+        <location filename="qml/window/FluentInitalizrWindow.qml" line="63"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="63"/>
         <source>Browse</source>
         <translation type="unfinished">浏览</translation>
     </message>
     <message>
-        <location filename="qml/window/FluentInitalizrWindow.qml" line="95"/>
-        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="95"/>
+        <location filename="qml/window/FluentInitalizrWindow.qml" line="93"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="93"/>
         <source>Cancel</source>
         <translation type="unfinished">取消</translation>
     </message>
     <message>
-        <location filename="qml/window/FluentInitalizrWindow.qml" line="103"/>
-        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="103"/>
+        <location filename="qml/window/FluentInitalizrWindow.qml" line="101"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="101"/>
         <source>Create</source>
         <translation type="unfinished">创建</translation>
     </message>
@@ -1606,26 +1606,26 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
 <context>
     <name>T_Home</name>
     <message>
-        <location filename="qml/page/T_Home.qml" line="17"/>
-        <location filename="qml-Qt6/page/T_Home.qml" line="17"/>
+        <location filename="qml/page/T_Home.qml" line="22"/>
+        <location filename="qml-Qt6/page/T_Home.qml" line="23"/>
         <source>FluentUI GitHub</source>
         <translation type="unfinished">FluentUI GitHub</translation>
     </message>
     <message>
-        <location filename="qml/page/T_Home.qml" line="18"/>
-        <location filename="qml-Qt6/page/T_Home.qml" line="18"/>
+        <location filename="qml/page/T_Home.qml" line="23"/>
+        <location filename="qml-Qt6/page/T_Home.qml" line="24"/>
         <source>The latest FluentUI controls and styles for your applications.</source>
         <translation type="unfinished">最新的 FluentUI 控件和样式</translation>
     </message>
     <message>
-        <location filename="qml/page/T_Home.qml" line="26"/>
-        <location filename="qml-Qt6/page/T_Home.qml" line="26"/>
+        <location filename="qml/page/T_Home.qml" line="31"/>
+        <location filename="qml-Qt6/page/T_Home.qml" line="32"/>
         <source>FluentUI Initalizr</source>
         <translation type="unfinished">FluentUI脚手架</translation>
     </message>
     <message>
-        <location filename="qml/page/T_Home.qml" line="27"/>
-        <location filename="qml-Qt6/page/T_Home.qml" line="27"/>
+        <location filename="qml/page/T_Home.qml" line="32"/>
+        <location filename="qml-Qt6/page/T_Home.qml" line="33"/>
         <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>
     </message>

diff --git a/src/Qt5/imports/FluentUI/Controls/FluWindowDialog.qml b/src/Qt5/imports/FluentUI/Controls/FluWindowDialog.qml
@@ -21,7 +21,8 @@ FluWindow {
         }
     }
     closeListener: function(event){
-        event.accepted = true
+        visible = false
+        event.accepted = false
     }
     function showDialog(){
         var x = transientParent.x + (transientParent.width - width)/2

diff --git a/src/Qt6/imports/FluentUI/Controls/FluWindowDialog.qml b/src/Qt6/imports/FluentUI/Controls/FluWindowDialog.qml
@@ -21,7 +21,8 @@ FluWindow {
         }
     }
     closeListener: function(event){
-        event.accepted = true
+        visible = false
+        event.accepted = false
     }
     function showDialog(){
         var x = transientParent.x + (transientParent.width - width)/2

diff --git a/src/fluentuiplugin_en_US.ts b/src/fluentuiplugin_en_US.ts
@@ -64,11 +64,7 @@
 <context>
     <name>FluCalendarPicker</name>
     <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/>
-        <source>Please select a date</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml" line="12"/>
         <location filename="Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/>
         <source>Pick a date</source>
         <translation type="unfinished"></translation>

diff --git a/src/fluentuiplugin_zh_CN.ts b/src/fluentuiplugin_zh_CN.ts
@@ -64,11 +64,11 @@
 <context>
     <name>FluCalendarPicker</name>
     <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/>
         <source>Please select a date</source>
-        <translation type="unfinished">请选择日期</translation>
+        <translation type="obsolete">请选择日期</translation>
     </message>
     <message>
+        <location filename="Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml" line="12"/>
         <location filename="Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/>
         <source>Pick a date</source>
         <translation type="unfinished">选择日期</translation>