Merge pull request #1476 from pypeclub/feature/sorted_custom_attribut…

…e_apps_tools

openpype/modules/ftrack/lib/custom_attributes.py

@@ -15,24 +15,34 @@ def default_custom_attributes_definition():
 
 
 def app_definitions_from_app_manager(app_manager):
-    app_definitions = []
+    _app_definitions = []
     for app_name, app in app_manager.applications.items():
         if app.enabled and app.is_host:
-            app_definitions.append({
-                app_name: app.full_label
-            })
+            _app_definitions.append(
+                (app_name, app.full_label)
+            )
+
+    # Sort items by label
+    app_definitions = []
+    for key, label in sorted(_app_definitions, key=lambda item: item[1]):
+        app_definitions.append({key: label})
 
     if not app_definitions:
         app_definitions.append({"empty": "< Empty >"})
     return app_definitions
 
 
 def tool_definitions_from_app_manager(app_manager):
-    tools_data = []
+    _tools_data = []
     for tool_name, tool in app_manager.tools.items():
-        tools_data.append({
-            tool_name: tool.label
-        })
+        _tools_data.append(
+            (tool_name, tool.label)
+        )
+
+    # Sort items by label
+    tools_data = []
+    for key, label in sorted(_tools_data, key=lambda item: item[1]):
+        tools_data.append({key: label})
 
     # Make sure there is at least one item
     if not tools_data:

openpype/settings/defaults/system_settings/tools.json

@@ -32,7 +32,7 @@
                 },
                 "__dynamic_keys_labels__": {
                     "3-2": "3.2",
-                    "3-1": "3.2"
+                    "3-1": "3.1"
                 }
             }
         },