Merge branch 'master' into lm_tm_hollowing

5 files changed, 176 insertions, 2 deletions

diff --git a/resources/icons/export_to_sd.svg b/resources/icons/export_to_sd.svg
new file mode 100644
index 000000000..516cec435
--- /dev/null
+++ b/resources/icons/export_to_sd.svg
@@ -0,0 +1,168 @@
+<?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"
+   id="svg8"
+   version="1.1"
+   viewBox="0 0 3.7041666 3.7041667"
+   height="3.7041667mm"
+   width="3.7041667mm">
+  <defs
+     id="defs2">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3733">
+      <path
+         d="M 0,800 H 800 V 0 H 0 Z"
+         id="path3731" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4697">
+      <path
+         d="M 0,800 H 800 V 0 H 0 Z"
+         id="path4695" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4697-9">
+      <path
+         d="M 0,800 H 800 V 0 H 0 Z"
+         id="path4695-2" />
+    </clipPath>
+  </defs>
+  <metadata
+     id="metadata5">
+    <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>
+  <g
+     transform="translate(294.04601,-97.736694)"
+     id="layer1">
+    <g
+       transform="translate(-265.33929,12.851203)"
+       id="layer1-0">
+      <g
+         transform="matrix(1.31769,0,0,1.31769,-167.28747,-111.35623)"
+         id="layer1-3">
+        <g
+           id="g4685"
+           transform="matrix(0.00352778,0,0,-0.00352778,105.26858,151.76571)">
+          <path
+             d="M 381.663,302.607 H 558.791 V 65.846 H 381.663 Z"
+             style="fill:#d8d8db;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path4687" />
+          <path
+             d="m 470.227,302.607 h 95.411 V 65.846 h -95.411 z"
+             style="fill:#f7f7f8;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path4689" />
+          <g
+             id="g4691">
+            <g
+               id="g4693"
+               clip-path="url(#clipPath4697-9)">
+              <g
+                 id="g4699"
+                 transform="translate(380.7793,225.1963)">
+                <path
+                   d="m 0,0 h 174.037 c 39.032,0 70.675,31.643 70.675,70.675 v 372.92 c 0,39.033 -31.643,70.675 -70.675,70.675 H 0 c -39.033,0 -70.675,-31.642 -70.675,-70.675 V 70.675 C -70.675,31.643 -39.033,0 0,0"
+                   style="fill:#e96700;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path4701" />
+              </g>
+              <g
+                 id="g4703"
+                 transform="translate(377.0244,168.7666)">
+                <path
+                   d="m 0,0 h -237.865 c -8.782,0 -15.902,7.12 -15.902,15.902 v 365.743 c 0,8.782 7.12,15.901 15.902,15.901 H 28.933 c 8.782,0 15.902,-7.119 15.902,-15.901 V 56.43 C 38.907,48.507 9.055,8.503 0,0"
+                   style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path4705" />
+              </g>
+              <g
+                 id="g4707"
+                 transform="translate(421.8594,225.1963)">
+                <path
+                   d="M 0,0 C -7.399,-10.049 -35.78,-47.927 -44.835,-56.43 H -282.7"
+                   style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path4709" />
+              </g>
+              <g
+                 id="g4711"
+                 transform="translate(421.8594,225.1963)">
+                <path
+                   d="M 0,0 C -5.876,-7.899 -35.78,-47.927 -44.835,-56.43"
+                   style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path4713" />
+              </g>
+              <g
+                 id="g4715"
+                 transform="translate(333.957,198.1406)">
+                <path
+                   d="m 0,0 h -22.969 c -2.196,0 -3.976,1.78 -3.976,3.976 v 81.276 c 0,2.195 1.78,3.976 3.976,3.976 H 0 c 2.196,0 3.976,-1.781 3.976,-3.976 V 3.976 C 3.976,1.78 2.196,0 0,0"
+                   style="fill:#efee86;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path4717" />
+              </g>
+              <g
+                 id="g4719"
+                 transform="translate(297.957,198.1406)">
+                <path
+                   d="m 0,0 h -22.969 c -2.196,0 -3.976,1.78 -3.976,3.976 v 81.276 c 0,2.195 1.78,3.976 3.976,3.976 H 0 c 2.196,0 3.976,-1.781 3.976,-3.976 V 3.976 C 3.976,1.78 2.196,0 0,0"
+                   style="fill:#efee86;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path4721" />
+              </g>
+              <g
+                 id="g4723"
+                 transform="translate(261.957,198.1406)">
+                <path
+                   d="m 0,0 h -22.969 c -2.196,0 -3.976,1.78 -3.976,3.976 v 81.276 c 0,2.195 1.78,3.976 3.976,3.976 H 0 c 2.196,0 3.976,-1.781 3.976,-3.976 V 3.976 C 3.976,1.78 2.196,0 0,0"
+                   style="fill:#efee86;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path4725" />
+              </g>
+              <g
+                 id="g4727"
+                 transform="translate(225.957,198.1406)">
+                <path
+                   d="m 0,0 h -22.969 c -2.196,0 -3.976,1.78 -3.976,3.976 v 81.276 c 0,2.195 1.78,3.976 3.976,3.976 H 0 c 2.196,0 3.976,-1.781 3.976,-3.976 V 3.976 C 3.976,1.78 2.196,0 0,0"
+                   style="fill:#efee86;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path4729" />
+              </g>
+              <g
+                 id="g4731"
+                 transform="translate(189.957,198.1406)">
+                <path
+                   d="m 0,0 h -22.969 c -2.196,0 -3.976,1.78 -3.976,3.976 v 81.276 c 0,2.195 1.78,3.976 3.976,3.976 H 0 c 2.196,0 3.976,-1.781 3.976,-3.976 V 3.976 C 3.976,1.78 2.196,0 0,0"
+                   style="fill:#efee86;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path4733" />
+              </g>
+              <g
+                 id="g4735"
+                 transform="translate(369.2207,225.1963)">
+                <path
+                   d="m 0,0 h -22.969 c -2.196,0 -3.976,1.78 -3.976,3.976 v 54.22 c 0,2.196 1.78,3.976 3.976,3.976 H 0 c 2.196,0 3.976,-1.78 3.976,-3.976 V 3.976 C 3.976,1.78 2.196,0 0,0"
+                   style="fill:#efee86;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path4737" />
+              </g>
+              <path
+                 d="m 450.019,104.056 h -50.577 v 33.128 h 50.577 z"
+                 style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path4739" />
+              <path
+                 d="m 543.221,104.056 h -50.576 v 33.128 h 50.576 z"
+                 style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                 id="path4741" />
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/resources/localization/PrusaSlicer.pot b/resources/localization/PrusaSlicer.pot
index c5bcaa3bd..77539a7a3 100644
--- a/resources/localization/PrusaSlicer.pot
+++ b/resources/localization/PrusaSlicer.pot
@@ -4914,7 +4914,7 @@ msgid "Cannot overwrite an external profile."
 msgstr ""
 
 #: src/slic3r/GUI/Tab.cpp:3038
