Mercurial > hg > octave-nkf

comparison gui/src/m-editor/file-editor.cc @ 14812:9d9eb9bac65e gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improved menu structure of file, edit and window menu. Removed ambiguous shortcuts, improved focus handling for operating the GUI with the keyboard. Added new shortcuts to focus subwindows directly. * files-dockwidget: Set focus proxy to the current directory line edit. * history-dockwidget: Set focus proxy to the inline search bar. * file-editor: Removed and improved shortcuts. * main-window: Added new slots for not only showing/hiding subwindows, but also for focussing them directly with Ctrl+0,1..4. Improved menu structure.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Thu, 28 Jun 2012 11:04:37 +0200
parents e3ae0850b105
children eae0e9f2a8c6
comparison
equal deleted inserted replaced
14804:a565c560e654 14812:9d9eb9bac65e
272 if (f) 272 if (f)
273 { 273 {
274 bool copy_available = f->copy_available (); 274 bool copy_available = f->copy_available ();
275 _copy_action->setEnabled (copy_available); 275 _copy_action->setEnabled (copy_available);
276 _cut_action->setEnabled (copy_available); 276 _cut_action->setEnabled (copy_available);
277 setFocusProxy (f);
277 } 278 }
278 } 279 }
279 280
280 void 281 void
281 file_editor::construct () 282 file_editor::construct ()
327 // some actions are disabled from the beginning 328 // some actions are disabled from the beginning
328 _copy_action->setEnabled(false); 329 _copy_action->setEnabled(false);
329 _cut_action->setEnabled(false); 330 _cut_action->setEnabled(false);
330 331
331 // short cuts 332 // short cuts
332 new_action->setShortcut (QKeySequence::New); 333 // TODO: These shortcuts are ambiguous and lead to bugs.
333 new_action->setShortcutContext (Qt::WindowShortcut); 334 // new_action->setShortcut (QKeySequence::New);
334 open_action->setShortcut (QKeySequence::Open); 335 // new_action->setShortcutContext (Qt::WindowShortcut);
335 open_action->setShortcutContext (Qt::WindowShortcut); 336 // open_action->setShortcut (QKeySequence::Open);
336 save_action->setShortcut (QKeySequence::Save); 337 // open_action->setShortcutContext (Qt::WindowShortcut);
337 save_action->setShortcutContext (Qt::WindowShortcut); 338 // save_action->setShortcut (QKeySequence::Save);
338 save_as_action->setShortcut (QKeySequence::SaveAs); 339 // save_action->setShortcutContext (Qt::WindowShortcut);
339 save_as_action->setShortcutContext (Qt::WindowShortcut); 340 // save_as_action->setShortcut (QKeySequence::SaveAs);
340 undo_action->setShortcut (QKeySequence::Undo); 341 // save_as_action->setShortcutContext (Qt::WindowShortcut);
341 undo_action->setShortcutContext (Qt::WindowShortcut); 342 // undo_action->setShortcut (QKeySequence::Undo);
342 redo_action->setShortcut (QKeySequence::Redo); 343 // undo_action->setShortcutContext (Qt::WindowShortcut);
343 redo_action->setShortcutContext (Qt::WindowShortcut); 344 // redo_action->setShortcut (QKeySequence::Redo);
344 _copy_action->setShortcut (QKeySequence::Copy); 345 // redo_action->setShortcutContext (Qt::WindowShortcut);
345 _copy_action->setShortcutContext (Qt::WindowShortcut); 346 // _copy_action->setShortcut (QKeySequence::Copy);
346 _cut_action->setShortcut (QKeySequence::Cut); 347 // _copy_action->setShortcutContext (Qt::WindowShortcut);
347 _cut_action->setShortcutContext (Qt::WindowShortcut); 348 // _cut_action->setShortcut (QKeySequence::Cut);
348 paste_action->setShortcut (QKeySequence::Paste); 349 // _cut_action->setShortcutContext (Qt::WindowShortcut);
349 paste_action->setShortcutContext (Qt::WindowShortcut); 350 // paste_action->setShortcut (QKeySequence::Paste);
350 run_action->setShortcut (Qt::SHIFT + Qt::Key_R); 351 // paste_action->setShortcutContext (Qt::WindowShortcut);
352 run_action->setShortcut (Qt::ControlModifier+ Qt::Key_R);
351 run_action->setShortcutContext (Qt::WindowShortcut); 353 run_action->setShortcutContext (Qt::WindowShortcut);
352 next_bookmark_action->setShortcut (Qt::Key_F2); 354 next_bookmark_action->setShortcut (Qt::Key_F2);
353 next_bookmark_action->setShortcutContext (Qt::WindowShortcut); 355 next_bookmark_action->setShortcutContext (Qt::WindowShortcut);
354 previous_bookmark_action->setShortcut (Qt::SHIFT + Qt::Key_F2); 356 previous_bookmark_action->setShortcut (Qt::SHIFT + Qt::Key_F2);
355 previous_bookmark_action->setShortcutContext (Qt::WindowShortcut); 357 previous_bookmark_action->setShortcutContext (Qt::WindowShortcut);
356 toggle_bookmark_action->setShortcut (Qt::Key_F7); 358 toggle_bookmark_action->setShortcut (Qt::Key_F7);
357 toggle_bookmark_action->setShortcutContext (Qt::WindowShortcut); 359 toggle_bookmark_action->setShortcutContext (Qt::WindowShortcut);
358 comment_selection_action->setShortcut (Qt::CTRL + Qt::Key_R); 360 comment_selection_action->setShortcut (Qt::ControlModifier + Qt::Key_7);
359 comment_selection_action->setShortcutContext (Qt::WindowShortcut); 361 comment_selection_action->setShortcutContext (Qt::WindowShortcut);
360 uncomment_selection_action->setShortcut (Qt::CTRL + Qt::Key_T); 362 uncomment_selection_action->setShortcut (Qt::ControlModifier + Qt::Key_8);
361 uncomment_selection_action->setShortcutContext(Qt::WindowShortcut); 363 uncomment_selection_action->setShortcutContext(Qt::WindowShortcut);
362 364
363 // toolbar 365 // toolbar
364 _tool_bar->addAction (new_action); 366 _tool_bar->addAction (new_action);
365 _tool_bar->addAction (open_action); 367 _tool_bar->addAction (open_action);