GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 22:26:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use correct font for all text elements

Browse Source 
Contributes to issue CURA-8561.
This commit is contained in:
Ghostkeeper 2021-11-09 17:25:02 +01:00
parent c56240f276
commit 234475547e
No known key found for this signature in database
GPG Key ID: 68F39EA88EEED5FF
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/Marketplace/resources/qml/PackageCard.qml
View File

@ -54,10 +54,9 @@ Rectangle
{ {
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
text: packageData.displayName
font: UM.Theme.getFont("medium_bold") font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
text: packageData.displayName
} }
UM.RecolorImage UM.RecolorImage
@ -88,6 +87,7 @@ Rectangle
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
text: packageData.packageVersion text: packageData.packageVersion
font: UM.Theme.getFont("small")
} }
UM.RecolorImage UM.RecolorImage
@ -115,6 +115,7 @@ Rectangle
property real lastLineWidth: 0; //Store the width of the last line, to properly position the elision. property real lastLineWidth: 0; //Store the width of the last line, to properly position the elision.
text: packageData.description text: packageData.description
font: UM.Theme.getFont("default")
maximumLineCount: 2 maximumLineCount: 2
wrapMode: Text.Wrap wrapMode: Text.Wrap
elide: Text.ElideRight elide: Text.ElideRight
@ -157,11 +158,13 @@ Rectangle
Label Label
{ {
text: "… "
visible: descriptionLabel.truncated
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: descriptionLabel.lastLineWidth anchors.leftMargin: descriptionLabel.lastLineWidth
anchors.bottom: readMoreButton.bottom anchors.bottom: readMoreButton.bottom
text: "… "
font: descriptionLabel.font
visible: descriptionLabel.truncated
} }
} }
@ -175,6 +178,7 @@ Rectangle
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
text: catalog.i18nc("@label", "By") text: catalog.i18nc("@label", "By")
font: UM.Theme.getFont("default")
} }
Cura.TertiaryButton Cura.TertiaryButton
@ -183,6 +187,7 @@ Rectangle
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
text: packageData.authorName text: packageData.authorName
textFont: UM.Theme.getFont("default")
// TODO on clicked (is link) -> MouseArea? // TODO on clicked (is link) -> MouseArea?
} }