Skip to content

Commit

Permalink
change some new "slic3rPE" strings into "slic3r++"
Browse files Browse the repository at this point in the history
  • Loading branch information
supermerill committed Jan 4, 2019
1 parent 339531f commit 3704ea1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions src/slic3r/GUI/GUI_App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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))
{
Expand Down
2 changes: 1 addition & 1 deletion src/slic3r/GUI/PresetBundle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 3704ea1

Please sign in to comment.