From cf0d3af78e55d3d4f18292d0f856e4dcc7744865 Mon Sep 17 00:00:00 2001
From: guthadam <guthadam@amazon.com>
Date: Mon, 10 May 2021 18:02:26 -0500
Subject: [PATCH] ATOM-15128 replacing material editor icon

---
 .../Source/Window/Icons/materialeditor.svg    | 20 +++++++++++++++
 .../Code/Source/Window/MaterialEditor.qrc     |  1 +
 .../Source/Window/MaterialEditorWindow.cpp    |  2 +-
 Gems/Atom/Tools/MaterialEditor/preview.svg    | 25 +++++++++++++------
 4 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Window/Icons/materialeditor.svg

diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/Icons/materialeditor.svg b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/Icons/materialeditor.svg
new file mode 100644
index 0000000000..31b0b304a1
--- /dev/null
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/Icons/materialeditor.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icons / Application Icons / Material Editor</title>
+    <defs>
+        <polygon id="path-1" points="7.67007885e-15 0 256 0 256 256.000195 7.67007885e-15 256.000195"></polygon>
+    </defs>
+    <g id="Icons-/-Application-Icons-/-Material-Editor" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" transform="translate(-0.000000, 0.000000)">
+            <g id="Fill-1-Clipped" transform="translate(-0.000000, 0.000000)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="path-1"></g>
+                <path d="M184.641349,-0.000129743592 L71.3589754,-0.000129743592 C32.1115389,-0.000129743592 7.67007885e-15,32.1114092 7.67007885e-15,71.3588457 L7.67007885e-15,184.641219 C7.67007885e-15,223.888656 32.1115389,256.000195 71.3589754,256.000195 L184.641349,256.000195 C223.888785,256.000195 256.000324,223.888656 256.000324,184.641219 L256.000324,71.3588457 C256.000324,32.1114092 223.888785,-0.000129743592 184.641349,-0.000129743592" id="Fill-1" fill="#1E70EB" fill-rule="nonzero" mask="url(#mask-2)"></path>
+            </g>
+            <path d="M128.000162,32.2473156 C74.9006511,32.2473156 32.2467966,74.9005214 32.2467966,128.000681 C32.2467966,181.099543 74.9006511,223.752749 128.000162,223.752749 C181.099673,223.752749 223.752879,181.099543 223.752879,128.000681 C223.752879,74.9005214 181.099673,32.2473156 128.000162,32.2473156 L128.000162,32.2473156 Z M198.508668,93.1813935 L168.912209,93.1813935 C166.301119,79.2534189 162.81945,65.3254443 157.595973,54.8797877 C175.005617,62.7143545 189.804171,75.7717496 198.508668,93.1813935 L198.508668,93.1813935 Z M154.114304,128.000681 C154.114304,134.09344 154.114304,140.186848 153.243724,145.409676 L102.755952,145.409676 C101.885372,140.186848 101.885372,134.09344 101.885372,128.000681 C101.885372,121.906625 101.885372,115.813217 102.755952,110.590389 L153.243724,110.590389 C154.114304,115.813217 154.114304,121.906625 154.114304,128.000681 L154.114304,128.000681 Z M128.000162,206.343105 C120.165595,206.343105 109.719939,189.804041 104.497111,162.81932 L150.632634,162.81932 C146.280386,189.804041 135.83408,206.343105 128.000162,206.343105 L128.000162,206.343105 Z M104.497111,93.1813935 C109.719939,66.1960238 120.165595,49.6569595 128.000162,49.6569595 C135.83408,49.6569595 146.280386,66.1960238 151.502565,93.1813935 L104.497111,93.1813935 Z M99.2742823,54.8797877 C94.0508053,65.3254443 89.6985565,79.2534189 87.0874667,93.1813935 L57.4910073,93.1813935 C66.1961536,75.7717496 80.9940589,62.7143545 99.2742823,54.8797877 L99.2742823,54.8797877 Z M51.3975995,110.590389 L84.4757282,110.590389 L84.4757282,128.000681 C84.4757282,134.09344 84.4757282,139.316269 85.3463077,145.409676 L51.3975995,145.409676 C50.52702,140.186848 49.6564405,134.09344 49.6564405,128.000681 C49.6564405,121.906625 50.52702,115.813217 51.3975995,110.590389 L51.3975995,110.590389 Z M57.4910073,162.81932 L87.0874667,162.81932 C89.6985565,176.746646 93.1808745,190.674621 98.4037028,201.120277 C80.9940589,193.28571 66.1961536,180.228964 57.4910073,162.81932 L57.4910073,162.81932 Z M156.725393,201.120277 C161.948222,190.674621 166.301119,177.617874 168.042278,162.81932 L197.638089,162.81932 C189.804171,180.228964 175.005617,193.28571 156.725393,201.120277 L156.725393,201.120277 Z M204.602076,145.409676 L171.523947,145.409676 C172.394527,139.316269 172.394527,134.09344 172.394527,128.000681 C172.394527,121.906625 172.394527,116.683796 171.523947,110.590389 L204.602076,110.590389 C205.472656,115.813217 206.343235,121.906625 206.343235,128.000681 C206.343235,134.09344 205.472656,140.186848 204.602076,145.409676 L204.602076,145.409676 Z" id="Fill-4" fill="#FFFFFF" fill-rule="nonzero"></path>
+            <path d="M128.000162,212.590259 L128.000162,125.542689 L128.000162,38.4944696 C128.000162,12.3803281 223.752879,73.3137573 223.752879,125.542689 C223.752879,177.770972 128.000162,238.705049 128.000162,212.590259" id="Fill-6" fill="#FFFFFF" fill-rule="nonzero"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditor.qrc b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditor.qrc
index 4f93770096..cde48079ac 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditor.qrc
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditor.qrc
@@ -1,6 +1,7 @@
 <RCC>
     <qresource prefix="/">
         <file>MaterialEditor.qss</file>
