Skip to content

Commit c9d8d11

Browse files
zhuzichu520zhuzichu520
authored
Merge pull request zhuzichu520#611 from Polaris-Night/main
refactor: 重构FluCheckBox与FluRadioButton，使其更贴近原生控件使用方式
2 parents 1a40adf + e4822bd commit c9d8d11

File tree

15 files changed

+702
-802
lines changed

15 files changed

+702
-802
lines changed

‎example/example_en_US.ts‎

Lines changed: 46 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ Updated content:
998998
<location filename="qml/page/T_Buttons.qml" line="199"/>
999999
<location filename="qml/page/T_Buttons.qml" line="320"/>
10001000
<location filename="qml/page/T_Buttons.qml" line="368"/>
1001-
<location filename="qml/page/T_Buttons.qml" line="419"/>
1001+
<location filename="qml/page/T_Buttons.qml" line="420"/>
10021002
<source>Disabled</source>
10031003
<translation type="unfinished"></translation>
10041004
</message>
@@ -1124,12 +1124,12 @@ Updated content:
11241124
<translation type="unfinished"></translation>
11251125
</message>
11261126
<message>
1127-
<location filename="qml/page/T_Buttons.qml" line="407"/>
1127+
<location filename="qml/page/T_Buttons.qml" line="408"/>
11281128
<source>Radio Button_2</source>
11291129
<translation type="unfinished"></translation>
11301130
</message>
11311131
<message>
1132-
<location filename="qml/page/T_Buttons.qml" line="410"/>
1132+
<location filename="qml/page/T_Buttons.qml" line="411"/>
11331133
<source>Radio Button_3</source>
11341134
<translation type="unfinished"></translation>
11351135
</message>
@@ -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>
@@ -2200,41 +2200,37 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
22002200
<translation type="unfinished"></translation>
22012201
</message>
22022202
<message>
2203-
<location filename="qml/page/T_RadioButton.qml" line="24"/>
2203+
<location filename="qml/page/T_RadioButton.qml" line="28"/>
22042204
<source>Right</source>
22052205
<translation type="unfinished"></translation>
22062206
</message>
22072207
<message>
2208-
<location filename="qml/page/T_RadioButton.qml" line="28"/>
2208+
<location filename="qml/page/T_RadioButton.qml" line="33"/>
22092209
<source>Left</source>
22102210
<translation type="unfinished"></translation>
22112211
</message>
22122212
<message>
2213-
<location filename="qml/page/T_RadioButton.qml" line="38"/>
2214-
<location filename="qml/page/T_RadioButton.qml" line="79"/>
2215-
<location filename="qml/page/T_RadioButton.qml" line="130"/>
2216-
<location filename="qml/page/T_RadioButton.qml" line="181"/>
2213+
<location filename="qml/page/T_RadioButton.qml" line="44"/>
2214+
<location filename="qml/page/T_RadioButton.qml" line="105"/>
2215+
<location filename="qml/page/T_RadioButton.qml" line="160"/>
22172216
<source>Disabled</source>
22182217
<translation type="unfinished"></translation>
22192218
</message>
22202219
<message>
2221-
<location filename="qml/page/T_RadioButton.qml" line="64"/>
2222-
<location filename="qml/page/T_RadioButton.qml" line="115"/>
2223-
<location filename="qml/page/T_RadioButton.qml" line="166"/>
2220+
<location filename="qml/page/T_RadioButton.qml" line="86"/>
2221+
<location filename="qml/page/T_RadioButton.qml" line="144"/>
22242222
<source>Radio Button_1</source>
22252223
<translation type="unfinished"></translation>
22262224
</message>
22272225
<message>
2228-
<location filename="qml/page/T_RadioButton.qml" line="67"/>
2229-
<location filename="qml/page/T_RadioButton.qml" line="118"/>
2230-
<location filename="qml/page/T_RadioButton.qml" line="169"/>
2226+
<location filename="qml/page/T_RadioButton.qml" line="90"/>
2227+
<location filename="qml/page/T_RadioButton.qml" line="147"/>
22312228
<source>Radio Button_2</source>
22322229
<translation type="unfinished"></translation>
22332230
</message>
22342231
<message>
2235-
<location filename="qml/page/T_RadioButton.qml" line="70"/>
2236-
<location filename="qml/page/T_RadioButton.qml" line="121"/>
2237-
<location filename="qml/page/T_RadioButton.qml" line="172"/>
2232+
<location filename="qml/page/T_RadioButton.qml" line="95"/>
2233+
<location filename="qml/page/T_RadioButton.qml" line="151"/>
22382234
<source>Radio Button_3</source>
22392235
<translation type="unfinished"></translation>
22402236
</message>
@@ -2556,108 +2552,108 @@ Some contents...</source>
25562552
<translation type="unfinished"></translation>
25572553
</message>
25582554
<message>
2559-
<location filename="qml/page/T_TableView.qml" line="72"/>
2555+
<location filename="qml/page/T_TableView.qml" line="65"/>
25602556
<source>Modify the column name</source>
25612557
<translation type="unfinished"></translation>
25622558
</message>
25632559
<message>
2564-
<location filename="qml/page/T_TableView.qml" line="73"/>
2560+
<location filename="qml/page/T_TableView.qml" line="66"/>
25652561
<source>Cancel</source>
25662562
<translation type="unfinished"></translation>
25672563
</message>
25682564
<message>
2569-
<location filename="qml/page/T_TableView.qml" line="91"/>
2565+
<location filename="qml/page/T_TableView.qml" line="84"/>
25702566
<source>OK</source>
25712567
<translation type="unfinished"></translation>
25722568
</message>
25732569
<message>
2574-
<location filename="qml/page/T_TableView.qml" line="133"/>
2570+
<location filename="qml/page/T_TableView.qml" line="126"/>
25752571
<source>Search</source>
25762572
<translation type="unfinished"></translation>
25772573
</message>
25782574
<message>
2579-
<location filename="qml/page/T_TableView.qml" line="176"/>
2580-
<location filename="qml/page/T_TableView.qml" line="504"/>
2575+
<location filename="qml/page/T_TableView.qml" line="169"/>
2576+
<location filename="qml/page/T_TableView.qml" line="493"/>
25812577
<source>Name</source>
25822578
<translation type="unfinished"></translation>
25832579
</message>
25842580
<message>
2585-
<location filename="qml/page/T_TableView.qml" line="210"/>
2581+
<location filename="qml/page/T_TableView.qml" line="203"/>
25862582
<source>Delete</source>
25872583
<translation type="unfinished"></translation>
25882584
</message>
25892585
<message>
2590-
<location filename="qml/page/T_TableView.qml" line="217"/>
2586+
<location filename="qml/page/T_TableView.qml" line="210"/>
25912587
<source>Edit</source>
25922588
<translation type="unfinished"></translation>
25932589
</message>
25942590
<message>
2595-
<location filename="qml/page/T_TableView.qml" line="236"/>
2591+
<location filename="qml/page/T_TableView.qml" line="229"/>
25962592
<source>Select All</source>
25972593
<translation type="unfinished"></translation>
25982594
</message>
25992595
<message>
2600-
<location filename="qml/page/T_TableView.qml" line="359"/>
2596+
<location filename="qml/page/T_TableView.qml" line="348"/>
26012597
<source>Age</source>
26022598
<translation type="unfinished"></translation>
26032599
</message>
26042600
<message>
2605-
<location filename="qml/page/T_TableView.qml" line="434"/>
2601+
<location filename="qml/page/T_TableView.qml" line="423"/>
26062602
<source>Clear All</source>
26072603
<translation type="unfinished"></translation>
26082604
</message>
26092605
<message>
2610-
<location filename="qml/page/T_TableView.qml" line="441"/>
2606+
<location filename="qml/page/T_TableView.qml" line="430"/>
26112607
<source>Delete Selection</source>
26122608
<translation type="unfinished"></translation>
26132609
</message>
26142610
<message>
2615-
<location filename="qml/page/T_TableView.qml" line="464"/>
2611+
<location filename="qml/page/T_TableView.qml" line="453"/>
26162612
<source>Add a row of Data</source>
26172613
<translation type="unfinished"></translation>
26182614
</message>
26192615
<message>
2620-
<location filename="qml/page/T_TableView.qml" line="470"/>
2616+
<location filename="qml/page/T_TableView.qml" line="459"/>
26212617
<source>Insert a Row</source>
26222618
<translation type="unfinished"></translation>
26232619
</message>
26242620
<message>
2625-
<location filename="qml/page/T_TableView.qml" line="477"/>
2621+
<location filename="qml/page/T_TableView.qml" line="466"/>
26262622
<source>Focus not acquired: Please click any item in the form as the target for insertion!</source>
26272623
<translation type="unfinished"></translation>
26282624
</message>
26292625
<message>
2630-
<location filename="qml/page/T_TableView.qml" line="509"/>
2626+
<location filename="qml/page/T_TableView.qml" line="498"/>
26312627
<source>Avatar</source>
26322628
<translation type="unfinished"></translation>
26332629
</message>
26342630
<message>
2635-
<location filename="qml/page/T_TableView.qml" line="523"/>
2631+
<location filename="qml/page/T_TableView.qml" line="512"/>
26362632
<source>Address</source>
26372633
<translation type="unfinished"></translation>
26382634
</message>
26392635
<message>
2640-
<location filename="qml/page/T_TableView.qml" line="531"/>
2636+
<location filename="qml/page/T_TableView.qml" line="520"/>
26412637
<source>Nickname</source>
26422638
<translation type="unfinished"></translation>
26432639
</message>
26442640
<message>
2645-
<location filename="qml/page/T_TableView.qml" line="538"/>
2641+
<location filename="qml/page/T_TableView.qml" line="527"/>
26462642
<source>Long String</source>
26472643
<translation type="unfinished"></translation>
26482644
</message>
26492645
<message>
2650-
<location filename="qml/page/T_TableView.qml" line="546"/>
2646+
<location filename="qml/page/T_TableView.qml" line="535"/>
26512647
<source>Options</source>
26522648
<translation type="unfinished"></translation>
26532649
</message>
26542650
<message>
2655-
<location filename="qml/page/T_TableView.qml" line="564"/>
2651+
<location filename="qml/page/T_TableView.qml" line="553"/>
26562652
<source>&lt;Previous</source>
26572653
<translation type="unfinished"></translation>
26582654
</message>
26592655
<message>
2660-
<location filename="qml/page/T_TableView.qml" line="565"/>
2656+
<location filename="qml/page/T_TableView.qml" line="554"/>
26612657
<source>Next&gt;</source>
26622658
<translation type="unfinished"></translation>
26632659
</message>

0 commit comments

Comments
 (0)