GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-10 06:29:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

3DConnexion settings dialog (Ctrl+M) shown only on Mac

Browse Source
This commit is contained in:
Enrico Turri 2020-03-31 14:16:53 +02:00
parent f1ccd38258
commit 095062e371
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3016,15 +3016,13 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
#ifdef __APPLE__ #ifdef __APPLE__
case 'm': case 'm':
case 'M': case 'M':
#else /* __APPLE__ */
case WXK_CONTROL_M:
#endif /* __APPLE__ */
{ {
Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller(); Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller();
controller.show_settings_dialog(!controller.is_settings_dialog_shown()); controller.show_settings_dialog(!controller.is_settings_dialog_shown());
m_dirty = true; m_dirty = true;
break; break;
} }
#endif /* __APPLE__ */
#ifdef __APPLE__ #ifdef __APPLE__
case 'v': case 'v':

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

@ -185,10 +185,12 @@ void KBShortcutsDialog::fill_shortcuts()
{ "Z", L("Zoom to selected object\nor all objects in scene, if none selected") }, { "Z", L("Zoom to selected object\nor all objects in scene, if none selected") },
{ "I", L("Zoom in") }, { "I", L("Zoom in") },
{ "O", L("Zoom out") }, { "O", L("Zoom out") },
{ ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") } #ifdef __APPLE__
{ ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") },
#endif // __APPLE__
#if ENABLE_RENDER_PICKING_PASS #if ENABLE_RENDER_PICKING_PASS
// Don't localize debugging texts. // Don't localize debugging texts.
, { "T", "Toggle picking pass texture rendering on/off" } { "T", "Toggle picking pass texture rendering on/off" },
#endif // ENABLE_RENDER_PICKING_PASS #endif // ENABLE_RENDER_PICKING_PASS
}; };