From 9c8dcf3faef951a768899e2e75131fdc6a422c38 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Fri, 7 Feb 2020 18:49:39 +0100
Subject: [PATCH] Updated mode icons

---
 resources/icons/mode_advanced.svg | 13 +++++++++++++
 resources/icons/mode_expert.svg   | 13 +++++++++++++
 resources/icons/mode_simple.svg   | 13 +++++++++++++
 src/slic3r/GUI/Tab.cpp            |  6 +++---
 src/slic3r/GUI/wxExtensions.cpp   |  6 +++---
 5 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 resources/icons/mode_advanced.svg
 create mode 100644 resources/icons/mode_expert.svg
 create mode 100644 resources/icons/mode_simple.svg

diff --git a/resources/icons/mode_advanced.svg b/resources/icons/mode_advanced.svg
new file mode 100644
index 000000000..79f68f5b9
--- /dev/null
+++ b/resources/icons/mode_advanced.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.3, 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 id="hex_x5F_yellow">
+	<g>
+		<polygon fill="#FFDC00" points="8,1 2,5 2,7 2,11 8,15 14,11 14,7 14,5 		"/>
+	</g>
+	<g>
+		<path fill="#FFD200" d="M8,1L2.94,4.38c4.13,1.04,7.4,4.21,8.58,8.28L14,11V7V5L8,1z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/mode_expert.svg b/resources/icons/mode_expert.svg
new file mode 100644
index 000000000..aaa6d0e4d
--- /dev/null
+++ b/resources/icons/mode_expert.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.3, 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 id="hex_x5F_red">
+	<g>
+		<polygon fill="#E70000" points="8,1 2,5 2,7 2,11 8,15 14,11 14,7 14,5 		"/>
+	</g>
+	<g>
+		<path fill="#D30000" d="M8,1L2.94,4.38c4.13,1.04,7.4,4.21,8.58,8.28L14,11V7V5L8,1z"/>
+	</g>
+</g>
+</svg>
diff --git a/resources/icons/mode_simple.svg b/resources/icons/mode_simple.svg
new file mode 100644
index 000000000..b94b7112c
--- /dev/null
+++ b/resources/icons/mode_simple.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.3, 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 id="hex_x5F_green">
+	<g>
+		<polygon fill="#7DF028" points="8,1 2,5 2,7 2,11 8,15 14,11 14,7 14,5 		"/>
+	</g>
+	<g>
+		<path fill="#7DDC28" d="M8,1L2.94,4.38c4.13,1.04,7.4,4.21,8.58,8.28L14,11V7V5L8,1z"/>
+	</g>
+</g>
+</svg>
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 5a41f12a5..5f17955d4 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -257,9 +257,9 @@ void Tab::create_preset_tab()
 
     // Fill cache for mode bitmaps
     m_mode_bitmap_cache.reserve(3);
-    m_mode_bitmap_cache.push_back(ScalableBitmap(this, "mode_simple_.png"));
-    m_mode_bitmap_cache.push_back(ScalableBitmap(this, "mode_advanced_.png"));
-    m_mode_bitmap_cache.push_back(ScalableBitmap(this, "mode_expert_.png"));
+    m_mode_bitmap_cache.push_back(ScalableBitmap(this, "mode_simple"));
+    m_mode_bitmap_cache.push_back(ScalableBitmap(this, "mode_advanced"));
+    m_mode_bitmap_cache.push_back(ScalableBitmap(this, "mode_expert"));
 
     // Initialize the DynamicPrintConfig by default keys/values.
     build();
diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp
index f814c11df..7e9ec86f9 100644
--- a/src/slic3r/GUI/wxExtensions.cpp
+++ b/src/slic3r/GUI/wxExtensions.cpp
@@ -727,9 +727,9 @@ ModeSizer::ModeSizer(wxWindow *parent, int hgap/* = 0*/) :
     SetFlexibleDirection(wxHORIZONTAL);
 
     std::vector < std::pair < wxString, std::string >> buttons = {
-        {_(L("Simple")),    "mode_simple_sq.png"},
-        {_(L("Advanced")),  "mode_advanced_sq.png"},
-        {_(L("Expert")),    "mode_expert_sq.png"}
+        {_(L("Simple")),    "mode_simple"},
+        {_(L("Advanced")),  "mode_advanced"},
+        {_(L("Expert")),    "mode_expert"},
     };
 
     auto modebtnfn = [](wxCommandEvent &event, int mode_id) {