Mercurial > octave-nkf
changeset 19942:7d888f9e94eb
fix some shortcut issues
* QTerminal.h (constructor): make sure interrupt action signal is connected
* main-window.cc (notice_settings): set all shortcuts respecting the
actual focus
| author | Torsten <ttl@justmail.de> |
|---|---|
| date | Thu, 05 Mar 2015 23:05:23 +0100 |
| parents | f8fbb7b9d78e |
| children | 4e15e8cb16ae |
| files | libgui/qterminal/libqterminal/QTerminal.h libgui/src/main-window.cc |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/qterminal/libqterminal/QTerminal.h Thu Mar 05 13:33:53 2015 -0500 +++ b/libgui/qterminal/libqterminal/QTerminal.h Thu Mar 05 23:05:23 2015 +0100 @@ -173,7 +173,7 @@ _interrupt_action->setShortcut ( QKeySequence (Qt::ControlModifier + Qt::Key_C)); - connect (_interrupt_action, SIGNAL (triggered (bool)), + connect (_interrupt_action, SIGNAL (triggered ()), this, SLOT (terminal_interrupt ())); }
--- a/libgui/src/main-window.cc Thu Mar 05 13:33:53 2015 -0500 +++ b/libgui/src/main-window.cc Thu Mar 05 23:05:23 2015 +0100 @@ -747,7 +747,6 @@ _prevent_readline_conflicts = settings->value ("shortcuts/prevent_readline_conflicts", true).toBool (); - set_global_shortcuts (command_window_has_focus ()); _suppress_dbg_location = ! settings->value ("terminal/print_debug_location", false).toBool (); @@ -755,6 +754,10 @@ resource_manager::update_network_settings (); emit active_dock_changed (0, _active_dock); // update dock widget styles + + configure_shortcuts (); + set_global_shortcuts (_active_dock == command_window); + set_global_edit_shortcuts (_active_dock == editor_window); } void