update

zhuzichu520 · Mar 15, 2024 · 9d5765e · 9d5765e
1 parent 2dbbaa5
commit 9d5765e
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 20 deletions.
diff --git a/example/example_en_US.ts b/example/example_en_US.ts
@@ -102,22 +102,22 @@
 <context>
     <name>InitalizrHelper</name>
     <message>
-        <location filename="src/helper/InitalizrHelper.cpp" line="73"/>
+        <location filename="src/helper/InitalizrHelper.cpp" line="77"/>
         <source>The name cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/helper/InitalizrHelper.cpp" line="77"/>
+        <location filename="src/helper/InitalizrHelper.cpp" line="81"/>
         <source>The creation path cannot be empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/helper/InitalizrHelper.cpp" line="82"/>
+        <location filename="src/helper/InitalizrHelper.cpp" line="86"/>
         <source>The path does not exist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/helper/InitalizrHelper.cpp" line="88"/>
+        <location filename="src/helper/InitalizrHelper.cpp" line="92"/>
         <source>%1 folder already exists</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1649,7 +1649,9 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
     </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="26"/>
+        <location filename="qml/page/T_InfoBar.qml" line="50"/>
         <location filename="qml-Qt6/page/T_InfoBar.qml" line="26"/>
+        <location filename="qml-Qt6/page/T_InfoBar.qml" line="50"/>
         <source>This is an InfoBar in the Info Style</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1683,6 +1685,12 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <source>InfoBar that needs to be turned off manually</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="qml/page/T_InfoBar.qml" line="50"/>
+        <location filename="qml-Qt6/page/T_InfoBar.qml" line="50"/>
+        <source>Manual shutdown is supported</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>T_LineChart</name>

diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts
@@ -102,22 +102,22 @@
 <context>
     <name>InitalizrHelper</name>
     <message>
-        <location filename="src/helper/InitalizrHelper.cpp" line="73"/>
+        <location filename="src/helper/InitalizrHelper.cpp" line="77"/>
         <source>The name cannot be empty</source>
         <translation type="unfinished">名称不能为空</translation>
     </message>
     <message>
-        <location filename="src/helper/InitalizrHelper.cpp" line="77"/>
+        <location filename="src/helper/InitalizrHelper.cpp" line="81"/>
         <source>The creation path cannot be empty</source>
         <translation type="unfinished">创建路径不能为空</translation>
     </message>
     <message>
-        <location filename="src/helper/InitalizrHelper.cpp" line="82"/>
+        <location filename="src/helper/InitalizrHelper.cpp" line="86"/>
         <source>The path does not exist</source>
         <translation type="unfinished">路径不存在</translation>
     </message>
     <message>
-        <location filename="src/helper/InitalizrHelper.cpp" line="88"/>
+        <location filename="src/helper/InitalizrHelper.cpp" line="92"/>
         <source>%1 folder already exists</source>
         <translation type="unfinished"></translation>
     </message>
@@ -239,19 +239,19 @@
         <location filename="qml/global/ItemsOriginal.qml" line="124"/>
         <location filename="qml-Qt6/global/ItemsOriginal.qml" line="124"/>
         <source>TimePicker</source>
-        <translation type="unfinished">时间选取器</translation>
+        <translation type="unfinished">时间选择器</translation>
     </message>
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="130"/>
         <location filename="qml-Qt6/global/ItemsOriginal.qml" line="130"/>
         <source>DatePicker</source>
-        <translation type="unfinished">日期选取器</translation>
+        <translation type="unfinished">日期选择器</translation>
     </message>
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="136"/>
         <location filename="qml-Qt6/global/ItemsOriginal.qml" line="136"/>
         <source>CalendarPicker</source>
-        <translation type="unfinished">日历选取器</translation>
+        <translation type="unfinished">日历选择器</translation>
     </message>
     <message>
         <location filename="qml/global/ItemsOriginal.qml" line="142"/>
@@ -1176,7 +1176,7 @@ Updated content:
         <location filename="qml/page/T_CalendarPicker.qml" line="10"/>
         <location filename="qml-Qt6/page/T_CalendarPicker.qml" line="10"/>
         <source>CalendarPicker</source>
-        <translation type="unfinished">日历选取器</translation>
+        <translation type="unfinished">日历选择器</translation>
     </message>
 </context>
 <context>
