From 9632e6fa6a675929db5e64bf24569815983eb587 Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Wed, 11 Aug 2021 12:11:19 +0200
Subject: [PATCH] New icons for mmu painting, fuzzy skin and object info items

---
 resources/icons/fuzzy_skin.svg            |  15 ++--
 resources/icons/info.png                  | Bin 308 -> 0 bytes
 resources/icons/info.svg                  |  86 ++++------------------
 resources/icons/mmu_segmentation.svg      |  28 +++++++
 src/slic3r/GUI/Gizmos/GLGizmosManager.cpp |   2 +-
 5 files changed, 55 insertions(+), 76 deletions(-)
 delete mode 100644 resources/icons/info.png
 create mode 100644 resources/icons/mmu_segmentation.svg

diff --git a/resources/icons/fuzzy_skin.svg b/resources/icons/fuzzy_skin.svg
index b8ba0a651..f1ddc6b33 100644
--- a/resources/icons/fuzzy_skin.svg
+++ b/resources/icons/fuzzy_skin.svg
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
-<g>
-	<circle fill="#808080" cx="8" cy="8" r="0"/>
-</g>
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path fill="#808080" d="M14,14.5c-0.28,0-0.5-0.22-0.5-0.5v-3c0-0.38-0.29-0.93-0.61-1.14L8.55,6.97c-0.29-0.19-0.82-0.19-1.11,0
+	L3.11,9.86C2.79,10.07,2.5,10.62,2.5,11v3c0,0.28-0.22,0.5-0.5,0.5S1.5,14.28,1.5,14v-3c0-0.72,0.45-1.57,1.05-1.97l4.34-2.89
+	c0.62-0.42,1.6-0.42,2.22,0l4.34,2.89c0.6,0.4,1.05,1.25,1.05,1.97v3C14.5,14.28,14.28,14.5,14,14.5z"/>
+<path fill="#ED6B21" d="M14.11,8c-0.54,0-0.98-0.43-1-0.97C11.8,6.98,11.11,5.96,11.11,5l-1-0.01c-1.26,0-1.95-0.97-2-1.91
+	c-0.01,0-0.01,0-0.02,0H8c0,0-0.01,0-0.02,0c-0.05,0.96-0.75,1.91-2,1.91h-1c0.03,0-0.02,0.02-0.04,0.03C4.99,5.97,4.3,7,3,7.03
+	C2.95,7.54,2.52,7.97,2,7.97C1.45,7.97,1,7.55,1,7c0-0.74,0.31-1.19,0.57-1.44C2.14,5.02,2.86,5.02,3,5.03c0-1.44,1.17-2,1.95-2.04
+	l1.04,0c0-0.69,0.3-1.12,0.55-1.36c0.58-0.56,1.35-0.56,1.5-0.55l0.07,0c0.11,0,0.88-0.01,1.46,0.55c0.25,0.24,0.55,0.68,0.55,1.37
+	l1,0c0.83,0.03,2,0.6,2,2.01c0.13,0.02,0.86,0.02,1.42,0.56c0.26,0.25,0.57,0.7,0.57,1.44C15.11,7.55,14.66,8,14.11,8z"/>
 </svg>
