Skip to content

Commit bb537f4

Browse files
zhuzichu520zhuzichu520
authored
Merge pull request zhuzichu520#577 from lucky9loogn/feat-fluexpander-custom-header
FluExpander 添加属性 headerHeight 和 headerDelegate
2 parents a8ca78f + cd6a46c commit bb537f4

File tree

7 files changed

+232
-16
lines changed

7 files changed

+232
-16
lines changed

‎example/example_en_US.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,6 +1314,26 @@ Since that moment, I have been tormented day and night by the fear that I might
13141314
My only desire is to be permitted to drive out the traitors and restore the Han. If I should let you down, punish my offense and report it to the spirit of the late Emperor. If those three advisors should fail in their duties, then they should be punished for their negligence.Your Majesty, consider your course of action carefully. Seek out good advice, and never forget the late Emperor. I depart now on a long expedition, and I will be forever grateful if you heed my advice. Blinded by my own tears, I know not what I write.</source>
13151315
<translation type="unfinished"></translation>
13161316
</message>
1317+
<message>
1318+
<location filename="qml/page/T_Expander.qml" line="152"/>
1319+
<source>Check for Updates</source>
1320+
<translation type="unfinished"></translation>
1321+
</message>
1322+
<message>
1323+
<location filename="qml/page/T_Expander.qml" line="207"/>
1324+
<source>This is a ToggleButton in the header</source>
1325+
<translation type="unfinished"></translation>
1326+
</message>
1327+
<message>
1328+
<location filename="qml/page/T_Expander.qml" line="215"/>
1329+
<source>This is a StandardButton in the content</source>
1330+
<translation type="unfinished"></translation>
1331+
</message>
1332+
<message>
1333+
<location filename="qml/page/T_Expander.qml" line="217"/>
1334+
<source>Click StandardButton</source>
1335+
<translation type="unfinished"></translation>
1336+
</message>
13171337
</context>
13181338
<context>
13191339
<name>T_FlipView</name>

‎example/example_zh_CN.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,6 +1432,26 @@ Since that moment, I have been tormented day and night by the fear that I might
14321432
My only desire is to be permitted to drive out the traitors and restore the Han. If I should let you down, punish my offense and report it to the spirit of the late Emperor. If those three advisors should fail in their duties, then they should be punished for their negligence.Your Majesty, consider your course of action carefully. Seek out good advice, and never forget the late Emperor. I depart now on a long expedition, and I will be forever grateful if you heed my advice. Blinded by my own tears, I know not what I write.</oldsource>
14331433
<translation type="unfinished">先帝创业未半而中道崩殂，今天下三分，益州疲弊，此诚危急存亡之秋也。然侍卫之臣不懈于内，忠志之士忘身于外者，盖追先帝之殊遇，欲报之于陛下也。诚宜开张圣听，以光先帝遗德，恢弘志士之气，不宜妄自菲薄，引喻失义，以塞忠谏之路也。宫中府中，俱为一体；陟罚臧否，不宜异同。若有作奸犯科及为忠善者，宜付有司论其刑赏，以昭陛下平明之理，不宜偏私，使内外异法也。侍中、侍郎郭攸之、费祎、董允等，此皆良实，志虑忠纯，是以先帝简拔以遗陛下。愚以为宫中之事，事无大小，悉以咨之，然后施行，必能裨补阙漏，有所广益。将军向宠，性行淑均，晓畅军事，试用于昔日，先帝称之曰能，是以众议举宠为督。愚以为营中之事，悉以咨之，必能使行阵和睦，优劣得所。亲贤臣，远小人，此先汉所以兴隆也；亲小人，远贤臣，此后汉所以倾颓也。先帝在时，每与臣论此事，未尝不叹息痛恨于桓、灵也。侍中、尚书、长史、参军，此悉贞良死节之臣，愿陛下亲之信之，则汉室之隆，可计日而待也。臣本布衣，躬耕于南阳，苟全性命于乱世，不求闻达于诸侯。先帝不以臣卑鄙，猥自枉屈，三顾臣于草庐之中，咨臣以当世之事，由是感激，遂许先帝以驱驰。后值倾覆，受任于败军之际，奉命于危难之间，尔来二十有一年矣。先帝知臣谨慎，故临崩寄臣以大事也。受命以来，夙夜忧叹，恐托付不效，以伤先帝之明；故五月渡泸，深入不毛。今南方已定，兵甲已足，当奖率三军，北定中原，庶竭驽钝，攘除奸凶，兴复汉室，还于旧都。此臣所以报先帝而忠陛下之职分也。至于斟酌损益，进尽忠言，则攸之、祎、允之任也。愿陛下托臣以讨贼兴复之效，不效，则治臣之罪，以告先帝之灵。若无兴德之言，则责攸之、祎、允等之慢，以彰其咎；陛下亦宜自谋，以咨诹善道，察纳雅言，深追先帝遗诏。臣不胜受恩感激。今当远离，临表涕零，不知所言。</translation>
14341434
</message>
1435+
<message>
1436+
<location filename="qml/page/T_Expander.qml" line="152"/>
1437+
<source>Check for Updates</source>
1438+
<translation type="unfinished">检查更新</translation>
1439+
</message>
1440+
<message>
1441+
<location filename="qml/page/T_Expander.qml" line="207"/>
1442+
<source>This is a ToggleButton in the header</source>
1443+
<translation type="unfinished">这是一个位于头部的开关按钮</translation>
1444+
</message>
1445+
<message>
1446+
<location filename="qml/page/T_Expander.qml" line="215"/>
1447+
<source>This is a StandardButton in the content</source>
1448+
<translation type="unfinished">这是一个位于内容的标准按钮</translation>
1449+
</message>
1450+
<message>
1451+
<location filename="qml/page/T_Expander.qml" line="217"/>
1452+
<source>Click StandardButton</source>
1453+
<translation type="unfinished">点击标准按钮</translation>
1454+
</message>
14351455
</context>
14361456
<context>
14371457
<name>T_FlipView</name>

