update

example/example_en.ts

@@ -48,31 +48,38 @@
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="11"/>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="31"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="11"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="31"/>
         <source>FluentUI Initalizr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="52"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="52"/>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="60"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="60"/>
         <source>Create In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="67"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="67"/>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="98"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="98"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="106"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="106"/>
         <source>Create</source>
         <translation type="unfinished"></translation>
     </message>
@@ -935,6 +942,15 @@ Updated content:
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>T_BarChart</name>
+    <message>
+        <location filename="qml/chart/T_BarChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_BarChart.qml" line="10"/>
+        <source>Bar Chart</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>T_BreadcrumbBar</name>
     <message>
@@ -950,6 +966,15 @@ Updated content:
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>T_BubbleChart</name>
+    <message>
+        <location filename="qml/chart/T_BubbleChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_BubbleChart.qml" line="10"/>
+        <source>Bubble Chart</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>T_Buttons</name>
     <message>
@@ -1274,6 +1299,61 @@ Updated content:
         <source>ColorPicker</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="19"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="19"/>
+        <source>Click to Select a Color - &gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="23"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="23"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="24"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="24"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="25"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="25"/>
+        <source>Color Picker</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="26"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="26"/>
+        <source>Edit Color</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="27"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="27"/>
+        <source>Red</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="28"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="28"/>
+        <source>Green</source>
+        <oldsource>Greeb</oldsource>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="29"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="29"/>
+        <source>Blue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="30"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="30"/>
+        <source>Opacity</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>T_ComboBox</name>
@@ -1626,6 +1706,15 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>T_LineChart</name>
+    <message>
+        <location filename="qml/chart/T_LineChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_LineChart.qml" line="10"/>
+        <source>Line Chart</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>T_Menu</name>
     <message>
@@ -1830,6 +1919,15 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>T_Network</name>
+    <message>
+        <location filename="qml/page/T_Network.qml" line="12"/>
+        <location filename="qml-Qt6/page/T_Network.qml" line="12"/>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>T_Pagination</name>
     <message>
@@ -1859,6 +1957,16 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>T_PieChart</name>
+    <message>
+        <location filename="qml/chart/T_PieChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_PieChart.qml" line="10"/>
+        <source>Pie Chart</source>
+        <oldsource>Doughnut and Pie Chart</oldsource>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>T_Pivot</name>
     <message>
@@ -1916,6 +2024,16 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>T_PolarAreaChart</name>
+    <message>
+        <location filename="qml/chart/T_PolarAreaChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_PolarAreaChart.qml" line="10"/>
+        <source>Polar Area Chart</source>
+        <oldsource>PolarArea Chart</oldsource>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>T_Progress</name>
     <message>
@@ -1934,6 +2052,15 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>T_RadarChart</name>
+    <message>
+        <location filename="qml/chart/T_RadarChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_RadarChart.qml" line="10"/>
+        <source>Radar Chart</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>T_RadioButton</name>
     <message>
@@ -1999,6 +2126,15 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>T_ScatterChart</name>
+    <message>
+        <location filename="qml/chart/T_ScatterChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_ScatterChart.qml" line="10"/>
+        <source>Scatter Chart</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>T_Settings</name>
     <message>
