Skip to content

Commit df7cd94

Browse files
zhuzichu520zhuzichu520
authored
Merge pull request zhuzichu520#592 from add-uos/main
fix: 优化示例中加载按钮交互效果
2 parents 882cc89 + aa8fcb3 commit df7cd94

File tree

3 files changed

+32
-20
lines changed

3 files changed

+32
-20
lines changed

‎example/example_en_US.ts

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -969,10 +969,16 @@ Updated content:
969969
<translation type="unfinished"></translation>
970970
</message>
971971
<message>
972+
<location filename="qml/page/T_Buttons.qml" line="222"/>
972973
<location filename="qml/page/T_Buttons.qml" line="238"/>
973974
<source>Loading</source>
974975
<translation type="unfinished"></translation>
975976
</message>
977+
<message>
978+
<location filename="qml/page/T_Buttons.qml" line="238"/>
979+
<source>Normal</source>
980+
<translation type="unfinished"></translation>
981+
</message>
976982
<message>
977983
<location filename="qml/page/T_Buttons.qml" line="270"/>
978984
<source>Click IconButton</source>
@@ -2291,39 +2297,39 @@ Some contents...</source>
22912297
<translation type="unfinished"></translation>
22922298
</message>
22932299
<message>
2294-
<location filename="qml/page/T_TabView.qml" line="45"/>
2295-
<location filename="qml/page/T_TabView.qml" line="47"/>
2300+
<location filename="qml/page/T_TabView.qml" line="44"/>
2301+
<location filename="qml/page/T_TabView.qml" line="46"/>
22962302
<source>Equal</source>
22972303
<translation type="unfinished"></translation>
22982304
</message>
22992305
<message>
2300-
<location filename="qml/page/T_TabView.qml" line="54"/>
2306+
<location filename="qml/page/T_TabView.qml" line="53"/>
23012307
<source>SizeToContent</source>
23022308
<translation type="unfinished"></translation>
23032309
</message>
23042310
<message>
2305-
<location filename="qml/page/T_TabView.qml" line="61"/>
2311+
<location filename="qml/page/T_TabView.qml" line="60"/>
23062312
<source>Compact</source>
23072313
<translation type="unfinished"></translation>
23082314
</message>
23092315
<message>
2310-
<location filename="qml/page/T_TabView.qml" line="69"/>
2316+
<location filename="qml/page/T_TabView.qml" line="68"/>
23112317
<source>Tab Close Button Visibility:</source>
23122318
<translation type="unfinished"></translation>
23132319
</message>
23142320
<message>
2315-
<location filename="qml/page/T_TabView.qml" line="74"/>
2316-
<location filename="qml/page/T_TabView.qml" line="84"/>
2321+
<location filename="qml/page/T_TabView.qml" line="72"/>
2322+
<location filename="qml/page/T_TabView.qml" line="82"/>
23172323
<source>Always</source>
23182324
<translation type="unfinished"></translation>
23192325
</message>
23202326
<message>
2321-
<location filename="qml/page/T_TabView.qml" line="77"/>
2327+
<location filename="qml/page/T_TabView.qml" line="75"/>
23222328
<source>Never</source>
23232329
<translation type="unfinished"></translation>
23242330
</message>
23252331
<message>
2326-
<location filename="qml/page/T_TabView.qml" line="91"/>
2332+
<location filename="qml/page/T_TabView.qml" line="89"/>
23272333
<source>OnHover</source>
23282334
<translation type="unfinished"></translation>
23292335
</message>

‎example/example_zh_CN.ts

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -995,10 +995,16 @@ Updated content:
995995
<translation type="unfinished">加载按钮</translation>
996996
</message>
997997
<message>
998+
<location filename="qml/page/T_Buttons.qml" line="222"/>
998999
<location filename="qml/page/T_Buttons.qml" line="238"/>
9991000
<source>Loading</source>
10001001
<translation type="unfinished">正在加载</translation>
10011002
</message>
1003+
<message>
1004+
<location filename="qml/page/T_Buttons.qml" line="238"/>
1005+
<source>Normal</source>
1006+
<translation type="unfinished">开启加载</translation>
1007+
</message>
10021008
<message>
10031009
<location filename="qml/page/T_Buttons.qml" line="270"/>
10041010
<source>Click IconButton</source>
@@ -2480,39 +2486,39 @@ Some contents...</source>
24802486
<translation type="unfinished">选项卡宽度：</translation>
24812487
</message>
24822488
<message>
2483-
<location filename="qml/page/T_TabView.qml" line="45"/>
2484-
<location filename="qml/page/T_TabView.qml" line="47"/>
2489+
<location filename="qml/page/T_TabView.qml" line="44"/>
2490+
<location filename="qml/page/T_TabView.qml" line="46"/>
24852491
<source>Equal</source>
24862492
<translation type="unfinished">相同宽度</translation>
24872493
</message>
24882494
<message>
2489-
<location filename="qml/page/T_TabView.qml" line="54"/>
2495+
<location filename="qml/page/T_TabView.qml" line="53"/>
24902496
<source>SizeToContent</source>
24912497
<translation type="unfinished">由内容</translation>
24922498
</message>
24932499
<message>
2494-
<location filename="qml/page/T_TabView.qml" line="61"/>
2500+
<location filename="qml/page/T_TabView.qml" line="60"/>
24952501
<source>Compact</source>
24962502
<translation type="unfinished">紧凑</translation>
24972503
</message>
24982504
<message>
2499-
<location filename="qml/page/T_TabView.qml" line="69"/>
2505+
<location filename="qml/page/T_TabView.qml" line="68"/>
25002506
<source>Tab Close Button Visibility:</source>
25012507
<translation type="unfinished">选项卡关闭按钮可见性：</translation>
25022508
</message>
25032509
<message>
2504-
<location filename="qml/page/T_TabView.qml" line="74"/>
2505-
<location filename="qml/page/T_TabView.qml" line="84"/>
2510+
<location filename="qml/page/T_TabView.qml" line="72"/>
2511+
<location filename="qml/page/T_TabView.qml" line="82"/>
25062512
<source>Always</source>
25072513
<translation type="unfinished">可见</translation>
25082514
</message>
25092515
<message>
2510-
<location filename="qml/page/T_TabView.qml" line="77"/>
2516+
<location filename="qml/page/T_TabView.qml" line="75"/>
25112517
<source>Never</source>
25122518
<translation type="unfinished">不可见</translation>
25132519
</message>
25142520
<message>
2515-
<location filename="qml/page/T_TabView.qml" line="91"/>
2521+
<location filename="qml/page/T_TabView.qml" line="89"/>
25162522
<source>OnHover</source>
25172523
<translation type="unfinished">鼠标悬浮显示</translation>
25182524
</message>

‎example/qml/page/T_Buttons.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ FluScrollablePage{
219219
FluLoadingButton{
220220
id: btn_loading
221221
loading: loading_button_switch.checked
222-
text: qsTr("Loading Button")
222+
text: loading_button_switch.checked ? qsTr("Loading") : qsTr("Loading Button")
223223
anchors{
224224
verticalCenter: parent.verticalCenter
225225
left: parent.left
@@ -235,7 +235,7 @@ FluScrollablePage{
235235
right: parent.right
236236
verticalCenter: parent.verticalCenter
237237
}
238-
text: qsTr("Loading")
238+
text: loading_button_switch.checked ? qsTr("Loading") : qsTr("Normal")
239239
}
240240
}
241241
CodeExpander{

0 commit comments

Comments
 (0)