3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-26 04:11:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Merge branch 'master' into libArachne_rebased

Browse source
This commit is contained in:
Ghostkeeper 2021-07-16 13:21:18 +02:00
commit 14ce560904
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
9 changed files with 88 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/definitions/anycubic_kossel_linear_plus.def.json
View file

@ -5,6 +5,7 @@
"metadata": {
"visible": true,
"platform": "kossel_pro_build_platform.3mf",
"platform_offset": [0, -0.25, 0],
"machine_extruder_trains": {
"0": "anycubic_kossel_extruder_0"
}

1
resources/qml/ActionButton.qml
View file

@ -18,6 +18,7 @@ Button
property alias textFont: buttonText.font
property alias cornerRadius: backgroundRect.radius
property alias tooltip: tooltip.tooltipText
property alias tooltipWidth: tooltip.width
property color color: UM.Theme.getColor("primary")
property color hoverColor: UM.Theme.getColor("primary_hover")

10
resources/qml/Cura.qml
View file

@ -417,6 +417,7 @@ UM.MainWindow
Cura.PrimaryButton
{
text: model.name
iconSource: UM.Theme.getIcon(model.icon)
height: UM.Theme.getSize("message_action_button").height
}
}
@ -426,6 +427,7 @@ UM.MainWindow
Cura.SecondaryButton
{
text: model.name
iconSource: UM.Theme.getIcon(model.icon)
height: UM.Theme.getSize("message_action_button").height
}
}
@ -434,6 +436,14 @@ UM.MainWindow
Cura.TertiaryButton
{
text: model.name
iconSource:
{
if (model.icon == null || model.icon == "")
{
return UM.Theme.getIcon("LinkExternal")
}
return UM.Theme.getIcon(model.icon)
}
height: UM.Theme.getSize("message_action_button").height
}
}