comparison 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
comparison
equal deleted inserted replaced
18726:fe0e34be5576 18729:7c78430535db
178 QKeySequence ()); 178 QKeySequence ());
179 179
180 // view 180 // view
181 init (tr ("Zoom In"), "editor_view:zoom_in", QKeySequence::ZoomIn); 181 init (tr ("Zoom In"), "editor_view:zoom_in", QKeySequence::ZoomIn);
182 init (tr ("Zoom Out"), "editor_view:zoom_out", QKeySequence::ZoomOut); 182 init (tr ("Zoom Out"), "editor_view:zoom_out", QKeySequence::ZoomOut);
183 init (tr ("Zoom Normal"), "editor_view:zoom_normal", 183 init (tr ("Zoom Normal"), "editor_view:zoom_normal", QKeySequence (Qt::ControlModifier + Qt::AltModifier + Qt::Key_0));
184 QKeySequence (Qt::ControlModifier + Qt::Key_Slash));
185 184
186 // debug 185 // debug
187 init (tr ("Toggle Breakpoint"), "editor_debug:toggle_breakpoint", 186 init (tr ("Toggle Breakpoint"), "editor_debug:toggle_breakpoint",
188 QKeySequence ()); 187 QKeySequence ());
189 init (tr ("Next Breakpoint"), "editor_debug:next_breakpoint", 188 init (tr ("Next Breakpoint"), "editor_debug:next_breakpoint",