Merge remote-tracking branch 'origin/master' into ys_menuicons

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 ### Version
-_Version of Slic3r Prusa Edition used goes here_
+_Version of PrusaSlicer used goes here_
 
-_Use `About->About Slic3r` for release versions_
+_Use `About->About PrusaSlicer` for release versions_
 
 _For -dev versions, use `git describe --tag` or get the hash value for the version you downloaded or `git rev-parse HEAD`_
 
@@ -18,9 +18,9 @@ _What 3D printer brand / version are you printing on, is it a stock model or did
   * _If this is a command-line slicing issue, include the options used_
 * _Expected Results_
 * _Actual Results_
-  * _Screenshots from __*Slic3r*__ preview are preferred_
+  * _Screenshots from __*PrusaSlicer*__ preview are preferred_
 
 _Is this a new feature request?_
 
 #### Project File (.3MF) where problem occurs
-_Upload a Slic3r PE Project File (.3MF) (`Plater -> Export plate as 3MF` for Slic3r PE 1.41.2 and older, `File -> Save` / `Save Project` for Slic3r PE 1.42.0-alpha and newer)_
+_Upload a PrusaSlicer Project File (.3MF) (`Plater -> Export plate as 3MF` for Slic3r PE 1.41.2 and older, `File -> Save` / `Save Project` for PrusaSlicer, Slic3r PE 1.42.0-alpha and newer)_

CMakeLists.txt

@@ -331,7 +331,7 @@ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
 add_custom_target(pot
     COMMAND xgettext --keyword=L --add-comments=TRN --from-code=UTF-8 --debug
         -f "${L10N_DIR}/list.txt"
-        -o "${L10N_DIR}/Slic3rPE.pot"
+        -o "${L10N_DIR}/PrusaSlicer.pot"
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
     COMMENT "Generate pot file from strings in the source tree"
 )

README.md

@@ -1,16 +1,18 @@
 
-![Slic3rPE logo](/resources/icons/Slic3r.png?raw=true)
+![PrusaSlicer logo](/resources/icons/PrusaSlicer.png?raw=true)
 
-# Slic3r Prusa Edition
+# PrusaSlicer
 
