diff options
| author | enricoturri1966 <enricoturri@seznam.cz> | 2020-03-31 19:05:12 +0300 |
|---|---|---|
| committer | enricoturri1966 <enricoturri@seznam.cz> | 2020-03-31 19:05:12 +0300 |
| commit | daa6dd0a254b09b6beba449fc0b3a12b9bb183fa (patch) | |
| tree | 021861083b1c85b864484547a1aa6ae2eda59d28 /src | |
| parent | e886475fe7b55500d0b5db9e4b1813ab412f4b3b (diff) | |
| parent | 081a24abf39cc5b1f911c797370566d2b609caa5 (diff) | |
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
Diffstat (limited to 'src')
| -rw-r--r-- | src/slic3r/GUI/GLCanvas3D.cpp | 7 | ||||
| -rw-r--r-- | src/slic3r/GUI/KBShortcutsDialog.cpp | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index d6ca9ca08..28cafcfbe 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3011,16 +3011,15 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) post_event(SimpleEvent(EVT_GLTOOLBAR_COPY)); break; -#ifdef __APPLE__ - case 'm': - case 'M': +#ifdef __linux__ + case WXK_CONTROL_M: { Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller(); controller.show_settings_dialog(!controller.is_settings_dialog_shown()); m_dirty = true; break; } -#endif /* __APPLE__ */ +#endif /* __linux__ */ #ifdef __APPLE__ case 'v': diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index d8a079232..79a6cad20 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -185,9 +185,9 @@ void KBShortcutsDialog::fill_shortcuts() { "Z", L("Zoom to selected object\nor all objects in scene, if none selected") }, { "I", L("Zoom in") }, { "O", L("Zoom out") }, -#ifdef __APPLE__ +#ifdef __linux__ { ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") }, -#endif // __APPLE__ +#endif // __linux__ #if ENABLE_RENDER_PICKING_PASS // Don't localize debugging texts. { "T", "Toggle picking pass texture rendering on/off" }, |