Skip to content

Commit f8dee13

Browse files
author
朱子楚\zhuzi
committed
update
1 parent d2de626 commit f8dee13

File tree

6 files changed

+47
-49
lines changed

6 files changed

+47
-49
lines changed

‎example/example_en_US.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,39 +47,39 @@
4747
<name>FluentInitalizrWindow</name>
4848
<message>
4949
<location filename="qml/window/FluentInitalizrWindow.qml" line="11"/>
50-
<location filename="qml/window/FluentInitalizrWindow.qml" line="32"/>
50+
<location filename="qml/window/FluentInitalizrWindow.qml" line="30"/>
5151
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="11"/>
52-
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="32"/>
52+
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="30"/>
5353
<source>FluentUI Initalizr</source>
5454
<translation type="unfinished"></translation>
5555
</message>
5656
<message>
57-
<location filename="qml/window/FluentInitalizrWindow.qml" line="53"/>
58-
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="53"/>
57+
<location filename="qml/window/FluentInitalizrWindow.qml" line="51"/>
58+
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="51"/>
5959
<source>Name</source>
6060
<translation type="unfinished"></translation>
6161
</message>
6262
<message>
63-
<location filename="qml/window/FluentInitalizrWindow.qml" line="61"/>
64-
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="61"/>
63+
<location filename="qml/window/FluentInitalizrWindow.qml" line="59"/>
64+
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="59"/>
6565
<source>Create In</source>
6666
<translation type="unfinished"></translation>
6767
</message>
6868
<message>
69-
<location filename="qml/window/FluentInitalizrWindow.qml" line="65"/>
70-
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="65"/>
69+
<location filename="qml/window/FluentInitalizrWindow.qml" line="63"/>
70+
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="63"/>
7171
<source>Browse</source>
7272
<translation type="unfinished"></translation>
7373
</message>
7474
<message>
75-
<location filename="qml/window/FluentInitalizrWindow.qml" line="95"/>
76-
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="95"/>
75+
<location filename="qml/window/FluentInitalizrWindow.qml" line="93"/>
76+
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="93"/>
7777
<source>Cancel</source>
7878
<translation type="unfinished"></translation>
7979
</message>
8080
<message>
81-
<location filename="qml/window/FluentInitalizrWindow.qml" line="103"/>
82-
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="103"/>
81+
<location filename="qml/window/FluentInitalizrWindow.qml" line="101"/>
82+
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="101"/>
8383
<source>Create</source>
8484
<translation type="unfinished"></translation>
8585
</message>
@@ -1594,26 +1594,26 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
15941594
<context>
15951595
<name>T_Home</name>
15961596
<message>
1597-
<location filename="qml/page/T_Home.qml" line="17"/>
1598-
<location filename="qml-Qt6/page/T_Home.qml" line="17"/>
1597+
<location filename="qml/page/T_Home.qml" line="22"/>
1598+
<location filename="qml-Qt6/page/T_Home.qml" line="23"/>
15991599
<source>FluentUI GitHub</source>
16001600
<translation type="unfinished"></translation>
16011601
</message>
16021602
<message>
1603-
<location filename="qml/page/T_Home.qml" line="18"/>
1604-
<location filename="qml-Qt6/page/T_Home.qml" line="18"/>
1603+
<location filename="qml/page/T_Home.qml" line="23"/>
1604+
<location filename="qml-Qt6/page/T_Home.qml" line="24"/>
16051605
<source>The latest FluentUI controls and styles for your applications.</source>
16061606
<translation type="unfinished"></translation>
16071607
</message>
16081608
<message>
1609-
<location filename="qml/page/T_Home.qml" line="26"/>
1610-
<location filename="qml-Qt6/page/T_Home.qml" line="26"/>
1609+
<location filename="qml/page/T_Home.qml" line="31"/>
1610+
<location filename="qml-Qt6/page/T_Home.qml" line="32"/>
16111611
<source>FluentUI Initalizr</source>
16121612
<translation type="unfinished"></translation>
16131613
</message>
16141614
<message>
1615-
<location filename="qml/page/T_Home.qml" line="27"/>
1616-
<location filename="qml-Qt6/page/T_Home.qml" line="27"/>
1615+
<location filename="qml/page/T_Home.qml" line="32"/>
1616+
<location filename="qml-Qt6/page/T_Home.qml" line="33"/>
16171617
<source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
16181618
<translation type="unfinished"></translation>
16191619
</message>