‎example/qml/page/T_Expander.qml

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,147 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
105105
}'
106106
}
107107

108+
FluFrame {
109+
Layout.fillWidth: true
110+
padding: 10
111+
Layout.topMargin: 20
112+
Column {
113+
spacing: 15
114+
FluExpander {
115+
headerHeight: 60
116+
contentHeight: content_layout.implicitHeight
117+
headerDelegate: Component {
118+
Item {
119+
RowLayout {
120+
anchors {
121+
verticalCenter: parent.verticalCenter
122+
left: parent.left
123+
leftMargin: 15
124+
}
125+
spacing: 15
126+
FluImage {
127+
width: 20
128+
height: 20
129+
sourceSize.width: 20
130+
sourceSize.height: 20
131+
source: "qrc:/example/res/image/favicon.ico"
132+
}
133+
ColumnLayout {
134+
spacing: 0
135+
FluText {
136+
text: "FluentUI"
137+
}
138+
FluText {
139+
text: "%1".arg(AppInfo.version)
140+
textColor: FluTheme.fontSecondaryColor
141+
font.pixelSize: 12
142+
}
143+
}
144+
}
145+
FluLoadingButton {
146+
id: btn_checkupdate
147+
anchors {
148+
verticalCenter: parent.verticalCenter
149+
right: parent.right
150+
rightMargin: 15
151+
}
152+
text: qsTr("Check for Updates")
153+
onClicked: {
154+
loading = true;
155+
FluEventBus.post("checkUpdate");
156+
}
157+
}
158+
FluEvent {
159+
name: "checkUpdateFinish"
160+
onTriggered: {
161+
btn_checkupdate.loading = false;
162+
}
163+
}
164+
}
165+
}
166+
content: ColumnLayout {
167+
id: content_layout
168+
spacing: 0
169+
RowLayout {
170+
Layout.topMargin: 15
171+
Layout.leftMargin: 15
172+
spacing: 0
173+
FluText {
174+
text: "GitHub: "
175+
}
176+
FluTextButton {
177+
text: "https://github.com/zhuzichu520/FluentUI"
178+
onClicked: {
179+
Qt.openUrlExternally(text);
180+
}
181+
}
182+
}
183+
RowLayout {
184+
Layout.bottomMargin: 15
185+
Layout.leftMargin: 15
186+
spacing: 0
187+
FluText {
188+
text: "bilibili: "
189+
}
190+
FluTextButton {
191+
text: "https://www.bilibili.com/video/BV1mg4y1M71w"
192+
onClicked: {
193+
Qt.openUrlExternally(text);
194+
}
195+
}
196+
}
197+
}
198+
}
199+
200+
FluExpander {
201+
contentHeight: 100
202+
headerHeight: 45
203+
headerDelegate: Component {
204+
Item {
205+
FluToggleButton {
206+
anchors.centerIn: parent
207+
text: qsTr("This is a ToggleButton in the header")
208+
}
209+
}
210+
}
211+
content: Item {
212+
anchors.fill: parent
213+
FluButton {
214+
anchors.centerIn: parent
215+
text: qsTr("This is a StandardButton in the content")
216+
onClicked: {
217+
showInfo(qsTr("Click StandardButton"))
218+
}
219+
}
220+
}
221+
}
222+
}
223+
}
108224