@@ -2124,6 +2260,36 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <source>ShortcutPicker</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="qml/page/T_ShortcutPicker.qml" line="19"/>
+        <location filename="qml-Qt6/page/T_ShortcutPicker.qml" line="19"/>
+        <source>Activate the Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ShortcutPicker.qml" line="20"/>
+        <location filename="qml-Qt6/page/T_ShortcutPicker.qml" line="20"/>
+        <source>Press the key combination to change the shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ShortcutPicker.qml" line="21"/>
+        <location filename="qml-Qt6/page/T_ShortcutPicker.qml" line="21"/>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ShortcutPicker.qml" line="22"/>
+        <location filename="qml-Qt6/page/T_ShortcutPicker.qml" line="22"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ShortcutPicker.qml" line="23"/>
+        <location filename="qml-Qt6/page/T_ShortcutPicker.qml" line="23"/>
+        <source>Reset</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>T_Slider</name>
@@ -2312,6 +2478,18 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <source>Next&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="qml/page/T_TableView.qml" line="419"/>
+        <location filename="qml-Qt6/page/T_TableView.qml" line="419"/>
+        <source>Delete Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_TableView.qml" line="443"/>
+        <location filename="qml-Qt6/page/T_TableView.qml" line="443"/>
+        <source>Add a row of Data</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>T_Text</name>
@@ -2658,6 +2836,12 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="qml/page/T_Tour.qml" line="10"/>
+        <location filename="qml-Qt6/page/T_Tour.qml" line="10"/>
+        <source>Tour</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>T_TreeView</name>

example/example_zh.ts

@@ -48,31 +48,38 @@
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="11"/>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="31"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="11"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="31"/>
         <source>FluentUI Initalizr</source>
         <translation type="unfinished">FluentUI脚手架</translation>
     </message>
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="52"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="52"/>
         <source>Name</source>
         <translation type="unfinished">名称</translation>
     </message>
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="60"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="60"/>
         <source>Create In</source>
         <translation type="unfinished">创建路径</translation>
     </message>
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="67"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="67"/>
         <source>Browse</source>
         <translation type="unfinished">浏览</translation>
     </message>
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="98"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="98"/>
         <source>Cancel</source>
         <translation type="unfinished">取消</translation>
     </message>
     <message>
         <location filename="qml/window/FluentInitalizrWindow.qml" line="106"/>
+        <location filename="qml-Qt6/window/FluentInitalizrWindow.qml" line="106"/>
         <source>Create</source>
         <translation type="unfinished">创建</translation>
     </message>
@@ -936,6 +943,15 @@ Updated content:
         <translation type="unfinished">一般出现在通知图标或头像的右上角，用于显示需要处理的消息条数</translation>
     </message>
 </context>
+<context>
+    <name>T_BarChart</name>
+    <message>
+        <location filename="qml/chart/T_BarChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_BarChart.qml" line="10"/>
+        <source>Bar Chart</source>
+        <translation type="unfinished">条形图</translation>
+    </message>
+</context>
 <context>
     <name>T_BreadcrumbBar</name>
     <message>
@@ -951,6 +967,15 @@ Updated content:
         <translation type="unfinished">重置</translation>
     </message>
 </context>
+<context>
+    <name>T_BubbleChart</name>
+    <message>
+        <location filename="qml/chart/T_BubbleChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_BubbleChart.qml" line="10"/>
+        <source>Bubble Chart</source>
+        <translation type="unfinished">气泡图</translation>
+    </message>
+</context>
 <context>
     <name>T_Buttons</name>
     <message>
@@ -1275,6 +1300,60 @@ Updated content:
         <source>ColorPicker</source>
         <translation type="unfinished">颜色选择器</translation>
     </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="19"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="19"/>
+        <source>Click to Select a Color - &gt;</source>
+        <translation type="unfinished">点击选中颜色 - &gt;</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="23"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="23"/>
+        <source>Cancel</source>
+        <translation type="unfinished">取消</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="24"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="24"/>
+        <source>OK</source>
+        <translation type="unfinished">确定</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="25"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="25"/>
+        <source>Color Picker</source>
+        <translation type="unfinished">颜色选择器</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="26"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="26"/>
+        <source>Edit Color</source>
+        <translation type="unfinished">编辑颜色</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="27"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="27"/>
+        <source>Red</source>
+        <translation type="unfinished">红色</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="28"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="28"/>
+        <source>Green</source>
+        <translation type="unfinished">绿色</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="29"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="29"/>
+        <source>Blue</source>
+        <translation type="unfinished">蓝色</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ColorPicker.qml" line="30"/>
+        <location filename="qml-Qt6/page/T_ColorPicker.qml" line="30"/>
+        <source>Opacity</source>
+        <translation type="unfinished">透明度</translation>
+    </message>
 </context>
 <context>
     <name>T_ComboBox</name>
