From 3704ea1fb2cd24e62179c49f88765296f8a671ff Mon Sep 17 00:00:00 2001 From: supermerill Date: Fri, 4 Jan 2019 20:54:34 +0100 Subject: [PATCH] change some new "slic3rPE" strings into "slic3r++" --- src/slic3r/GUI/GUI_App.cpp | 10 +++++----- src/slic3r/GUI/PresetBundle.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 091071e16f3..36a132e3bc7 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -87,8 +87,8 @@ bool GUI_App::OnInit() wxCHECK_MSG(m_imgui->init(), false, "Failed to initialize ImGui"); #endif // ENABLE_IMGUI - SetAppName("Slic3rPE-alpha"); - SetAppDisplayName("Slic3r Prusa Edition"); + SetAppName("Slic3r++_alpha"); + SetAppDisplayName("Slic3r++"); // Slic3r::debugf "wxWidgets version %s, Wx version %s\n", wxVERSION_STRING, wxVERSION; @@ -460,7 +460,7 @@ bool GUI_App::select_language( wxArrayString & names, m_wxLocale = new wxLocale; m_wxLocale->Init(identifiers[index]); m_wxLocale->AddCatalogLookupPathPrefix(wxString::FromUTF8(localization_dir())); - m_wxLocale->AddCatalog(/*GetAppName()*/"Slic3rPE"); + m_wxLocale->AddCatalog(/*GetAppName()*/"Slic3r++"); //FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only. wxSetlocale(LC_NUMERIC, "C"); Preset::update_suffix_modified(); @@ -488,7 +488,7 @@ bool GUI_App::load_language() m_wxLocale = new wxLocale; m_wxLocale->Init(identifiers[i]); m_wxLocale->AddCatalogLookupPathPrefix(wxString::FromUTF8(localization_dir())); - m_wxLocale->AddCatalog(/*GetAppName()*/"Slic3rPE"); + m_wxLocale->AddCatalog(/*GetAppName()*/"Slic3r++"); //FIXME This is a temporary workaround, the correct solution is to switch to "C" locale during file import / export only. wxSetlocale(LC_NUMERIC, "C"); Preset::update_suffix_modified(); @@ -532,7 +532,7 @@ void GUI_App::get_installed_languages(wxArrayString & names, wxArrayLong & ident { auto full_file_name = dir.GetName() + wxFileName::GetPathSeparator() + filename + wxFileName::GetPathSeparator() + - /*GetAppName()*/"Slic3rPE" + + /*GetAppName()*/"Slic3r++" + wxT(".mo"); if (wxFileExists(full_file_name)) { diff --git a/src/slic3r/GUI/PresetBundle.cpp b/src/slic3r/GUI/PresetBundle.cpp index 274f2a7ef65..66c6b605c76 100644 --- a/src/slic3r/GUI/PresetBundle.cpp +++ b/src/slic3r/GUI/PresetBundle.cpp @@ -28,7 +28,7 @@ #include "libslic3r/libslic3r.h" #include "libslic3r/Utils.hpp" -// Store the print/filament/printer presets into a "presets" subdirectory of the Slic3rPE config dir. +// Store the print/filament/printer presets into a "presets" subdirectory of the Slic3r++ config dir. // This breaks compatibility with the upstream Slic3r if the --datadir is used to switch between the two versions. // #define SLIC3R_PROFILE_USE_PRESETS_SUBDIR