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

Merge branch 'master' into refactor_singleton_settingsbase

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-09-25 09:38:55 +02:00
commit b52c28321a
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/Settings/CuraContainerStack.py
View File

@ -291,7 +291,7 @@ class CuraContainerStack(ContainerStack):
# Helper to make sure we emit a PyQt signal on container changes. # Helper to make sure we emit a PyQt signal on container changes.
def _onContainersChanged(self, container: Any) -> None: def _onContainersChanged(self, container: Any) -> None:
self.pyqtContainersChanged.emit() Application.getInstance().callLater(self.pyqtContainersChanged.emit)
# Helper that can be overridden to get the "machine" definition, that is, the definition that defines the machine # Helper that can be overridden to get the "machine" definition, that is, the definition that defines the machine
# and its properties rather than, for example, the extruder. Defaults to simply returning the definition property. # and its properties rather than, for example, the extruder. Defaults to simply returning the definition property.

20
resources/qml/Preferences/Materials/MaterialsList.qml
View File

@ -17,9 +17,23 @@ Item
// Children // Children
UM.I18nCatalog { id: catalog; name: "cura"; } UM.I18nCatalog { id: catalog; name: "cura"; }
Cura.MaterialBrandsModel { id: materialsModel } Cura.MaterialBrandsModel
Cura.FavoriteMaterialsModel { id: favoriteMaterialsModel } {
Cura.GenericMaterialsModel { id: genericMaterialsModel } id: materialsModel
extruderPosition: Cura.ExtruderManager.activeExtruderIndex
}
Cura.FavoriteMaterialsModel
{
id: favoriteMaterialsModel
extruderPosition: Cura.ExtruderManager.activeExtruderIndex
}
Cura.GenericMaterialsModel
{
id: genericMaterialsModel
extruderPosition: Cura.ExtruderManager.activeExtruderIndex
}
property var currentType: null property var currentType: null
property var currentBrand: null property var currentBrand: null