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

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':

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" },