From e97aede56ac0d058bac3ed0210338d9470f61f61 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 11 Jun 2021 11:03:16 +0200 Subject: [PATCH 1/2] sort applications and tools alphabetically --- openpype/settings/entities/enum_entity.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/openpype/settings/entities/enum_entity.py b/openpype/settings/entities/enum_entity.py index 5df365508c9..758ceff77ad 100644 --- a/openpype/settings/entities/enum_entity.py +++ b/openpype/settings/entities/enum_entity.py @@ -116,7 +116,7 @@ def _get_enum_values(self): system_settings_entity = self.get_entity_from_path("system_settings") valid_keys = set() - enum_items = [] + enum_items_list = [] applications_entity = system_settings_entity["applications"] for group_name, app_group in applications_entity.items(): enabled_entity = app_group.get("enabled") @@ -149,8 +149,12 @@ def _get_enum_values(self): full_label = variant_label full_name = "/".join((group_name, variant_name)) - enum_items.append({full_name: full_label}) + enum_items_list.append((full_name, full_label)) valid_keys.add(full_name) + + enum_items = [] + for key, value in sorted(enum_items_list, key=lambda item: item[0]): + enum_items.append({key: value}) return enum_items, valid_keys def set_override_state(self, *args, **kwargs): @@ -179,7 +183,7 @@ def _get_enum_values(self): system_settings_entity = self.get_entity_from_path("system_settings") valid_keys = set() - enum_items = [] + enum_items_list = [] tool_groups_entity = system_settings_entity["tools"]["tool_groups"] for group_name, tool_group in tool_groups_entity.items(): # Try to get group label from entity @@ -204,8 +208,12 @@ def _get_enum_values(self): else: tool_label = tool_name - enum_items.append({tool_name: tool_label}) + enum_items_list.append((tool_name, tool_label)) valid_keys.add(tool_name) + + enum_items = [] + for key, value in sorted(enum_items_list, key=lambda item: item[0]): + enum_items.append({key: value}) return enum_items, valid_keys def set_override_state(self, *args, **kwargs): From 2a7d99bb01edc7042fed97fecb265b95079246d8 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 11 Jun 2021 11:13:05 +0200 Subject: [PATCH 2/2] sort them by label instead of name --- openpype/settings/entities/enum_entity.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openpype/settings/entities/enum_entity.py b/openpype/settings/entities/enum_entity.py index 758ceff77ad..0b0575a2557 100644 --- a/openpype/settings/entities/enum_entity.py +++ b/openpype/settings/entities/enum_entity.py @@ -153,7 +153,7 @@ def _get_enum_values(self): valid_keys.add(full_name) enum_items = [] - for key, value in sorted(enum_items_list, key=lambda item: item[0]): + for key, value in sorted(enum_items_list, key=lambda item: item[1]): enum_items.append({key: value}) return enum_items, valid_keys @@ -212,7 +212,7 @@ def _get_enum_values(self): valid_keys.add(tool_name) enum_items = [] - for key, value in sorted(enum_items_list, key=lambda item: item[0]): + for key, value in sorted(enum_items_list, key=lambda item: item[1]): enum_items.append({key: value}) return enum_items, valid_keys