amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-01-22 20:04:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 1.7.6-dev

Browse Source 
# Conflicts:
#	src/Qt5/imports/FluentUI/Controls/FluRadioButtons.qml
#	src/Qt6/imports/FluentUI/Controls/FluRadioButtons.qml
This commit is contained in:
朱子楚\zhuzi 2024-05-10 12:26:14 +08:00
commit e6c4b79298
11 changed files with 311 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
example/example_en_US.ts
View File

@ -1273,19 +1273,19 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
</message> </message>
<message> <message>
<location filename="qml/page/T_GroupBox.qml" line="17"/> <location filename="qml/page/T_GroupBox.qml" line="17"/>
<location filename="qml/page/T_GroupBox.qml" line="27"/> <location filename="qml/page/T_GroupBox.qml" line="35"/>
<source>E-mail</source> <source>E-mail</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_GroupBox.qml" line="18"/> <location filename="qml/page/T_GroupBox.qml" line="18"/>
<location filename="qml/page/T_GroupBox.qml" line="28"/> <location filename="qml/page/T_GroupBox.qml" line="36"/>
<source>Calendar</source> <source>Calendar</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_GroupBox.qml" line="19"/> <location filename="qml/page/T_GroupBox.qml" line="19"/>
<location filename="qml/page/T_GroupBox.qml" line="29"/> <location filename="qml/page/T_GroupBox.qml" line="37"/>
<source>Contacts</source> <source>Contacts</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -1295,6 +1295,11 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
<oldsource>RadioButton Group111111111111111111111111</oldsource> <oldsource>RadioButton Group111111111111111111111111</oldsource>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="qml/page/T_GroupBox.qml" line="46"/>
<source>Disabled</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>T_Home</name> <name>T_Home</name>
@ -1358,46 +1363,77 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="23"/> <location filename="qml/page/T_InfoBar.qml" line="27"/>
<source>Info</source> <source>Info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="25"/> <location filename="qml/page/T_InfoBar.qml" line="29"/>
<location filename="qml/page/T_InfoBar.qml" line="49"/> <location filename="qml/page/T_InfoBar.qml" line="53"/>
<source>This is an InfoBar in the Info Style</source> <source>This is an InfoBar in the Info Style</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="29"/> <location filename="qml/page/T_InfoBar.qml" line="33"/>
<source>Warning</source> <source>Warning</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="31"/> <location filename="qml/page/T_InfoBar.qml" line="35"/>
<source>This is an InfoBar in the Warning Style</source> <source>This is an InfoBar in the Warning Style</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="37"/> <location filename="qml/page/T_InfoBar.qml" line="41"/>
<source>This is an InfoBar in the Error Style</source> <source>This is an InfoBar in the Error Style</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="43"/> <location filename="qml/page/T_InfoBar.qml" line="47"/>
<source>This is an InfoBar in the Success Style</source> <source>This is an InfoBar in the Success Style</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="47"/> <location filename="qml/page/T_InfoBar.qml" line="51"/>
<source>InfoBar that needs to be turned off manually</source> <source>InfoBar that needs to be turned off manually</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="49"/> <location filename="qml/page/T_InfoBar.qml" line="53"/>
<source>Manual shutdown is supported</source> <source>Manual shutdown is supported</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location filename="qml/page/T_InfoBar.qml" line="59"/>
<source>Manually close the info message box</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_InfoBar.qml" line="64"/>
<location filename="qml/page/T_InfoBar.qml" line="74"/>
<location filename="qml/page/T_InfoBar.qml" line="84"/>
<source>close &apos;%1&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_InfoBar.qml" line="64"/>
<location filename="qml/page/T_InfoBar.qml" line="74"/>
<location filename="qml/page/T_InfoBar.qml" line="84"/>
<source>show &apos;%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_InfoBar.qml" line="70"/>
<location filename="qml/page/T_InfoBar.qml" line="80"/>
<location filename="qml/page/T_InfoBar.qml" line="90"/>
<source>This is an &apos;%1&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_InfoBar.qml" line="94"/>
<source>clear all info</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>T_LineChart</name> <name>T_LineChart</name>
@ -1700,30 +1736,30 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
</message> </message>
<message> <message>
<location filename="qml/page/T_RadioButton.qml" line="38"/> <location filename="qml/page/T_RadioButton.qml" line="38"/>
<location filename="qml/page/T_RadioButton.qml" line="81"/> <location filename="qml/page/T_RadioButton.qml" line="79"/>
<location filename="qml/page/T_RadioButton.qml" line="134"/> <location filename="qml/page/T_RadioButton.qml" line="130"/>
<location filename="qml/page/T_RadioButton.qml" line="187"/> <location filename="qml/page/T_RadioButton.qml" line="181"/>
<source>Disabled</source> <source>Disabled</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_RadioButton.qml" line="64"/> <location filename="qml/page/T_RadioButton.qml" line="64"/>
<location filename="qml/page/T_RadioButton.qml" line="117"/> <location filename="qml/page/T_RadioButton.qml" line="115"/>
<location filename="qml/page/T_RadioButton.qml" line="170"/> <location filename="qml/page/T_RadioButton.qml" line="166"/>
<source>Radio Button_1</source> <source>Radio Button_1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_RadioButton.qml" line="68"/> <location filename="qml/page/T_RadioButton.qml" line="67"/>
<location filename="qml/page/T_RadioButton.qml" line="121"/> <location filename="qml/page/T_RadioButton.qml" line="118"/>
<location filename="qml/page/T_RadioButton.qml" line="174"/> <location filename="qml/page/T_RadioButton.qml" line="169"/>
<source>Radio Button_2</source> <source>Radio Button_2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_RadioButton.qml" line="72"/> <location filename="qml/page/T_RadioButton.qml" line="70"/>
<location filename="qml/page/T_RadioButton.qml" line="125"/> <location filename="qml/page/T_RadioButton.qml" line="121"/>
<location filename="qml/page/T_RadioButton.qml" line="178"/> <location filename="qml/page/T_RadioButton.qml" line="172"/>
<source>Radio Button_3</source> <source>Radio Button_3</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