@@ -1635,6 +1714,15 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished">加载中...</translation>
     </message>
 </context>
+<context>
+    <name>T_LineChart</name>
+    <message>
+        <location filename="qml/chart/T_LineChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_LineChart.qml" line="10"/>
+        <source>Line Chart</source>
+        <translation type="unfinished">线型图</translation>
+    </message>
+</context>
 <context>
     <name>T_Menu</name>
     <message>
@@ -1839,6 +1927,15 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished">登录窗口返回过来的密码 - &gt;</translation>
     </message>
 </context>
+<context>
+    <name>T_Network</name>
+    <message>
+        <location filename="qml/page/T_Network.qml" line="12"/>
+        <location filename="qml-Qt6/page/T_Network.qml" line="12"/>
+        <source>Network</source>
+        <translation type="unfinished">网络</translation>
+    </message>
+</context>
 <context>
     <name>T_Pagination</name>
     <message>
@@ -1868,6 +1965,16 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished">下一页&gt;</translation>
     </message>
 </context>
+<context>
+    <name>T_PieChart</name>
+    <message>
+        <location filename="qml/chart/T_PieChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_PieChart.qml" line="10"/>
+        <source>Pie Chart</source>
+        <oldsource>Doughnut and Pie Chart</oldsource>
+        <translation type="unfinished">饼图</translation>
+    </message>
+</context>
 <context>
     <name>T_Pivot</name>
     <message>
@@ -1925,6 +2032,16 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished">紧急电子邮件都在这里</translation>
     </message>
 </context>
+<context>
+    <name>T_PolarAreaChart</name>
+    <message>
+        <location filename="qml/chart/T_PolarAreaChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_PolarAreaChart.qml" line="10"/>
+        <source>Polar Area Chart</source>
+        <oldsource>PolarArea Chart</oldsource>
+        <translation type="unfinished">极坐标区域图</translation>
+    </message>
+</context>
 <context>
     <name>T_Progress</name>
     <message>
@@ -1943,6 +2060,15 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished">二维码</translation>
     </message>
 </context>
+<context>
+    <name>T_RadarChart</name>
+    <message>
+        <location filename="qml/chart/T_RadarChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_RadarChart.qml" line="10"/>
+        <source>Radar Chart</source>
+        <translation type="unfinished">雷达图</translation>
+    </message>
+</context>
 <context>
     <name>T_RadioButton</name>
     <message>
@@ -2008,6 +2134,15 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <translation type="unfinished">矩形</translation>
     </message>
 </context>
+<context>
+    <name>T_ScatterChart</name>
+    <message>
+        <location filename="qml/chart/T_ScatterChart.qml" line="10"/>
+        <location filename="qml-Qt6/chart/T_ScatterChart.qml" line="10"/>
+        <source>Scatter Chart</source>
+        <translation type="unfinished">散点图</translation>
+    </message>
+</context>
 <context>
     <name>T_Settings</name>
     <message>
@@ -2133,6 +2268,36 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <source>ShortcutPicker</source>
         <translation type="unfinished">快捷键选择器</translation>
     </message>
