Merge branch 'master' into network_rewrite

This commit is contained in:
ChrisTerBeke 2018-01-03 14:17:48 +01:00 committed by GitHub
commit 182e7de07d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 11010 additions and 340 deletions

View file

@ -246,17 +246,19 @@ Item
spacing: UM.Theme.getSize("default_margin").width
}
Connections
{
target: Printer
onAdditionalComponentsChanged:
{
if(areaId == "monitorButtons")
{
for (var component in CuraApplication.additionalComponents["monitorButtons"])
{
CuraApplication.additionalComponents["monitorButtons"][component].parent = additionalComponentsRow
}
Component.onCompleted: {
buttonsRow.updateAdditionalComponents("monitorButtons")
}
Connections {
target: CuraApplication
onAdditionalComponentsChanged: buttonsRow.updateAdditionalComponents("monitorButtons")
}
function updateAdditionalComponents (areaId) {
if(areaId == "monitorButtons") {
for (var component in CuraApplication.additionalComponents["monitorButtons"]) {
CuraApplication.additionalComponents["monitorButtons"][component].parent = additionalComponentsRow
}
}
}