PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-14 13:02:39 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master + resolved conflicts

Browse Source
This commit is contained in:
Enrico Turri
2018-07-17 10:44:23 +02:00
parent 8175c9d306 161a2bc6f8
commit 5c90746914
46 changed files with 1697 additions and 3091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xs/src/slic3r/GUI/GUI.cpp
View File

@@ -342,7 +342,7 @@ 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);
auto config_wizard_name = _(ConfigWizard::name().wx_str());
const 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, config_wizard_name + dots, config_wizard_tooltip);