3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 06:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge branch 'master' into CURA-8055_export_all_materials_usb_redone

Browse source
This commit is contained in:
Ghostkeeper 2021-07-23 15:11:07 +02:00
commit 82c7f19164
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
487 changed files with 4988 additions and 2890 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,7 +66,7 @@ Item
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
color: "black"
source: brand_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
source: brand_section.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
}
}
}
@ -144,4 +144,4 @@ Item
expanded = materialList.expandedBrands.indexOf(sectionName) > -1
}
}
}
}

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

@ -122,7 +122,7 @@ Rectangle
}
}
}
source: materialSlot.is_favorite ? UM.Theme.getIcon("favorites_star_full") : UM.Theme.getIcon("favorites_star_empty")
source: materialSlot.is_favorite ? UM.Theme.getIcon("StarFilled") : UM.Theme.getIcon("Star")
}
}
}
}

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

@ -78,7 +78,7 @@ Item
width: UM.Theme.getSize("standard_arrow").width
height: UM.Theme.getSize("standard_arrow").height
color: "black"
source: material_type_section.expanded ? UM.Theme.getIcon("arrow_bottom") : UM.Theme.getIcon("arrow_left")
source: material_type_section.expanded ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleLeft")
}
}
@ -134,4 +134,4 @@ Item
expanded = materialList.expandedTypes.indexOf(materialBrand + "_" + materialName) > -1
}
}
}
}