From 67d38a5beab64986147c0b9e42edf4b55b17ad09 Mon Sep 17 00:00:00 2001 From: lsemp3d <58790905+lsemp3d@users.noreply.github.com> Date: Wed, 24 Nov 2021 09:18:03 -0800 Subject: [PATCH] A few more updtes and a fallback category for items in the Other field Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com> --- .../TranslationAssets/Classes/AssetInfo.names | 12 ++-- .../Classes/MotionEvent.names | 60 +++++++++---------- .../Classes/SimpleAssetReferenceBase.names | 24 ++++---- .../EBus/Senders/AreaSystemRequestBus.names | 1 - .../Nodes/MathCrc32_FromString.names | 4 +- .../Widgets/NodePalette/NodePaletteModel.cpp | 6 +- 6 files changed, 54 insertions(+), 53 deletions(-) diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names index 39abff351c..db6fe2d2e3 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/AssetInfo.names @@ -9,7 +9,7 @@ }, "methods": [ { - "base": "assetId", + "base": "GetassetId", "details": { "name": "Get Asset Id" }, @@ -31,7 +31,7 @@ ] }, { - "base": "assetType", + "base": "GetassetType", "details": { "name": "Get Asset Type" }, @@ -53,9 +53,9 @@ ] }, { - "base": "sizeBytes", + "base": "GetsizeBytes", "details": { - "name": "Get Size (Bytes)" + "name": "Get Size Bytes" }, "params": [ { @@ -69,13 +69,13 @@ { "typeid": "{D6597933-47CD-4FC8-B911-63F3E2B0993A}", "details": { - "name": "Size (Bytes)" + "name": "Size" } } ] }, { - "base": "relativePath", + "base": "GetrelativePath", "details": { "name": "Get Relative Path" }, diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names index 2251df87a6..fccd0720b5 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/MotionEvent.names @@ -12,7 +12,7 @@ { "base": "GetlocalWeight", "details": { - "name": "Getlocal Weight" + "name": "Get Local Weight" }, "params": [ { @@ -26,7 +26,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Local Weight" } } ] @@ -34,7 +34,7 @@ { "base": "SetlocalWeight", "details": { - "name": "Setlocal Weight" + "name": "Set Local Weight" }, "params": [ { @@ -46,7 +46,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Local Weight" } } ] @@ -54,7 +54,7 @@ { "base": "GetglobalWeight", "details": { - "name": "Getglobal Weight" + "name": "Get Global Weight" }, "params": [ { @@ -68,7 +68,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Global Weight" } } ] @@ -76,7 +76,7 @@ { "base": "SetglobalWeight", "details": { - "name": "Setglobal Weight" + "name": "Set Global Weight" }, "params": [ { @@ -88,7 +88,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Global Weight" } } ] @@ -96,7 +96,7 @@ { "base": "Gettime", "details": { - "name": "Gettime" + "name": "Get Time" }, "params": [ { @@ -110,7 +110,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Time" } } ] @@ -118,7 +118,7 @@ { "base": "Settime", "details": { - "name": "Settime" + "name": "Set Time" }, "params": [ { @@ -130,7 +130,7 @@ { "typeid": "{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}", "details": { - "name": "float" + "name": "Time" } } ] @@ -138,7 +138,7 @@ { "base": "GeteventType", "details": { - "name": "Getevent Type" + "name": "Get Event Type" }, "params": [ { @@ -152,7 +152,7 @@ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Event Type" } } ] @@ -160,7 +160,7 @@ { "base": "SeteventType", "details": { - "name": "Setevent Type" + "name": "Set Event Type" }, "params": [ { @@ -172,7 +172,7 @@ { "typeid": "{43DA906B-7DEF-4CA8-9790-854106D3F983}", "details": { - "name": "unsigned int" + "name": "Event Type" } } ] @@ -180,7 +180,7 @@ { "base": "GeteventTypeName", "details": { - "name": "Getevent Type Name" + "name": "Get Event Type Name" }, "params": [ { @@ -194,7 +194,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Event Type Name" } } ] @@ -202,7 +202,7 @@ { "base": "SeteventTypeName", "details": { - "name": "Setevent Type Name" + "name": "Set Event Type Name" }, "params": [ { @@ -214,7 +214,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Event Type Name" } } ] @@ -222,7 +222,7 @@ { "base": "GetisEventStart", "details": { - "name": "Getis Event Start" + "name": "Get Is Event Start" }, "params": [ { @@ -236,7 +236,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Event Start" } } ] @@ -244,7 +244,7 @@ { "base": "SetisEventStart", "details": { - "name": "Setis Event Start" + "name": "Set Is Event Start" }, "params": [ { @@ -256,7 +256,7 @@ { "typeid": "{A0CA880C-AFE4-43CB-926C-59AC48496112}", "details": { - "name": "bool" + "name": "Is Event Start" } } ] @@ -264,7 +264,7 @@ { "base": "Getparameter", "details": { - "name": "Getparameter" + "name": "Get Parameter" }, "params": [ { @@ -278,7 +278,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Parameter" } } ] @@ -286,7 +286,7 @@ { "base": "Setparameter", "details": { - "name": "Setparameter" + "name": "Set Parameter" }, "params": [ { @@ -298,7 +298,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "char" + "name": "Parameter" } } ] @@ -306,7 +306,7 @@ { "base": "GetentityId", "details": { - "name": "Getentity Id" + "name": "Get Entity Id" }, "params": [ { @@ -329,7 +329,7 @@ { "base": "SetentityId", "details": { - "name": "Setentity Id" + "name": "Set Entity Id" }, "params": [ { diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names index 083e61fc8a..b4da62d2e8 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Classes/SimpleAssetReferenceBase.names @@ -5,7 +5,7 @@ "context": "BehaviorClass", "variant": "", "details": { - "name": "Asset Reference" + "name": "Simple Asset Reference" }, "methods": [ { @@ -26,20 +26,20 @@ { "typeid": "{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}", "details": { - "name": "Asset Reference", + "name": "Asset path", "tooltip": "Asset reference as a project-relative path" } }, { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "Path" + "name": "char" } } ] }, { - "base": "assetPath", + "base": "GetassetPath", "details": { "name": "Get Asset Path" }, @@ -47,7 +47,7 @@ { "typeid": "{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}", "details": { - "name": "Asset Reference", + "name": "Asset path", "tooltip": "Asset reference as a project-relative path" } } @@ -56,13 +56,13 @@ { "typeid": "{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}", "details": { - "name": "Path" + "name": "AZ Std::string" } } ] }, { - "base": "assetType", + "base": "GetassetType", "details": { "name": "Get Asset Type" }, @@ -70,7 +70,7 @@ { "typeid": "{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}", "details": { - "name": "Asset Reference", + "name": "Asset path", "tooltip": "Asset reference as a project-relative path" } } @@ -79,13 +79,13 @@ { "typeid": "{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}", "details": { - "name": "Type" + "name": "AZ:: Uuid" } } ] }, { - "base": "fileFilter", + "base": "GetfileFilter", "details": { "name": "Get File Filter" }, @@ -93,7 +93,7 @@ { "typeid": "{E16CA6C5-5C78-4AD9-8E9B-F8C1FB4D1DB8}", "details": { - "name": "Asset Reference", + "name": "Asset path", "tooltip": "Asset reference as a project-relative path" } } @@ -102,7 +102,7 @@ { "typeid": "{3AB0037F-AF8D-48CE-BCA0-A170D18B2C03}", "details": { - "name": "Filter" + "name": "char" } } ] diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names index fd994b7663..57f718450a 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/EBus/Senders/AreaSystemRequestBus.names @@ -5,7 +5,6 @@ "context": "EBusSender", "variant": "", "details": { - "name": "Area System", "category": "Area System" }, "methods": [ diff --git a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names index 5ab5075de1..a3682b3751 100644 --- a/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names +++ b/Gems/ScriptCanvas/Assets/TranslationAssets/Nodes/MathCrc32_FromString.names @@ -6,8 +6,8 @@ "variant": "", "details": { "name": "From String", - "category": "Math/Crc32", - "tooltip": "Returns a Crc32 from the string" + "category": "Math/Tag", + "tooltip": "Returns a Tag from the string" }, "slots": [ { diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp index f128537e1a..dc221deec0 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp @@ -611,8 +611,9 @@ namespace { categoryPath.append(details.m_name.c_str()); } - else + else if (categoryPath.contains("Other")) { + // Use the BehaviorEBus name to categorize within the 'Other' category categoryPath.append(behaviorEbus.m_name.c_str()); } } @@ -657,8 +658,9 @@ namespace { categoryPath.append(details.m_name.c_str()); } - else + else if (categoryPath.contains("Other")) { + // Use the behavior EBus name to categorize within the 'Other' category categoryPath.append(behaviorEbus.m_name.c_str()); }