+    <message>
+        <location filename="qml/page/T_ShortcutPicker.qml" line="19"/>
+        <location filename="qml-Qt6/page/T_ShortcutPicker.qml" line="19"/>
+        <source>Activate the Shortcut</source>
+        <translation type="unfinished">激活快捷键</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ShortcutPicker.qml" line="20"/>
+        <location filename="qml-Qt6/page/T_ShortcutPicker.qml" line="20"/>
+        <source>Press the key combination to change the shortcut</source>
+        <translation type="unfinished">按下组合键以更改此快捷键</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ShortcutPicker.qml" line="21"/>
+        <location filename="qml-Qt6/page/T_ShortcutPicker.qml" line="21"/>
+        <source>Save</source>
+        <translation type="unfinished">保存</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ShortcutPicker.qml" line="22"/>
+        <location filename="qml-Qt6/page/T_ShortcutPicker.qml" line="22"/>
+        <source>Cancel</source>
+        <translation type="unfinished">取消</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_ShortcutPicker.qml" line="23"/>
+        <location filename="qml-Qt6/page/T_ShortcutPicker.qml" line="23"/>
+        <source>Reset</source>
+        <translation type="unfinished">重置</translation>
+    </message>
 </context>
 <context>
     <name>T_Slider</name>
@@ -2321,6 +2486,18 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <source>Next&gt;</source>
         <translation type="unfinished">下一页&gt;</translation>
     </message>
+    <message>
+        <location filename="qml/page/T_TableView.qml" line="419"/>
+        <location filename="qml-Qt6/page/T_TableView.qml" line="419"/>
+        <source>Delete Selection</source>
+        <translation type="unfinished">删除选中</translation>
+    </message>
+    <message>
+        <location filename="qml/page/T_TableView.qml" line="443"/>
+        <location filename="qml-Qt6/page/T_TableView.qml" line="443"/>
+        <source>Add a row of Data</source>
+        <translation type="unfinished">添加一行数据</translation>
+    </message>
 </context>
 <context>
     <name>T_Text</name>
@@ -2667,6 +2844,12 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
         <source>More</source>
         <translation type="unfinished">更多</translation>
     </message>
+    <message>
+        <location filename="qml/page/T_Tour.qml" line="10"/>
+        <location filename="qml-Qt6/page/T_Tour.qml" line="10"/>
+        <source>Tour</source>
+        <translation type="unfinished">游览</translation>
+    </message>
 </context>
 <context>
     <name>T_TreeView</name>

