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

View File

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

View File

@ -23,7 +23,7 @@ FluScrollablePage{
right: parent.right right: parent.right
} }
FluText{ FluText{
wrapMode: Text.WordWrap wrapMode: Text.WrapAnywhere
width: parent.width 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") 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")
} }

View File

@ -64,7 +64,7 @@ FluScrollablePage{
FluText{ FluText{
id:text_info id:text_info
width: scrollview.width width: scrollview.width
wrapMode: Text.WordWrap wrapMode: Text.WrapAnywhere
padding: 14 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. 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. 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{ FluText{
id:text_info id:text_info
width: scrollview.width width: scrollview.width
wrapMode: Text.WordWrap wrapMode: Text.WrapAnywhere
padding: 14 padding: 14
text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work...") text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work...")
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -23,7 +23,7 @@ FluScrollablePage{
right: parent.right right: parent.right
} }
FluText{ FluText{
wrapMode: Text.WordWrap wrapMode: Text.WrapAnywhere
width: parent.width 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") 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")
} }

View File

@ -64,7 +64,7 @@ FluScrollablePage{
FluText{ FluText{
id:text_info id:text_info
width: scrollview.width width: scrollview.width
wrapMode: Text.WordWrap wrapMode: Text.WrapAnywhere
padding: 14 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. 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. 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{ FluText{
id:text_info id:text_info
width: scrollview.width width: scrollview.width
wrapMode: Text.WordWrap wrapMode: Text.WrapAnywhere
padding: 14 padding: 14
text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work...") text: qsTr("Permit me to observe: the late emperor was taken from us before he could finish his life`s work...")
} }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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