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

Merge branch '4.0' into STAR-322_cloud-connection

Browse Source
This commit is contained in:
ChrisTerBeke 2018-12-20 15:49:00 +01:00
commit bfd1debb8f
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py
View File

@ -47,7 +47,7 @@ def getMetaData() -> Dict[str, Any]:
}, },
"user": { "user": {
"get_version": upgrade.getCfgVersion, "get_version": upgrade.getCfgVersion,
"location": {"./user"} "location": {"./user", "./materials/*"}
}, },
"variant": { "variant": {
"get_version": upgrade.getCfgVersion, "get_version": upgrade.getCfgVersion,

3
resources/qml/MainWindow/MainWindowHeader.qml
View File

@ -30,7 +30,8 @@ Item
width: UM.Theme.getSize("logo").width width: UM.Theme.getSize("logo").width
height: UM.Theme.getSize("logo").height height: UM.Theme.getSize("logo").height
mipmap: true sourceSize.width: width
sourceSize.height: height
} }
Row Row

4
resources/qml/Preferences/Materials/MaterialsSlot.qml
View File

@ -15,7 +15,7 @@ Rectangle
id: materialSlot id: materialSlot
property var material: null property var material: null
property var hovered: false property var hovered: false
property var is_favorite: material != null ? material.is_favorite : false property var is_favorite: material != null && material.is_favorite
height: UM.Theme.getSize("favorites_row").height height: UM.Theme.getSize("favorites_row").height
width: parent.width width: parent.width
@ -73,11 +73,9 @@ Rectangle
if (materialSlot.is_favorite) if (materialSlot.is_favorite)
{ {
base.materialManager.removeFavorite(material.root_material_id) base.materialManager.removeFavorite(material.root_material_id)
materialSlot.is_favorite = false
return return
} }
base.materialManager.addFavorite(material.root_material_id) base.materialManager.addFavorite(material.root_material_id)
materialSlot.is_favorite = true
return return
} }
style: ButtonStyle style: ButtonStyle