diff libgui/src/shortcut-manager.cc @ 18729:7c78430535db

maint: Periodic merge of gui-release to stable.
author Rik <rik@octave.org>
date Mon, 28 Apr 2014 11:17:05 -0700
parents 6113e0c6920b 03edfcd943db
children dff05c124017
line wrap: on
line diff
--- a/libgui/src/shortcut-manager.cc	Sun Apr 27 18:02:47 2014 -0700
+++ b/libgui/src/shortcut-manager.cc	Mon Apr 28 11:17:05 2014 -0700
@@ -180,8 +180,7 @@
   // view
   init (tr ("Zoom In"), "editor_view:zoom_in", QKeySequence::ZoomIn);
   init (tr ("Zoom Out"), "editor_view:zoom_out", QKeySequence::ZoomOut);
-  init (tr ("Zoom Normal"), "editor_view:zoom_normal",
-        QKeySequence (Qt::ControlModifier + Qt::Key_Slash));
+  init (tr ("Zoom Normal"), "editor_view:zoom_normal",  QKeySequence (Qt::ControlModifier + Qt::AltModifier + Qt::Key_0));
 
   // debug
   init (tr ("Toggle Breakpoint"), "editor_debug:toggle_breakpoint",