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

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

Browse Source
This commit is contained in:
Jaime van Kessel 2016-10-26 15:44:19 +02:00
commit f35914299b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cura/Settings/SettingInheritanceManager.py
View File

@ -5,6 +5,7 @@ from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal
import UM.Settings
from UM.Application import Application
import cura.Settings
from UM.Logger import Logger
## The settingInheritance manager is responsible for checking each setting in order to see if one of the "deeper"
@ -39,9 +40,13 @@ class SettingInheritanceManager(QObject):
return result
@pyqtSlot(str, str, result = "QStringList")
def getOverridesForExtruder(self, key, extruder):
extruder = cura.Settings.ExtruderManager.getInstance().getExtruderStack(extruder)
def getOverridesForExtruder(self, key, extruder_index):
multi_extrusion = self._global_container_stack.getProperty("machine_extruder_count", "value") > 1
if not multi_extrusion:
return self._settings_with_inheritance_warning
extruder = cura.Settings.ExtruderManager.getInstance().getExtruderStack(extruder_index)
if not extruder:
Logger.log("w", "Unable to find extruder for current machine with index %s", extruder_index)
return []
definitions = self._global_container_stack.getBottom().findDefinitions(key=key)

2
resources/i18n/nl/cura.po
View File

@ -1837,7 +1837,7 @@ msgstr "Aanbevolen"
#: /home/ruben/Projects/Cura/resources/qml/Sidebar.qml:383
msgctxt "@title:tab"
msgid "Custom"
msgstr "Aangepaste"
msgstr "Aangepast"
#: /home/ruben/Projects/Cura/resources/qml/Menus/MaterialMenu.qml:18
#: /home/ruben/Projects/Cura/resources/qml/Menus/NozzleMenu.qml:18