-msgid "Preset with name \"%1%\" already exist."
+msgid "Preset with name \"%1%\" already exists."
 msgstr ""
 
 #: src/slic3r/GUI/Tab.cpp:3039
diff --git a/resources/localization/list.txt b/resources/localization/list.txt
index 93ee2f441..fc33097df 100644
--- a/resources/localization/list.txt
+++ b/resources/localization/list.txt
@@ -46,6 +46,7 @@ src/slic3r/GUI/Tab.hpp
 src/slic3r/GUI/UpdateDialogs.cpp
 src/slic3r/GUI/WipeTowerDialog.cpp
 src/slic3r/GUI/wxExtensions.cpp
+src/slic3r/GUI/DoubleSlider.cpp
 src/slic3r/GUI/ExtruderSequenceDialog.cpp
 src/slic3r/Utils/Duet.cpp
 src/slic3r/Utils/OctoPrint.cpp
diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx
index c451bb8bf..9ac22c59d 100644
--- a/resources/profiles/PrusaResearch.idx
+++ b/resources/profiles/PrusaResearch.idx
@@ -1,3 +1,8 @@
+min_slic3r_version = 2.2.0-alpha3
+1.1.1-alpha3 Print bed textures are now configurable from the Preset Bundle. Requires PrusaSlicer 2.2.0-alpha3 and newer.
+# The following line (max_slic3r_version) forces the users of PrusaSlicer 2.2.0-alpha3 and newer to update the profiles to 1.1.1-alpha3 and newer,
+# so they will see the print bed.
+max_slic3r_version = 2.2.0-alpha2
 min_slic3r_version = 2.2.0-alpha0
 1.1.1-alpha2 Bumped up config version, so our in house customer will get updated profiles.
 1.1.0 Filament aliases, Creality profiles and other goodies for PrusaSlicer 2.2.0-alpha0
diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini
index 4f5c0482b..aa4b7cff0 100644
--- a/resources/profiles/PrusaResearch.ini
+++ b/resources/profiles/PrusaResearch.ini
@@ -5,7 +5,7 @@
 name = Prusa Research

 # Configuration version of this file. Config file will only be installed, if the config_version differs.

 # This means, the server may force the PrusaSlicer configuration to be downgraded.

-config_version = 1.1.1-alpha2

+config_version = 1.1.1-alpha3

 # Where to get the updates from?

 config_update_url = http://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/

 changelog_url = http://files.prusa3d.com/?latest=slicer-profiles&lng=%1%