225+
CodeExpander {
226+
Layout.fillWidth: true
227+
Layout.topMargin: -6
228+
code: 'FluExpander {
229+
contentHeight: 100
230+
headerHeight: 45
231+
headerDelegate: Component {
232+
Item {
233+
FluToggleButton {
234+
anchors.centerIn: parent
235+
text: qsTr("This is a ToggleButton in the header")
236+
}
237+
}
238+
}
239+
content: Item {
240+
anchors.fill: parent
241+
FluButton {
242+
anchors.centerIn: parent
243+
text: qsTr("This is a StandardButton in the content")
244+
onClicked: {
245+
showInfo(qsTr("Click StandardButton"))
246+
}
247+
}
248+
}
249+
}'
250+
}
109251
}

‎src/Qt5/imports/FluentUI/Controls/FluExpander.qml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import FluentUI 1.0
55

66
Item {
77
property string headerText: ""
8+
property int headerHeight : 45
9+
property Component headerDelegate: com_header
810
property bool expand: false
911
property int contentHeight : 300
1012
default property alias content: container.data
@@ -21,10 +23,23 @@ Item {
2123
}
2224
}
2325
clip: true
26+
Component {
27+
id: com_header
28+
Item {
29+
FluText {
30+
text: control.headerText
31+
anchors {
32+
verticalCenter: parent.verticalCenter
33+
left: parent.left
34+
leftMargin: 15
35+
}
36+
}
37+
}
38+
}
2439
Rectangle{
2540
id:layout_header
2641
width: parent.width
27-
height: 45
42+
height: control.headerHeight
2843
radius: 4
2944
border.color: FluTheme.dividerColor
3045
color: {
@@ -41,15 +56,17 @@ Item {
4156
d.toggle()
4257
}
4358
}
44-
FluText{
45-
text: headerText
46-
anchors{
47-
verticalCenter: parent.verticalCenter
59+
FluLoader {
60+
anchors {
61+
top: parent.top
62+
bottom: parent.bottom
4863
left: parent.left
49-
leftMargin: 15
64+
right: btn_toggle.left
5065
}
66+
sourceComponent: control.headerDelegate
5167
}
5268
FluIconButton{
69+
id: btn_toggle
5370
anchors{
5471
verticalCenter: parent.verticalCenter
5572
right: parent.right

‎src/Qt6/imports/FluentUI/Controls/FluExpander.qml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import FluentUI
55

66
Item {
77
property string headerText: ""
8+
property int headerHeight : 45
9+
property Component headerDelegate: com_header
810
property bool expand: false
911
property int contentHeight : 300
1012
default property alias content: container.data
@@ -21,10 +23,23 @@ Item {
2123
}
2224
}
2325
clip: true
26+
Component {
27+
id: com_header
28+
Item {
29+
FluText {
30+
text: control.headerText
31+
anchors {
32+
verticalCenter: parent.verticalCenter
33+
left: parent.left
34+
leftMargin: 15
35+
}
36+
}
37+
}
38+
}
2439
Rectangle{
2540
id:layout_header
2641
width: parent.width
27-
height: 45
42+
height: control.headerHeight
2843
radius: 4
2944
border.color: FluTheme.dividerColor
3045
color: {
@@ -41,15 +56,17 @@ Item {
4156
d.toggle()
4257
}
4358
}
44-
FluText{
45-
text: headerText
46-
anchors{
47-
verticalCenter: parent.verticalCenter
59+
FluLoader {
60+
anchors {
61+
top: parent.top
62+
bottom: parent.bottom
4863
left: parent.left
49-
leftMargin: 15
64+
right: btn_toggle.left
5065
}
66+
sourceComponent: control.headerDelegate
5167
}
5268
FluIconButton{
69+
id: btn_toggle
5370
anchors{
5471
verticalCenter: parent.verticalCenter
5572
right: parent.right

‎src/fluentui_en_US.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@
355355
<context>
356356
<name>FluWindow</name>
357357
<message>
358-
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
359-
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
358+
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="375"/>
359+
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="374"/>
360360
<source>Loading...</source>
361361
<translation type="unfinished"></translation>
362362
</message>

‎src/fluentui_zh_CN.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@
355355
<context>
356356
<name>FluWindow</name>
357357
<message>
358-
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
359-
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
358+
<location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="375"/>
359+
<location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="374"/>
360360
<source>Loading...</source>
361361
<translation type="unfinished">加载中...</translation>
362362
</message>

0 commit comments

Comments
 (0)