@@ -1373,7 +1373,7 @@ Updated content:
         <location filename="qml/page/T_DatePicker.qml" line="10"/>
         <location filename="qml-Qt6/page/T_DatePicker.qml" line="10"/>
         <source>TimePicker</source>
-        <translation type="unfinished">时间选取器</translation>
+        <translation type="unfinished">时间选择器</translation>
     </message>
     <message>
         <location filename="qml/page/T_DatePicker.qml" line="23"/>
@@ -1665,7 +1665,9 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
     </message>
     <message>
         <location filename="qml/page/T_InfoBar.qml" line="26"/>
+        <location filename="qml/page/T_InfoBar.qml" line="50"/>
         <location filename="qml-Qt6/page/T_InfoBar.qml" line="26"/>
+        <location filename="qml-Qt6/page/T_InfoBar.qml" line="50"/>
         <source>This is an InfoBar in the Info Style</source>
         <translation type="unfinished">这是一个Info样式的信息栏</translation>
     </message>
@@ -1699,6 +1701,12 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <source>InfoBar that needs to be turned off manually</source>
         <translation type="unfinished">需要手动关闭的信息栏</translation>
     </message>
+    <message>
+        <location filename="qml/page/T_InfoBar.qml" line="50"/>
+        <location filename="qml-Qt6/page/T_InfoBar.qml" line="50"/>
+        <source>Manual shutdown is supported</source>
+        <translation type="unfinished">支持手动关闭</translation>
+    </message>
     <message>
         <source>Loading...</source>
         <translation type="obsolete">加载中...</translation>
@@ -2576,7 +2584,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <location filename="qml/page/T_TimePicker.qml" line="10"/>
         <location filename="qml-Qt6/page/T_TimePicker.qml" line="10"/>
         <source>TimePicker</source>
-        <translation type="unfinished">时间选取器</translation>
+        <translation type="unfinished">时间选择器</translation>
     </message>
     <message>
         <location filename="qml/page/T_TimePicker.qml" line="26"/>

diff --git a/example/qml-Qt6/page/T_InfoBar.qml b/example/qml-Qt6/page/T_InfoBar.qml
@@ -47,7 +47,7 @@ FluScrollablePage{
             FluButton{
                 text: qsTr("InfoBar that needs to be turned off manually")
                 onClicked: {
-                    showInfo("This is an InfoBar in the Info Style",0,"Manual shutdown is supported")
+                    showInfo(qsTr("This is an InfoBar in the Info Style"),0,qsTr("Manual shutdown is supported"))
                 }
             }
             FluButton{

diff --git a/example/qml/page/T_InfoBar.qml b/example/qml/page/T_InfoBar.qml
@@ -47,7 +47,7 @@ FluScrollablePage{
             FluButton{
                 text: qsTr("InfoBar that needs to be turned off manually")
                 onClicked: {
-                    showInfo("This is an InfoBar in the Info Style",0,"Manual shutdown is supported")
+                    showInfo(qsTr("This is an InfoBar in the Info Style"),0,qsTr("Manual shutdown is supported"))
                 }
             }
             FluButton{

diff --git a/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml b/src/Qt5/imports/FluentUI/Controls/FluCalendarPicker.qml
@@ -10,6 +10,8 @@ Rectangle {
     property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
     property color normalColor: FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1)
     property string text: qsTr("Pick a date")
+    property date from: new Date(1924, 0, 1)
+    property date to: new Date(2124, 11, 31)
     property var current
     signal accepted()
     id:control
@@ -34,8 +36,8 @@ Rectangle {
     }
     CalendarModel {
         id:calender_model
-        from: new Date(1924, 0, 1)
-        to: new Date(2124, 11, 31)
+        from: control.from
+        to: control.to
     }
     Item{
         id:d

diff --git a/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml b/src/Qt6/imports/FluentUI/Controls/FluCalendarPicker.qml
@@ -9,6 +9,8 @@ Rectangle {
     property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
     property color normalColor: FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1)
     property string text: qsTr("Pick a date")
+    property date from: new Date(1924, 0, 1)
+    property date to: new Date(2124, 11, 31)
     property var current
     signal accepted()
     id:control
@@ -33,8 +35,8 @@ Rectangle {
     }
     CalendarModel {
         id:calender_model
-        from: new Date(1924, 0, 1)
-        to: new Date(2124, 11, 31)
+        from: control.from
+        to: control.to
     }
     Item{
         id:d