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

FIX: mac command key display 

Change-Id: Ida9f41e7c05a414122176893dafaf150c460d458
This commit is contained in:
liz.li 2023-04-07 16:46:20 +08:00 committed by Lane.Wei
parent 62a2fadeb8
commit bde527f6e1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/KBShortcutsDialog.cpp
View File

@ -183,7 +183,12 @@ void KBShortcutsDialog::fill_shortcuts()
// Slice plate // Slice plate
{ ctrl + "R", L("Slice plate")}, { ctrl + "R", L("Slice plate")},
// Send to Print // Send to Print
#ifdef __APPLE__
{ L("⌘+Shift+G"), L("Print plate")},
#else
{ L("Ctrl+Shift+G"), L("Print plate")}, { L("Ctrl+Shift+G"), L("Print plate")},
#endif // __APPLE
// Edit // Edit
{ ctrl + "X", L("Cut") }, { ctrl + "X", L("Cut") },
{ ctrl + "C", L("Copy to clipboard") }, { ctrl + "C", L("Copy to clipboard") },

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

@ -1974,7 +1974,7 @@ static void add_common_publish_menu_items(wxMenu* publish_menu, MainFrame* mainF
static void add_common_view_menu_items(wxMenu* view_menu, MainFrame* mainFrame, std::function<bool(void)> can_change_view) static void add_common_view_menu_items(wxMenu* view_menu, MainFrame* mainFrame, std::function<bool(void)> can_change_view)
{ {
const std::string& ctrl = GUI::shortkey_ctrl_prefix(); const wxString ctrl = _L("Ctrl+");
// The camera control accelerators are captured by GLCanvas3D::on_char(). // The camera control accelerators are captured by GLCanvas3D::on_char().
append_menu_item(view_menu, wxID_ANY, _L("Default View") + "\t" + ctrl + "0", _L("Default View"), [mainFrame](wxCommandEvent&) { append_menu_item(view_menu, wxID_ANY, _L("Default View") + "\t" + ctrl + "0", _L("Default View"), [mainFrame](wxCommandEvent&) {
mainFrame->select_view("plate"); mainFrame->select_view("plate");
@ -2005,7 +2005,7 @@ void MainFrame::init_menubar_as_editor()
m_menubar = new wxMenuBar(); m_menubar = new wxMenuBar();
#endif #endif
const std::string& ctrl = GUI::shortkey_ctrl_prefix(); const wxString ctrl = _L("Ctrl+");
// File menu // File menu
wxMenu* fileMenu = new wxMenu; wxMenu* fileMenu = new wxMenu;