3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch '5.0'

Browse source 
Conflicts:
	plugins/Marketplace/resources/qml/PackageCardHeader.qml -> An improvement for future translations was made at the same time as a change to the label here.
This commit is contained in:
Ghostkeeper 2022-05-16 15:11:39 +02:00
commit fc4585e098
No known key found for this signature in database
GPG key ID: 68F39EA88EEED5FF
78 changed files with 6736 additions and 6556 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/Marketplace/resources/qml/PackageCardHeader.qml
View file

@ -87,11 +87,10 @@ Item
Layout.preferredWidth: parent.width
Layout.preferredHeight: childrenRect.height
Label
UM.Label
{
text: packageData.displayName
font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
verticalAlignment: Text.AlignTop
}
VerifiedIcon
@ -100,12 +99,10 @@ Item
visible: packageData.isCheckedByUltimaker
}
Label
UM.Label
{
id: packageVersionLabel
text: packageData.packageVersion
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
Layout.fillWidth: true
}
@ -155,7 +152,7 @@ Item
spacing: UM.Theme.getSize("narrow_margin").width
// label "By"
Label
UM.Label
{
id: authorBy
Layout.alignment: Qt.AlignCenter