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

FIX:fix bug of shortcut key 

jira: STUDIO-7252
Change-Id: I9e83c4055250aa78701baa5626006f14390f4fc5
(cherry picked from commit f20788cd2c2eded210ad008601915630c998427b)
This commit is contained in:
zhou.xu 2024-06-05 19:54:27 +08:00 committed by Lane.Wei
parent c89732a046
commit 4f5922f193
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/GUI.cpp
View File

@ -82,7 +82,7 @@ const std::string& shortkey_ctrl_prefix()
{ {
static const std::string str = static const std::string str =
#ifdef __APPLE__ #ifdef __APPLE__
"⌘+" "command+" //"⌘+"
#else #else
_u8L("Ctrl+") _u8L("Ctrl+")
#endif #endif
@ -94,7 +94,7 @@ const std::string& shortkey_alt_prefix()
{ {
static const std::string str = static const std::string str =
#ifdef __APPLE__ #ifdef __APPLE__
"⌥+" "option+"//"⌥+"
#else #else
"Alt+" "Alt+"
#endif #endif

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

@ -2172,10 +2172,15 @@ static const wxString sep_space = "";
static wxMenu* generate_help_menu() static wxMenu* generate_help_menu()
{ {
wxMenu* helpMenu = new wxMenu(); wxMenu* helpMenu = new wxMenu();
#ifdef __WINDOWS__
// shortcut key // shortcut key
append_menu_item(helpMenu, wxID_ANY, _L("Keyboard Shortcuts") + sep + "&?", _L("Show the list of the keyboard shortcuts"), auto alt = GUI::shortkey_alt_prefix();
append_menu_item(helpMenu, wxID_ANY, _L("Keyboard Shortcuts") + sep + "& Shift+" + alt +"+?", _L("Show the list of the keyboard shortcuts"),
[](wxCommandEvent&) { wxGetApp().keyboard_shortcuts(); }); [](wxCommandEvent&) { wxGetApp().keyboard_shortcuts(); });
#else
append_menu_item(helpMenu, wxID_ANY, _L("Keyboard Shortcuts") + sep + "& Shift+?", _L("Show the list of the keyboard shortcuts"),
[](wxCommandEvent &) { wxGetApp().keyboard_shortcuts(); });
#endif
// Show Beginner's Tutorial // Show Beginner's Tutorial
append_menu_item(helpMenu, wxID_ANY, _L("Setup Wizard"), _L("Setup Wizard"), [](wxCommandEvent &) {wxGetApp().ShowUserGuide();}); append_menu_item(helpMenu, wxID_ANY, _L("Setup Wizard"), _L("Setup Wizard"), [](wxCommandEvent &) {wxGetApp().ShowUserGuide();});