# HG changeset patch
# User Torsten <ttl@justmail.de>
# Date 1425593123 -3600
# Node ID 7d888f9e94eb5fc32e27ec34314fd25779d4a9ac
# Parent  f8fbb7b9d78e7937dc10c0908ad052c37f27cc90
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

diff -r f8fbb7b9d78e -r 7d888f9e94eb libgui/qterminal/libqterminal/QTerminal.h
--- 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 ()));
   }
 
diff -r f8fbb7b9d78e -r 7d888f9e94eb libgui/src/main-window.cc
--- 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