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

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-03-09 22:19:10 +08:00
parent eff9e385f5
commit 1d5f8772e1
35 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/qml-Qt6/page/T_Awesome.qml
View File

@ -62,7 +62,7 @@ FluContentPage {
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: item_icon.bottom
width:parent.width
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
text: modelData.name
horizontalAlignment: Text.AlignHCenter
}

2
example/qml-Qt6/page/T_Badge.qml
View File

@ -23,7 +23,7 @@ FluScrollablePage{
right: parent.right
}
FluText{
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
width: parent.width
text: qsTr("It usually appears in the upper right corner of the notification icon or avatar to display the number of messages that need to be processed")
}

4
example/qml-Qt6/page/T_Expander.qml
View File

@ -64,7 +64,7 @@ FluScrollablePage{
FluText{
id:text_info
width: scrollview.width
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
padding: 14
text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work, the restoration of Han. Today, the empire is still divided in three, and our very survival is threatened. Yet still the officials at court and the soldiers throughout the realm remain loyal to you, your majesty. Because they remember the late emperor, all of them, and they wish to repay his kindness in service to you. This is the moment to extend your divine influence, to honour the memory of the late Emperor and strengthen the morale of your officers. It is not time to listen to bad advice, or close your ears to the suggestions of loyal men.
The court and the administration are as one. Both must be judged by one standard. Those who are loyal and good must get what they deserve, but so must the evil-doers who break the law. This will demonstrate the justice of your rule. There cannot be one law for the court and another for the administration.
@ -97,7 +97,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
FluText{
id:text_info
width: scrollview.width
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
padding: 14
text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work...")
}

4
example/qml-Qt6/page/T_Home.qml
View File

@ -118,7 +118,7 @@ FluScrollablePage{
Layout.leftMargin: 20
color: FluColors.Grey120
font.pixelSize: 12
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
}
}
FluIcon{
@ -214,7 +214,7 @@ FluScrollablePage{
id:item_desc
text:desc
color:FluColors.Grey120
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
elide: Text.ElideRight
font: FluTextStyle.Caption
maximumLineCount: 2

2
example/qml-Qt6/page/T_Network.qml
View File

@ -552,7 +552,7 @@ FluContentPage{
FluText{
id:text_info
width: scrollview.width
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
padding: 14
}
}

4
example/qml-Qt6/page/T_Timeline.qml
View File

@ -23,7 +23,7 @@ FluScrollablePage{
Component{
id:com_lable
FluText{
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
font.bold: true
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: modelData.lable
@ -41,7 +41,7 @@ FluScrollablePage{
Component{
id:com_text
FluText{
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: modelData.text
font.bold: true

2
example/qml-Qt6/window/CrashWindow.qml
View File

@ -44,7 +44,7 @@ FluWindow {
leftMargin: 10
rightMargin: 10
}
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
text: qsTr("We apologize for the inconvenience caused by an unexpected error")
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter

2
example/qml-Qt6/window/HotloadWindow.qml
View File

@ -32,7 +32,7 @@ FluWindow {
text:loader.itemLodaer().sourceComponent.errorString()
color:"red"
anchors.fill: parent
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
padding: 20
verticalAlignment: Qt.AlignVCenter
horizontalAlignment: Qt.AlignHCenter

2
example/qml-Qt6/window/SingleInstanceWindow.qml
View File

@ -22,7 +22,7 @@ FluWindow {
}
FluText{
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
anchors{
left: parent.left
right: parent.right

2
example/qml/page/T_Awesome.qml
View File

@ -62,7 +62,7 @@ FluContentPage {
anchors.horizontalCenter: parent.horizontalCenter
anchors.top: item_icon.bottom
width:parent.width
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
text: modelData.name
horizontalAlignment: Text.AlignHCenter
}

2
example/qml/page/T_Badge.qml
View File

@ -23,7 +23,7 @@ FluScrollablePage{
right: parent.right
}
FluText{
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
width: parent.width
text: qsTr("It usually appears in the upper right corner of the notification icon or avatar to display the number of messages that need to be processed")
}

4
example/qml/page/T_Expander.qml
View File

@ -64,7 +64,7 @@ FluScrollablePage{
FluText{
id:text_info
width: scrollview.width
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
padding: 14
text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work, the restoration of Han. Today, the empire is still divided in three, and our very survival is threatened. Yet still the officials at court and the soldiers throughout the realm remain loyal to you, your majesty. Because they remember the late emperor, all of them, and they wish to repay his kindness in service to you. This is the moment to extend your divine influence, to honour the memory of the late Emperor and strengthen the morale of your officers. It is not time to listen to bad advice, or close your ears to the suggestions of loyal men.
The court and the administration are as one. Both must be judged by one standard. Those who are loyal and good must get what they deserve, but so must the evil-doers who break the law. This will demonstrate the justice of your rule. There cannot be one law for the court and another for the administration.
@ -97,7 +97,7 @@ My only desire is to be permitted to drive out the traitors and restore the Han.
FluText{
id:text_info
width: scrollview.width
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
padding: 14
text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work...")
}

4
example/qml/page/T_Home.qml
View File

@ -118,7 +118,7 @@ FluScrollablePage{
Layout.leftMargin: 20
color: FluColors.Grey120
font.pixelSize: 12
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
}
}
FluIcon{
@ -214,7 +214,7 @@ FluScrollablePage{
id:item_desc
text:desc
color:FluColors.Grey120
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
elide: Text.ElideRight
font: FluTextStyle.Caption
maximumLineCount: 2

2
example/qml/page/T_Network.qml
View File

@ -552,7 +552,7 @@ FluContentPage{
FluText{
id:text_info
width: scrollview.width
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
padding: 14
}
}

4
example/qml/page/T_Timeline.qml
View File

@ -23,7 +23,7 @@ FluScrollablePage{
Component{
id:com_lable
FluText{
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
font.bold: true
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: modelData.lable
@ -41,7 +41,7 @@ FluScrollablePage{
Component{
id:com_text
FluText{
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: modelData.text
font.bold: true

2
example/qml/window/CrashWindow.qml
View File

@ -44,7 +44,7 @@ FluWindow {
leftMargin: 10
rightMargin: 10
}
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
text: qsTr("We apologize for the inconvenience caused by an unexpected error")
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter

2
example/qml/window/HotloadWindow.qml
View File

@ -32,7 +32,7 @@ FluWindow {
text:loader.itemLodaer().sourceComponent.errorString()
color:"red"
anchors.fill: parent
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
padding: 20
verticalAlignment: Qt.AlignVCenter
horizontalAlignment: Qt.AlignHCenter

2
example/qml/window/MainWindow.qml
View File

@ -13,7 +13,7 @@ FluWindow {
id:window
title: "FluentUI"
width: 960
width: 980
height: 600
minimumWidth: 520
minimumHeight: 200

2
example/qml/window/SingleInstanceWindow.qml
View File

@ -22,7 +22,7 @@ FluWindow {
}
FluText{
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
anchors{
left: parent.left
right: parent.right

4
src/Qt5/imports/FluentUI/Controls/FluContentDialog.qml
View File

@ -41,7 +41,7 @@ FluPopup {
FluText{
id:text_message
font: FluTextStyle.Body
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
text:message
width: parent.width
topPadding: 4
@ -67,7 +67,7 @@ FluPopup {
topPadding: 20
leftPadding: 20
rightPadding: 20
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
}
FluLoader{
sourceComponent: com_message

2
src/Qt5/imports/FluentUI/Controls/FluFilledButton.qml
View File

@ -45,7 +45,7 @@ Button {
radius: parent.radius
anchors{
fill: parent
topMargin: control.enabled ? 1 : 0
topMargin: control.enabled ? 0 : 0
leftMargin: control.enabled ? 1 : 0
rightMargin: control.enabled ? 1 : 0
bottomMargin: control.enabled ? 2 : 0

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

@ -192,13 +192,13 @@ FluObject {
spacing: 5
FluText{
text:_super.text
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
width: Math.min(implicitWidth,mcontrol.maxWidth)
}
FluText{
text: _super.moremsg
visible: _super.moremsg
wrapMode : Text.WordWrap
wrapMode : Text.WrapAnywhere
textColor: FluColors.Grey120
width: Math.min(implicitWidth,mcontrol.maxWidth)
}

2
src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml
View File

@ -20,7 +20,7 @@ TextArea{
return normalColor
}
font:FluTextStyle.Body
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
padding: 8
leftPadding: padding+4
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering

2
src/Qt5/imports/FluentUI/Controls/FluTableView.qml
View File

@ -141,7 +141,7 @@ Rectangle {
id:item_text
text: String(display)
elide: Text.ElideRight
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
anchors{
fill: parent
leftMargin: 11

4
src/Qt5/imports/FluentUI/Controls/FluTimeline.qml
View File

@ -95,7 +95,7 @@ Item{
Component{
id:com_lable
FluText{
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: {
if(modelData.lable){
@ -110,7 +110,7 @@ Item{
Component{
id:com_text
FluText{
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: modelData.text
textFormat: Text.RichText

2
src/Qt5/imports/FluentUI/Controls/FluToggleButton.qml
View File

@ -61,7 +61,7 @@ Button {
radius: parent.radius
anchors{
fill: parent
topMargin: checked && enabled ? 1 : 0
topMargin: checked && enabled ? 0 : 0
leftMargin: checked && enabled ? 1 : 0
rightMargin: checked && enabled ? 1 : 0
bottomMargin: checked && enabled ? 2 : 0

2
src/Qt5/imports/FluentUI/Controls/FluTour.qml
View File

@ -145,7 +145,7 @@ Popup{
FluText{
id: text_desc
font: FluTextStyle.Body
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
maximumLineCount: 4
elide: Text.ElideRight
text: d.step.description

4
src/Qt6/imports/FluentUI/Controls/FluContentDialog.qml
View File

@ -41,7 +41,7 @@ FluPopup {
FluText{
id:text_message
font: FluTextStyle.Body
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
text:message
width: parent.width
topPadding: 4
@ -67,7 +67,7 @@ FluPopup {
topPadding: 20
leftPadding: 20
rightPadding: 20
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
}
FluLoader{
sourceComponent: com_message

2
src/Qt6/imports/FluentUI/Controls/FluFilledButton.qml
View File

@ -46,7 +46,7 @@ Button {
radius: parent.radius
anchors{
fill: parent
topMargin: control.enabled ? 1 : 0
topMargin: control.enabled ? 0 : 0
leftMargin: control.enabled ? 1 : 0
rightMargin: control.enabled ? 1 : 0
bottomMargin: control.enabled ? 2 : 0

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

@ -192,13 +192,13 @@ FluObject {
spacing: 5
FluText{
text:_super.text
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
width: Math.min(implicitWidth,mcontrol.maxWidth)
}
FluText{
text: _super.moremsg
visible: _super.moremsg
wrapMode : Text.WordWrap
wrapMode : Text.WrapAnywhere
textColor: FluColors.Grey120
width: Math.min(implicitWidth,mcontrol.maxWidth)
}

2
src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml
View File

@ -21,7 +21,7 @@ TextArea{
return normalColor
}
font:FluTextStyle.Body
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
padding: 8
leftPadding: padding+4
renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering

2
src/Qt6/imports/FluentUI/Controls/FluTableView.qml
View File

@ -142,7 +142,7 @@ Rectangle {
id:item_text
text: String(display)
elide: Text.ElideRight
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
anchors{
fill: parent
leftMargin: 11

4
src/Qt6/imports/FluentUI/Controls/FluTimeline.qml
View File

@ -95,7 +95,7 @@ Item{
Component{
id:com_lable
FluText{
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: {
if(modelData.lable){
@ -110,7 +110,7 @@ Item{
Component{
id:com_text
FluText{
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
horizontalAlignment: isRight ? Qt.AlignRight : Qt.AlignLeft
text: modelData.text
textFormat: Text.RichText

2
src/Qt6/imports/FluentUI/Controls/FluToggleButton.qml
View File

@ -57,7 +57,7 @@ Button {
radius: parent.radius
anchors{
fill: parent
topMargin: checked && enabled ? 1 : 0
topMargin: checked && enabled ? 0 : 0
leftMargin: checked && enabled ? 1 : 0
rightMargin: checked && enabled ? 1 : 0
bottomMargin: checked && enabled ? 2 : 0

2
src/Qt6/imports/FluentUI/Controls/FluTour.qml
View File

@ -145,7 +145,7 @@ Popup{
FluText{
id: text_desc
font: FluTextStyle.Body
wrapMode: Text.WordWrap
wrapMode: Text.WrapAnywhere
maximumLineCount: 4
elide: Text.ElideRight
text: d.step.description