diff libgui/src/main-window.h @ 18751:f017240310fb gui-release

disabling global shortcuts when terminal has focus as user preference * main-window.h: new flag _prevent_readline__conflicts, new function configure_shortcuts * main-window.cc (constructor): initialize new flag to true; (notice_settings): read value of flag from settings, configure shortcuts; (configure_shortcuts): new function setting all shortcuts from the settings; (construct): configure shortcuts via new function; (set_global_shortcuts): return if global shortcuts should not be disabled when terminal has focus, use new function configure_shortcuts; * settings-dialog.ui: new checkbox in the shortcut tab whether global shortcuts should be desabled when terminal has focus or not * settings-dialog.cc (constructor): read value for checkbox from settings; (write_changed_settings): write value of checkbox to the settings
author Torsten <ttl@justmail.de>
date Fri, 02 May 2014 17:44:44 +0200
parents 9ef65c422f53
children b2c4d6d461f0
line wrap: on
line diff
--- a/libgui/src/main-window.h	Thu May 01 13:24:27 2014 +0200
+++ b/libgui/src/main-window.h	Fri May 02 17:44:44 2014 +0200
@@ -270,6 +270,8 @@
 
   void execute_debug_callback ();
 
+  void configure_shortcuts ();
+
   bool confirm_exit_octave ();
 
   workspace_model *_workspace_model;
@@ -389,6 +391,8 @@
   QStringList *_dbg_queue;
   QSemaphore   _dbg_processing;
   QMutex       _dbg_queue_mutex;
+
+  bool _prevent_readline_conflicts;
 };
 
 class news_reader : public QObject