Get most of software names, id, description from the define.

src/CMakeLists.txt

@@ -92,7 +92,7 @@ endif()
 # Create a SuperSlicer executable
 # Process mainfests for various platforms.
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/SuperSlicer.rc.in ${CMAKE_CURRENT_BINARY_DIR}/SuperSlicer.rc @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/PrusaSlicer-gcodeviewer.rc.in ${CMAKE_CURRENT_BINARY_DIR}/PrusaSlicer-gcodeviewer.rc @ONLY)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/gcodeviewer.rc.in ${CMAKE_CURRENT_BINARY_DIR}/gcodeviewer.rc @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/msw/PrusaSlicer.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/SuperSlicer.manifest @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/osx/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY)
 if (WIN32)
@@ -148,35 +148,40 @@ if (WIN32)
     if (MINGW)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -municode")
     endif()
+
+	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libslic3r/libslic3r_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h @ONLY)
 
-    add_executable(SuperSlicer_app_gui WIN32 PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/SuperSlicer.rc)
+    add_executable(SuperSlicer_app_gui WIN32 PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/SuperSlicer.rc ${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h)
+	target_include_directories(SuperSlicer_app_gui PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
     # Generate debug symbols even in release mode.
     if(MSVC)
         target_link_options(SuperSlicer_app_gui PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
     endif()
     target_compile_definitions(SuperSlicer_app_gui PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE)
     add_dependencies(SuperSlicer_app_gui SuperSlicer)
-    set_target_properties(SuperSlicer_app_gui PROPERTIES OUTPUT_NAME "superslicer")
+    set_target_properties(SuperSlicer_app_gui PROPERTIES OUTPUT_NAME "@SLIC3R_APP_CMD@")
     target_link_libraries(SuperSlicer_app_gui PRIVATE boost_headeronly)
 
-    add_executable(SuperSlicer_app_console PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/SuperSlicer.rc)
+    add_executable(SuperSlicer_app_console PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/SuperSlicer.rc ${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h)
+	target_include_directories(SuperSlicer_app_console PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
     # Generate debug symbols even in release mode.
     if (MSVC)
         target_link_options(SuperSlicer_app_console PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
     endif ()
     target_compile_definitions(SuperSlicer_app_console PRIVATE -DSLIC3R_WRAPPER_CONSOLE)
     add_dependencies(SuperSlicer_app_console SuperSlicer)
-    set_target_properties(SuperSlicer_app_console PROPERTIES OUTPUT_NAME "superslicer_console")
+    set_target_properties(SuperSlicer_app_console PROPERTIES OUTPUT_NAME "@SLIC3R_APP_CMD@_console")
     target_link_libraries(SuperSlicer_app_console PRIVATE boost_headeronly)
 
-    add_executable(PrusaSlicer_app_gcodeviewer WIN32 PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/PrusaSlicer-gcodeviewer.rc)
+    add_executable(PrusaSlicer_app_gcodeviewer WIN32 PrusaSlicer_app_msvc.cpp ${CMAKE_CURRENT_BINARY_DIR}/gcodeviewer.rc ${CMAKE_CURRENT_BINARY_DIR}/libslic3r_version.h)
+	target_include_directories(PrusaSlicer_app_gcodeviewer PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
     # Generate debug symbols even in release mode.
     if (MSVC)
         target_link_options(PrusaSlicer_app_gcodeviewer PUBLIC "$<$<CONFIG:RELEASE>:/DEBUG>")
     endif ()
     target_compile_definitions(PrusaSlicer_app_gcodeviewer PRIVATE -DSLIC3R_WRAPPER_NOCONSOLE -DSLIC3R_WRAPPER_GCODEVIEWER)
     add_dependencies(PrusaSlicer_app_gcodeviewer SuperSlicer)
-    set_target_properties(PrusaSlicer_app_gcodeviewer PROPERTIES OUTPUT_NAME "prusa-gcodeviewer")
+    set_target_properties(PrusaSlicer_app_gcodeviewer PROPERTIES OUTPUT_NAME "@GCODEVIEWER_APP_CMD@")
     target_link_libraries(PrusaSlicer_app_gcodeviewer PRIVATE boost_headeronly)
 endif ()
 

src/PrusaSlicer.cpp

@@ -668,7 +668,7 @@ void CLI::print_help(bool include_print_options, PrinterTechnology printer_techn
         << " (without GUI support)"
 #endif /* SLIC3R_GUI */
         << std::endl
-        << "https://github.com/prusa3d/PrusaSlicer" << std::endl << std::endl
+        << "https://github.com/" << SLIC3R_GITHUB << std::endl << std::endl
         << "Usage: superslicer [ ACTIONS ] [ TRANSFORM ] [ OPTIONS ] [ file.stl ... ]" << std::endl
         << std::endl
         << "Actions:" << std::endl;

src/PrusaSlicer_app_msvc.cpp

@@ -6,6 +6,7 @@
 #include <Windows.h>
 #include <shellapi.h>
 #include <wchar.h>
+#include "libslic3r/libslic3r_version.h"
 
 
 
@@ -286,7 +287,7 @@ int wmain(int argc, wchar_t **argv)
 //    printf("Loading SuperSlicer library: %S\n", path_to_slic3r);
     HINSTANCE hInstance_Slic3r = LoadLibraryExW(path_to_slic3r, nullptr, 0);
     if (hInstance_Slic3r == nullptr) {
-        printf("SuperSlicer.dll was not loaded, error code: %d\n", GetLastError());
+        printf(SLIC3R_APP_NAME ".dll was not loaded, error code: %d\n", GetLastError());
         return -1;
     }
 

src/libslic3r/AppConfig.cpp

@@ -24,7 +24,7 @@ namespace Slic3r {
 
 static const std::string VENDOR_PREFIX = "vendor:";
 static const std::string MODEL_PREFIX = "model:";
-static const std::string VERSION_CHECK_URL = "https://api.github.com/repos/supermerill/superslicer/releases";
+static const std::string VERSION_CHECK_URL = "https://api.github.com/repos/" SLIC3R_GITHUB "/releases";
 
 const std::string AppConfig::SECTION_FILAMENTS = "filaments";
 const std::string AppConfig::SECTION_MATERIALS = "sla_materials";
@@ -208,7 +208,7 @@ std::string AppConfig::load()
         // we will rethrow this exception from the place of load() call, if returned value wouldn't be empty
         /*
         throw Slic3r::RuntimeError(
-        	_utf8(L("Error parsing SuperSlicer config file, it is probably corrupted. "
+        	_utf8(L("Error parsing " SLIC3R_APP_NAME " config file, it is probably corrupted. "
                     "Try to manually delete the file to recover from the error. Your user profiles will not be affected.")) + 
         	"\n\n" + AppConfig::config_path() + "\n\n" + ex.what());
         */

src/libslic3r/Config.cpp

@@ -722,7 +722,7 @@ void ConfigBase::load_from_gcode_file(const std::string &file)
             strncmp(slic3rpp_gcode_header, firstline.c_str(), strlen(slic3rpp_gcode_header)) != 0 &&
             strncmp(superslicer_gcode_header, firstline.c_str(), strlen(superslicer_gcode_header)) != 0 &&
             strncmp(prusaslicer_gcode_header, firstline.c_str(), strlen(prusaslicer_gcode_header)) != 0)
-			throw Slic3r::RuntimeError("Not a PrusaSlicer / SuperSlicer generated g-code.");
+			throw Slic3r::RuntimeError("Not a Slic3r / PrusaSlicer / SuperSlicer generated g-code.");
     }
     ifs.seekg(0, ifs.end);
 	auto file_length = ifs.tellg();

src/libslic3r/GCode/GCodeProcessor.cpp

@@ -863,7 +863,7 @@ void GCodeProcessor::process_file(const std::string& filename, bool apply_postpr
             }
         });
 
-        // if the gcode was produced by SuperSlicer,
+        // if the gcode was produced by this slicer,
         // extract the config from it
         try {
             if (m_producer == EProducer::PrusaSlicer || m_producer == EProducer::SuperSlicer || m_producer == EProducer::Slic3rPE || m_producer == EProducer::Slic3r) {

src/libslic3r/GCode/GCodeProcessor.hpp

@@ -435,7 +435,8 @@ namespace Slic3r {
         {
             Unknown,
             PrusaSlicer,
-            SuperSlicer,            Slic3rPE,
+            SuperSlicer,
+            Slic3rPE,
             Slic3r,
             Cura,
             Simplify3D,

src/libslic3r/PrintConfig.cpp

@@ -1932,7 +1932,7 @@ void PrintConfigDef::init_fff_params()
     def->category = OptionCategory::infill;
     def->tooltip = L("Connect an infill line to an internal perimeter with a short segment of an additional perimeter. "
                      "If expressed as percentage (example: 15%) it is calculated over infill extrusion width. "
-                     "PrusaSlicer tries to connect two close infill lines to a short perimeter segment. If no such perimeter segment "
+                     SLIC3R_APP_NAME " tries to connect two close infill lines to a short perimeter segment. If no such perimeter segment "
                      "shorter than infill_anchor_max is found, the infill line is connected to a perimeter segment at just one side "
                      "and the length of the perimeter segment taken is limited to this parameter, but no longer than anchor_length_max. "
                      "\nSet this parameter to zero to disable anchoring perimeters connected to a single infill line.");
@@ -1959,7 +1959,7 @@ void PrintConfigDef::init_fff_params()
     def->category    = def_infill_anchor_min->category;
     def->tooltip = L("Connect an infill line to an internal perimeter with a short segment of an additional perimeter. "
                      "If expressed as percentage (example: 15%) it is calculated over infill extrusion width. "
-                     "PrusaSlicer tries to connect two close infill lines to a short perimeter segment. If no such perimeter segment "
+                     SLIC3R_APP_NAME " tries to connect two close infill lines to a short perimeter segment. If no such perimeter segment "
                      "shorter than this parameter is found, the infill line is connected to a perimeter segment at just one side "
                      "and the length of the perimeter segment taken is limited to infill_anchor, but no longer than this parameter. "
                      "\nIf set to 0, the old algorithm for infill connection will be used, it should create the same result as with 1000 & 0.");
@@ -2903,7 +2903,7 @@ void PrintConfigDef::init_fff_params()
         "the slicing job and reducing memory usage. High-resolution models often carry "
         "more detail than printers can render. Set to zero to disable any simplification "
         "and use full resolution from input. "
-        "\nNote: SuperSlicer has an internal resolution of 0.000001mm."
+        "\nNote: " SLIC3R_APP_NAME " has an internal resolution of 0.000001mm."
         "\nInfill & Thin areas are simplified up to 0.0125mm.");
     def->sidetext = L("mm");
     def->min = 0;
@@ -5971,8 +5971,8 @@ CLIMiscConfigDef::CLIMiscConfigDef()
 
     def = this->add("single_instance", coBool);
     def->label = L("Single instance mode");
-    def->tooltip = L("If enabled, the command line arguments are sent to an existing instance of GUI PrusaSlicer, "
-                     "or an existing PrusaSlicer window is activated. "
+    def->tooltip = L("If enabled, the command line arguments are sent to an existing instance of GUI " SLIC3R_APP_NAME ", "
+                     "or an existing " SLIC3R_APP_NAME " window is activated. "
                      "Overrides the \"single_instance\" configuration value from application preferences.");
 
 /*

src/libslic3r/SlicingAdaptive.cpp

@@ -24,7 +24,7 @@ lerr2=1./(0.3+cos(a));
 plot(adeg, t, 'b', adeg, sqrt(t), 'g', adeg, 0.5 * lerr, 'm', adeg, 0.5 * lerr2, 'r')
 xlabel("angle(deg), 0 - horizontal wall, 90 - vertical wall");
 ylabel("layer height");
-legend("tan(a) as cura - topographic lines distance limit", "sqrt(tan(a)) as PrusaSlicer - error triangle area limit", "old slic3r - max distance metric", "new slic3r - Waserfall paper");
+legend("tan(a) as cura - topographic lines distance limit", "sqrt(tan(a)) as "+SLIC3R_APP_NAME+" - error triangle area limit", "old slic3r - max distance metric", "new slic3r - Waserfall paper");
 #endif
 
 #ifndef NDEBUG

src/libslic3r/libslic3r.h

@@ -2,9 +2,6 @@
 #define _libslic3r_h_
 
 #include "libslic3r_version.h"
-#define GCODEVIEWER_APP_NAME "PrusaSlicer G-code Viewer"
-#define GCODEVIEWER_APP_KEY  "PrusaSlicerGcodeViewer"
-#define GCODEVIEWER_BUILD_ID std::string("PrusaSlicer G-code Viewer-") + std::string(SLIC3R_VERSION) + std::string("-UNKNOWN")
 
 // this needs to be included early for MSVC (listing it in Build.PL is not enough)
 #include <memory>

src/libslic3r/libslic3r_version.h.in

@@ -2,9 +2,22 @@
 #define __SLIC3R_VERSION_H
 
 #define SLIC3R_APP_NAME "@SLIC3R_APP_NAME@"
+#define SLIC3R_APP_WNAME L"@SLIC3R_APP_NAME@"
 #define SLIC3R_APP_KEY "@SLIC3R_APP_KEY@"
+#define SLIC3R_APP_CMD "@SLIC3R_APP_CMD@"
+#define SLIC3R_APP_WCMD L"@SLIC3R_APP_CMD@"
 #define SLIC3R_VERSION "@SLIC3R_VERSION@"
 #define SLIC3R_VERSION_FULL "@SLIC3R_VERSION_FULL@"
 #define SLIC3R_BUILD_ID "@SLIC3R_BUILD_ID@"
 
+#define GCODEVIEWER_APP_NAME "@GCODEVIEWER_APP_NAME@"
+#define GCODEVIEWER_APP_KEY "@GCODEVIEWER_APP_KEY@"
+#define GCODEVIEWER_APP_CMD "@GCODEVIEWER_APP_CMD@"
+#define GCODEVIEWER_APP_WCMD L"@GCODEVIEWER_APP_CMD@"
+#define GCODEVIEWER_BUILD_ID GCODEVIEWER_APP_NAME "-" SLIC3R_VERSION "-UNKNOWN"
+
+#define SLIC3R_BASED_ON "@SLIC3R_BASED_ON@"
+#define SLIC3R_GITHUB "@SLIC3R_GITHUB@"
+#define SLIC3R_INTRO "@SLIC3R_INTRO@"
+
 #endif /* __SLIC3R_VERSION_H */

src/platform/msw/SuperSlicer.rc.in

@@ -21,5 +21,5 @@ PRODUCTVERSION @SLIC3R_RC_VERSION@
    VALUE "Translation", 0x409, 1252
  }
 }
-2 ICON "@SLIC3R_RESOURCES_DIR@/icons/slic3r.ico"
+2 ICON "@SLIC3R_RESOURCES_DIR@/icons/SuperSlicer.ico"
 1 24 "SuperSlicer.manifest" 

src/slic3r/GUI/AboutDialog.cpp

@@ -81,6 +81,8 @@ CopyrightsDialog::CopyrightsDialog()
 void CopyrightsDialog::fill_entries()
 {
     m_entries = {
+        { "Slic3r"          , "2021 Slic3r"                                 , "https://github.com/slic3r/slic3r" },
+        { "Prusaslicer"     , "2021 PrusaResearch"                          , "https://github.com/prusa3d/PrusaSlicer" },
         { "wxWidgets"       , "2019 wxWidgets"                              , "https://www.wxwidgets.org/" },
         { "OpenGL"          , "1997-2019 The Khronos Group Inc"            , "https://www.opengl.org/" },
         { "GNU gettext"     , "1998, 2019 Free Software Foundation, Inc."   , "https://www.gnu.org/software/gettext/" },
@@ -264,7 +266,7 @@ AboutDialog::AboutDialog()
         // TRN "Slic3r _is licensed under the_ License"
         const std::string is_lecensed_str = _utf8(L("is licensed under the"));
         const std::string license_str = _utf8(L("GNU Affero General Public License, version 3"));
-        const std::string based_on_str = _utf8(L("SuperSlicer is based on PrusaSlicer which is based on Slic3r by Alessandro Ranellucci and the RepRap community."));
+        const std::string based_on_str = _utf8(L(SLIC3R_INTRO));
         const std::string contributors_str = _utf8(L("Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr Ledvina, Joseph Lenox, Y. Sapir, Mike Sheldrake, Vojtech Bubnik, Durand Rémi and numerous others."));
         const auto text = from_u8(
             (boost::format(

src/slic3r/GUI/ConfigSnapshotDialog.cpp

@@ -48,7 +48,7 @@ static wxString generate_html_row(const Config::Snapshot &snapshot, bool row_eve
         text += " (" + wxString::FromUTF8(snapshot.comment.data()) + ")";
     text += "</b></font><br>";
     // End of row header.
-    text += _(L("SuperSlicer version")) + ": " + snapshot.slic3r_version_captured.to_string() + "<br>";
+    text += _(L(SLIC3R_APP_NAME " version")) + ": " + snapshot.slic3r_version_captured.to_string() + "<br>";
     bool has_fff = ! snapshot.print.empty() || ! snapshot.filaments.empty();
     bool has_sla = ! snapshot.sla_print.empty() || ! snapshot.sla_material.empty();
     if (has_fff || ! has_sla) {
@@ -64,9 +64,9 @@ static wxString generate_html_row(const Config::Snapshot &snapshot, bool row_eve
     bool compatible = true;
     for (const Config::Snapshot::VendorConfig &vc : snapshot.vendor_configs) {
         text += _(L("vendor")) + ": " + vc.name +", " + _(L("version")) + ": " + vc.version.config_version.to_string() + 
-				", " + _(L("min SuperSlicer version")) + ": " + vc.version.min_slic3r_version.to_string();
+				", " + _(L("min " SLIC3R_APP_NAME " version")) + ": " + vc.version.min_slic3r_version.to_string();
         if (vc.version.max_slic3r_version != Semver::inf())
-            text += ", " + _(L("max SuperSlicer version")) + ": " + vc.version.max_slic3r_version.to_string();
+            text += ", " + _(L("max " SLIC3R_APP_NAME " version")) + ": " + vc.version.max_slic3r_version.to_string();
         text += "<br>";
         for (const std::pair<std::string, std::set<std::string>> &model : vc.models_variants_installed) {
             text += _(L("model")) + ": " + model.first + ", " + _(L("variants")) + ": ";

src/slic3r/GUI/ConfigWizard.cpp

@@ -1199,8 +1199,8 @@ PageReloadFromDisk::PageReloadFromDisk(ConfigWizard* parent)
 PageFilesAssociation::PageFilesAssociation(ConfigWizard* parent)
     : ConfigWizardPage(parent, _L("Files association"), _L("Files association"))
 {
-    cb_3mf = new wxCheckBox(this, wxID_ANY, _L("Associate .3mf files to SuperSlicer"));
-    cb_stl = new wxCheckBox(this, wxID_ANY, _L("Associate .stl files to SuperSlicer"));
+    cb_3mf = new wxCheckBox(this, wxID_ANY, _L("Associate .3mf files to " SLIC3R_APP_NAME));
+    cb_stl = new wxCheckBox(this, wxID_ANY, _L("Associate .stl files to " SLIC3R_APP_NAME));
 //    cb_gcode = new wxCheckBox(this, wxID_ANY, _L("Associate .gcode files to PrusaSlicer G-code Viewer"));
 
     append(cb_3mf);
@@ -1213,7 +1213,7 @@ PageFilesAssociation::PageFilesAssociation(ConfigWizard* parent)
 PageMode::PageMode(ConfigWizard *parent)
     : ConfigWizardPage(parent, _L("View mode"), _L("View mode"))
 {
-    append_text(_L("SuperSlicer's user interfaces comes in three variants:\nSimple, Advanced, and Expert.\n"
+    append_text(_L(SLIC3R_APP_NAME "'s user interfaces comes in three variants:\nSimple, Advanced, and Expert.\n"
         "The Simple mode shows only the most frequently used settings relevant for regular 3D printing. "
         "The other two offer progressively more sophisticated fine-tuning, "
         "they are suitable for advanced and expert users, respectively."));