3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Setting dialog for 3DConnexion device (CTRL+M) enabled on MAC

Browse source
This commit is contained in:
enricoturri1966 2020-10-26 11:35:53 +01:00
parent efe157025e
commit a830b7ea83
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -2934,7 +2934,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
post_event(SimpleEvent(EVT_GLTOOLBAR_COPY)); post_event(SimpleEvent(EVT_GLTOOLBAR_COPY));
break; break;
#ifdef __linux__ #if defined(__linux__) || defined(__APPLE__)
case WXK_CONTROL_M: case WXK_CONTROL_M:
{ {
Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller(); Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller();

2
src/slic3r/GUI/KBShortcutsDialog.cpp
View file

@ -178,7 +178,7 @@ void KBShortcutsDialog::fill_shortcuts()
{ "O", L("Zoom out") }, { "O", L("Zoom out") },
{ "Tab", L("Switch between Editor/Preview") }, { "Tab", L("Switch between Editor/Preview") },
{ "Shift+Tab", L("Collapse/Expand the sidebar") }, { "Shift+Tab", L("Collapse/Expand the sidebar") },
#ifdef __linux__ #if defined(__linux__) || defined(__APPLE__)
{ ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") }, { ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") },
#endif // __linux__ #endif // __linux__
#if ENABLE_RENDER_PICKING_PASS #if ENABLE_RENDER_PICKING_PASS