3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-23 16:51:21 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Semver fixes, misc fixes

Browse source
This commit is contained in:
Vojtech Kral 2018-04-11 17:07:27 +02:00
parent 12b3132b1a
commit b030791384
8 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xs/src/slic3r/GUI/AboutDialog.cpp
View file

@ -56,7 +56,7 @@ AboutDialog::AboutDialog()
// version
{
std::string version_string = _(L("Version ")) + std::string(SLIC3R_VERSION);
auto version_string = _(L("Version ")) + std::string(SLIC3R_VERSION);
wxStaticText* version = new wxStaticText(this, wxID_ANY, version_string.c_str(), wxDefaultPosition, wxDefaultSize);
wxFont version_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
#ifdef __WXMSW__

8
xs/src/slic3r/GUI/GUI.cpp
View file

@ -352,11 +352,11 @@ void add_config_menu(wxMenuBar *menu, int event_preferences_changed, int event_l
// A different naming convention is used for the Wizard on Windows vs. OSX & GTK.
#if WIN32
std::string config_wizard_menu = _(L("Configuration Wizard"));
std::string config_wizard_tooltip = _(L("Run configuration wizard"));
auto config_wizard_menu = _(L("Configuration Wizard"));
auto config_wizard_tooltip = _(L("Run configuration wizard"));
#else
std::string config_wizard_menu = _(L("Configuration Assistant"));
std::string config_wizard_tooltip = _(L("Run configuration Assistant"));
auto config_wizard_menu = _(L("Configuration Assistant"));
auto config_wizard_tooltip = _(L("Run configuration Assistant"));
#endif
// Cmd+, is standard on OS X - what about other operating systems?
local_menu->Append(config_id_base + ConfigMenuWizard, config_wizard_menu + "\u2026", config_wizard_tooltip);