GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 06:09:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2016-07-04 17:11:50 +02:00
commit b3adf8a271
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cura/MachineManagerModel.py
View File

@ -236,6 +236,13 @@ class MachineManagerModel(QObject):
return "" return ""
@pyqtProperty(str, notify = activeStackChanged)
def activeStackId(self):
if self._active_container_stack:
return self._active_container_stack.getId()
return ""
@pyqtProperty(str, notify = activeMaterialChanged) @pyqtProperty(str, notify = activeMaterialChanged)
def activeMaterialName(self): def activeMaterialName(self):
if self._active_container_stack: if self._active_container_stack:

3
resources/qml/SidebarSimple.qml
View File

@ -371,7 +371,7 @@ Item
{ {
id: infillDensity id: infillDensity
containerStackId: Cura.MachineManager.activeMachineId containerStackId: Cura.MachineManager.activeStackId
key: "infill_sparse_density" key: "infill_sparse_density"
watchedProperties: [ "value" ] watchedProperties: [ "value" ]
storeIndex: 0 storeIndex: 0
@ -406,6 +406,7 @@ Item
watchedProperties: [ "value" ] watchedProperties: [ "value" ]
storeIndex: 0 storeIndex: 0
} }
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {
id: supportExtruderNr id: supportExtruderNr