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

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer

Browse Source
This commit is contained in:
enricoturri1966 2020-03-31 18:05:12 +02:00
commit daa6dd0a25
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3011,16 +3011,15 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
post_event(SimpleEvent(EVT_GLTOOLBAR_COPY)); post_event(SimpleEvent(EVT_GLTOOLBAR_COPY));
break; break;
#ifdef __APPLE__ #ifdef __linux__
case 'm': case WXK_CONTROL_M:
case 'M':
{ {
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__ */ #endif /* __linux__ */
#ifdef __APPLE__ #ifdef __APPLE__
case 'v': case 'v':

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

@ -185,9 +185,9 @@ 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") },
#ifdef __APPLE__ #ifdef __linux__
{ ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") }, { ctrl + "M", L("Show/Hide 3Dconnexion devices settings dialog") },
#endif // __APPLE__ #endif // __linux__
#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" },