3DConnexion settings dialog (Ctrl+M) shown only on Mac
This commit is contained in:
parent
f1ccd38258
commit
095062e371
2 changed files with 10 additions and 10 deletions
|
@ -3016,15 +3016,13 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
|
|||
#ifdef __APPLE__
|
||||
case 'm':
|
||||
case 'M':
|
||||
#else /* __APPLE__ */
|
||||
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__ */
|
||||
{
|
||||
Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller();
|
||||
controller.show_settings_dialog(!controller.is_settings_dialog_shown());
|
||||
m_dirty = true;
|
||||
break;
|
||||
}
|
||||
|
||||
#ifdef __APPLE__
|
||||
case 'v':
|
||||
|
|
|
@ -185,10 +185,12 @@ 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") },
|
||||
{ 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
|
||||
// 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
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue