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 'master' of https://github.com/Ultimaker/Cura

Browse source
This commit is contained in:
fieldOfView 2016-07-11 17:26:19 +02:00
commit cd09017328
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -135,7 +135,7 @@ UM.ManagementPage
enabled: base.currentItem != null && !base.currentItem.readOnly
checkable: true
checkable: enabled
}
}
@ -150,7 +150,7 @@ UM.ManagementPage
bottom: parent.bottom
}
editingEnabled: base.currentItem != null && !base.currentItem.readOnly && editButton.checked;
editingEnabled: editButton.checkable && editButton.checked;
properties: materialProperties
containerId: base.currentItem != null ? base.currentItem.id : ""