Skip to content

Commit 909186c

Browse files
zhuzichu520zhuzichu520
authored
Merge pull request zhuzichu520#607 from Polaris-Night/main
feat: 新增拼音功能FluPinyin
2 parents de5e456 + c8c51f0 commit 909186c

File tree

17 files changed

+51770
-21
lines changed

17 files changed

+51770
-21
lines changed

‎THIRD_PARTY_COPYRIGHT.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,3 +1024,26 @@ the library. If this is what you want to do, use the GNU Lesser General
10241024
Public License instead of this License. But first, please read
10251025
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
10261026

1027+
************************************************************************************
1028+
MIT License
1029+
1030+
Copyright (c) 2022-present zh-lx
1031+
1032+
Permission is hereby granted, free of charge, to any person obtaining a copy
1033+
of this software and associated documentation files (the "Software"), to deal
1034+
in the Software without restriction, including without limitation the rights
1035+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
1036+
copies of the Software, and to permit persons to whom the Software is
1037+
furnished to do so, subject to the following conditions:
1038+
1039+
The above copyright notice and this permission notice shall be included in all
1040+
copies or substantial portions of the Software.
1041+
1042+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1043+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1044+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1045+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1046+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1047+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1048+
SOFTWARE.
1049+

‎example/example.qrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@
214214
<file>res/image/logo_pro.png</file>
215215
<file>qml/page/T_FluentPro.qml</file>
216216
<file>qml/page/T_BubbleBox.qml</file>
217+
<file>qml/page/T_Pinyin.qml</file>
217218
</qresource>
218219
<qresource prefix="/"/>
219220
</RCC>