+        <file>Icons/materialeditor.svg</file>
         <file>Icons/material.svg</file>
         <file>Icons/materialtype.svg</file>
         <file>Icons/mesh.svg</file>
diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
index 6e47de189c..d87d3b81e3 100644
--- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
+++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
@@ -58,7 +58,7 @@ namespace MaterialEditor
     {
         AzQtComponents::StyleManager::setStyleSheet(this, QStringLiteral(":/MaterialEditor.qss"));
 
-        QApplication::setWindowIcon(QIcon(":/Icons/materialtype.svg"));
+        QApplication::setWindowIcon(QIcon(":/Icons/materialeditor.svg"));
 
         AZ::Name apiName = AZ::RHI::Factory::Get().GetName();
         if (!apiName.IsEmpty())
diff --git a/Gems/Atom/Tools/MaterialEditor/preview.svg b/Gems/Atom/Tools/MaterialEditor/preview.svg
index 56c1ead3c1..31b0b304a1 100644
--- a/Gems/Atom/Tools/MaterialEditor/preview.svg
+++ b/Gems/Atom/Tools/MaterialEditor/preview.svg
@@ -1,9 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="140px" height="80px" viewBox="0 0 140 80" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background: #3D3D3D;">
-    <title>Icons / Project Configurator / Gems / Material Editor</title>
-    <g id="Icons-/-Project-Configurator-/-Gems-/-Material-Editor" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <rect fill="#3D3D3D" x="0" y="0" width="140" height="80"></rect>
-        <rect id="Rectangle" fill="#3D3D3D" x="0" y="0" width="140" height="80"></rect>
-        <path d="M73.2408742,13.1546686 L73.5657106,13.2306181 C85.906012,14.8406656 95.5585578,24.701494 96.85234,37.1420953 L96.9210589,37.9069399 C96.9730868,38.3746085 97,38.8420235 97,39.306992 L96.9962868,39.5446661 L97,40 L97,40 C97,54.9727273 84.9727273,67 70,67 C55.0272727,67 43,54.9727273 43,40 C43,25.0272727 55.0272727,13 70,13 C70.4866296,13 70.9701478,13.0127046 71.4502429,13.0378021 C71.8438705,12.9761732 72.3100032,12.9915388 72.835667,13.0772753 L73.2408742,13.1546686 Z M70.4576271,50.5254237 L63.1355932,50.5263757 L63.30962,51.2793289 C64.9262977,57.9629917 67.8804497,62.1213112 70.2023411,62.4098089 L70.4576271,62.4237288 L70.4576271,50.5254237 Z M58.9293184,49.6101695 L50.3220339,49.6101695 L50.7601942,50.4306198 C53.3341147,55.0138675 57.4385142,58.4714946 62.220339,60.5932203 C61.0051929,58.1969183 60.1140858,55.1616025 59.4174021,51.9984838 L59.1650061,50.807322 L58.9293184,49.6101695 Z M70.4576271,34.9661017 L63.3777731,34.9681606 L63.2783387,35.6436273 C63.1956538,36.3347889 63.1602174,37.0702243 63.1450304,37.8246341 L63.1355932,38.5844316 L63.1355932,40.502373 C63.1394993,41.1392466 63.1512177,41.7687999 63.1863729,42.376392 L63.2586362,43.2694792 L63.3777731,44.1186441 L70.4576271,44.1181865 L70.4576271,34.9661017 Z M58.2914427,34.9661017 L48.1120298,34.9661017 L47.9534452,35.8154576 C47.7477139,36.979661 47.5762712,38.2610169 47.5762712,39.5423729 C47.5762712,40.5033898 47.6727077,41.4644068 47.8077189,42.376 L47.9534452,43.2692881 L48.1120298,44.1186441 L58.559322,44.1186441 L58.4285969,43.1814237 C58.3600198,42.5700339 58.3257313,41.9806102 58.308587,41.3838644 L58.2935858,40.4795932 L58.2914427,34.9661017 Z M70.4576271,17.5762712 C68.1852718,17.5762712 65.2077027,21.4954965 63.4946548,27.989603 L63.30962,28.7216983 L63.1355932,29.4745763 L70.4576271,29.4729105 L70.4576271,17.5762712 L70.4576271,17.5762712 Z M62.220339,19.4067797 C57.5932203,21.403698 53.7495292,24.5839753 51.2115505,28.7722993 L50.7511084,29.5693802 L50.3220339,30.3898305 L58.75,30.3898305 L58.9877182,29.192678 C59.7440042,25.6072111 60.8817797,22.1026194 62.220339,19.4067797 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icons / Application Icons / Material Editor</title>
+    <defs>
+        <polygon id="path-1" points="7.67007885e-15 0 256 0 256 256.000195 7.67007885e-15 256.000195"></polygon>
+    </defs>
+    <g id="Icons-/-Application-Icons-/-Material-Editor" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="Group" transform="translate(-0.000000, 0.000000)">
+            <g id="Fill-1-Clipped" transform="translate(-0.000000, 0.000000)">
+                <mask id="mask-2" fill="white">
+                    <use xlink:href="#path-1"></use>
+                </mask>
+                <g id="path-1"></g>
+                <path d="M184.641349,-0.000129743592 L71.3589754,-0.000129743592 C32.1115389,-0.000129743592 7.67007885e-15,32.1114092 7.67007885e-15,71.3588457 L7.67007885e-15,184.641219 C7.67007885e-15,223.888656 32.1115389,256.000195 71.3589754,256.000195 L184.641349,256.000195 C223.888785,256.000195 256.000324,223.888656 256.000324,184.641219 L256.000324,71.3588457 C256.000324,32.1114092 223.888785,-0.000129743592 184.641349,-0.000129743592" id="Fill-1" fill="#1E70EB" fill-rule="nonzero" mask="url(#mask-2)"></path>
+            </g>
+            <path d="M128.000162,32.2473156 C74.9006511,32.2473156 32.2467966,74.9005214 32.2467966,128.000681 C32.2467966,181.099543 74.9006511,223.752749 128.000162,223.752749 C181.099673,223.752749 223.752879,181.099543 223.752879,128.000681 C223.752879,74.9005214 181.099673,32.2473156 128.000162,32.2473156 L128.000162,32.2473156 Z M198.508668,93.1813935 L168.912209,93.1813935 C166.301119,79.2534189 162.81945,65.3254443 157.595973,54.8797877 C175.005617,62.7143545 189.804171,75.7717496 198.508668,93.1813935 L198.508668,93.1813935 Z M154.114304,128.000681 C154.114304,134.09344 154.114304,140.186848 153.243724,145.409676 L102.755952,145.409676 C101.885372,140.186848 101.885372,134.09344 101.885372,128.000681 C101.885372,121.906625 101.885372,115.813217 102.755952,110.590389 L153.243724,110.590389 C154.114304,115.813217 154.114304,121.906625 154.114304,128.000681 L154.114304,128.000681 Z M128.000162,206.343105 C120.165595,206.343105 109.719939,189.804041 104.497111,162.81932 L150.632634,162.81932 C146.280386,189.804041 135.83408,206.343105 128.000162,206.343105 L128.000162,206.343105 Z M104.497111,93.1813935 C109.719939,66.1960238 120.165595,49.6569595 128.000162,49.6569595 C135.83408,49.6569595 146.280386,66.1960238 151.502565,93.1813935 L104.497111,93.1813935 Z M99.2742823,54.8797877 C94.0508053,65.3254443 89.6985565,79.2534189 87.0874667,93.1813935 L57.4910073,93.1813935 C66.1961536,75.7717496 80.9940589,62.7143545 99.2742823,54.8797877 L99.2742823,54.8797877 Z M51.3975995,110.590389 L84.4757282,110.590389 L84.4757282,128.000681 C84.4757282,134.09344 84.4757282,139.316269 85.3463077,145.409676 L51.3975995,145.409676 C50.52702,140.186848 49.6564405,134.09344 49.6564405,128.000681 C49.6564405,121.906625 50.52702,115.813217 51.3975995,110.590389 L51.3975995,110.590389 Z M57.4910073,162.81932 L87.0874667,162.81932 C89.6985565,176.746646 93.1808745,190.674621 98.4037028,201.120277 C80.9940589,193.28571 66.1961536,180.228964 57.4910073,162.81932 L57.4910073,162.81932 Z M156.725393,201.120277 C161.948222,190.674621 166.301119,177.617874 168.042278,162.81932 L197.638089,162.81932 C189.804171,180.228964 175.005617,193.28571 156.725393,201.120277 L156.725393,201.120277 Z M204.602076,145.409676 L171.523947,145.409676 C172.394527,139.316269 172.394527,134.09344 172.394527,128.000681 C172.394527,121.906625 172.394527,116.683796 171.523947,110.590389 L204.602076,110.590389 C205.472656,115.813217 206.343235,121.906625 206.343235,128.000681 C206.343235,134.09344 205.472656,140.186848 204.602076,145.409676 L204.602076,145.409676 Z" id="Fill-4" fill="#FFFFFF" fill-rule="nonzero"></path>
+            <path d="M128.000162,212.590259 L128.000162,125.542689 L128.000162,38.4944696 C128.000162,12.3803281 223.752879,73.3137573 223.752879,125.542689 C223.752879,177.770972 128.000162,238.705049 128.000162,212.590259" id="Fill-6" fill="#FFFFFF" fill-rule="nonzero"></path>
+        </g>
     </g>
-</svg>
+</svg>
\ No newline at end of file