diff --git a/resources/icons/info.png b/resources/icons/info.png
deleted file mode 100644
index 9eeee9b3cdbac7fd819d3f4c3ee85414c5f1ed50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0002%Nkl<ZIE|gtF-ikb5C-5ci}e-@+6DqbDjP2#c!wp&NNXy~;3@V5DbgD}
zgH?hM4BJJ>6|`_Rtm|7y^1~Ew=AW5=n0W(fT;mbLc<=CvuP!m`yl+rpgAzqp8NMnw
zN!+2v9C;$1N30I+zs_}ZYEa-QtZ4bm;QmokMfEnO_zs(PV)Mv3c0VL!_bF(`IW#IJ
zSafGP0SinrjIiz@J%^>R#;Ci-vyowo@ddeKY%{FzAieuO<dL(=u*VX!GYZTiXWuwd
zht!AUA#vd;U$qGDxW@}V@rI9x-TIw*8Jwf^L66Lnzw-}Ur84DM{QNTj0000<MNUMn
GLSTYtPJt5u

diff --git a/resources/icons/info.svg b/resources/icons/info.svg
index 276b26061..6e11a9b77 100644
--- a/resources/icons/info.svg
+++ b/resources/icons/info.svg
@@ -1,71 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   id="error"
-   x="0px"
-   y="0px"
-   viewBox="0 0 200 200"
-   enable-background="new 0 0 100 100"
-   xml:space="preserve"
-   sodipodi:docname="notification_error.svg"
-   width="200"
-   height="200"
-   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"><metadata
-   id="metadata19"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs17" /><sodipodi:namedview
-   inkscape:document-rotation="0"
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="2560"
-   inkscape:window-height="1377"
-   id="namedview15"
-   showgrid="false"
-   inkscape:zoom="5.04"
-   inkscape:cx="117.17146"
-   inkscape:cy="98.609664"
-   inkscape:window-x="-8"
-   inkscape:window-y="-8"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="error" />
-<g
-   id="g4"
-   transform="matrix(2.52,0,0,2.52,-26,-26)">
-	<path
-   fill="#808080"
-   d="m 50,54.25 c -2.35,0 -4.25,-1.9 -4.25,-4.25 V 35 c 0,-2.35 1.9,-4.25 4.25,-4.25 2.35,0 4.25,1.9 4.25,4.25 v 15 c 0,2.35 -1.9,4.25 -4.25,4.25 z"
-   id="path2" />
-</g>
-<g
-   id="g8"
-   transform="matrix(2.52,0,0,2.52,-26,-26)">
-	<circle
-   fill="#808080"
-   cx="50"
-   cy="65"
-   r="5"
-   id="circle6" />
-</g>
-<g
-   id="g12"
-   transform="matrix(2.52,0,0,2.52,-26,-26)">
-	<path
-   fill="#808080"
-   d="M 50,89.25 C 28.36,89.25 10.75,71.64 10.75,50 10.75,28.36 28.36,10.75 50,10.75 71.64,10.75 89.25,28.36 89.25,50 89.25,71.64 71.64,89.25 50,89.25 Z m 0,-70 C 33.05,19.25 19.25,33.04 19.25,50 19.25,66.95 33.04,80.75 50,80.75 66.95,80.75 80.75,66.96 80.75,50 80.75,33.05 66.95,19.25 50,19.25 Z"
-   id="path10" />
-</g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path fill="#808080" d="M13,14.5H3.5c-0.55,0-1-0.45-1-1V13c0-1.98,1.31-2.5,2-2.5h2c-0.46,0-1-0.43-1-2.5V7c0-1.98,1.31-2.5,2-2.5
+	h1c0.69,0,2,0.52,2,2.5v1c0,2.07-0.54,2.5-1,2.5h2c0.69,0,2,0.52,2,2.5v1C13.5,14.28,13.28,14.5,13,14.5z M4.5,11.5
+	c-0.16,0-1,0.1-1,1.5v0.5h9V13c0-1.48-0.96-1.5-1-1.5h-2c-0.55,0-1-0.45-1-1c0-0.49,0.35-0.89,0.81-0.98C9.37,9.39,9.5,9,9.5,8V7
+	c0-1.48-0.96-1.5-1-1.5h-1c-0.16,0-1,0.1-1,1.5v1c0,1,0.13,1.39,0.19,1.52c0.46,0.09,0.81,0.5,0.81,0.98c0,0.55-0.45,1-1,1H4.5z"/>
+<path fill="#ED6B21" d="M13.43,5.49c-0.12-0.24-0.14-0.64-0.05-0.91l0.12-0.35c0.09-0.26,0-0.63-0.2-0.83L12.6,2.7
+	c-0.19-0.19-0.57-0.28-0.83-0.2l-0.35,0.12c-0.26,0.09-0.67,0.06-0.91-0.05s-1-0.54-1.12-0.79L9.22,1.45C9.1,1.2,8.77,1,8.5,1h-1
+	C7.22,1,6.9,1.2,6.78,1.45L6.61,1.78C6.49,2.02,6.18,2.3,5.93,2.38S4.84,2.7,4.58,2.62L4.23,2.5C3.97,2.41,3.6,2.5,3.4,2.7L2.7,3.4
+	C2.5,3.6,2.41,3.97,2.5,4.23l0.12,0.35C2.7,4.84,2.68,5.25,2.57,5.49s-0.54,1-0.79,1.12L1.45,6.78C1.2,6.9,1,7.22,1,7.5v1
+	c0,0.27,0.2,0.6,0.45,0.72l0.33,0.17c0.25,0.12,0.47,0.28,0.49,0.35S2.58,10,2.86,10h0.06c0.28,0,0.43-0.21,0.34-0.48
+	C3.27,9.52,3,8.71,3,8c0-2.76,2.24-5,5-5s5,2.24,5,5c0,0.71-0.27,1.52-0.27,1.52C12.65,9.79,12.8,10,13.08,10h0.06
+	c0.27,0,0.52-0.06,0.55-0.13s0.29-0.36,0.53-0.48l0.33-0.17C14.8,9.1,15,8.77,15,8.5v-1c0-0.28-0.2-0.6-0.45-0.72l-0.33-0.17
+	C13.98,6.49,13.55,5.72,13.43,5.49z"/>
 </svg>
diff --git a/resources/icons/mmu_segmentation.svg b/resources/icons/mmu_segmentation.svg
new file mode 100644
index 000000000..715e6ec28
--- /dev/null
+++ b/resources/icons/mmu_segmentation.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<path fill="#FFFFFF" d="M52.87,108.38c-5.24,0-9.5-4.26-9.5-9.5s4.26-9.5,9.5-9.5s9.5,4.26,9.5,9.5S58.11,108.38,52.87,108.38z
+	 M52.87,92.38c-3.58,0-6.5,2.92-6.5,6.5s2.92,6.5,6.5,6.5s6.5-2.92,6.5-6.5S56.46,92.38,52.87,92.38z M29.82,83.59
+	c-5.24,0-9.5-4.26-9.5-9.5s4.26-9.5,9.5-9.5s9.5,4.26,9.5,9.5S35.06,83.59,29.82,83.59z M29.82,67.59c-3.58,0-6.5,2.92-6.5,6.5
+	s2.92,6.5,6.5,6.5s6.5-2.92,6.5-6.5S33.4,67.59,29.82,67.59z M34,49.86c-5.24,0-9.5-4.26-9.5-9.5s4.26-9.5,9.5-9.5s9.5,4.26,9.5,9.5
+	S39.24,49.86,34,49.86z M34,33.86c-3.58,0-6.5,2.92-6.5,6.5s2.92,6.5,6.5,6.5s6.5-2.92,6.5-6.5S37.59,33.86,34,33.86z M64,35.21
+	c-5.24,0-9.5-4.26-9.5-9.5s4.26-9.5,9.5-9.5s9.5,4.26,9.5,9.5S69.24,35.21,64,35.21z M64,19.21c-3.58,0-6.5,2.92-6.5,6.5
+	s2.92,6.5,6.5,6.5s6.5-2.92,6.5-6.5S67.58,19.21,64,19.21z M96.1,52.24c-5.24,0-9.5-4.26-9.5-9.5s4.26-9.5,9.5-9.5s9.5,4.26,9.5,9.5
+	S101.34,52.24,96.1,52.24z M96.1,36.24c-3.58,0-6.5,2.92-6.5,6.5s2.92,6.5,6.5,6.5s6.5-2.92,6.5-6.5S99.69,36.24,96.1,36.24z
+	 M72.54,120.87c2.6-0.39,4.78-2.06,5.81-4.46c1.06-2.47,0.77-5.29-0.8-7.52c-3.1-4.43-4.49-9.87-3.92-15.31
+	c0.26-2.47,0.94-4.89,2.03-7.17c0.36-0.75,0.04-1.64-0.71-2c-0.75-0.36-1.64-0.04-2,0.71c-1.23,2.6-2.01,5.34-2.3,8.15
+	c-0.64,6.16,0.94,12.32,4.45,17.34c0.96,1.38,1.15,3.11,0.5,4.62c-0.63,1.47-1.91,2.44-3.5,2.68c-3.29,0.49-6.66,0.68-10.01,0.57
+	c-28.61-0.99-51.7-24.18-52.56-52.79c-0.46-15.2,5.2-29.48,15.94-40.21S50.49,9.07,65.68,9.53c28.62,0.86,51.8,23.94,52.79,52.56
+	c0.11,3.25-0.06,6.51-0.52,9.69c-0.24,1.66-1.31,3.06-2.87,3.73c-1.52,0.66-3.16,0.5-4.49-0.42c-3.29-2.3-7.17-3.8-11.21-4.34
+	c-0.83-0.11-1.58,0.47-1.68,1.29c-0.11,0.82,0.47,1.58,1.29,1.68c3.57,0.47,6.99,1.79,9.89,3.82c2.17,1.52,4.94,1.78,7.4,0.72
+	c2.52-1.09,4.26-3.36,4.65-6.06c0.48-3.36,0.67-6.8,0.55-10.22c-1.04-30.19-25.5-54.55-55.7-55.45
+	c-16.02-0.48-31.1,5.49-42.42,16.81C12.02,34.66,6.05,49.73,6.53,65.77c0.9,30.19,25.26,54.66,55.45,55.7
+	c0.67,0.02,1.34,0.04,2.01,0.04C66.86,121.5,69.73,121.29,72.54,120.87z"/>
+<path fill="#ED6B21" d="M115.41,105.01l-27.66-38.8c7.76-12.6-22.89-18.09-27.92-23.34c-2.48-2.6-0.44,35.31,15.58,32.26
+	l29.74,37.59c0.54,0.91,3.45,5.54,7.39,6.36c0.39,0.08,0.78,0.12,1.16,0.12c1.26,0,2.48-0.42,3.58-1.25
+	c1.36-1.02,2.14-2.41,2.27-4.01C119.87,109.95,116.14,105.79,115.41,105.01z M78.44,74.13c1.24-0.57,2.54-1.37,3.92-2.42
+	c1.39-1.05,2.53-2.06,3.45-3.04l6.94,9.73l-6.85,5.15L78.44,74.13z M116.56,113.69c-0.06,0.76-0.4,1.35-1.08,1.85
+	c-0.77,0.58-1.51,0.76-2.33,0.6c-2.38-0.49-4.75-3.78-5.46-5.01c-0.04-0.06-0.08-0.12-0.12-0.18L87.76,85.91l6.73-5.06l18.53,25.99
+	c0.04,0.06,0.09,0.12,0.14,0.17C114.11,107.98,116.75,111.3,116.56,113.69z"/>
+</svg>
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
index eda95a2a5..7461b0922 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
@@ -103,7 +103,7 @@ bool GLGizmosManager::init()
     m_gizmos.emplace_back(new GLGizmoSlaSupports(m_parent, "sla_supports.svg", 6));
     m_gizmos.emplace_back(new GLGizmoFdmSupports(m_parent, "fdm_supports.svg", 7));
     m_gizmos.emplace_back(new GLGizmoSeam(m_parent, "seam.svg", 8));
-    m_gizmos.emplace_back(new GLGizmoMmuSegmentation(m_parent, "fdm_supports.svg", 9));
+    m_gizmos.emplace_back(new GLGizmoMmuSegmentation(m_parent, "mmu_segmentation.svg", 9));
     m_gizmos.emplace_back(new GLGizmoSimplify(m_parent, "cut.svg", 10));
 
     m_common_gizmos_data.reset(new CommonGizmosDataPool(&m_parent));