mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:typos in mac shortcut 

Change-Id: I928f95582db8927ac563ee7003d57d6d3e12d7cd
This commit is contained in:
liz.li 2022-08-15 16:27:30 +08:00 committed by Lane.Wei
parent 639bb98396
commit 5444f69fc2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/MainFrame.cpp
View File

@ -1936,7 +1936,7 @@ void MainFrame::init_menubar_as_editor()
#ifdef __APPLE__ #ifdef __APPLE__
wxWindowID bambu_studio_id_base = wxWindow::NewControlId(int(2)); wxWindowID bambu_studio_id_base = wxWindow::NewControlId(int(2));
wxMenu* parent_menu = m_menubar->OSXGetAppleMenu(); wxMenu* parent_menu = m_menubar->OSXGetAppleMenu();
auto preference_item = new wxMenuItem(parent_menu, BambuStudioMenuPreferences + bambu_studio_id_base, _L("Preferences") + "\tCtrl+,", ""); //auto preference_item = new wxMenuItem(parent_menu, BambuStudioMenuPreferences + bambu_studio_id_base, _L("Preferences") + "\tCtrl+,", "");
#else #else
wxMenu* parent_menu = m_topbar->GetTopMenu(); wxMenu* parent_menu = m_topbar->GetTopMenu();
auto preference_item = new wxMenuItem(parent_menu, ConfigMenuPreferences + config_id_base, _L("Preferences") + "\tCtrl+P", ""); auto preference_item = new wxMenuItem(parent_menu, ConfigMenuPreferences + config_id_base, _L("Preferences") + "\tCtrl+P", "");
@ -2011,7 +2011,7 @@ void MainFrame::init_menubar_as_editor()
#ifdef __APPLE__ #ifdef __APPLE__
wxString about_title = wxString::Format(_L("&About %s"), SLIC3R_APP_FULL_NAME); wxString about_title = wxString::Format(_L("&About %s"), SLIC3R_APP_FULL_NAME);
auto about_item = new wxMenuItem(parent_menu, BambuStudioMenuAbout + bambu_studio_id_base, about_title, ""); //auto about_item = new wxMenuItem(parent_menu, BambuStudioMenuAbout + bambu_studio_id_base, about_title, "");
//parent_menu->Bind(wxEVT_MENU, [this, bambu_studio_id_base](wxEvent& event) { //parent_menu->Bind(wxEVT_MENU, [this, bambu_studio_id_base](wxEvent& event) {
// switch (event.GetId() - bambu_studio_id_base) { // switch (event.GetId() - bambu_studio_id_base) {
// case BambuStudioMenuAbout: // case BambuStudioMenuAbout:
@ -2035,11 +2035,11 @@ void MainFrame::init_menubar_as_editor()
//}); //});
//parent_menu->Insert(0, about_item); //parent_menu->Insert(0, about_item);
append_menu_item( append_menu_item(
parent_menu, wxID_ANY, _L("About") + "", _L(""), parent_menu, wxID_ANY, _L(about_title), _L(""),
[this](wxCommandEvent &) { Slic3r::GUI::about();}, [this](wxCommandEvent &) { Slic3r::GUI::about();},
"", nullptr, []() { return true; }, this, 0); "", nullptr, []() { return true; }, this, 0);
append_menu_item( append_menu_item(
parent_menu, wxID_ANY, _L("Preferences") + "\tCtrl+'", _L(""), parent_menu, wxID_ANY, _L("Preferences") + "\tCtrl+,", _L(""),
[this](wxCommandEvent &) { [this](wxCommandEvent &) {
PreferencesDialog dlg(this); PreferencesDialog dlg(this);
dlg.ShowModal(); dlg.ShowModal();