Skip to content

Commit e4822bd

Browse files
Polaris-NightPolaris-Night
committed
refactor: 重构FluRadioButton，使其更贴近原生RadioButton使用方式
1 parent 024f165 commit e4822bd

9 files changed

Lines changed: 241 additions & 273 deletions

File tree

‎example/example_en_US.ts‎

Lines changed: 14 additions & 18 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>
@@ -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>

‎example/example_zh_CN.ts‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,7 @@ Updated content:
10241024
<location filename="qml/page/T_Buttons.qml" line="199"/>
10251025
<location filename="qml/page/T_Buttons.qml" line="320"/>
10261026
<location filename="qml/page/T_Buttons.qml" line="368"/>
1027-
<location filename="qml/page/T_Buttons.qml" line="419"/>
1027+
<location filename="qml/page/T_Buttons.qml" line="420"/>
10281028
<source>Disabled</source>
10291029
<translation type="unfinished">禁用</translation>
10301030
</message>
@@ -1150,12 +1150,12 @@ Updated content:
11501150
<translation type="unfinished">单选按钮_1</translation>
11511151
</message>
11521152
<message>
1153-
<location filename="qml/page/T_Buttons.qml" line="407"/>
1153+
<location filename="qml/page/T_Buttons.qml" line="408"/>
11541154
<source>Radio Button_2</source>
11551155
<translation type="unfinished">单选按钮_1</translation>
11561156
</message>
11571157
<message>
1158-
<location filename="qml/page/T_Buttons.qml" line="410"/>
1158+
<location filename="qml/page/T_Buttons.qml" line="411"/>
11591159
<source>Radio Button_3</source>
11601160
<translation type="unfinished">单选按钮_3</translation>
11611161
</message>
@@ -2351,41 +2351,37 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
23512351
<translation type="unfinished">单选按钮</translation>
23522352
</message>
23532353
<message>
2354-
<location filename="qml/page/T_RadioButton.qml" line="24"/>
2354+
<location filename="qml/page/T_RadioButton.qml" line="28"/>
23552355
<source>Right</source>
23562356
<translation type="unfinished">右</translation>
23572357
</message>
23582358
<message>
2359-
<location filename="qml/page/T_RadioButton.qml" line="28"/>
2359+
<location filename="qml/page/T_RadioButton.qml" line="33"/>
23602360
<source>Left</source>
23612361
<translation type="unfinished">左</translation>
23622362
</message>
23632363
<message>
2364-
<location filename="qml/page/T_RadioButton.qml" line="38"/>
2365-
<location filename="qml/page/T_RadioButton.qml" line="79"/>
2366-
<location filename="qml/page/T_RadioButton.qml" line="130"/>
2367-
<location filename="qml/page/T_RadioButton.qml" line="181"/>
2364+
<location filename="qml/page/T_RadioButton.qml" line="44"/>
2365+
<location filename="qml/page/T_RadioButton.qml" line="105"/>
2366+
<location filename="qml/page/T_RadioButton.qml" line="160"/>
23682367
<source>Disabled</source>
23692368
<translation type="unfinished">禁用</translation>
23702369
</message>
23712370
<message>
2372-
<location filename="qml/page/T_RadioButton.qml" line="64"/>
2373-
<location filename="qml/page/T_RadioButton.qml" line="115"/>
2374-
<location filename="qml/page/T_RadioButton.qml" line="166"/>
2371+
<location filename="qml/page/T_RadioButton.qml" line="86"/>
2372+
<location filename="qml/page/T_RadioButton.qml" line="144"/>
23752373
<source>Radio Button_1</source>
23762374
<translation type="unfinished">单选按钮_1</translation>
23772375
</message>
23782376
<message>
2379-
<location filename="qml/page/T_RadioButton.qml" line="67"/>
2380-
<location filename="qml/page/T_RadioButton.qml" line="118"/>
2381-
<location filename="qml/page/T_RadioButton.qml" line="169"/>
2377+
<location filename="qml/page/T_RadioButton.qml" line="90"/>
2378+
<location filename="qml/page/T_RadioButton.qml" line="147"/>
23822379
<source>Radio Button_2</source>
23832380
<translation type="unfinished">单选按钮_1</translation>
23842381
</message>
23852382
<message>
2386-
<location filename="qml/page/T_RadioButton.qml" line="70"/>
2387-
<location filename="qml/page/T_RadioButton.qml" line="121"/>
2388-
<location filename="qml/page/T_RadioButton.qml" line="172"/>
2383+
<location filename="qml/page/T_RadioButton.qml" line="95"/>
2384+
<location filename="qml/page/T_RadioButton.qml" line="151"/>
23892385
<source>Radio Button_3</source>
23902386
<translation type="unfinished">单选按钮_3</translation>
23912387
</message>

‎example/qml/page/T_Buttons.qml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,15 +393,16 @@ FluScrollablePage{
393393
Layout.preferredHeight: 100
394394
padding: 10
395395
Layout.topMargin: 20
396-
FluRadioButtons{
396+
ColumnLayout{
397397
spacing: 8
398398
anchors{
399399
verticalCenter: parent.verticalCenter
400400
left: parent.left
401401
}
402-
disabled: radio_button_switch.checked
402+
enabled: !radio_button_switch.checked
403403
FluRadioButton{
404404
text: qsTr("Radio Button_1")
405+
checked: true
405406
}
406407
FluRadioButton{
407408
text: qsTr("Radio Button_2")

‎example/qml/page/T_Expander.qml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ FluScrollablePage{
2626
Layout.topMargin: 20
2727
Item{
2828
anchors.fill: parent
29-
FluRadioButtons{
29+
ColumnLayout{
3030
spacing: 8
3131
anchors{
3232
top: parent.top

‎example/qml/page/T_GroupBox.qml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ FluScrollablePage{
2525
Layout.fillWidth: true
2626
Layout.preferredHeight: 150
2727
Layout.topMargin: 20
28-
FluRadioButtons {
28+
ColumnLayout {
2929
anchors{
3030
verticalCenter: parent.verticalCenter
3131
left: parent.left
3232
}
3333
spacing: 10
34-
disabled: radio_button_switch.checked
34+
enabled: !radio_button_switch.checked
3535
FluRadioButton { text: qsTr("E-mail") }
3636
FluRadioButton { text: qsTr("Calendar") }
3737
FluRadioButton { text: qsTr("Contacts") }
@@ -65,10 +65,8 @@ FluGroupBox {
6565
6666
FluGroupBox {
6767
title: qsTr("RadioButton Group")
68-
FluRadioButtons {
68+
ColumnLayout {
6969
spacing: 10
70-
disabled: true // 禁用所有FluRadioButton子组件
71-
manuallyDisabled: true // 是否指定每个FluRadioButton上的disabled选项
7270
FluRadioButton { text: qsTr("E-mail") }
7371
FluRadioButton { text: qsTr("Calendar") }
7472
FluRadioButton { text: qsTr("Contacts") }

0 commit comments

Comments
 (0)