From 4ad97342c2e9120bce09fb23fc3127f3c851ced6 Mon Sep 17 00:00:00 2001 From: Hasareej <82398396+Hasareej@users.noreply.github.com> Date: Fri, 18 Jun 2021 11:45:48 +0100 Subject: [PATCH] Hasareej fix whitebox and physx cluster icons (#1398) Fixing the issue with the icons not appearing & deleting duplicate icons. --- Assets/Editor/Icons/PhysX/Move.svg | 28 ------------------- Assets/Editor/Icons/PhysX/Rotate.svg | 21 -------------- Assets/Editor/Icons/PhysX/Scale.svg | 22 --------------- Assets/Editor/Icons/WhiteBox/Move.svg | 28 ------------------- Assets/Editor/Icons/WhiteBox/Rotate.svg | 21 -------------- Assets/Editor/Icons/WhiteBox/Scale.svg | 22 --------------- .../img/UI20/toolbar}/RestoreMode.svg | 0 .../toolbar/{Translate.svg => Rotate.svg} | 0 .../img/UI20/toolbar}/SketchMode.svg | 0 .../AzQtComponents/Components/resources.qrc | 4 ++- .../EditorTransformComponentSelection.cpp | 2 +- .../Code/Editor/ColliderComponentMode.cpp | 2 +- .../Source/EditorWhiteBoxComponentMode.cpp | 2 +- 13 files changed, 6 insertions(+), 146 deletions(-) delete mode 100644 Assets/Editor/Icons/PhysX/Move.svg delete mode 100644 Assets/Editor/Icons/PhysX/Rotate.svg delete mode 100644 Assets/Editor/Icons/PhysX/Scale.svg delete mode 100644 Assets/Editor/Icons/WhiteBox/Move.svg delete mode 100644 Assets/Editor/Icons/WhiteBox/Rotate.svg delete mode 100644 Assets/Editor/Icons/WhiteBox/Scale.svg rename {Assets/Editor/Icons/WhiteBox => Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar}/RestoreMode.svg (100%) rename Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/{Translate.svg => Rotate.svg} (100%) rename {Assets/Editor/Icons/WhiteBox => Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar}/SketchMode.svg (100%) diff --git a/Assets/Editor/Icons/PhysX/Move.svg b/Assets/Editor/Icons/PhysX/Move.svg deleted file mode 100644 index e9019bf226..0000000000 --- a/Assets/Editor/Icons/PhysX/Move.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/Editor/Icons/PhysX/Rotate.svg b/Assets/Editor/Icons/PhysX/Rotate.svg deleted file mode 100644 index 79bfb77540..0000000000 --- a/Assets/Editor/Icons/PhysX/Rotate.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - Icons / Toolbar / Rotate - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/Editor/Icons/PhysX/Scale.svg b/Assets/Editor/Icons/PhysX/Scale.svg deleted file mode 100644 index f4879b89f6..0000000000 --- a/Assets/Editor/Icons/PhysX/Scale.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - Icons / Toolbar / Scale - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/Editor/Icons/WhiteBox/Move.svg b/Assets/Editor/Icons/WhiteBox/Move.svg deleted file mode 100644 index e9019bf226..0000000000 --- a/Assets/Editor/Icons/WhiteBox/Move.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/Editor/Icons/WhiteBox/Rotate.svg b/Assets/Editor/Icons/WhiteBox/Rotate.svg deleted file mode 100644 index 79bfb77540..0000000000 --- a/Assets/Editor/Icons/WhiteBox/Rotate.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - Icons / Toolbar / Rotate - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/Editor/Icons/WhiteBox/Scale.svg b/Assets/Editor/Icons/WhiteBox/Scale.svg deleted file mode 100644 index f4879b89f6..0000000000 --- a/Assets/Editor/Icons/WhiteBox/Scale.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - Icons / Toolbar / Scale - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/Editor/Icons/WhiteBox/RestoreMode.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/RestoreMode.svg similarity index 100% rename from Assets/Editor/Icons/WhiteBox/RestoreMode.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/RestoreMode.svg diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Translate.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Rotate.svg similarity index 100% rename from Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Translate.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/Rotate.svg diff --git a/Assets/Editor/Icons/WhiteBox/SketchMode.svg b/Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/SketchMode.svg similarity index 100% rename from Assets/Editor/Icons/WhiteBox/SketchMode.svg rename to Code/Framework/AzQtComponents/AzQtComponents/Components/img/UI20/toolbar/SketchMode.svg diff --git a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc index 7070bd372b..d6cd99b1d9 100644 --- a/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc +++ b/Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc @@ -370,6 +370,7 @@ img/UI20/toolbar/Redo.svg img/UI20/toolbar/remove_link.svg img/UI20/toolbar/Reset_physics_state.svg + img/UI20/toolbar/RestoreMode.svg img/UI20/toolbar/Save.svg img/UI20/toolbar/Scale.svg img/UI20/toolbar/Select.svg @@ -377,9 +378,10 @@ img/UI20/toolbar/Select_terrain.svg img/UI20/toolbar/Simulate_Physics.svg img/UI20/toolbar/Simulate_Physics_on_selected_objects.svg + img/UI20/toolbar/SketchMode.svg img/UI20/toolbar/Terrain.svg img/UI20/toolbar/Terrain_Texture.svg - img/UI20/toolbar/Translate.svg + img/UI20/toolbar/Rotate.svg img/UI20/toolbar/undo.svg img/UI20/toolbar/Unlocked.svg img/UI20/toolbar/Vertex_snapping.svg diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp index 3e16088f0e..54934c13c7 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp @@ -2489,7 +2489,7 @@ namespace AzToolsFramework // create and register the buttons (strings correspond to icons even if the values appear different) m_translateButtonId = RegisterClusterButton(m_transformModeClusterId, "Move"); - m_rotateButtonId = RegisterClusterButton(m_transformModeClusterId, "Translate"); + m_rotateButtonId = RegisterClusterButton(m_transformModeClusterId, "Rotate"); m_scaleButtonId = RegisterClusterButton(m_transformModeClusterId, "Scale"); // set button tooltips diff --git a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp index 7caa497344..0957985623 100644 --- a/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp +++ b/Gems/PhysX/Code/Editor/ColliderComponentMode.cpp @@ -223,7 +223,7 @@ namespace PhysX AzToolsFramework::ViewportUi::ViewportUiRequestBus::EventResult( buttonId, AzToolsFramework::ViewportUi::DefaultViewportId, &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateClusterButton, clusterId, - AZStd::string::format("Icons/PhysX/%s.svg", iconName)); + AZStd::string::format(":/stylesheet/img/UI20/toolbar/%s.svg", iconName)); return buttonId; } diff --git a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp index 0772851cba..a3ec073e41 100644 --- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp +++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp @@ -465,7 +465,7 @@ namespace WhiteBox AzToolsFramework::ViewportUi::ViewportUiRequestBus::EventResult( buttonId, AzToolsFramework::ViewportUi::DefaultViewportId, &AzToolsFramework::ViewportUi::ViewportUiRequestBus::Events::CreateClusterButton, clusterId, - AZStd::string::format("Icons/WhiteBox/%s.svg", iconName)); + AZStd::string::format(":/stylesheet/img/UI20/toolbar/%s.svg", iconName)); return buttonId; }