3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-10 15:25:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '5.4' into CURA-10599_fix_exclude_materials

Browse source 
# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_TW/cura.po
This commit is contained in:
c.lamboo 2023-06-12 13:37:34 +02:00
commit 731a2d10ed
24 changed files with 419 additions and 412 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cura/Machines/Models/IntentSelectionModel.py
View file

@ -107,14 +107,21 @@ class IntentSelectionModel(ListModel):
.findContainersMetadata(type="intent", definition=global_stack.definition.getId(),
intent_category=category)[0]
intent_name = intent_metadata.get("name", category.title())
icon = intent_metadata.get("icon", None)
description = intent_metadata.get("description", None)
if icon is not None:
icon = QUrl.fromLocalFile(
Resources.getPath(cura.CuraApplication.CuraApplication.ResourceTypes.ImageFiles, icon))
try:
icon = QUrl.fromLocalFile(
Resources.getPath(cura.CuraApplication.CuraApplication.ResourceTypes.ImageFiles, icon))
except FileNotFoundError:
Logger.log("e", f"Icon file for intent {intent_name} not found.")
icon = None
result.append({
"name": intent_metadata.get("name", category.title()),
"description": intent_metadata.get("description", None),
"name": intent_name,
"description": description,
"custom_icon": icon,
"icon": None,
"intent_category": category,