3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse source
This commit is contained in:
Diego Prado Gesto 2018-02-01 09:05:32 +01:00
commit 701ac7f91e
4 changed files with 41 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Preferences/MaterialsPage.qml
View file

@ -301,7 +301,7 @@ UM.ManagementPage
folder: CuraApplication.getDefaultPath("dialog_material_path")
onAccepted:
{
var result = Cura.ContainerManager.importContainer(fileUrl)
var result = Cura.ContainerManager.importMaterialContainer(fileUrl)
messageDialog.title = catalog.i18nc("@title:window", "Import Material")
messageDialog.text = catalog.i18nc("@info:status Don't translate the XML tags <filename> or <message>!", "Could not import material <filename>%1</filename>: <message>%2</message>").arg(fileUrl).arg(result.message)