Skip to content

Commit 024f165

Browse files
committed
refactor: 重构FluCheckBox,使其更贴近原生CheckBox使用方式
1 parent f1e62c1 commit 024f165

File tree

9 files changed

+463
-531
lines changed

9 files changed

+463
-531
lines changed

example/example_en_US.ts

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,48 +1246,48 @@ Updated content:
12461246
<translation type="unfinished"></translation>
12471247
</message>
12481248
<message>
1249-
<location filename="qml/page/T_CheckBox.qml" line="52"/>
1249+
<location filename="qml/page/T_CheckBox.qml" line="18"/>
12501250
<source>A 2-state CheckBox</source>
12511251
<translation type="unfinished"></translation>
12521252
</message>
12531253
<message>
1254-
<location filename="qml/page/T_CheckBox.qml" line="66"/>
1254+
<location filename="qml/page/T_CheckBox.qml" line="32"/>
12551255
<source>Right</source>
12561256
<translation type="unfinished"></translation>
12571257
</message>
12581258
<message>
1259-
<location filename="qml/page/T_CheckBox.qml" line="70"/>
1259+
<location filename="qml/page/T_CheckBox.qml" line="36"/>
12601260
<source>Left</source>
12611261
<translation type="unfinished"></translation>
12621262
</message>
12631263
<message>
1264-
<location filename="qml/page/T_CheckBox.qml" line="80"/>
1265-
<location filename="qml/page/T_CheckBox.qml" line="135"/>
1264+
<location filename="qml/page/T_CheckBox.qml" line="46"/>
1265+
<location filename="qml/page/T_CheckBox.qml" line="85"/>
12661266
<source>Disabled</source>
12671267
<translation type="unfinished"></translation>
12681268
</message>
12691269
<message>
1270-
<location filename="qml/page/T_CheckBox.qml" line="98"/>
1270+
<location filename="qml/page/T_CheckBox.qml" line="64"/>
12711271
<source>A 3-state CheckBox</source>
12721272
<translation type="unfinished"></translation>
12731273
</message>
12741274
<message>
1275-
<location filename="qml/page/T_CheckBox.qml" line="109"/>
1275+
<location filename="qml/page/T_CheckBox.qml" line="74"/>
12761276
<source>Three State</source>
12771277
<translation type="unfinished"></translation>
12781278
</message>
12791279
<message>
1280-
<location filename="qml/page/T_CheckBox.qml" line="154"/>
1280+
<location filename="qml/page/T_CheckBox.qml" line="104"/>
12811281
<source>Using a 3-state CheckBox</source>
12821282
<translation type="unfinished"></translation>
12831283
</message>
12841284
<message>
1285-
<location filename="qml/page/T_CheckBox.qml" line="157"/>
1285+
<location filename="qml/page/T_CheckBox.qml" line="113"/>
12861286
<source>Select all</source>
12871287
<translation type="unfinished"></translation>
12881288
</message>
12891289
<message>
1290-
<location filename="qml/page/T_CheckBox.qml" line="168"/>
1290+
<location filename="qml/page/T_CheckBox.qml" line="120"/>
12911291
<source>Option %1</source>
12921292
<translation type="unfinished"></translation>
12931293
</message>
@@ -2556,108 +2556,108 @@ Some contents...</source>
25562556
<translation type="unfinished"></translation>
25572557
</message>
25582558
<message>
2559-
<location filename="qml/page/T_TableView.qml" line="72"/>
2559+
<location filename="qml/page/T_TableView.qml" line="65"/>
25602560
<source>Modify the column name</source>
25612561
<translation type="unfinished"></translation>
25622562
</message>
25632563
<message>
2564-
<location filename="qml/page/T_TableView.qml" line="73"/>
2564+
<location filename="qml/page/T_TableView.qml" line="66"/>
25652565
<source>Cancel</source>
25662566
<translation type="unfinished"></translation>
25672567
</message>
25682568
<message>
2569-
<location filename="qml/page/T_TableView.qml" line="91"/>
2569+
<location filename="qml/page/T_TableView.qml" line="84"/>
25702570
<source>OK</source>
25712571
<translation type="unfinished"></translation>
25722572
</message>
25732573
<message>
2574-
<location filename="qml/page/T_TableView.qml" line="133"/>
2574+
<location filename="qml/page/T_TableView.qml" line="126"/>
25752575
<source>Search</source>
25762576
<translation type="unfinished"></translation>
25772577
</message>
25782578
<message>
2579-
<location filename="qml/page/T_TableView.qml" line="176"/>
2580-
<location filename="qml/page/T_TableView.qml" line="504"/>
2579+
<location filename="qml/page/T_TableView.qml" line="169"/>
2580+
<location filename="qml/page/T_TableView.qml" line="493"/>
25812581
<source>Name</source>
25822582
<translation type="unfinished"></translation>
25832583
</message>
25842584
<message>
2585-
<location filename="qml/page/T_TableView.qml" line="210"/>
2585+
<location filename="qml/page/T_TableView.qml" line="203"/>
25862586
<source>Delete</source>
25872587
<translation type="unfinished"></translation>
25882588
</message>
25892589
<message>
2590-
<location filename="qml/page/T_TableView.qml" line="217"/>
2590+
<location filename="qml/page/T_TableView.qml" line="210"/>
25912591
<source>Edit</source>
25922592
<translation type="unfinished"></translation>
25932593
</message>
25942594
<message>
2595-
<location filename="qml/page/T_TableView.qml" line="236"/>
2595+
<location filename="qml/page/T_TableView.qml" line="229"/>
25962596
<source>Select All</source>
25972597
<translation type="unfinished"></translation>
25982598
</message>
25992599
<message>
2600-
<location filename="qml/page/T_TableView.qml" line="359"/>
2600+
<location filename="qml/page/T_TableView.qml" line="348"/>
26012601
<source>Age</source>
26022602
<translation type="unfinished"></translation>
26032603
</message>
26042604
<message>
2605-
<location filename="qml/page/T_TableView.qml" line="434"/>
2605+
<location filename="qml/page/T_TableView.qml" line="423"/>
26062606
<source>Clear All</source>
26072607
<translation type="unfinished"></translation>
26082608
</message>
26092609
<message>
2610-
<location filename="qml/page/T_TableView.qml" line="441"/>
2610+
<location filename="qml/page/T_TableView.qml" line="430"/>
26112611
<source>Delete Selection</source>
26122612
<translation type="unfinished"></translation>
26132613
</message>
26142614
<message>
2615-
<location filename="qml/page/T_TableView.qml" line="464"/>
2615+
<location filename="qml/page/T_TableView.qml" line="453"/>
26162616
<source>Add a row of Data</source>
26172617
<translation type="unfinished"></translation>
26182618
</message>
26192619
<message>
2620-
<location filename="qml/page/T_TableView.qml" line="470"/>
2620+
<location filename="qml/page/T_TableView.qml" line="459"/>
26212621
<source>Insert a Row</source>
26222622
<translation type="unfinished"></translation>
26232623
</message>
26242624
<message>
2625-
<location filename="qml/page/T_TableView.qml" line="477"/>
2625+
<location filename="qml/page/T_TableView.qml" line="466"/>
26262626
<source>Focus not acquired: Please click any item in the form as the target for insertion!</source>
26272627
<translation type="unfinished"></translation>
26282628
</message>
26292629
<message>
2630-
<location filename="qml/page/T_TableView.qml" line="509"/>
2630+
<location filename="qml/page/T_TableView.qml" line="498"/>
26312631
<source>Avatar</source>
26322632
<translation type="unfinished"></translation>
26332633
</message>
26342634
<message>
2635-
<location filename="qml/page/T_TableView.qml" line="523"/>
2635+
<location filename="qml/page/T_TableView.qml" line="512"/>
26362636
<source>Address</source>
26372637
<translation type="unfinished"></translation>
26382638
</message>
26392639
<message>
2640-
<location filename="qml/page/T_TableView.qml" line="531"/>
2640+
<location filename="qml/page/T_TableView.qml" line="520"/>
26412641
<source>Nickname</source>
26422642
<translation type="unfinished"></translation>
26432643
</message>
26442644
<message>
2645-
<location filename="qml/page/T_TableView.qml" line="538"/>
2645+
<location filename="qml/page/T_TableView.qml" line="527"/>
26462646
<source>Long String</source>
26472647
<translation type="unfinished"></translation>
26482648
</message>
26492649
<message>
2650-
<location filename="qml/page/T_TableView.qml" line="546"/>
2650+
<location filename="qml/page/T_TableView.qml" line="535"/>
26512651
<source>Options</source>
26522652
<translation type="unfinished"></translation>
26532653
</message>
26542654
<message>
2655-
<location filename="qml/page/T_TableView.qml" line="564"/>
2655+
<location filename="qml/page/T_TableView.qml" line="553"/>
26562656
<source>&lt;Previous</source>
26572657
<translation type="unfinished"></translation>
26582658
</message>
26592659
<message>
2660-
<location filename="qml/page/T_TableView.qml" line="565"/>
2660+
<location filename="qml/page/T_TableView.qml" line="554"/>
26612661
<source>Next&gt;</source>
26622662
<translation type="unfinished"></translation>
26632663
</message>

