Mercurial > hg > octave-lyh

diff gui/src/main-window.cc @ 14795:e3ae0850b105 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed integrating debug menu in the editor window. * file-editor-interface.h: Removed methods for enabling/disabling debug mode. * file-editor-tab.cc: Renamed variable to meet coding style standards. * file-editor: Added get for the editors debug menu. * main-window: Added the same actions in the main windows as well the editors debug menu.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Thu, 21 Jun 2012 21:29:01 +0200
parents 84d1d9c035c7
children 625be3eb27c5
line wrap: on
line diff
--- a/gui/src/main-window.cc
+++ b/gui/src/main-window.cc
@@ -207,16 +207,22 @@
 main_window::handle_entered_debug_mode ()
 {
   setWindowTitle ("Octave (Debugging)");
-  _file_editor->handle_entered_debug_mode ();
-  _debug_menu->setEnabled (true);
+  _debug_continue->setEnabled (true);
+  _debug_step_into->setEnabled (true);
+  _debug_step_over->setEnabled (true);
+  _debug_step_out->setEnabled (true);
+  _debug_quit->setEnabled (true);
 }
 
 void
 main_window::handle_quit_debug_mode ()
 {
   setWindowTitle ("Octave");
-  _file_editor->handle_quit_debug_mode ();
-  _debug_menu->setEnabled (false);
+  _debug_continue->setEnabled (false);
+  _debug_step_into->setEnabled (false);
+  _debug_step_over->setEnabled (false);
+  _debug_step_out->setEnabled (false);
+  _debug_quit->setEnabled (false);
 }
 
 void
@@ -398,19 +404,33 @@
   redo_action->setShortcut (QKeySequence::Redo);
 
   _debug_menu = menuBar ()->addMenu (tr ("De&bug"));
-  QAction * debug_continue = _debug_menu->addAction (tr ("Continue"));
-  debug_continue->setShortcut (Qt::Key_F5);
-  QAction * debug_step_into = _debug_menu->addAction (tr ("Step into"));
-  debug_step_into->setShortcut (Qt::Key_F9);
-  QAction * debug_step_over = _debug_menu->addAction (tr ("Next"));
-  debug_step_over->setShortcut (Qt::Key_F10);
-  QAction * debug_step_out = _debug_menu->addAction (tr ("Step out"));
-  debug_step_out->setShortcut (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_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 ();
-  QAction * debug_quit = _debug_menu->addAction (tr ("Quit"));
-  debug_quit->setShortcut (Qt::Key_Escape);
-  _debug_menu->setEnabled (false);
 
+  _debug_quit = _debug_menu->addAction (tr ("Quit"));
+  _debug_quit->setEnabled (false);
+  _file_editor->debug_menu ()->addAction (_debug_quit);
+  _debug_quit->setShortcut (Qt::Key_Escape);
 
   //QMenu *parallelMenu = menuBar ()->addMenu (tr ("&Parallel"));
 
@@ -524,15 +544,15 @@
            _terminal,                   SLOT   (pasteClipboard ()));
   connect (_current_directory_combo_box, SIGNAL (activated (QString)),
            this,                        SLOT (change_current_working_directory (QString)));
-  connect (debug_continue,              SIGNAL (triggered ()),
+  connect (_debug_continue,             SIGNAL (triggered ()),
            this,                        SLOT (debug_continue ()));
-  connect (debug_step_into,             SIGNAL (triggered ()),
+  connect (_debug_step_into,            SIGNAL (triggered ()),
            this,                        SLOT (debug_step_into ()));
-  connect (debug_step_over,             SIGNAL (triggered ()),
+  connect (_debug_step_over,            SIGNAL (triggered ()),
            this,                        SLOT (debug_step_over ()));
-  connect (debug_step_out,              SIGNAL (triggered ()),
+  connect (_debug_step_out,             SIGNAL (triggered ()),
            this,                        SLOT (debug_step_out ()));
-  connect (debug_quit,                  SIGNAL (triggered ()),
+  connect (_debug_quit,                 SIGNAL (triggered ()),
            this,                        SLOT (debug_quit ()));
 
   setWindowTitle ("Octave");