-Prebuilt Windows, OSX and Linux binaries are available through the [git releases page](https://github.com/prusa3d/Slic3r/releases).
+Prebuilt Windows, OSX and Linux binaries are available through the [git releases page](https://github.com/prusa3d/PrusaSlicer/releases).
 
-Slic3r takes 3D models (STL, OBJ, AMF) and converts them into G-code
+PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code
 instructions for FFF printers or PNG layers for mSLA 3D printers. It's
 compatible with any modern printer based on the RepRap toolchain, including all
 those based on the Marlin, Prusa, Sprinter and Repetier firmware. It also works
 with Mach3, LinuxCNC and Machinekit controllers.
 
+PrusaSlicer is based on [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranelucci and the RepRap community.
+
 See the [project homepage](https://www.prusa3d.com/slic3r-prusa-edition/) and
 the [documentation directory](doc/) for more information.
 
@@ -18,12 +20,12 @@ the [documentation directory](doc/) for more information.
 
 All user facing code is written in C++, and some legacy code as well as unit
 tests are written in Perl. Perl is not required for either development or use
-of Slic3r.
+of PrusaSlicer.
 
 The slicing core is the `libslic3r` library, which can be built and used in a standalone way.
 The command line interface is a thin wrapper over `libslic3r`.
 
-### What are Slic3r's main features?
+### What are PrusaSlicer's main features?
 
 Key features are:
 
@@ -46,7 +48,7 @@ Other major features are:
 * several infill patterns including honeycomb, spirals, Hilbert curves
 * support material, raft, brim, skirt
 * **standby temperature** and automatic wiping for multi-extruder printing
-* [customizable **G-code macros**](https://github.com/prusa3d/Slic3r/wiki/Slic3r-Prusa-Edition-Macro-Language) and output filename with variable placeholders
+* [customizable **G-code macros**](https://github.com/prusa3d/PrusaSlicer/wiki/Slic3r-Prusa-Edition-Macro-Language) and output filename with variable placeholders
 * support for **post-processing scripts**
 * **cooling logic** controlling fan speed and dynamic print speed
 
@@ -61,18 +63,14 @@ these documentation pages:
 ### Can I help?
 
 Sure! You can do the following to find things that are available to help with:
-* Add an [issue](https://github.com/prusa3d/Slic3r/issues) to the github tracker if it isn't already present.
-* Look at [issues labeled "volunteer needed"](https://github.com/prusa3d/Slic3r/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3A%22volunteer+needed%22)
+* Add an [issue](https://github.com/prusa3d/PrusaSlicer/issues) to the github tracker if it isn't already present.
+* Look at [issues labeled "volunteer needed"](https://github.com/prusa3d/PrusaSlicer/issues?utf8=%E2%9C%93&q=is%3Aopen+is%3Aissue+label%3A%22volunteer+needed%22)
 
-### What's Slic3r license?
+### What's PrusaSlicer license?
 
-Slic3r PE is licensed under the _GNU Affero General Public License, version 3_.
-The Prusa Edition is originally based on Slic3r by Alessandro Ranellucci.
+PrusaSlicer is licensed under the _GNU Affero General Public License, version 3_.
+The PrusaSlicer is originally based on Slic3r by Alessandro Ranellucci.
 
-The [Silk icon set](http://www.famfamfam.com/lab/icons/silk/) used in Slic3r is
-licensed under the _Creative Commons Attribution 3.0 License_.
-The author of the Silk icon set is Mark James.
+### How can I use PrusaSlicer from the command line?
 
-### How can I use Slic3r PE from the command line?
-
-Please refer to the [Command Line Interface](https://github.com/prusa3d/Slic3r/wiki/Command-Line-Interface) wiki page.
+Please refer to the [Command Line Interface](https://github.com/prusa3d/PrusaSlicer/wiki/Command-Line-Interface) wiki page.

doc/How to build - Linux et al.md

@@ -1,13 +1,13 @@
 
-# Building Slic3r PE on UNIX/Linux
+# Building PrusaSlicer on UNIX/Linux
 
-Slic3r PE uses the CMake build system and requires several dependencies.
+PrusaSlicer uses the CMake build system and requires several dependencies.
 The dependencies can be listed in `deps/deps-linux.cmake`, although they don't necessarily need to be as recent
 as the versions listed - generally versions available on conservative Linux distros such as Debian stable or CentOS should suffice.
 
 Perl is not required any more.
 
-In a typical situation, one would open a command line, go to the Slic3r sources, create a directory called `build` or similar,
+In a typical situation, one would open a command line, go to the PrusaSlicer sources, create a directory called `build` or similar,
 `cd` into it and call:
 
     cmake ..
@@ -19,13 +19,13 @@ Additional CMake flags may be applicable as explained below.
 
 ### Dependency resolution
 
-By default Slic3r looks for dependencies the default way CMake looks for them, i.e. in default system locations.
-On Linux this will typically make Slic3r depend on dynamically loaded libraries from the system, however, Slic3r can be told
+By default PrusaSlicer looks for dependencies the default way CMake looks for them, i.e. in default system locations.
+On Linux this will typically make PrusaSlicer depend on dynamically loaded libraries from the system, however, PrusaSlicer can be told
 to specifically look for static libraries with the `SLIC3R_STATIC` flag passed to cmake:
 
     cmake .. -DSLIC3R_STATIC=1
 
-Additionally, Slic3r can be built in a static manner mostly independent of the system libraries with a dependencies bundle
+Additionally, PrusaSlicer can be built in a static manner mostly independent of the system libraries with a dependencies bundle
 created using CMake script in the `deps` directory (these are not interconnected with the rest of the CMake scripts).
 
 Note: We say _mostly independent_ because it's still expected the system will provide some transitive dependencies, such as GTK for wxWidgets.
@@ -37,7 +37,7 @@ To do this, go to the `deps` directory, create a `build` subdirectory (or the li
 where the target destdir is a directory of your choosing where the dependencies will be installed.
 You can also omit the `DESTDIR` option to use the default, in that case the `destdir` will be created inside the `build` directory where `cmake` is run.
 
-To pass the destdir path to the top-level Slic3r CMake script, use the `CMAKE_PREFIX_PATH` option along with turning on `SLIC3R_STATIC`:
+To pass the destdir path to the top-level PrusaSlicer CMake script, use the `CMAKE_PREFIX_PATH` option along with turning on `SLIC3R_STATIC`:
 
     cmake .. -DSLIC3R_STATIC=1 -DCMAKE_PREFIX_PATH=<path to destdir>/usr/local
 
@@ -48,24 +48,24 @@ This is because wxWidgets hardcode the installation path.
 
 ### wxWidgets version
 
-By default, Slic3r PE looks for wxWidgets 3.1, this is because the 3.1 version has
+By default, PrusaSlicer looks for wxWidgets 3.1, this is because the 3.1 version has
 a number of bugfixes and improvements not found in 3.0. However, it can also be built with wxWidgets 3.0.
 This is done by passing this option to CMake:
 
     -DSLIC3R_WX_STABLE=1
 
-Note that Slic3r PE is tested with wxWidgets 3.0 somewhat sporadically and so there may be bugs in bleeding edge releases.
+Note that PrusaSlicer is tested with wxWidgets 3.0 somewhat sporadically and so there may be bugs in bleeding edge releases.
 
 ### Build variant
 
-By default Slic3r builds the release variant.
+By default PrusaSlicer builds the release variant.
 To create a debug build, use the following CMake flag:
 
     -DCMAKE_BUILD_TYPE=Debug
 
 ### Enabling address sanitizer
 
-If you're using GCC/Clang compiler, it is possible to build Slic3r with the built-in address sanitizer enabled to help detect memory-corruption issues.
+If you're using GCC/Clang compiler, it is possible to build PrusaSlicer with the built-in address sanitizer enabled to help detect memory-corruption issues.
 To enable it, simply use the following CMake flag:
 
     -DSLIC3R_ASAN=1
@@ -74,12 +74,12 @@ This requires GCC>4.8 or Clang>3.1.
 
 ### Installation
 
-At runtime, Slic3r needs a way to access its resource files. By default, it looks for a `resources` directory relative to its binary.
+At runtime, PrusaSlicer needs a way to access its resource files. By default, it looks for a `resources` directory relative to its binary.
 
-If you instead want Slic3r installed in a structure according to the File System Hierarchy Standard, use the `SLIC3R_FHS` flag
+If you instead want PrusaSlicer installed in a structure according to the File System Hierarchy Standard, use the `SLIC3R_FHS` flag
 
     cmake .. -DSLIC3R_FHS=1
 
-This will make Slic3r look for a fixed-location `share/slic3r-prusa3d` directory instead (note that the location becomes hardcoded).
+This will make PrusaSlicer look for a fixed-location `share/slic3r-prusa3d` directory instead (note that the location becomes hardcoded).
 
-You can then use the `make install` target to install Slic3r.
+You can then use the `make install` target to install PrusaSlicer.

doc/How to build - Mac OS.md

@@ -1,12 +1,12 @@
 
-# Building Slic3r PE on Mac OS
+# Building PrusaSlicer on Mac OS
 
-To build Slic3r PE on Mac OS, you will need to install XCode, [CMake](https://cmake.org/) (available on Brew) and possibly git.
+To build PrusaSlicer on Mac OS, you will need to install XCode, [CMake](https://cmake.org/) (available on Brew) and possibly git.
 
 ### Dependencies
 
-Slic3r comes with a set of CMake scripts to build its dependencies, it lives in the `deps` directory.
-Open a terminal window and navigate to Slic3r sources directory and then to `deps`.
+PrusaSlicer comes with a set of CMake scripts to build its dependencies, it lives in the `deps` directory.
+Open a terminal window and navigate to PrusaSlicer sources directory and then to `deps`.
 Use the following commands to build the dependencies:
 
     mkdir build
@@ -21,10 +21,10 @@ You can also customize the bundle output path using the `-DDESTDIR=<some path>`
 (This is because wxWidgets hardcodes the installation path.)
 
 
-### Building Slic3r
+### Building PrusaSlicer
 
-If dependencies are built without errors, you can proceed to build Slic3r itself.
-Go back to top level Slic3r sources directory and use these commands:
+If dependencies are built without errors, you can proceed to build PrusaSlicer itself.
+Go back to top level PrusaSlicer sources directory and use these commands:
 
     mkdir build
     cd build
@@ -33,7 +33,7 @@ Go back to top level Slic3r sources directory and use these commands:
 The `CMAKE_PREFIX_PATH` is the path to the dependencies bundle but with `/usr/local` appended - if you set a custom path
 using the `DESTDIR` option, you will need to change this accordingly. **Warning:** the `CMAKE_PREFIX_PATH` needs to be an absolute path.
 
-The CMake command above prepares Slic3r for building from the command line.
+The CMake command above prepares PrusaSlicer for building from the command line.
 To start the build, use
 
     make -jN
@@ -49,7 +49,7 @@ This should open up XCode where you can perform build using the GUI or perform o
 
 ### Note on Mac OS X SDKs
 
-By default Slic3r builds against whichever SDK is the default on the current system.
+By default PrusaSlicer builds against whichever SDK is the default on the current system.
 
 This can be customized. The `CMAKE_OSX_SYSROOT` option sets the path to the SDK directory location
 and the `CMAKE_OSX_DEPLOYMENT_TARGET` option sets the target OS X system version (eg. `10.14` or similar).
@@ -58,9 +58,9 @@ In case you set both, the two settings need to agree with each other. (Building
 is currently unsupported because some of the dependencies don't support this, most notably wxWidgets.)
 
 Please note that the `CMAKE_OSX_DEPLOYMENT_TARGET` and `CMAKE_OSX_SYSROOT` options need to be set the same
-on both the dependencies bundle as well as Slic3r PE itself.
+on both the dependencies bundle as well as PrusaSlicer itself.
 
-Official Mac Slic3r builds are currently built against SDK 10.9 to ensure compatibility with older Macs.
+Official Mac PrusaSlicer builds are currently built against SDK 10.9 to ensure compatibility with older Macs.
 
 _Warning:_ XCode may be set such that it rejects SDKs bellow some version (silently, more or less).
 This is set in the property list file

doc/How to build - Windows.md

@@ -1,7 +1,7 @@
 
-# Building Slic3r PE on Microsoft Windows
+# Building PrusaSlicer on Microsoft Windows
 
-The currently supported way of building Slic3r PE on Windows is with CMake and MS Visual Studio 2013.
+The currently supported way of building PrusaSlicer on Windows is with CMake and MS Visual Studio 2013.
 You can use the free [Visual Studio 2013 Community Edition](https://www.visualstudio.com/vs/older-downloads/).
 CMake installer can be downloaded from [the official website](https://cmake.org/download/).
 
@@ -11,7 +11,7 @@ _Note:_ Thanks to [**@supermerill**](https://github.com/supermerill) for testing
 
 ### Dependencies
 
-On Windows Slic3r is built against statically built libraries.
+On Windows PrusaSlicer is built against statically built libraries.
 We provide a prebuilt package of all the needed dependencies. This package only works on Visual Studio 2013, so if you are using a newer version of Visual Studio, you need to compile the dependencies yourself as per [below](#building-the-dependencies-package-yourself).
 The package comes in a several variants:
 
@@ -26,14 +26,14 @@ If you're unsure where to unpack the package, unpack it into `C:\local\` (but it
 
 Alternatively you can also compile the dependencies yourself, see below.
 
-### Building Slic3r PE with Visual Studio
+### Building PrusaSlicer with Visual Studio
 
-First obtain the Slic3r PE sources via either git or by extracting the source archive.
+First obtain the PrusaSlicer sources via either git or by extracting the source archive.
 
 Then you will need to note down the so-called 'prefix path' to the dependencies, this is the location of the dependencies packages + `\usr\local` appended.
 For example on 64 bits this would be `C:\local\destdir-64\usr\local`. The prefix path will need to be passed to CMake.
 
-When ready, open the relevant Visual Studio command line and `cd` into the directory with Slic3r sources.
+When ready, open the relevant Visual Studio command line and `cd` into the directory with PrusaSlicer sources.
 Use these commands to prepare Visual Studio solution file:
 
     mkdir build
@@ -51,9 +51,9 @@ Note that you won't be able to build a _Debug_ variant against a _Release_-only
 
 #### Installing using the `INSTALL` project
 
-Slic3r PE can be run from the Visual Studio or from Visual Studio's build directory (`src\Release` or `src\Debug`),
+PrusaSlicer can be run from the Visual Studio or from Visual Studio's build directory (`src\Release` or `src\Debug`),
 but for longer-term usage you might want to install somewhere using the `INSTALL` project.
-By default, this installs into `C:\Program Files\Slic3r`.
+By default, this installs into `C:\Program Files\PrusaSlicer`.
 To customize the install path, use the `-DCMAKE_INSTALL_PREFIX=<path of your choice>` when invoking `cmake`.
 
 ### Building from the command line
@@ -75,10 +75,10 @@ To install, use `msbuild /P:Configuration=Release INSTALL.vcxproj` , `ninja inst
 
 ### Building the dependencies package yourself
 
-The dependencies package is built using CMake scripts inside the `deps` subdirectory of Slic3r PE sources.
+The dependencies package is built using CMake scripts inside the `deps` subdirectory of PrusaSlicer sources.
 (This is intentionally not interconnected with the CMake scripts in the rest of the sources.)
 
-Open the preferred Visual Studio command line (64 or 32 bit variant) and `cd` into the directory with Slic3r sources.
+Open the preferred Visual Studio command line (64 or 32 bit variant) and `cd` into the directory with PrusaSlicer sources.
 Then `cd` into the `deps` directory and use these commands to build:
 
     mkdir build

doc/Localization_guide.md

@@ -1,6 +1,6 @@
 # Localization and translation guide
 
-The purpose of this guide is to describe how to contribute to the Slic3rPE translations. We use GNUgettext for extracting string resources from the project and PoEdit for editing translations.
+The purpose of this guide is to describe how to contribute to the PrusaSlicer translations. We use GNUgettext for extracting string resources from the project and PoEdit for editing translations.
 
 Those can be downloaded here: 
 -    https://sourceforge.net/directory/os:windows/?q=gnu+gettext GNUgettext package contains a set of tools to extract strings from the source code and to create the translation Catalog.
@@ -13,40 +13,40 @@ Full manual for GNUgettext can be seen here: http://www.gnu.org/software/gettext
 
 ### Scenario 1. How do I add a translation or fix an existing translation
 1. Get PO-file from corresponding folder here:
-https://github.com/prusa3d/Slic3r/tree/master/resources/localization
+https://github.com/prusa3d/PrusaSlicer/tree/master/resources/localization
 2. Open this file in PoEdit as "Edit a translation"
 3. Apply your corrections to the translation
-4. Push changed Slic3rPE.po and Slic3rPE.mo (will create automatically after saving of Slic3r.po in PoEdit) back to to the enter folder.
+4. Push changed PrusaSlicer.po and PrusaSlicer.mo (will create automatically after saving of PrusaSlicer.po in PoEdit) back to to the enter folder.
 
 ### Scenario 2. How do I add a new language support
-1. Get file Slic3rPE.pot here :
-https://github.com/prusa3d/Slic3r/tree/master/resources/localization
+1. Get file PrusaSlicer.pot here :
+https://github.com/prusa3d/PrusaSlicer/tree/master/resources/localization
 2. Open it in PoEdit for "Create new translation"
 3. Select Translation Language (for example French).
 4. As a result you will have fr.po - the file containing translation to French.
 Notice. When the translation is complete you need to:
-    - Rename the file to Slic3rPE.po
-    - Click "Save file" button. Slic3rPE.mo will be created immediately
-    - Both Slic3rPE.po and Slic3rPE.mo have to be saved here:
-https://github.com/prusa3d/Slic3r/tree/master/resources/localization/fr
+    - Rename the file to PrusaSlicer.po
+    - Click "Save file" button. PrusaSlicer.mo will be created immediately
+    - Both PrusaSlicer.po and PrusaSlicer.mo have to be saved here:
+https://github.com/prusa3d/PrusaSlicer/tree/master/resources/localization/fr
 ( name of folder "fr" means "French" - the translation language). 
 
-### Scenario 3. How do I add a new text resource when implementing a feature to Slic3rPE
-Each string resource in Slic3rPE available for translation needs to be explicitly marked using L() macro like this:
+### Scenario 3. How do I add a new text resource when implementing a feature to PrusaSlicer
+Each string resource in PrusaSlicer available for translation needs to be explicitly marked using L() macro like this:
 ```C++
 auto msg = L("This message to be localized")
 ```
 To get translated text use one of needed macro/function (`_(s)` or `_CHB(s)` ).
 If you add new file resource, add it to the list of files containing macro `L()`
 
-### Scenario 4. How do I use GNUgettext to localize my own application taking Slic3rPE as an example
+### Scenario 4. How do I use GNUgettext to localize my own application taking PrusaSlicer as an example
 
 1.  For convenience create a list of files with this macro `L(s)`. We have 
-https://github.com/prusa3d/Slic3r/tree/master/resources/localization/list.txt.
+https://github.com/prusa3d/PrusaSlicer/tree/master/resources/localization/list.txt.
 
 2.  Create template file(*.POT) with GNUgettext command:
     ```
-        xgettext --keyword=L --add-comments=TRN --from-code=UTF-8 --debug -o Slic3rPE.pot -f list.txt
+        xgettext --keyword=L --add-comments=TRN --from-code=UTF-8 --debug -o PrusaSlicer.pot -f list.txt
     ```
 
     Use flag `--from-code=UTF-8` to specify that the source strings are in UTF-8 encoding