Mercurial > octave-nkf

changeset 14831:cff522bf80c5 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed debugging shortcuts and debug menu item order. * file-editor.cc: Fixed shortcuts. * main-window.cc: Fixed debug menu order.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Mon, 02 Jul 2012 17:20:51 +0200
parents 41b86dc61306
children 9c07dde77266
files gui/src/m-editor/file-editor.cc gui/src/main-window.cc
diffstat 2 files changed, 20 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/gui/src/m-editor/file-editor.cc	Mon Jul 02 16:06:50 2012 +0200
+++ b/gui/src/m-editor/file-editor.cc	Mon Jul 02 17:20:51 2012 +0200
@@ -373,7 +373,7 @@
   QAction *uncomment_selection_action = new QAction (tr ("&Uncomment Selected Text"),_tool_bar);
 
   _run_action = new QAction (QIcon(":/actions/icons/artsbuilderexecute.png"),
-        tr("&Run File"), _tool_bar);
+        tr("Save File And Run"), _tool_bar);
 
   // some actions are disabled from the beginning
   _copy_action->setEnabled(false);
--- a/gui/src/main-window.cc	Mon Jul 02 16:06:50 2012 +0200
+++ b/gui/src/main-window.cc	Mon Jul 02 17:20:51 2012 +0200
@@ -577,32 +577,33 @@
 
   _debug_menu = menuBar ()->addMenu (tr ("De&bug"));
 
+  _debug_step_over = _debug_menu->addAction (tr ("Step"));
+  _debug_step_over->setEnabled (false);
+  _file_editor->debug_menu ()->addAction (_debug_step_over);
+  _debug_step_over->setShortcut (Qt::Key_F10);
+
+  _debug_step_into = _debug_menu->addAction (tr ("Step in"));
+  _debug_step_into->setEnabled (false);
+  _file_editor->debug_menu ()->addAction (_debug_step_into);
+  _debug_step_into->setShortcut (Qt::Key_F11);
+
+  _debug_step_out = _debug_menu->addAction (tr ("Step out"));
+  _debug_step_out->setEnabled (false);
+  _file_editor->debug_menu ()->addAction (_debug_step_out);
+  _debug_step_out->setShortcut (Qt::ShiftModifier + Qt::Key_F11);
+
   _debug_continue = _debug_menu->addAction (tr ("Continue"));
   _debug_continue->setEnabled (false);
   _file_editor->debug_menu ()->addAction (_debug_continue);
   _debug_continue->setShortcut (Qt::Key_F5);
 
-  _debug_step_into = _debug_menu->addAction (tr ("Step into"));
-  _debug_step_into->setEnabled (false);
-  _file_editor->debug_menu ()->addAction (_debug_step_into);
-  _debug_step_into->setShortcut (Qt::Key_F9);
+  _debug_menu->addSeparator ();
+  _file_editor->debug_menu ()->addSeparator ();
 
-  _debug_step_over = _debug_menu->addAction (tr ("Next"));
-  _debug_step_over->setEnabled (false);
-  _file_editor->debug_menu ()->addAction (_debug_step_over);
-  _debug_step_over->setShortcut (Qt::Key_F10);
-
-  _debug_step_out = _debug_menu->addAction (tr ("Step out"));
-  _debug_step_out->setEnabled (false);
-  _file_editor->debug_menu ()->addAction (_debug_step_over);
-  _debug_step_out->setShortcut (Qt::Key_F11);
-
-  _debug_menu->addSeparator ();
-
-  _debug_quit = _debug_menu->addAction (tr ("Quit"));
+  _debug_quit = _debug_menu->addAction (tr ("Exit Debug Mode"));
   _debug_quit->setEnabled (false);
   _file_editor->debug_menu ()->addAction (_debug_quit);
-  _debug_quit->setShortcut (Qt::Key_Escape);
+  _debug_quit->setShortcut (Qt::ShiftModifier + Qt::Key_F5);
 
   //QMenu *parallelMenu = menuBar ()->addMenu (tr ("&Parallel"));