Mercurial > octave-dspies

changeset 18697:908523bd79b4 gui-release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use shortcut manager for the debug menu * main-window.cc (add_action): new function for adding actions to menus and setting Qt::ApplicationShortcut to the actions; (construct_debug_menu_item): do not set shortcuts but the slot here; (construct_debug_menu): update calls to construct_debug_menu_item; (set_global_shortcuts): set the shortcut for the actions and the settings key * main-window.h: new function add_action, changed paramters of construct_debug_menu_item * shortcut-manager.cc (do_init_data): init the shortcuts for the debug menus
author Torsten <ttl@justmail.de>
date Mon, 28 Apr 2014 22:48:28 +0200
parents 92f91183630b
children f31fde98c872
files libgui/src/main-window.cc libgui/src/main-window.h libgui/src/shortcut-manager.cc
diffstat 3 files changed, 39 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Mon Apr 28 11:38:56 2014 -0700
+++ b/libgui/src/main-window.cc	Mon Apr 28 22:48:28 2014 +0200
@@ -1425,6 +1425,16 @@
   construct_news_menu (menu_bar);
 }
 
+QAction*
+main_window::add_action (QMenu *menu, const QIcon &icon, const QString &text,
+                         const char *member)
+{
+  QAction *a = menu->addAction (icon, text, this, member);
+  addAction (a);  // important for shortcut context
+  a->setShortcutContext (Qt::ApplicationShortcut);
+  return a;
+}
+
 void
 main_window::construct_file_menu (QMenuBar *p)
 {
@@ -1571,14 +1581,12 @@
 }
 
 QAction *
-main_window::construct_debug_menu_item (const char *icon_file,
-                                        const QString& item,
-                                        const QKeySequence& key)
+main_window::construct_debug_menu_item (const char *icon, const QString& item,
+                                        const char *member)
 {
-  QAction *action = _debug_menu->addAction (QIcon (icon_file), item);
+  QAction *action = add_action (_debug_menu, QIcon (icon), item, member);
 
   action->setEnabled (false);
-  action->setShortcut (key);
 
 #ifdef HAVE_QSCINTILLA
   editor_window->debug_menu ()->addAction (action);
@@ -1594,20 +1602,20 @@
   _debug_menu = p->addMenu (tr ("De&bug"));
 
   _debug_step_over = construct_debug_menu_item
-                       (":/actions/icons/db_step.png", tr ("Step"),
-                        Qt::Key_F10);
+                      (":/actions/icons/db_step.png", tr ("Step"),
+                       SLOT (debug_step_over ()));
 
   _debug_step_into = construct_debug_menu_item
-                       (":/actions/icons/db_step_in.png", tr ("Step In"),
-                        Qt::Key_F11);
+                      (":/actions/icons/db_step_in.png", tr ("Step In"),
+                       SLOT (debug_step_into ()));
 
   _debug_step_out = construct_debug_menu_item
                       (":/actions/icons/db_step_out.png", tr ("Step Out"),
-                       Qt::ShiftModifier + Qt::Key_F11);
+                       SLOT (debug_step_out ()));
 
   _debug_continue = construct_debug_menu_item
                       (":/actions/icons/db_cont.png", tr ("Continue"),
-                       Qt::Key_F5);
+                       SLOT (debug_continue ()));
 
   _debug_menu->addSeparator ();
 #ifdef HAVE_QSCINTILLA
@@ -1615,23 +1623,8 @@
 #endif
 
   _debug_quit = construct_debug_menu_item
-                (":/actions/icons/db_stop.png", tr ("Exit Debug Mode"),
-                 Qt::ShiftModifier + Qt::Key_F5);
-
-  connect (_debug_step_over, SIGNAL (triggered ()),
-           this, SLOT (debug_step_over ()));
-
-  connect (_debug_step_into, SIGNAL (triggered ()),
-           this, SLOT (debug_step_into ()));
-
-  connect (_debug_step_out, SIGNAL (triggered ()),
-           this, SLOT (debug_step_out ()));
-
-  connect (_debug_continue, SIGNAL (triggered ()),
-           this, SLOT (debug_continue ()));
-
-  connect (_debug_quit, SIGNAL (triggered ()),
-           this, SLOT (debug_quit ()));
+                      (":/actions/icons/db_stop.png", tr ("Quit Debug Mode"),
+                       SLOT (debug_quit ()));
 }
 
 QAction *
@@ -2324,6 +2317,12 @@
       shortcut_manager::set_shortcut (_clear_command_window_action, "main_edit:clear_command_window");
       shortcut_manager::set_shortcut (_clear_workspace_action, "main_edit:clear_workspace");
 
+      // debug menu
+      shortcut_manager::set_shortcut (_debug_step_over, "main_debug:step_over");
+      shortcut_manager::set_shortcut (_debug_step_into, "main_debug:step_into");
+      shortcut_manager::set_shortcut (_debug_step_out,  "main_debug:step_out");
+      shortcut_manager::set_shortcut (_debug_continue,  "main_debug:continue");
+      shortcut_manager::set_shortcut (_debug_quit,      "main_debug:quit");
     }
   else
     {
--- a/libgui/src/main-window.h	Mon Apr 28 11:38:56 2014 -0700
+++ b/libgui/src/main-window.h	Mon Apr 28 22:48:28 2014 +0200
@@ -213,15 +213,15 @@
 
   void construct_octave_qt_link (void);
 
+  QAction *add_action (QMenu *menu, const QIcon &icon, const QString &text,
+                       const char *member);
+
   void construct_menu_bar (void);
   void construct_file_menu (QMenuBar *p);
   void construct_new_menu (QMenu *p);
   void construct_edit_menu (QMenuBar *p);
-  void construct_debug_menu_item (QMenu *p, const QString& item,
-                                  const QKeySequence& key);
-  QAction *construct_debug_menu_item (const char *icon_file,
-                                      const QString& item,
-                                      const QKeySequence& key);
+  QAction *construct_debug_menu_item (const char *icon, const QString& item,
+                                      const char* member);
   void construct_debug_menu (QMenuBar *p);
   QAction *construct_window_menu_item (QMenu *p, const QString& item,
                                        bool checkable,
--- a/libgui/src/shortcut-manager.cc	Mon Apr 28 11:38:56 2014 -0700
+++ b/libgui/src/shortcut-manager.cc	Mon Apr 28 22:48:28 2014 +0200
@@ -102,6 +102,13 @@
   init (tr ("Clear Command History"), "main_edit:clear_history", QKeySequence () );
   init (tr ("Clear Workspace"), "main_edit:clear_workspace", QKeySequence () );
 
+  // debug
+  init (tr ("Step Over"), "main_debug:step_over", QKeySequence (Qt::Key_F10));
+  init (tr ("Step Into"), "main_debug:step_into", QKeySequence (Qt::Key_F11));
+  init (tr ("Step Out"), "main_debug:step_out", QKeySequence (Qt::ShiftModifier + Qt::Key_F11));
+  init (tr ("Continue"), "main_debug:continue", QKeySequence (Qt::Key_F5));
+  init (tr ("Quit Debug Mode"), "main_debug:quit", QKeySequence (Qt::ShiftModifier + Qt::Key_F5));
+
   // actions of the editor
 
   // file