comparison libgui/src/shortcut-manager.cc @ 19642:5d0663bff506

maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 30 Jan 2015 16:06:14 -0500
parents 0e1f5a750d00 8ef79bc61d8a
children ff56a9899101
comparison
equal deleted inserted replaced
19641:8fe29850fb74 19642:5d0663bff506
253 init (tr ("Convert Line Ednings to Mac"), "editor_edit:conv_eol_mac", 253 init (tr ("Convert Line Ednings to Mac"), "editor_edit:conv_eol_mac",
254 QKeySequence ()); 254 QKeySequence ());
255 255
256 init (tr ("Goto Line"), "editor_edit:goto_line", 256 init (tr ("Goto Line"), "editor_edit:goto_line",
257 QKeySequence (ctrl + Qt::Key_G)); 257 QKeySequence (ctrl + Qt::Key_G));
258 init (tr ("Move to Matching Brace"), "editor_edit:move_to_brace",
259 QKeySequence (ctrl + Qt::Key_M));
260 init (tr ("Select to Matching Brace"), "editor_edit:select_to_brace",
261 QKeySequence (ctrl_shift + Qt::Key_M));
258 init (tr ("Toggle Bookmark"), "editor_edit:toggle_bookmark", 262 init (tr ("Toggle Bookmark"), "editor_edit:toggle_bookmark",
259 QKeySequence (prefix + Qt::Key_F7)); 263 QKeySequence (prefix + Qt::Key_F7));
260 init (tr ("Next Bookmark"), "editor_edit:next_bookmark", 264 init (tr ("Next Bookmark"), "editor_edit:next_bookmark",
261 QKeySequence (prefix + Qt::Key_F2)); 265 QKeySequence (prefix + Qt::Key_F2));
262 init (tr ("Previous Bookmark"), "editor_edit:previous_bookmark", 266 init (tr ("Previous Bookmark"), "editor_edit:previous_bookmark",