Merge branch 'materials_empty' of github.com:Ultimaker/Cura into 3.0

This commit is contained in:
Jaime van Kessel 2017-10-02 13:10:08 +02:00
commit e33528538f
2 changed files with 5 additions and 1 deletions

View file

@ -354,11 +354,14 @@ class MachineManager(QObject):
if containers:
Application.getInstance().setGlobalContainerStack(containers[0])
self.__onInstanceContainersChanged()
@pyqtSlot(str, str)
def addMachine(self, name: str, definition_id: str) -> None:
new_stack = CuraStackBuilder.createMachine(name, definition_id)
if new_stack:
Application.getInstance().setGlobalContainerStack(new_stack)
# Instead of setting the global container stack here, we set the active machine and so the signals are emitted
self.setActiveMachine(new_stack.getId())
else:
Logger.log("w", "Failed creating a new machine!")

View file

@ -67,6 +67,7 @@ Item
target: Cura.MachineManager
onActiveQualityChanged: qualityModel.update()
onActiveMaterialChanged: qualityModel.update()
onActiveVariantChanged: qualityModel.update()
}
ListModel