‎example/example_en_US.ts‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -566,26 +566,31 @@
566566
</message>
567567
<message>
568568
<location filename="qml/global/ItemsOriginal.qml" line="466"/>
569-
<source>Captcha</source>
569+
<source>Pinyin</source>
570570
<translation type="unfinished"></translation>
571571
</message>
572572
<message>
573573
<location filename="qml/global/ItemsOriginal.qml" line="472"/>
574+
<source>Captcha</source>
575+
<translation type="unfinished"></translation>
576+
</message>
577+
<message>
578+
<location filename="qml/global/ItemsOriginal.qml" line="478"/>
574579
<source>Network</source>
575580
<translation type="unfinished"></translation>
576581
</message>
577582
<message>
578-
<location filename="qml/global/ItemsOriginal.qml" line="479"/>
583+
<location filename="qml/global/ItemsOriginal.qml" line="485"/>
579584
<source>Remote Loader</source>
580585
<translation type="unfinished"></translation>
581586
</message>
582587
<message>
583-
<location filename="qml/global/ItemsOriginal.qml" line="493"/>
588+
<location filename="qml/global/ItemsOriginal.qml" line="499"/>
584589
<source>Hot Loader</source>
585590
<translation type="unfinished"></translation>
586591
</message>
587592
<message>
588-
<location filename="qml/global/ItemsOriginal.qml" line="499"/>
593+
<location filename="qml/global/ItemsOriginal.qml" line="505"/>
589594
<source>Test Crash</source>
590595
<translation type="unfinished"></translation>
591596
</message>
@@ -1932,6 +1937,35 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
19321937
<translation type="unfinished"></translation>
19331938
</message>
19341939
</context>
1940+
<context>
1941+
<name>T_Pinyin</name>
1942+
<message>
1943+
<location filename="qml/page/T_Pinyin.qml" line="10"/>
1944+
<source>Pinyin</source>
1945+
<translation type="unfinished"></translation>
1946+
</message>
1947+
<message>
1948+
<location filename="qml/page/T_Pinyin.qml" line="47"/>
1949+
<source>[pinyin-pro document](https://pinyin-pro.cn/guide/compare.html)</source>
1950+
<translation type="unfinished"></translation>
1951+
</message>
1952+
<message>
1953+
<location filename="qml/page/T_Pinyin.qml" line="89"/>
1954+
<location filename="qml/page/T_Pinyin.qml" line="151"/>
1955+
<source>Input Chinese or Pinyin</source>
1956+
<translation type="unfinished"></translation>
1957+
</message>
1958+
<message>
1959+
<location filename="qml/page/T_Pinyin.qml" line="170"/>
1960+
<source>Matching time: %1</source>
1961+
<translation type="unfinished"></translation>
1962+
</message>
1963+
<message>
1964+
<location filename="qml/page/T_Pinyin.qml" line="175"/>
1965+
<source>Matching with cache</source>
1966+
<translation type="unfinished"></translation>
1967+
</message>
1968+
</context>
19351969
<context>
19361970
<name>T_Pivot</name>
19371971
<message>

‎example/example_zh_CN.ts‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -566,21 +566,26 @@
566566
</message>
567567
<message>
568568
<location filename="qml/global/ItemsOriginal.qml" line="466"/>
569+
<source>Pinyin</source>
570+
<translation type="unfinished">拼音</translation>
571+
</message>
572+
<message>
573+
<location filename="qml/global/ItemsOriginal.qml" line="472"/>
569574
<source>Captcha</source>
570575
<translation type="unfinished">验证码</translation>
571576
</message>
572577
<message>
573-
<location filename="qml/global/ItemsOriginal.qml" line="472"/>
578+
<location filename="qml/global/ItemsOriginal.qml" line="478"/>
574579
<source>Network</source>
575580
<translation type="unfinished">网络</translation>
576581
</message>
577582
<message>
578-
<location filename="qml/global/ItemsOriginal.qml" line="479"/>
583+
<location filename="qml/global/ItemsOriginal.qml" line="485"/>
579584
<source>Remote Loader</source>
580585
<translation type="unfinished">远程加载</translation>
581586
</message>
582587
<message>
583-
<location filename="qml/global/ItemsOriginal.qml" line="493"/>
588+
<location filename="qml/global/ItemsOriginal.qml" line="499"/>
584589
<source>Hot Loader</source>
585590
<translation type="unfinished">热加载</translation>
586591
</message>
@@ -589,7 +594,7 @@
589594
<translation type="obsolete">3D</translation>
590595
</message>
591596
<message>
592-
<location filename="qml/global/ItemsOriginal.qml" line="499"/>
597+
<location filename="qml/global/ItemsOriginal.qml" line="505"/>
593598
<source>Test Crash</source>
594599
<translation type="unfinished">测试崩溃</translation>
595600
</message>
@@ -2082,6 +2087,35 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
20822087
<translation type="unfinished">饼图</translation>
20832088
</message>
20842089
</context>
2090+
<context>
2091+
<name>T_Pinyin</name>
2092+
<message>
2093+
<location filename="qml/page/T_Pinyin.qml" line="10"/>
2094+
<source>Pinyin</source>
2095+
<translation type="unfinished">拼音</translation>
2096+
</message>
2097+
<message>
2098+
<location filename="qml/page/T_Pinyin.qml" line="47"/>
2099+
<source>[pinyin-pro document](https://pinyin-pro.cn/guide/compare.html)</source>
2100+
<translation type="unfinished">[pinyin-pro文档](https://pinyin-pro.cn/guide/compare.html)</translation>
2101+
</message>
2102+
<message>
2103+
<location filename="qml/page/T_Pinyin.qml" line="89"/>
2104+
<location filename="qml/page/T_Pinyin.qml" line="151"/>
2105+
<source>Input Chinese or Pinyin</source>
2106+
<translation type="unfinished">输入汉字或拼音</translation>
2107+
</message>
2108+
<message>
2109+
<location filename="qml/page/T_Pinyin.qml" line="170"/>
2110+
<source>Matching time: %1</source>
2111+
<translation type="unfinished">匹配耗时: %1</translation>
2112+
</message>
2113+
<message>
2114+
<location filename="qml/page/T_Pinyin.qml" line="175"/>
2115+
<source>Matching with cache</source>
2116+
<translation type="unfinished">带缓存匹配</translation>
2117+
</message>
2118+
</context>
20852119
<context>
20862120
<name>T_Pivot</name>
20872121
<message>

‎example/qml/global/ItemsOriginal.qml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,12 @@ FluObject{
462462
url: "qrc:/example/qml/page/T_Timeline.qml"
463463
onTap: { navigationView.push(url) }
464464
}
465+
FluPaneItem{
466+
title: qsTr("Pinyin")
467+
menuDelegate: paneItemMenu
468+
url: "qrc:/example/qml/page/T_Pinyin.qml"
469+
onTap: { navigationView.push(url) }
470+
}
465471
FluPaneItem{
466472
title: qsTr("Captcha")
467473
menuDelegate: paneItemMenu

0 commit comments

Comments
 (0)