Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

change place where missing key is handled

Browse source
This commit is contained in:
Jakub Trllo 2025-04-22 17:11:31 +02:00
parent 6440974d5d
commit 4b385c141f
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/ayon_core/tools/launcher/ui/actions_widget.py
View file

@ -145,11 +145,6 @@ class ActionsQtModel(QtGui.QStandardItemModel):
icon_def = action_item.icon
if not icon_def:
icon_def = transparent_icon.copy()
elif icon_def.get("type") == "material-symbols":
if "name" not in icon_def:
icon_def = transparent_icon.copy()
elif not icon_def.get("color"):
icon_def["color"] = "#f4f5f5"
try:
icon = get_qt_icon(icon_def)

1
client/ayon_core/tools/utils/constants.py
View file

@ -14,3 +14,4 @@ except AttributeError:
DEFAULT_PROJECT_LABEL = "< Default >"
PROJECT_NAME_ROLE = QtCore.Qt.UserRole + 101
PROJECT_IS_ACTIVE_ROLE = QtCore.Qt.UserRole + 102
DEFAULT_WEB_ICON_COLOR = "#f4f5f5"

21
client/ayon_core/tools/utils/lib.py
View file

@ -19,7 +19,12 @@ from ayon_core.style import (
from ayon_core.resources import get_image_path
from ayon_core.lib import Logger
from .constants import CHECKED_INT, UNCHECKED_INT, PARTIALLY_CHECKED_INT
from .constants import (
CHECKED_INT,
UNCHECKED_INT,
PARTIALLY_CHECKED_INT,
DEFAULT_WEB_ICON_COLOR,
)
log = Logger.get_logger(__name__)
@ -482,8 +487,14 @@ class _IconsCache:
if icon_type == "path":
parts = [icon_type, icon_def["path"]]
elif icon_type in {"awesome-font", "material-symbols"}:
color = icon_def["color"] or ""
elif icon_type == "awesome-font":
color = icon_def.get("color") or ""
if isinstance(color, QtGui.QColor):
color = color.name()
parts = [icon_type, icon_def["name"] or "", color]
elif icon_type == "material-symbols":
color = icon_def.get("color") or DEFAULT_WEB_ICON_COLOR
if isinstance(color, QtGui.QColor):
color = color.name()
parts = [icon_type, icon_def["name"] or "", color]
@ -517,7 +528,7 @@ class _IconsCache:
elif icon_type == "awesome-font":
icon_name = icon_def["name"]
icon_color = icon_def["color"]
icon_color = icon_def.get("color")
icon = cls.get_qta_icon_by_name_and_color(icon_name, icon_color)
if icon is None:
icon = cls.get_qta_icon_by_name_and_color(
@ -525,7 +536,7 @@ class _IconsCache:
elif icon_type == "material-symbols":
icon_name = icon_def["name"]
icon_color = icon_def["color"]
icon_color = icon_def.get("color") or DEFAULT_WEB_ICON_COLOR
if qtmaterialsymbols.get_icon_name_char(icon_name) is not None:
icon = qtmaterialsymbols.get_icon(icon_name, icon_color)