Mercurial > octave
diff libgui/src/main-window.cc @ 18665:777281eeb3d4 gui-release
add all editor actions to the shortcut manager and fix their shortcut context
* file_editor_interface.h: new virtual function insert_new_open_actions
* file-editor.cc (request_undo, request_redo, request_copy, request_cut,
request_paste, request_selectall, request_save_file, request_save_file_as,
request_print_file, request_run_file, request_toggle_bookmark,
request_next_bookmark, request_previous_bookmark, request_remove_bookmark,
request_toggle_breakpoint, request_next_breakpoint,
request_previous_breakpoint, request_remove_breakpoint,
request_comment_selected_text, request_uncomment_selected_text,
request_indent_selected_text, request_unindent_selected_text, request_find,
request_goto_line, request_completion) : change slot parameter
from void to bool;
(handle_editor_state_changed): renamed context_run_action;
(notice_settings): call set_shortcuts without parameter;
(insert_new_open_actions): new function called from main window for addings
global action (new, open) to the editors file menu;
(add_action): new function for adding a new action to a menu, connecting the
slot, adding the action to the editor, and setting the shortcut context;
(construct): make all actions class variables, add actions with add_actions,
removing obsolete calls to QAction (), to setShortcutContext (), and to
connect (), new submenu for navigation actions;
(copyClipboard, pasteClipboard, selectAll): use slots with bool parameter;
(set_shortcuts): remove the parameter of this function, it is now only
called when the shortcut settings were changed and not when the terminal
changes focus;
(check_actions): enable/disable whole submenus instead of singe actions
* file-editor.h: new function insert_new_open_actions, slots with bool
parameter instead void, class variables for all actions, new submenus,
set_shortcuts without parameter
* main-window.cc (construct): do not connect the signal for setting shortcuts
depending on terminal focus to the editor, insert new and open file actions
into the editor file menu
* main-window.h: remove the signal for settings other widgets shortcuts
* shortcut-manager.cc (do_init_data): add more actions to the list
author | Torsten <ttl@justmail.de> |
---|---|
date | Wed, 23 Apr 2014 08:42:19 +0200 |
parents | 7cb98e81ecd1 |
children | c199304dfb2a 6113e0c6920b |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Fri Apr 18 15:04:39 2014 -0400 +++ b/libgui/src/main-window.cc Wed Apr 23 08:42:19 2014 +0200 @@ -1219,9 +1219,6 @@ connect (file_browser_window, SIGNAL (find_files_signal (const QString&)), this, SLOT (find_files (const QString&))); - connect (this, SIGNAL (set_widget_shortcuts_signal (bool)), - editor_window, SLOT (set_shortcuts (bool))); - connect_uiwidget_links (); setWindowTitle ("Octave"); @@ -1440,6 +1437,9 @@ tr ("Open...")); _open_action->setShortcutContext (Qt::ApplicationShortcut); + editor_window->insert_new_open_actions (_new_script_action, + _new_function_action, + _open_action); #ifdef HAVE_QSCINTILLA file_menu->addMenu (editor_window->get_mru_menu ()); @@ -2333,7 +2333,6 @@ } - emit set_widget_shortcuts_signal (set_shortcuts); } void