diff options
| author | bubnikv <bubnikv@gmail.com> | 2018-06-28 18:43:15 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2018-06-28 18:43:15 +0300 |
| commit | c4a3e4eca74360e84e3634a5c720551118107af4 (patch) | |
| tree | 901d1a94129976252792b98e0fbe238ae6dda161 /xs/src/slic3r/GUI/GUI.cpp | |
| parent | aae6cfc696e065066aa185e3d12ca21d075e8e40 (diff) | |
| parent | 5f1f7dcbedcdc884b4cd489562b444ad372b89c9 (diff) | |
Merge branch 'for_merging'
Diffstat (limited to 'xs/src/slic3r/GUI/GUI.cpp')
| -rw-r--r-- | xs/src/slic3r/GUI/GUI.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp index c1f8adaf1..12af36d19 100644 --- a/xs/src/slic3r/GUI/GUI.cpp +++ b/xs/src/slic3r/GUI/GUI.cpp @@ -317,10 +317,11 @@ void add_config_menu(wxMenuBar *menu, int event_preferences_changed, int event_l auto local_menu = new wxMenu(); wxWindowID config_id_base = wxWindow::NewControlId((int)ConfigMenuCnt); - const auto config_wizard_tooltip = wxString::Format(_(L("Run %s")), ConfigWizard::name()); + auto config_wizard_name = _(ConfigWizard::name().wx_str()); + const auto config_wizard_tooltip = wxString::Format(_(L("Run %s")), config_wizard_name); // Cmd+, is standard on OS X - what about other operating systems? - local_menu->Append(config_id_base + ConfigMenuWizard, ConfigWizard::name() + dots, config_wizard_tooltip); - local_menu->Append(config_id_base + ConfigMenuSnapshots, _(L("Configuration Snapshots"))+dots, _(L("Inspect / activate configuration snapshots"))); + local_menu->Append(config_id_base + ConfigMenuWizard, config_wizard_name + dots, config_wizard_tooltip); + local_menu->Append(config_id_base + ConfigMenuSnapshots, _(L("Configuration Snapshots"))+dots, _(L("Inspect / activate configuration snapshots"))); local_menu->Append(config_id_base + ConfigMenuTakeSnapshot, _(L("Take Configuration Snapshot")), _(L("Capture a configuration snapshot"))); // local_menu->Append(config_id_base + ConfigMenuUpdate, _(L("Check for updates")), _(L("Check for configuration updates"))); local_menu->AppendSeparator(); |