3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 06:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

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

5
plugins/Marketplace/resources/qml/LicenseDialog.qml
View file

@ -42,16 +42,13 @@ UM.Dialog
source: UM.Theme.getIcon("Certificate", "high")
}
Label
UM.Label
{
text: catalog.i18nc("@text", "Please read and agree with the plugin licence.")
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("large")
anchors.verticalCenter: icon.verticalCenter
height: UM.Theme.getSize("marketplace_large_icon").height
verticalAlignment: Qt.AlignmentFlag.AlignVCenter
wrapMode: Text.Wrap
renderType: Text.NativeRendering
}
}

5
plugins/Marketplace/resources/qml/Marketplace.qml
View file

@ -6,7 +6,7 @@ import QtQuick.Controls 2.15
import QtQuick.Layouts 1.15
import QtQuick.Window 2.2
import UM 1.2 as UM
import UM 1.5 as UM
import Cura 1.6 as Cura
Window
@ -67,7 +67,7 @@ Window
Layout.preferredWidth: parent.width
Layout.preferredHeight: childrenRect.height + UM.Theme.getSize("default_margin").height
Label
UM.Label
{
id: pageTitle
anchors
@ -80,7 +80,6 @@ Window
}
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text")
text: content.item ? content.item.pageTitle: catalog.i18nc("@title", "Loading...")
}
}

5
plugins/Marketplace/resources/qml/PackageCard.qml
View file

@ -29,16 +29,13 @@ Rectangle
anchors.fill: parent
Label
UM.Label
{
id: descriptionLabel
width: parent.width
text: packageData.description
font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text")
maximumLineCount: 2
wrapMode: Text.Wrap
elide: Text.ElideRight
visible: text !== ""
}

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

3
plugins/Marketplace/resources/qml/PackageDetails.qml
View file

@ -45,14 +45,13 @@ Item
iconSize: height - leftPadding * 2
}
Label
UM.Label
{
Layout.alignment: Qt.AlignmentFlag.AlignVCenter
Layout.fillWidth: true
text: detailPage.title
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text")
}
}

43
plugins/Marketplace/resources/qml/PackagePage.qml
View file

@ -56,13 +56,9 @@ Rectangle
color: UM.Theme.getColor("text")
}
Label
UM.Label
{
anchors.verticalCenter: downloadsIcon.verticalCenter
color: UM.Theme.getColor("text")
font: UM.Theme.getFont("default")
text: packageData.downloadCount
}
}
@ -78,25 +74,22 @@ Rectangle
topPadding: 0
spacing: UM.Theme.getSize("default_margin").height
Label
UM.Label
{
width: parent.width - parent.padding * 2
text: catalog.i18nc("@header", "Description")
font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
elide: Text.ElideRight
}
Label
UM.Label
{
width: parent.width - parent.padding * 2
text: packageData.formattedDescription
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
linkColor: UM.Theme.getColor("text_link")
wrapMode: Text.Wrap
textFormat: Text.RichText
onLinkActivated: UM.UrlUtil.openUrl(link, ["http", "https"])
@ -110,13 +103,12 @@ Rectangle
visible: packageData.packageType === "material"
spacing: 0
Label
UM.Label
{
width: parent.width
text: catalog.i18nc("@header", "Compatible printers")
font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
elide: Text.ElideRight
}
@ -124,25 +116,23 @@ Rectangle
{
model: packageData.compatiblePrinters
Label
UM.Label
{
width: compatiblePrinterColumn.width
text: modelData
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
elide: Text.ElideRight
}
}
Label
UM.Label
{
width: parent.width
visible: packageData.compatiblePrinters.length == 0
text: "(" + catalog.i18nc("@info", "No compatibility information") + ")"
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
elide: Text.ElideRight
}
}
@ -155,13 +145,12 @@ Rectangle
visible: packageData.packageType === "material"
spacing: 0
Label
UM.Label
{
width: parent.width
text: catalog.i18nc("@header", "Compatible support materials")
font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
elide: Text.ElideRight
}
@ -169,25 +158,23 @@ Rectangle
{
model: packageData.compatibleSupportMaterials
Label
UM.Label
{
width: compatibleSupportMaterialColumn.width
text: modelData
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
elide: Text.ElideRight
}
}
Label
UM.Label
{
width: parent.width
visible: packageData.compatibleSupportMaterials.length == 0
text: "(" + catalog.i18nc("@info No materials", "None") + ")"
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
elide: Text.ElideRight
}
}
@ -199,23 +186,21 @@ Rectangle
visible: packageData.packageType === "material"
spacing: 0
Label
UM.Label
{
width: parent.width
text: catalog.i18nc("@header", "Compatible with Material Station")
font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
elide: Text.ElideRight
}
Label
UM.Label
{
width: parent.width
text: packageData.isCompatibleMaterialStation ? catalog.i18nc("@info", "Yes") : catalog.i18nc("@info", "No")
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
elide: Text.ElideRight
}
}
@ -227,23 +212,21 @@ Rectangle
visible: packageData.packageType === "material"
spacing: 0
Label
UM.Label
{
width: parent.width
text: catalog.i18nc("@header", "Optimized for Air Manager")
font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
elide: Text.ElideRight
}
Label
UM.Label
{
width: parent.width
text: packageData.isCompatibleAirManager ? catalog.i18nc("@info", "Yes") : catalog.i18nc("@info", "No")
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("text")
elide: Text.ElideRight
}
}

5
plugins/Marketplace/resources/qml/PackageTypeTab.qml
View file

@ -3,7 +3,7 @@
import QtQuick 2.15
import QtQuick.Controls 2.15
import UM 1.0 as UM
import UM 1.5 as UM
TabButton
{
@ -22,11 +22,10 @@ TabButton
border.width: UM.Theme.getSize("thick_lining").width
}
contentItem: Label
contentItem: UM.Label
{
text: parent.text
font: UM.Theme.getFont("medium_bold")
color: UM.Theme.getColor("text")
width: contentWidth
anchors.centerIn: parent
}

3
plugins/Marketplace/resources/qml/Packages.qml
View file

@ -40,7 +40,7 @@ ListView
color: UM.Theme.getColor("detail_background")
Label
UM.Label
{
id: sectionHeaderText
anchors.verticalCenter: parent.verticalCenter
@ -48,7 +48,6 @@ ListView
text: section
font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text")
}
}