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

Merge branch 'CURA-5876_fixes' into 4.0

Browse source
This commit is contained in:
Ghostkeeper 2018-12-14 16:28:04 +01:00
commit 78a5f95c43
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
23 changed files with 218 additions and 431 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/ActionPanel/OutputProcessWidget.qml
View file

@ -119,8 +119,6 @@ Column
}
height: UM.Theme.getSize("action_button").height
leftPadding: UM.Theme.getSize("default_margin").width
rightPadding: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@button", "Preview")
onClicked: UM.Controller.setActiveStage("PreviewStage")

2
resources/qml/ActionPanel/SliceProcessWidget.qml
View file

@ -60,7 +60,7 @@ Column
text: catalog.i18nc("@label:PrintjobStatus", "Unable to Slice")
source: UM.Theme.getIcon("warning")
color: UM.Theme.getColor("warning")
iconColor: UM.Theme.getColor("warning")
}
// Progress bar, only visible when the backend is in the process of slice the printjob