3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-03 07:41:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
fieldOfView 2016-06-06 17:11:17 +02:00
commit a0bbf98fba
6 changed files with 126 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Settings/SettingView.qml
View file

@ -80,7 +80,7 @@ ScrollView
{
id: provider
containerStackId: Cura.MachineManager.activeMachineId
containerStackId: Cura.ExtruderManager.activeExtruderStackId ? Cura.ExtruderManager.activeExtruderStackId : Cura.MachineManager.activeMachineId
key: model.key
watchedProperties: [ "value", "enabled", "state", "validationState" ]
storeIndex: 0

2
resources/qml/SidebarHeader.qml
View file

@ -111,7 +111,7 @@ Item
onClicked:
{
base.currentExtruderIndex = index
Cura.MachineManager.setActiveExtruderIndex(index)
Cura.ExtruderManager.setActiveExtruderIndex(index)
}
style: ButtonStyle {