‎example/example_zh_CN.ts‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,39 +47,39 @@
4747
<name>FluentInitalizrWindow</name>
4848
<message>
4949
<location filename="qml/window/FluentInitalizrWindow.qml" line="11"/>
50-
<location filename="qml/window/FluentInitalizrWindow.qml" line="32"/>
50+
<location filename="qml/window/FluentInitalizrWindow.qml" line="30"/>
5151
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="11"/>
52-
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="32"/>
52+
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="30"/>
5353
<source>FluentUI Initalizr</source>
5454
<translation type="unfinished">FluentUI脚手架</translation>
5555
</message>
5656
<message>
57-
<location filename="qml/window/FluentInitalizrWindow.qml" line="53"/>
58-
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="53"/>
57+
<location filename="qml/window/FluentInitalizrWindow.qml" line="51"/>
58+
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="51"/>
5959
<source>Name</source>
6060
<translation type="unfinished">名称</translation>
6161
</message>
6262
<message>
63-
<location filename="qml/window/FluentInitalizrWindow.qml" line="61"/>
64-
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="61"/>
63+
<location filename="qml/window/FluentInitalizrWindow.qml" line="59"/>
64+
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="59"/>
6565
<source>Create In</source>
6666
<translation type="unfinished">创建路径</translation>
6767
</message>
6868
<message>
69-
<location filename="qml/window/FluentInitalizrWindow.qml" line="65"/>
70-
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="65"/>
69+
<location filename="qml/window/FluentInitalizrWindow.qml" line="63"/>
70+
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="63"/>
7171
<source>Browse</source>
7272
<translation type="unfinished">浏览</translation>
7373
</message>
7474
<message>
75-
<location filename="qml/window/FluentInitalizrWindow.qml" line="95"/>
76-
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="95"/>
75+
<location filename="qml/window/FluentInitalizrWindow.qml" line="93"/>
76+
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="93"/>
7777
<source>Cancel</source>
7878
<translation type="unfinished">取消</translation>
7979
</message>
8080
<message>
81-
<location filename="qml/window/FluentInitalizrWindow.qml" line="103"/>
82-
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="103"/>
81+
<location filename="qml/window/FluentInitalizrWindow.qml" line="101"/>
82+
<location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="101"/>
8383
<source>Create</source>
8484
<translation type="unfinished">创建</translation>
8585
</message>
@@ -1606,26 +1606,26 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
16061606
<context>
16071607
<name>T_Home</name>
16081608
<message>
1609-
<location filename="qml/page/T_Home.qml" line="17"/>
1610-
<location filename="qml-Qt6/page/T_Home.qml" line="17"/>
1609+
<location filename="qml/page/T_Home.qml" line="22"/>
1610+
<location filename="qml-Qt6/page/T_Home.qml" line="23"/>
16111611
<source>FluentUI GitHub</source>
16121612
<translation type="unfinished">FluentUI GitHub</translation>
16131613
</message>
16141614
<message>
1615-
<location filename="qml/page/T_Home.qml" line="18"/>
1616-
<location filename="qml-Qt6/page/T_Home.qml" line="18"/>
1615+
<location filename="qml/page/T_Home.qml" line="23"/>
1616+
<location filename="qml-Qt6/page/T_Home.qml" line="24"/>
16171617
<source>The latest FluentUI controls and styles for your applications.</source>
16181618
<translation type="unfinished">最新的 FluentUI 控件和样式</translation>
16191619
</message>
16201620
<message>
1621-
<location filename="qml/page/T_Home.qml" line="26"/>
1622-
<location filename="qml-Qt6/page/T_Home.qml" line="26"/>
1621+
<location filename="qml/page/T_Home.qml" line="31"/>
1622+
<location filename="qml-Qt6/page/T_Home.qml" line="32"/>
16231623
<source>FluentUI Initalizr</source>
16241624
<translation type="unfinished">FluentUI脚手架</translation>
16251625
</message>
16261626
<message>
1627-
<location filename="qml/page/T_Home.qml" line="27"/>
1628-
<location filename="qml-Qt6/page/T_Home.qml" line="27"/>
1627+
<location filename="qml/page/T_Home.qml" line="32"/>
1628+
<location filename="qml-Qt6/page/T_Home.qml" line="33"/>
16291629
<source>FluentUI Initializr is a Tool that helps you create and customize Fluent UI projects with various options.</source>
16301630
<translation type="unfinished">FluentUI 脚手架是一个快速创建项目工具，可帮助您创建和自定义具有各种选项的 Fluent UI 项目</translation>
16311631
</message>

‎src/Qt5/imports/FluentUI/Controls/FluWindowDialog.qml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ FluWindow {
2121
}
2222
}
2323
closeListener: function(event){
24-
event.accepted = true
24+
visible = false
25+
event.accepted = false
2526
}
2627
function showDialog(){
2728
var x = transientParent.x + (transientParent.width - width)/2

‎src/Qt6/imports/FluentUI/Controls/FluWindowDialog.qml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ FluWindow {
2121
}
2222
}
2323
closeListener: function(event){
24-
event.accepted = true
24+
visible = false
25+
event.accepted = false
2526
}
2627
function showDialog(){
2728
var x = transientParent.x + (transientParent.width - width)/2

‎src/fluentuiplugin_en_US.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,7 @@
6464
<context>
6565
<name>FluCalendarPicker</name>
6666
<message>
67-
<location filename="Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/>
68-
<source>Please select a date</source>
69-
<translation type="unfinished"></translation>
70-
</message>
71-
<message>
67+
<location filename="Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml" line="12"/>
7268
<location filename="Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/>
7369
<source>Pick a date</source>
7470
<translation type="unfinished"></translation>

‎src/fluentuiplugin_zh_CN.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@
6464
<context>
6565
<name>FluCalendarPicker</name>
6666
<message>
67-
<location filename="Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/>
6867
<source>Please select a date</source>
69-
<translation type="unfinished">请选择日期</translation>
68+
<translation type="obsolete">请选择日期</translation>
7069
</message>
7170
<message>
71+
<location filename="Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml" line="12"/>
7272
<location filename="Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml" line="11"/>
7373
<source>Pick a date</source>
7474
<translation type="unfinished">选择日期</translation>

0 commit comments

Comments
 (0)