82
example/example_zh_CN.ts
View File

@ -1359,19 +1359,19 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
</message> </message>
<message> <message>
<location filename="qml/page/T_GroupBox.qml" line="17"/> <location filename="qml/page/T_GroupBox.qml" line="17"/>
<location filename="qml/page/T_GroupBox.qml" line="27"/> <location filename="qml/page/T_GroupBox.qml" line="35"/>
<source>E-mail</source> <source>E-mail</source>
<translation type="unfinished">邮箱</translation> <translation type="unfinished">邮箱</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_GroupBox.qml" line="18"/> <location filename="qml/page/T_GroupBox.qml" line="18"/>
<location filename="qml/page/T_GroupBox.qml" line="28"/> <location filename="qml/page/T_GroupBox.qml" line="36"/>
<source>Calendar</source> <source>Calendar</source>
<translation type="unfinished">日历</translation> <translation type="unfinished">日历</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_GroupBox.qml" line="19"/> <location filename="qml/page/T_GroupBox.qml" line="19"/>
<location filename="qml/page/T_GroupBox.qml" line="29"/> <location filename="qml/page/T_GroupBox.qml" line="37"/>
<source>Contacts</source> <source>Contacts</source>
<translation type="unfinished">联系人</translation> <translation type="unfinished">联系人</translation>
</message> </message>
@ -1381,6 +1381,11 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
<oldsource>RadioButton Group111111111111111111111111</oldsource> <oldsource>RadioButton Group111111111111111111111111</oldsource>
<translation type="unfinished">单选框分组</translation> <translation type="unfinished">单选框分组</translation>
</message> </message>
<message>
<location filename="qml/page/T_GroupBox.qml" line="46"/>
<source>Disabled</source>
<translation type="unfinished">禁用</translation>
</message>
</context> </context>
<context> <context>
<name>T_Home</name> <name>T_Home</name>
@ -1452,46 +1457,77 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
<translation type="unfinished">信息栏</translation> <translation type="unfinished">信息栏</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="23"/> <location filename="qml/page/T_InfoBar.qml" line="27"/>
<source>Info</source> <source>Info</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="25"/> <location filename="qml/page/T_InfoBar.qml" line="29"/>
<location filename="qml/page/T_InfoBar.qml" line="49"/> <location filename="qml/page/T_InfoBar.qml" line="53"/>
<source>This is an InfoBar in the Info Style</source> <source>This is an InfoBar in the Info Style</source>
<translation type="unfinished">这是一个Info样式的信息栏</translation> <translation type="unfinished">这是一个Info样式的信息栏</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="29"/> <location filename="qml/page/T_InfoBar.qml" line="33"/>
<source>Warning</source> <source>Warning</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="31"/> <location filename="qml/page/T_InfoBar.qml" line="35"/>
<source>This is an InfoBar in the Warning Style</source> <source>This is an InfoBar in the Warning Style</source>
<translation type="unfinished">这是一个Warning样式的信息栏</translation> <translation type="unfinished">这是一个Warning样式的信息栏</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="37"/> <location filename="qml/page/T_InfoBar.qml" line="41"/>
<source>This is an InfoBar in the Error Style</source> <source>This is an InfoBar in the Error Style</source>
<translation type="unfinished">这是一个Error样式的信息栏</translation> <translation type="unfinished">这是一个Error样式的信息栏</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="43"/> <location filename="qml/page/T_InfoBar.qml" line="47"/>
<source>This is an InfoBar in the Success Style</source> <source>This is an InfoBar in the Success Style</source>
<translation type="unfinished">这是一个Success样式的信息栏</translation> <translation type="unfinished">这是一个Success样式的信息栏</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="47"/> <location filename="qml/page/T_InfoBar.qml" line="51"/>
<source>InfoBar that needs to be turned off manually</source> <source>InfoBar that needs to be turned off manually</source>
<translation type="unfinished">需要手动关闭的信息栏</translation> <translation type="unfinished">需要手动关闭的信息栏</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_InfoBar.qml" line="49"/> <location filename="qml/page/T_InfoBar.qml" line="53"/>
<source>Manual shutdown is supported</source> <source>Manual shutdown is supported</source>
<translation type="unfinished">支持手动关闭</translation> <translation type="unfinished">支持手动关闭</translation>
</message> </message>
<message>
<location filename="qml/page/T_InfoBar.qml" line="59"/>
<source>Manually close the info message box</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_InfoBar.qml" line="64"/>
<location filename="qml/page/T_InfoBar.qml" line="74"/>
<location filename="qml/page/T_InfoBar.qml" line="84"/>
<source>close &apos;%1&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_InfoBar.qml" line="64"/>
<location filename="qml/page/T_InfoBar.qml" line="74"/>
<location filename="qml/page/T_InfoBar.qml" line="84"/>
<source>show &apos;%1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_InfoBar.qml" line="70"/>
<location filename="qml/page/T_InfoBar.qml" line="80"/>
<location filename="qml/page/T_InfoBar.qml" line="90"/>
<source>This is an &apos;%1&apos;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="qml/page/T_InfoBar.qml" line="94"/>
<source>clear all info</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Loading...</source> <source>Loading...</source>
<translation type="obsolete">加载中...</translation> <translation type="obsolete">加载中...</translation>
@ -1808,30 +1844,30 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
</message> </message>
<message> <message>
<location filename="qml/page/T_RadioButton.qml" line="38"/> <location filename="qml/page/T_RadioButton.qml" line="38"/>
<location filename="qml/page/T_RadioButton.qml" line="81"/> <location filename="qml/page/T_RadioButton.qml" line="79"/>
<location filename="qml/page/T_RadioButton.qml" line="134"/> <location filename="qml/page/T_RadioButton.qml" line="130"/>
<location filename="qml/page/T_RadioButton.qml" line="187"/> <location filename="qml/page/T_RadioButton.qml" line="181"/>
<source>Disabled</source> <source>Disabled</source>
<translation type="unfinished">禁用</translation> <translation type="unfinished">禁用</translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_RadioButton.qml" line="64"/> <location filename="qml/page/T_RadioButton.qml" line="64"/>
<location filename="qml/page/T_RadioButton.qml" line="117"/> <location filename="qml/page/T_RadioButton.qml" line="115"/>
<location filename="qml/page/T_RadioButton.qml" line="170"/> <location filename="qml/page/T_RadioButton.qml" line="166"/>
<source>Radio Button_1</source> <source>Radio Button_1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_RadioButton.qml" line="68"/> <location filename="qml/page/T_RadioButton.qml" line="67"/>
<location filename="qml/page/T_RadioButton.qml" line="121"/> <location filename="qml/page/T_RadioButton.qml" line="118"/>
<location filename="qml/page/T_RadioButton.qml" line="174"/> <location filename="qml/page/T_RadioButton.qml" line="169"/>
<source>Radio Button_2</source> <source>Radio Button_2</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="qml/page/T_RadioButton.qml" line="72"/> <location filename="qml/page/T_RadioButton.qml" line="70"/>
<location filename="qml/page/T_RadioButton.qml" line="125"/> <location filename="qml/page/T_RadioButton.qml" line="121"/>
<location filename="qml/page/T_RadioButton.qml" line="178"/> <location filename="qml/page/T_RadioButton.qml" line="172"/>
<source>Radio Button_3</source> <source>Radio Button_3</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

