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

Merge branch '5.7' into 5.7-translations

Browse source
This commit is contained in:
Saumya Jain 2024-03-15 14:36:11 +01:00 • committed by GitHub
commit 409e855435
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7261 changed files with 7291 additions and 7263 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/3MFReader/WorkspaceDialog.qml
View file

@ -35,6 +35,19 @@ UM.Dialog
anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.leftMargin: UM.Theme.getSize("default_margin").height
}
Cura.TertiaryButton
{
id: learnMoreButton
visible: manager.isUcp
anchors.right: parent.right
anchors.topMargin: UM.Theme.getSize("default_margin").height
anchors.rightMargin: UM.Theme.getSize("default_margin").height
text: catalog.i18nc("@button", "Learn more")
iconSource: UM.Theme.getIcon("LinkExternal")
isIconOnRightSide: true
onClicked: Qt.openUrlExternally("https://support.ultimaker.com/s/article/000002979")
}
}
Rectangle

20
plugins/3MFWriter/UCPDialog.qml
View file

@ -36,13 +36,23 @@ UM.Dialog
anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.rightMargin: anchors.leftMargin
UM.Label
RowLayout
{
id: titleLabel
text: catalog.i18nc("@action:title Don't translate 'Universal Cura Project'", "Summary - Universal Cura Project")
font: UM.Theme.getFont("large")
UM.Label
{
id: titleLabel
text: catalog.i18nc("@action:title Don't translate 'Universal Cura Project'", "Summary - Universal Cura Project")
font: UM.Theme.getFont("large")
}
Cura.TertiaryButton
{
id: learnMoreButton
text: catalog.i18nc("@button", "Learn more")
iconSource: UM.Theme.getIcon("LinkExternal")
isIconOnRightSide: true
onClicked: Qt.openUrlExternally("https://support.ultimaker.com/s/article/000002979")
}
}
UM.Label
{
id: descriptionLabel

5
plugins/VersionUpgrade/VersionUpgrade56to57/VersionUpgrade56to57.py
View file

@ -68,6 +68,11 @@ class VersionUpgrade56to57(VersionUpgrade):
if removed in parser["values"]:
del parser["values"][removed]
if "brim_outside_only" in parser["values"]:
parser["values"]["brim_location"] = "outside" if parser["values"][
"brim_outside_only"] == "True" else "everywhere"
del parser["values"]["brim_outside_only"]
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]