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

Merge branch '4.0' into unify_font_types

Browse source
This commit is contained in:
Ghostkeeper 2018-12-28 15:51:54 +01:00
commit b54312fb9b
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
30 changed files with 266 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Preferences/Materials/MaterialsBrandSection.qml
View file

@ -10,7 +10,7 @@ import QtQuick.Dialogs 1.2
import UM 1.2 as UM
import Cura 1.0 as Cura
Rectangle
Item
{
id: brand_section

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

@ -15,7 +15,7 @@ Rectangle
id: materialSlot
property var material: null
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
width: parent.width
@ -73,11 +73,9 @@ Rectangle
if (materialSlot.is_favorite)
{
base.materialManager.removeFavorite(material.root_material_id)
materialSlot.is_favorite = false
return
}
base.materialManager.addFavorite(material.root_material_id)
materialSlot.is_favorite = true
return
}
style: ButtonStyle

2
resources/qml/Preferences/Materials/MaterialsTypeSection.qml
View file

@ -10,7 +10,7 @@ import QtQuick.Dialogs 1.2
import UM 1.2 as UM
import Cura 1.0 as Cura
Rectangle
Item
{
id: material_type_section
property var materialType