36
example/qml/page/T_GroupBox.qml
View File

@ -22,18 +22,37 @@ FluScrollablePage{
FluGroupBox { FluGroupBox {
title: qsTr("RadioButton Group") title: qsTr("RadioButton Group")
Layout.fillWidth: true
Layout.preferredHeight: 150
Layout.topMargin: 20
FluRadioButtons { FluRadioButtons {
anchors{
verticalCenter: parent.verticalCenter
left: parent.left
}
spacing: 10 spacing: 10
disabled: radio_button_switch.checked
FluRadioButton { text: qsTr("E-mail") } FluRadioButton { text: qsTr("E-mail") }
FluRadioButton { text: qsTr("Calendar") } FluRadioButton { text: qsTr("Calendar") }
FluRadioButton { text: qsTr("Contacts") } FluRadioButton { text: qsTr("Contacts") }
} }
FluToggleSwitch{
id: radio_button_switch
anchors{
right: parent.right
verticalCenter: parent.verticalCenter
}
text: qsTr("Disabled")
}
} }
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 4 Layout.topMargin: 4
code:'FluGroupBox { code:`
FluGroupBox {
title: qsTr("CheckBox Group") title: qsTr("CheckBox Group")
ColumnLayout { ColumnLayout {
spacing: 10 spacing: 10
@ -42,7 +61,20 @@ FluScrollablePage{
FluCheckBox { text: qsTr("Calendar") } FluCheckBox { text: qsTr("Calendar") }
FluCheckBox { text: qsTr("Contacts") } FluCheckBox { text: qsTr("Contacts") }
} }
}' }
FluGroupBox {
title: qsTr("RadioButton Group")
FluRadioButtons {
spacing: 10
disabled: true // 禁用所有FluRadioButton子组件
manuallyDisabled: true // 是否指定每个FluRadioButton上的disabled选项
FluRadioButton { text: qsTr("E-mail") }
FluRadioButton { text: qsTr("Calendar") }
FluRadioButton { text: qsTr("Contacts") }
}
}
`
} }
} }

60
example/qml/page/T_InfoBar.qml
View File

@ -9,9 +9,13 @@ FluScrollablePage{
title: qsTr("InfoBar") title: qsTr("InfoBar")
property var info1
property var info2
property var info3
FluFrame{ FluFrame{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 270 Layout.preferredHeight: 350
padding: 10 padding: 10
ColumnLayout{ ColumnLayout{
spacing: 14 spacing: 14
@ -49,6 +53,51 @@ FluScrollablePage{
showInfo(qsTr("This is an InfoBar in the Info Style"),0,qsTr("Manual shutdown is supported")) showInfo(qsTr("This is an InfoBar in the Info Style"),0,qsTr("Manual shutdown is supported"))
} }
} }
FluText{
wrapMode: Text.WrapAnywhere
width: parent.width
text: qsTr("Manually close the info message box")
}
Row{
spacing: 5
FluButton{
text: (info1 ? qsTr("close '%1'") : qsTr("show '%1")).arg("info1")
onClicked: {
if(info1) {
info1.close()
return
}
info1 = showInfo(qsTr("This is an '%1'").arg("info1"), 0)
}
}
FluButton{
text: (info2 ? qsTr("close '%1'") : qsTr("show '%1")).arg("info2")
onClicked: {
if(info2) {
info2.close()
return
}
info2 = showInfo(qsTr("This is an '%1'").arg("info2"), 0)
}
}
FluButton{
text: (info3 ? qsTr("close '%1'") : qsTr("show '%1")).arg("info3")
onClicked: {
if(info3) {
info3.close()
return
}
info3 = showInfo(qsTr("This is an '%1'").arg("info3"), 0)
}
}
FluButton{
text: qsTr("clear all info")
onClicked: {
clearAllInfo()
}
}
}
FluButton{ FluButton{
text:"Loading" text:"Loading"
onClicked: { onClicked: {
@ -60,12 +109,17 @@ FluScrollablePage{
CodeExpander{ CodeExpander{
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: -6 Layout.topMargin: -6
code:'showInfo(qsTr("This is an InfoBar in the Info Style")) code:`
showInfo(qsTr("This is an InfoBar in the Info Style"))
showWarning(qsTr("This is an InfoBar in the Warning Style")) showWarning(qsTr("This is an InfoBar in the Warning Style"))
showError(qsTr("This is an InfoBar in the Error Style")) showError(qsTr("This is an InfoBar in the Error Style"))
showSuccess(qsTr("This is an InfoBar in the Success Style"))' showSuccess(qsTr("This is an InfoBar in the Success Style"))
var info1 = showInfo(qsTr("This is an 'Info1'"), 0)
info1.close()
`
} }
} }

12
example/qml/page/T_RadioButton.qml
View File

@ -53,6 +53,7 @@ FluScrollablePage{
Layout.topMargin: 20 Layout.topMargin: 20
FluRadioButtons{ FluRadioButtons{
spacing: 8 spacing: 8
disabled: radio_button_switch2.checked
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors{ anchors{
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
@ -60,15 +61,12 @@ FluScrollablePage{
} }
currentIndex: 1 currentIndex: 1
FluRadioButton{ FluRadioButton{
disabled: radio_button_switch2.checked
text: qsTr("Radio Button_1") text: qsTr("Radio Button_1")
} }
FluRadioButton{ FluRadioButton{
disabled: radio_button_switch2.checked
text: qsTr("Radio Button_2") text: qsTr("Radio Button_2")
} }
FluRadioButton{ FluRadioButton{
disabled: radio_button_switch2.checked
text: qsTr("Radio Button_3") text: qsTr("Radio Button_3")
} }
} }
@ -110,18 +108,16 @@ FluScrollablePage{
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
left: parent.left left: parent.left
} }
disabled: radio_button_switch3.checked
orientation: Qt.Horizontal orientation: Qt.Horizontal
currentIndex: 1 currentIndex: 1
FluRadioButton{ FluRadioButton{
disabled: radio_button_switch3.checked
text: qsTr("Radio Button_1") text: qsTr("Radio Button_1")
} }
FluRadioButton{ FluRadioButton{
disabled: radio_button_switch3.checked
text: qsTr("Radio Button_2") text: qsTr("Radio Button_2")
} }
FluRadioButton{ FluRadioButton{
disabled: radio_button_switch3.checked
text: qsTr("Radio Button_3") text: qsTr("Radio Button_3")
} }
} }
@ -164,17 +160,15 @@ FluScrollablePage{
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
left: parent.left left: parent.left
} }
disabled: radio_button_switch4.checked
currentIndex: -1 currentIndex: -1
FluCheckBox{ FluCheckBox{
disabled: radio_button_switch4.checked
text: qsTr("Radio Button_1") text: qsTr("Radio Button_1")
} }
FluCheckBox{ FluCheckBox{
disabled: radio_button_switch4.checked
text: qsTr("Radio Button_2") text: qsTr("Radio Button_2")
} }
FluCheckBox{ FluCheckBox{
disabled: radio_button_switch4.checked
text: qsTr("Radio Button_3") text: qsTr("Radio Button_3")
} }
} }

41
src/Qt5/imports/FluentUI/Controls/FluInfoBar.qml
View File

@ -18,22 +18,23 @@ FluObject {
if(screenLayout){ if(screenLayout){
var last = screenLayout.getLastloader(); var last = screenLayout.getLastloader();
if(last.type === type && last.text === text && moremsg === last.moremsg){ if(last.type === type && last.text === text && moremsg === last.moremsg){
last.restart(); last.duration = duration
return; if (duration > 0) last.restart();
return last;
} }
} }
initScreenLayout(); initScreenLayout();
contentComponent.createObject(screenLayout,{ return contentComponent.createObject(screenLayout,{
type:type, type:type,
text:text, text:text,
duration:duration, duration:duration,
moremsg:moremsg, moremsg:moremsg,
}); });
} }
function createCustom(itemcomponent,duration){ function createCustom(itemcomponent,duration){
initScreenLayout(); initScreenLayout();
if(itemcomponent){ if(itemcomponent){
contentComponent.createObject(screenLayout,{itemcomponent:itemcomponent,duration:duration}); return contentComponent.createObject(screenLayout,{itemcomponent:itemcomponent,duration:duration});
} }
} }
function initScreenLayout(){ function initScreenLayout(){
@ -85,7 +86,9 @@ FluObject {
} }
Timer { Timer {
id:delayTimer id:delayTimer
interval: duration; running: duration > 0; repeat: duration > 0 interval: duration;
running: duration > 0;
repeat: duration > 0
onTriggered: content.close(); onTriggered: content.close();
} }
FluLoader{ FluLoader{
@ -235,18 +238,26 @@ FluObject {
} }
} }
function showSuccess(text,duration=1000,moremsg){ function showSuccess(text,duration=1000,moremsg){
mcontrol.create(mcontrol.const_success,text,duration,moremsg ? moremsg : ""); return mcontrol.create(mcontrol.const_success,text,duration,moremsg ? moremsg : "");
} }
function showInfo(text,duration=1000,moremsg){ function showInfo(text,duration=1000,moremsg){
mcontrol.create(mcontrol.const_info,text,duration,moremsg ? moremsg : ""); return mcontrol.create(mcontrol.const_info,text,duration,moremsg ? moremsg : "");
} }
function showWarning(text,duration=1000,moremsg){ function showWarning(text,duration=1000,moremsg){
mcontrol.create(mcontrol.const_warning,text,duration,moremsg ? moremsg : ""); return mcontrol.create(mcontrol.const_warning,text,duration,moremsg ? moremsg : "");
} }
function showError(text,duration=1000,moremsg){ function showError(text,duration=1000,moremsg){
mcontrol.create(mcontrol.const_error,text,duration,moremsg ? moremsg : ""); return mcontrol.create(mcontrol.const_error,text,duration,moremsg ? moremsg : "");
} }
function showCustom(itemcomponent,duration=1000){ function showCustom(itemcomponent,duration=1000){
mcontrol.createCustom(itemcomponent,duration); return mcontrol.createCustom(itemcomponent,duration);
}
function clearAllInfo(){
if(mcontrol.screenLayout != null) {
mcontrol.screenLayout.destroy()
mcontrol.screenLayout = null
}
return true
} }
} }

15
src/Qt5/imports/FluentUI/Controls/FluRadioButtons.qml
View File

@ -9,6 +9,8 @@ Item{
property int currentIndex : -1 property int currentIndex : -1
property int spacing: 8 property int spacing: 8
property int orientation: Qt.Vertical property int orientation: Qt.Vertical
property bool disabled: false
property bool manuallyDisabled: false
QtObject{ QtObject{
id: d id: d
function updateChecked(){ function updateChecked(){
@ -22,12 +24,23 @@ Item{
buttons[currentIndex].checked = true buttons[currentIndex].checked = true
} }
} }
function refreshButtonStatus() {
for(var i = 0;i<buttons.length;i++){
if(!manuallyDisabled) buttons[i].enabled = !disabled
}
}
} }
implicitWidth: childrenRect.width implicitWidth: childrenRect.width
implicitHeight: childrenRect.height implicitHeight: childrenRect.height
onCurrentIndexChanged: { onCurrentIndexChanged: {
d.updateChecked() d.updateChecked()
} }
onDisabledChanged: {
d.refreshButtonStatus()
}
onManuallyDisabledChanged: {
d.refreshButtonStatus()
}
Component{ Component{
id:com_vertical id:com_vertical
ColumnLayout { ColumnLayout {
@ -45,6 +58,7 @@ Item{
} }
} }
d.updateChecked() d.updateChecked()
d.refreshButtonStatus()
} }
} }
} }
@ -65,6 +79,7 @@ Item{
} }
} }
d.updateChecked() d.updateChecked()
d.refreshButtonStatus()
} }
} }
} }

11
src/Qt5/imports/FluentUI/Controls/FluWindow.qml
View File

@ -299,16 +299,19 @@ Window {
loader_loading.sourceComponent = undefined loader_loading.sourceComponent = undefined
} }
function showSuccess(text,duration,moremsg){ function showSuccess(text,duration,moremsg){
info_bar.showSuccess(text,duration,moremsg) return info_bar.showSuccess(text,duration,moremsg)
} }
function showInfo(text,duration,moremsg){ function showInfo(text,duration,moremsg){
info_bar.showInfo(text,duration,moremsg) return info_bar.showInfo(text,duration,moremsg)
} }
function showWarning(text,duration,moremsg){ function showWarning(text,duration,moremsg){
info_bar.showWarning(text,duration,moremsg) return info_bar.showWarning(text,duration,moremsg)
} }
function showError(text,duration,moremsg){ function showError(text,duration,moremsg){
info_bar.showError(text,duration,moremsg) return info_bar.showError(text,duration,moremsg)
}
function clearAllInfo(){
return info_bar.clearAllInfo()
} }
function moveWindowToDesktopCenter(){ function moveWindowToDesktopCenter(){
var availableGeometry = FluTools.desktopAvailableGeometry(window) var availableGeometry = FluTools.desktopAvailableGeometry(window)

47
src/Qt6/imports/FluentUI/Controls/FluInfoBar.qml
View File

@ -1,6 +1,6 @@
import QtQuick import QtQuick 2.15
import QtQuick.Controls import QtQuick.Controls 2.15
import FluentUI import FluentUI 1.0
FluObject { FluObject {
property var root; property var root;
@ -18,22 +18,23 @@ FluObject {
if(screenLayout){ if(screenLayout){
var last = screenLayout.getLastloader(); var last = screenLayout.getLastloader();
if(last.type === type && last.text === text && moremsg === last.moremsg){ if(last.type === type && last.text === text && moremsg === last.moremsg){
last.restart(); last.duration = duration
return; if (duration > 0) last.restart();
return last;
} }
} }
initScreenLayout(); initScreenLayout();
contentComponent.createObject(screenLayout,{ return contentComponent.createObject(screenLayout,{
type:type, type:type,
text:text, text:text,
duration:duration, duration:duration,
moremsg:moremsg, moremsg:moremsg,
}); });
} }
function createCustom(itemcomponent,duration){ function createCustom(itemcomponent,duration){
initScreenLayout(); initScreenLayout();
if(itemcomponent){ if(itemcomponent){
contentComponent.createObject(screenLayout,{itemcomponent:itemcomponent,duration:duration}); return contentComponent.createObject(screenLayout,{itemcomponent:itemcomponent,duration:duration});
} }
} }
function initScreenLayout(){ function initScreenLayout(){
@ -85,7 +86,9 @@ FluObject {
} }
Timer { Timer {
id:delayTimer id:delayTimer
interval: duration; running: duration > 0; repeat: duration > 0 interval: duration;
running: duration > 0;
repeat: duration > 0
onTriggered: content.close(); onTriggered: content.close();
} }
FluLoader{ FluLoader{
@ -235,18 +238,26 @@ FluObject {
} }
} }
function showSuccess(text,duration=1000,moremsg){ function showSuccess(text,duration=1000,moremsg){
mcontrol.create(mcontrol.const_success,text,duration,moremsg ? moremsg : ""); return mcontrol.create(mcontrol.const_success,text,duration,moremsg ? moremsg : "");
} }
function showInfo(text,duration=1000,moremsg){ function showInfo(text,duration=1000,moremsg){
mcontrol.create(mcontrol.const_info,text,duration,moremsg ? moremsg : ""); return mcontrol.create(mcontrol.const_info,text,duration,moremsg ? moremsg : "");
} }
function showWarning(text,duration=1000,moremsg){ function showWarning(text,duration=1000,moremsg){
mcontrol.create(mcontrol.const_warning,text,duration,moremsg ? moremsg : ""); return mcontrol.create(mcontrol.const_warning,text,duration,moremsg ? moremsg : "");
} }
function showError(text,duration=1000,moremsg){ function showError(text,duration=1000,moremsg){
mcontrol.create(mcontrol.const_error,text,duration,moremsg ? moremsg : ""); return mcontrol.create(mcontrol.const_error,text,duration,moremsg ? moremsg : "");
} }
function showCustom(itemcomponent,duration=1000){ function showCustom(itemcomponent,duration=1000){
mcontrol.createCustom(itemcomponent,duration); return mcontrol.createCustom(itemcomponent,duration);
}
function clearAllInfo(){
if(mcontrol.screenLayout != null) {
mcontrol.screenLayout.destroy()
mcontrol.screenLayout = null
}
return true
} }
} }

15
src/Qt6/imports/FluentUI/Controls/FluRadioButtons.qml
View File

@ -10,6 +10,8 @@ Item{
property int currentIndex : -1 property int currentIndex : -1
property int spacing: 8 property int spacing: 8
property int orientation: Qt.Vertical property int orientation: Qt.Vertical
property bool disabled: false
property bool manuallyDisabled: false
QtObject{ QtObject{
id: d id: d
function updateChecked(){ function updateChecked(){
@ -23,12 +25,23 @@ Item{
buttons[currentIndex].checked = true buttons[currentIndex].checked = true
} }
} }
function refreshButtonStatus() {
for(var i = 0;i<buttons.length;i++){
if(!manuallyDisabled) buttons[i].enabled = !disabled
}
}
} }
implicitWidth: childrenRect.width implicitWidth: childrenRect.width
implicitHeight: childrenRect.height implicitHeight: childrenRect.height
onCurrentIndexChanged: { onCurrentIndexChanged: {
d.updateChecked() d.updateChecked()
} }
onDisabledChanged: {
d.refreshButtonStatus()
}
onManuallyDisabledChanged: {
d.refreshButtonStatus()
}
Component{ Component{
id:com_vertical id:com_vertical
ColumnLayout { ColumnLayout {
@ -46,6 +59,7 @@ Item{
} }
} }
d.updateChecked() d.updateChecked()
d.refreshButtonStatus()
} }
} }
} }
@ -66,6 +80,7 @@ Item{
} }
} }
d.updateChecked() d.updateChecked()
d.refreshButtonStatus()
} }
} }
} }

11
src/Qt6/imports/FluentUI/Controls/FluWindow.qml
View File

@ -298,16 +298,19 @@ Window {
loader_loading.sourceComponent = undefined loader_loading.sourceComponent = undefined
} }
function showSuccess(text,duration,moremsg){ function showSuccess(text,duration,moremsg){
info_bar.showSuccess(text,duration,moremsg) return info_bar.showSuccess(text,duration,moremsg)
} }
function showInfo(text,duration,moremsg){ function showInfo(text,duration,moremsg){
info_bar.showInfo(text,duration,moremsg) return info_bar.showInfo(text,duration,moremsg)
} }
function showWarning(text,duration,moremsg){ function showWarning(text,duration,moremsg){
info_bar.showWarning(text,duration,moremsg) return info_bar.showWarning(text,duration,moremsg)
} }
function showError(text,duration,moremsg){ function showError(text,duration,moremsg){
info_bar.showError(text,duration,moremsg) return info_bar.showError(text,duration,moremsg)
}
function clearAllInfo(){
return info_bar.clearAllInfo()
} }
function moveWindowToDesktopCenter(){ function moveWindowToDesktopCenter(){
var availableGeometry = FluTools.desktopAvailableGeometry(window) var availableGeometry = FluTools.desktopAvailableGeometry(window)