From 09e67612b080c7f2aa0d3b2086ddb418977db929 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Thu, 12 Jun 2025 14:57:05 +0200 Subject: [PATCH] moved 'calculate_full_label' to actions model --- client/ayon_core/tools/launcher/abstract.py | 7 ------- client/ayon_core/tools/launcher/models/actions.py | 11 +++++++++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/ayon_core/tools/launcher/abstract.py b/client/ayon_core/tools/launcher/abstract.py index f6f3e8e560..1d7dafd62f 100644 --- a/client/ayon_core/tools/launcher/abstract.py +++ b/client/ayon_core/tools/launcher/abstract.py @@ -55,13 +55,6 @@ class ActionItem: addon_name: Optional[str] = None addon_version: Optional[str] = None - @staticmethod - def calculate_full_label(label: str, variant_label: Optional[str]) -> str: - """Calculate full label from label and variant_label.""" - if variant_label: - return " ".join([label, variant_label]) - return label - class AbstractLauncherCommon(ABC): @abstractmethod diff --git a/client/ayon_core/tools/launcher/models/actions.py b/client/ayon_core/tools/launcher/models/actions.py index b929cdcba8..0ed4bdad3a 100644 --- a/client/ayon_core/tools/launcher/models/actions.py +++ b/client/ayon_core/tools/launcher/models/actions.py @@ -108,6 +108,13 @@ class ActionsModel: self._variant = get_settings_variant() + @staticmethod + def calculate_full_label(label: str, variant_label: Optional[str]) -> str: + """Calculate full label from label and variant_label.""" + if variant_label: + return " ".join([label, variant_label]) + return label + @property def log(self): if self._log is None: @@ -410,7 +417,7 @@ class ActionsModel: group_label = variant_label variant_label = None - full_label = ActionItem.calculate_full_label( + full_label = self.calculate_full_label( group_label, variant_label ) action_items.append(ActionItem( @@ -564,7 +571,7 @@ class ActionsModel: label = action.label or identifier variant_label = getattr(action, "label_variant", None) - full_label = ActionItem.calculate_full_label( + full_label = self.calculate_full_label( label, variant_label ) icon = get_action_icon(action)