Merge branch 'CURA-5876_fixes' into 4.0

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

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")