example/qml-Qt6/chart/T_BarChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Bar Chart"
+    title: qsTr("Bar Chart")
 
     FluArea{
         width: 500

example/qml-Qt6/chart/T_BubbleChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Bubble Chart"
+    title: qsTr("Bubble Chart")
 
     function randomScalingFactor() {
         return Math.random().toFixed(1);

example/qml-Qt6/chart/T_LineChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Line Chart"
+    title: qsTr("Line Chart")
 
     FluArea{
         width: 500

example/qml-Qt6/chart/T_PieChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Doughnut and Pie Chart"
+    title: qsTr("Pie Chart")
 
     FluArea{
         width: 500

example/qml-Qt6/chart/T_PolarAreaChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"PolarArea Chart"
+    title: qsTr("Polar Area Chart")
 
     FluArea{
         width: 500

example/qml-Qt6/chart/T_RadarChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Radar Chart"
+    title: qsTr("Radar Chart")
 
     FluArea{
         width: 500

example/qml-Qt6/chart/T_ScatterChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Scatter Chart"
+    title: qsTr("Scatter Chart")
 
     function randomScalingFactor() {
         return Math.random().toFixed(1);

example/qml-Qt6/page/T_ColorPicker.qml

@@ -14,14 +14,20 @@ FluScrollablePage{
         Layout.topMargin: 20
         height: 60
         paddings: 10
-
         RowLayout{
             FluText{
-                text:"点击选择颜色->"
+                text: qsTr("Click to Select a Color - >")
                 Layout.alignment: Qt.AlignVCenter
             }
             FluColorPicker{
-
+                cancelText: qsTr("Cancel")
+                okText: qsTr("OK")
+                titleText: qsTr("Color Picker")
+                editText: qsTr("Edit Color")
+                redText: qsTr("Red")
+                greenText: qsTr("Green")
+                blueText: qsTr("Blue")
+                opacityText: qsTr("Opacity")
             }
         }
     }

example/qml-Qt6/page/T_Network.qml

@@ -9,7 +9,7 @@ import "../component"
 FluContentPage{
 
     id:root
-    title:"Network"
+    title: qsTr("Network")
 
     FluNetworkCallable{
         id:callable

example/qml-Qt6/page/T_ShortcutPicker.qml

@@ -16,6 +16,11 @@ FluScrollablePage{
         paddings: 10
         FluShortcutPicker{
             anchors.verticalCenter: parent.verticalCenter
+            title: qsTr("Activate the Shortcut")
+            message: qsTr("Press the key combination to change the shortcut")
+            positiveText: qsTr("Save")
+            neutralText: qsTr("Cancel")
+            negativeText: qsTr("Reset")
         }
     }
     CodeExpander{

example/qml-Qt6/page/T_TableView.qml

@@ -416,7 +416,7 @@ FluContentPage{
             }
 
             FluButton{
-                text:"Delete Selection"
+                text: qsTr("Delete Selection")
                 onClicked: {
                     var data = []
                     var rows = []
@@ -440,7 +440,7 @@ FluContentPage{
             }
 
             FluButton{
-                text:"Add a row of Data"
+                text: qsTr("Add a row of Data")
                 onClicked: {
                     table_view.appendRow(genTestObject())
                 }

example/qml-Qt6/page/T_Tour.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Tour"
+    title: qsTr("Tour")
 
     FluTour{
         id:tour

example/qml-Qt6/window/FluentInitalizrWindow.qml

@@ -8,11 +8,11 @@ import "../component"
 FluWindow {
 
     id:window
-    title:"FluentUI Initalizr"
+    title:qsTr("FluentUI Initalizr")
     width: 600
     height: 400
     fixSize: true
-    modality: Qt.ApplicationModal
+    //    modality: Qt.ApplicationModal
     launchMode: FluWindowType.SingleTask
     showStayTop: false
 
@@ -28,7 +28,7 @@ FluWindow {
 
     FluText{
         id:text_title
-        text:"FluentUI脚手架"
+        text:qsTr("FluentUI Initalizr")
         font: FluTextStyle.Title
         anchors{
             left: parent.left
@@ -49,7 +49,7 @@ FluWindow {
         FluTextBox{
             id:text_box_name
             width: 180
-            placeholderText: "名称"
+            placeholderText: qsTr("Name")
             focus: true
         }
         Row{
@@ -57,14 +57,14 @@ FluWindow {
             FluTextBox{
                 id:text_box_path
                 width: 300
-                placeholderText: "创建路径"
+                placeholderText: qsTr("Create In")
                 anchors.verticalCenter: parent.verticalCenter
                 Component.onCompleted: {
                     text = FluTools.toLocalPath(StandardPaths.standardLocations(StandardPaths.DocumentsLocation)[0])
                 }
             }
             FluButton{
-                text:"浏览"
+                text:qsTr("Browse")
                 anchors.verticalCenter: parent.verticalCenter
                 onClicked: {
                     folder_dialog.open()
@@ -95,7 +95,7 @@ FluWindow {
                 rightMargin: 20
             }
             FluButton{
-                text:"取消"
+                text:qsTr("Cancel")
                 width: 120
                 anchors.verticalCenter: parent.verticalCenter
                 onClicked: {
@@ -103,7 +103,7 @@ FluWindow {
                 }
             }
             FluFilledButton{
-                text:"创建"
+                text:qsTr("Create")
                 width: 120
                 anchors.verticalCenter: parent.verticalCenter
                 onClicked: {

example/qml/chart/T_BarChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Bar Chart"
+    title: qsTr("Bar Chart")
 
     FluArea{
         width: 500

example/qml/chart/T_BubbleChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Bubble Chart"
+    title: qsTr("Bubble Chart")
 
     function randomScalingFactor() {
         return Math.random().toFixed(1);

example/qml/chart/T_LineChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Line Chart"
+    title: qsTr("Line Chart")
 
     FluArea{
         width: 500

example/qml/chart/T_PieChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Doughnut and Pie Chart"
+    title: qsTr("Pie Chart")
 
     FluArea{
         width: 500

example/qml/chart/T_PolarAreaChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"PolarArea Chart"
+    title: qsTr("Polar Area Chart")
 
     FluArea{
         width: 500

example/qml/chart/T_RadarChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Radar Chart"
+    title: qsTr("Radar Chart")
 
     FluArea{
         width: 500

example/qml/chart/T_ScatterChart.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Scatter Chart"
+    title: qsTr("Scatter Chart")
 
     function randomScalingFactor() {
         return Math.random().toFixed(1);

example/qml/page/T_ColorPicker.qml

@@ -14,14 +14,20 @@ FluScrollablePage{
         Layout.topMargin: 20
         height: 60
         paddings: 10
-
         RowLayout{
             FluText{
-                text:"点击选择颜色->"
+                text: qsTr("Click to Select a Color - >")
                 Layout.alignment: Qt.AlignVCenter
             }
             FluColorPicker{
-
+                cancelText: qsTr("Cancel")
+                okText: qsTr("OK")
+                titleText: qsTr("Color Picker")
+                editText: qsTr("Edit Color")
+                redText: qsTr("Red")
+                greenText: qsTr("Green")
+                blueText: qsTr("Blue")
+                opacityText: qsTr("Opacity")
             }
         }
     }
@@ -34,4 +40,3 @@ FluScrollablePage{
     }
 
 }
-

example/qml/page/T_Network.qml

@@ -9,7 +9,7 @@ import "../component"
 FluContentPage{
 
     id:root
-    title:"Network"
+    title: qsTr("Network")
 
     FluNetworkCallable{
         id:callable

example/qml/page/T_ShortcutPicker.qml

@@ -16,6 +16,11 @@ FluScrollablePage{
         paddings: 10
         FluShortcutPicker{
             anchors.verticalCenter: parent.verticalCenter
+            title: qsTr("Activate the Shortcut")
+            message: qsTr("Press the key combination to change the shortcut")
+            positiveText: qsTr("Save")
+            neutralText: qsTr("Cancel")
+            negativeText: qsTr("Reset")
         }
     }
     CodeExpander{
@@ -28,3 +33,4 @@ FluScrollablePage{
 
 }
 
+

example/qml/page/T_TableView.qml

@@ -416,7 +416,7 @@ FluContentPage{
             }
 
             FluButton{
-                text:"Delete Selection"
+                text: qsTr("Delete Selection")
                 onClicked: {
                     var data = []
                     var rows = []
@@ -440,7 +440,7 @@ FluContentPage{
             }
 
             FluButton{
-                text:"Add a row of Data"
+                text: qsTr("Add a row of Data")
                 onClicked: {
                     table_view.appendRow(genTestObject())
                 }

example/qml/page/T_Tour.qml

@@ -7,7 +7,7 @@ import "../component"
 
 FluScrollablePage{
 
-    title:"Tour"
+    title: qsTr("Tour")
 
     FluTour{
         id:tour

src/CMakeLists.txt

@@ -83,7 +83,7 @@ endif()
 #如果是Windows平台，则生成rc文件
 set(FLUENTUI_VERSION_RC_PATH "")
 if(WIN32)
-    set(FLUENTUI_VERSION_RC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/version_${PROJECT_NAME}.rc)
+    set(FLUENTUI_VERSION_RC_PATH ${CMAKE_CURRENT_BINARY_DIR}/version_${PROJECT_NAME}.rc)
     configure_file(
         ${CMAKE_CURRENT_SOURCE_DIR}/.cmake/version_dll.rc.in
         ${FLUENTUI_VERSION_RC_PATH}

src/FluFramelessHelper.cpp

@@ -64,7 +64,7 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
         if (wp != nullptr && (wp->flags & SWP_NOSIZE) == 0)
         {
             wp->flags |= SWP_NOCOPYBITS;
-            *result = DefWindowProcW(hwnd, uMsg, wParam, lParam);
+            *result = 0;
             return true;
         }
         return false;

src/Qt5/imports/FluentUI/Controls/FluColorPicker.qml

@@ -13,6 +13,14 @@ Button{
     property color current : Qt.rgba(1,1,1,1)
     signal accepted()
     property int colorHandleRadius: 8
+    property string cancelText: "取消"
+    property string okText: "确定"
+    property string titleText: "颜色选择器"
+    property string editText: "编辑颜色"
+    property string redText: "红色"
+    property string greenText: "绿色"
+    property string blueText: "蓝色"
+    property string opacityText: "透明度"
     background:
         Rectangle{
         id:layout_color
@@ -60,7 +68,7 @@ Button{
                     Layout.fillWidth: true
                     Layout.fillHeight: true
                     FluButton{
-                        text: "取消"
+                        text: control.cancelText
                         width: parent.width
                         anchors.centerIn: parent
                         onClicked: {
@@ -72,7 +80,7 @@ Button{
                     Layout.fillWidth: true
                     Layout.fillHeight: true
                     FluFilledButton{
-                        text: "确认"
+                        text: control.okText
                         width: parent.width
                         anchors.centerIn: parent
                         onClicked: {
@@ -93,13 +101,13 @@ Button{
             clip: true
             ScrollBar.vertical: FluScrollBar {}
             Item{
-                id:layout_content
+                id: layout_content
                 width: parent.width
                 height: childrenRect.height
                 FluText{
-                    id:text_titile
+                    id: text_titile
-                    font:FluTextStyle.Subtitle
+                    font: FluTextStyle.Subtitle
-                    text:"颜色选择器"
+                    text: control.titleText
                     anchors{
                         left: parent.left
                         top: parent.top
@@ -108,7 +116,7 @@ Button{
                     }
                 }
                 Item{
-                    id:layout_sb
+                    id: layout_sb
                     width: 200
                     height: 200
                     anchors{
@@ -117,7 +125,7 @@ Button{
                         leftMargin: 12
                     }
                     FluClip{
-                        id:layout_color_hue
+                        id: layout_color_hue
                         property color colorValue
                         property real xPercent: pickerCursor.x/width
                         property real yPercent: pickerCursor.y/height
@@ -455,7 +463,7 @@ Button{
                         width: parent.width
                         height: text_box_color.height
                         FluText{
-                            text:"编辑颜色"
+                            text: control.editText
                             anchors{
                                 verticalCenter: parent.verticalCenter
                                 left:parent.left
@@ -507,7 +515,7 @@ Button{
                             }
                         }
                         FluText{
-                            text:"Red"
+                            text: control.redText
                             anchors.verticalCenter: parent.verticalCenter
                         }
                     }
@@ -526,7 +534,7 @@ Button{
                             }
                         }
                         FluText{
-                            text:"Green"
+                            text: control.greenText
                             anchors.verticalCenter: parent.verticalCenter
                         }
                     }
@@ -545,7 +553,7 @@ Button{
                             }
                         }
                         FluText{
-                            text:"Blue"
+                            text: control.blueText
                             anchors.verticalCenter: parent.verticalCenter
                         }
                     }
@@ -570,7 +578,7 @@ Button{
                             }
                         }
                         FluText{
-                            text:"Opacity"
+                            text: control.opacityText
                             anchors.verticalCenter: parent.verticalCenter
                         }
                     }

src/Qt6/imports/FluentUI/Controls/FluColorPicker.qml

@@ -13,6 +13,14 @@ Button{
     property color current : Qt.rgba(1,1,1,1)
     signal accepted()
     property int colorHandleRadius: 8
+    property string cancelText: "取消"
+    property string okText: "确定"
+    property string titleText: "颜色选择器"
+    property string editText: "编辑颜色"
+    property string redText: "红色"
+    property string greenText: "绿色"
+    property string blueText: "蓝色"
+    property string opacityText: "透明度"
     background:
         Rectangle{
         id:layout_color
@@ -60,7 +68,7 @@ Button{
                     Layout.fillWidth: true
                     Layout.fillHeight: true
                     FluButton{
-                        text: "取消"
+                        text: control.cancelText
                         width: parent.width
                         anchors.centerIn: parent
                         onClicked: {
@@ -72,7 +80,7 @@ Button{
                     Layout.fillWidth: true
                     Layout.fillHeight: true
                     FluFilledButton{
-                        text: "确认"
+                        text: control.okText
                         width: parent.width
                         anchors.centerIn: parent
                         onClicked: {
@@ -93,13 +101,13 @@ Button{
             clip: true
             ScrollBar.vertical: FluScrollBar {}
             Item{
-                id:layout_content
+                id: layout_content
                 width: parent.width
                 height: childrenRect.height
                 FluText{
-                    id:text_titile
+                    id: text_titile
-                    font:FluTextStyle.Subtitle
+                    font: FluTextStyle.Subtitle
-                    text:"颜色选择器"
+                    text: control.titleText
                     anchors{
                         left: parent.left
                         top: parent.top
@@ -108,7 +116,7 @@ Button{
                     }
                 }
                 Item{
-                    id:layout_sb
+                    id: layout_sb
                     width: 200
                     height: 200
                     anchors{
@@ -117,7 +125,7 @@ Button{
                         leftMargin: 12
                     }
                     FluClip{
-                        id:layout_color_hue
+                        id: layout_color_hue
                         property color colorValue
                         property real xPercent: pickerCursor.x/width
                         property real yPercent: pickerCursor.y/height
@@ -455,7 +463,7 @@ Button{
                         width: parent.width
                         height: text_box_color.height
                         FluText{
-                            text:"编辑颜色"
+                            text: control.editText
                             anchors{
                                 verticalCenter: parent.verticalCenter
                                 left:parent.left
@@ -507,7 +515,7 @@ Button{
                             }
                         }
                         FluText{
-                            text:"Red"
+                            text: control.redText
                             anchors.verticalCenter: parent.verticalCenter
                         }
                     }
@@ -526,7 +534,7 @@ Button{
                             }
                         }
                         FluText{
-                            text:"Green"
+                            text: control.greenText
                             anchors.verticalCenter: parent.verticalCenter
                         }
                     }
@@ -545,7 +553,7 @@ Button{
                             }
                         }
                         FluText{
-                            text:"Blue"
+                            text: control.blueText
                             anchors.verticalCenter: parent.verticalCenter
                         }
                     }
@@ -570,7 +578,7 @@ Button{
                             }
                         }
                         FluText{
-                            text:"Opacity"
+                            text: control.opacityText
                             anchors.verticalCenter: parent.verticalCenter
                         }
                     }

src/version_fluentuiplugin.rc

@@ -1,32 +0,0 @@
-1 VERSIONINFO
- FILEVERSION 1,6,9,1176
- PRODUCTVERSION 1,6,9,1176
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "080404b0"
-        BEGIN
-            VALUE "CompanyName", "ZhuZiChu"
-            VALUE "FileDescription", ""
-            VALUE "FileVersion", "1.6.9.1176"
-            VALUE "InternalName", "fluentuiplugin.dll"
-            VALUE "LegalCopyright", "Copyright (C) 2023 ZhuZiChu. All rights reserved."
-            VALUE "OriginalFilename", "fluentuiplugin.dll"
-            VALUE "ProductName", "fluentuiplugin"
-            VALUE "ProductVersion", "1.6.9.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x804, 1200
-    END
-END