example/example_zh_CN.ts

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,48 +1272,48 @@ Updated content:
12721272
<translation type="unfinished">复选框</translation>
12731273
</message>
12741274
<message>
1275-
<location filename="qml/page/T_CheckBox.qml" line="52"/>
1275+
<location filename="qml/page/T_CheckBox.qml" line="18"/>
12761276
<source>A 2-state CheckBox</source>
12771277
<translation type="unfinished">两状态复选框</translation>
12781278
</message>
12791279
<message>
1280-
<location filename="qml/page/T_CheckBox.qml" line="66"/>
1280+
<location filename="qml/page/T_CheckBox.qml" line="32"/>
12811281
<source>Right</source>
12821282
<translation type="unfinished">右</translation>
12831283
</message>
12841284
<message>
1285-
<location filename="qml/page/T_CheckBox.qml" line="70"/>
1285+
<location filename="qml/page/T_CheckBox.qml" line="36"/>
12861286
<source>Left</source>
12871287
<translation type="unfinished">左</translation>
12881288
</message>
12891289
<message>
1290-
<location filename="qml/page/T_CheckBox.qml" line="80"/>
1291-
<location filename="qml/page/T_CheckBox.qml" line="135"/>
1290+
<location filename="qml/page/T_CheckBox.qml" line="46"/>
1291+
<location filename="qml/page/T_CheckBox.qml" line="85"/>
12921292
<source>Disabled</source>
12931293
<translation type="unfinished">禁用</translation>
12941294
</message>
12951295
<message>
1296-
<location filename="qml/page/T_CheckBox.qml" line="98"/>
1296+
<location filename="qml/page/T_CheckBox.qml" line="64"/>
12971297
<source>A 3-state CheckBox</source>
12981298
<translation type="unfinished">三状态复选框</translation>
12991299
</message>
13001300
<message>
1301-
<location filename="qml/page/T_CheckBox.qml" line="109"/>
1301+
<location filename="qml/page/T_CheckBox.qml" line="74"/>
13021302
<source>Three State</source>
13031303
<translation type="unfinished">三状态</translation>
13041304
</message>
13051305
<message>
1306-
<location filename="qml/page/T_CheckBox.qml" line="154"/>
1306+
<location filename="qml/page/T_CheckBox.qml" line="104"/>
13071307
<source>Using a 3-state CheckBox</source>
13081308
<translation type="unfinished">使用三状态复选框</translation>
13091309
</message>
13101310
<message>
1311-
<location filename="qml/page/T_CheckBox.qml" line="157"/>
1311+
<location filename="qml/page/T_CheckBox.qml" line="113"/>
13121312
<source>Select all</source>
13131313
<translation type="unfinished">选中全部</translation>
13141314
</message>
13151315
<message>
1316-
<location filename="qml/page/T_CheckBox.qml" line="168"/>
1316+
<location filename="qml/page/T_CheckBox.qml" line="120"/>
13171317
<source>Option %1</source>
13181318
<translation type="unfinished">选项 %1</translation>
13191319
</message>
@@ -2745,108 +2745,108 @@ Some contents...</source>
27452745
<translation type="unfinished">表格</translation>
27462746
</message>
27472747
<message>
2748-
<location filename="qml/page/T_TableView.qml" line="72"/>
2748+
<location filename="qml/page/T_TableView.qml" line="65"/>
27492749
<source>Modify the column name</source>
27502750
<translation type="unfinished">修改列名</translation>
27512751
</message>
27522752
<message>
2753-
<location filename="qml/page/T_TableView.qml" line="73"/>
2753+
<location filename="qml/page/T_TableView.qml" line="66"/>
27542754
<source>Cancel</source>
27552755
<translation type="unfinished">取消</translation>
27562756
</message>
27572757
<message>
2758-
<location filename="qml/page/T_TableView.qml" line="91"/>
2758+
<location filename="qml/page/T_TableView.qml" line="84"/>
27592759
<source>OK</source>
27602760
<translation type="unfinished">确定</translation>
27612761
</message>
27622762
<message>
2763-
<location filename="qml/page/T_TableView.qml" line="133"/>
2763+
<location filename="qml/page/T_TableView.qml" line="126"/>
27642764
<source>Search</source>
27652765
<translation type="unfinished">搜索</translation>
27662766
</message>
27672767
<message>
2768-
<location filename="qml/page/T_TableView.qml" line="176"/>
2769-
<location filename="qml/page/T_TableView.qml" line="504"/>
2768+
<location filename="qml/page/T_TableView.qml" line="169"/>
2769+
<location filename="qml/page/T_TableView.qml" line="493"/>
27702770
<source>Name</source>
27712771
<translation type="unfinished">名称</translation>
27722772
</message>
27732773
<message>
2774-
<location filename="qml/page/T_TableView.qml" line="210"/>
2774+
<location filename="qml/page/T_TableView.qml" line="203"/>
27752775
<source>Delete</source>
27762776
<translation type="unfinished">删除</translation>
27772777
</message>
27782778
<message>
2779-
<location filename="qml/page/T_TableView.qml" line="217"/>
2779+
<location filename="qml/page/T_TableView.qml" line="210"/>
27802780
<source>Edit</source>
27812781
<translation type="unfinished">编辑</translation>
27822782
</message>
27832783
<message>
2784-
<location filename="qml/page/T_TableView.qml" line="236"/>
2784+
<location filename="qml/page/T_TableView.qml" line="229"/>
27852785
<source>Select All</source>
27862786
<translation type="unfinished">全选</translation>
27872787
</message>
27882788
<message>
2789-
<location filename="qml/page/T_TableView.qml" line="359"/>
2789+
<location filename="qml/page/T_TableView.qml" line="348"/>
27902790
<source>Age</source>
27912791
<translation type="unfinished">年龄</translation>
27922792
</message>
27932793
<message>
2794-
<location filename="qml/page/T_TableView.qml" line="434"/>
2794+
<location filename="qml/page/T_TableView.qml" line="423"/>
27952795
<source>Clear All</source>
27962796
<translation type="unfinished">清除所有</translation>
27972797
</message>
27982798
<message>
2799-
<location filename="qml/page/T_TableView.qml" line="470"/>
2799+
<location filename="qml/page/T_TableView.qml" line="459"/>
28002800
<source>Insert a Row</source>
28012801
<translation type="unfinished">插入一行</translation>
28022802
</message>
28032803
<message>
2804-
<location filename="qml/page/T_TableView.qml" line="477"/>
2804+
<location filename="qml/page/T_TableView.qml" line="466"/>
28052805
<source>Focus not acquired: Please click any item in the form as the target for insertion!</source>
28062806
<translation type="unfinished">焦点未获取:请点击表格中的任意一项,作为插入的靶点!</translation>
28072807
</message>
28082808
<message>
2809-
<location filename="qml/page/T_TableView.qml" line="509"/>
2809+
<location filename="qml/page/T_TableView.qml" line="498"/>
28102810
<source>Avatar</source>
28112811
<translation type="unfinished">头像</translation>
28122812
</message>
28132813
<message>
2814-
<location filename="qml/page/T_TableView.qml" line="523"/>
2814+
<location filename="qml/page/T_TableView.qml" line="512"/>
28152815
<source>Address</source>
28162816
<translation type="unfinished">地址</translation>
28172817
</message>
28182818
<message>
2819-
<location filename="qml/page/T_TableView.qml" line="531"/>
2819+
<location filename="qml/page/T_TableView.qml" line="520"/>
28202820
<source>Nickname</source>
28212821
<translation type="unfinished">昵称</translation>
28222822
</message>
28232823
<message>
2824-
<location filename="qml/page/T_TableView.qml" line="538"/>
2824+
<location filename="qml/page/T_TableView.qml" line="527"/>
28252825
<source>Long String</source>
28262826
<translation type="unfinished">长字符串</translation>
28272827
</message>
28282828
<message>
2829-
<location filename="qml/page/T_TableView.qml" line="546"/>
2829+
<location filename="qml/page/T_TableView.qml" line="535"/>
28302830
<source>Options</source>
28312831
<translation type="unfinished">操作</translation>
28322832
</message>
28332833
<message>
2834-
<location filename="qml/page/T_TableView.qml" line="564"/>
2834+
<location filename="qml/page/T_TableView.qml" line="553"/>
28352835
<source>&lt;Previous</source>
28362836
<translation type="unfinished">&lt;上一页</translation>
28372837
</message>
28382838
<message>
2839-
<location filename="qml/page/T_TableView.qml" line="565"/>
2839+
<location filename="qml/page/T_TableView.qml" line="554"/>
28402840
<source>Next&gt;</source>
28412841
<translation type="unfinished">下一页&gt;</translation>
28422842
</message>
28432843
<message>
2844-
<location filename="qml/page/T_TableView.qml" line="441"/>
2844+
<location filename="qml/page/T_TableView.qml" line="430"/>
28452845
<source>Delete Selection</source>
28462846
<translation type="unfinished">删除选中</translation>
28472847
</message>
28482848
<message>
2849-
<location filename="qml/page/T_TableView.qml" line="464"/>
2849+
<location filename="qml/page/T_TableView.qml" line="453"/>
28502850
<source>Add a row of Data</source>
28512851
<translation type="unfinished">添加一行数据</translation>
28522852
</message>

0 commit comments

Comments
 (0)