Mercurial > jwe > octave

diff libgui/src/main-window.cc @ 21158:65827e9cccb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Gui support for enhancement of dbstop. * octave-qscintilla.cc (contextMenuEvent): Capture right-click in the left margins to show a context menu for "dbstop if...". * octave-qscintilla.{cc,h} (contextmenu_break_condition): new function * file-editor-interface.h: pass condition to handle_update_breakpoint_marker_request * file-editor-tab.{cc,h}: (file_editor_tab, bp_info, handle_request_add_breakpoint, next_breakpoint, previous_breakpoint, do_breakpoint_marker, add_breakpoint_callback): Allow conditional breakpoint markers * file-editor-tab.cc (handle_context_menu_break_condition): new function * file-editor.{cc,h} (request_open_file, add_file_editor_tab, handle_delete_debugger_pointer_request): pass bp conditions. * marker.{cc,h} (marker, construct, handle_report_editor_linenr): pass breakpoint conditions * main-window.{cc,h} (handle_update_breakpoint_marker_request): pass breakpoint condition. * octave-link.h (update_breakpoint): pass breakpoint condition. * octave-qt-link.{cc,h} (do_update_breakpoint): pass breakpoint condition.
author Lachlan Andrew <lachlanbis@gmail.com>
date Sat, 30 Jan 2016 10:13:34 +1100
parents e8c3590da9ff
children 710e700cdd7f
line wrap: on
line diff
--- a/libgui/src/main-window.cc	Sun Jan 24 11:02:30 2016 +1100
+++ b/libgui/src/main-window.cc	Sat Jan 30 10:13:34 2016 +1100
@@ -1000,11 +1000,12 @@
 void
 main_window::handle_update_breakpoint_marker_request (bool insert,
                                                       const QString& file,
-                                                      int line)
+                                                      int line,
+						      const QString& cond)
 {
   bool cmd_focus = command_window_has_focus ();
 
-  emit update_breakpoint_marker_signal (insert, file, line);
+  emit update_breakpoint_marker_signal (insert, file, line, cond);
 
   if (cmd_focus)
     focus_command_window ();
@@ -1414,11 +1415,13 @@
                SLOT (handle_delete_debugger_pointer_request (const QString&, int)));
 
       connect (this,
-               SIGNAL (update_breakpoint_marker_signal (bool, const QString&, int)),
+               SIGNAL (update_breakpoint_marker_signal (bool, const QString&,
+	                                                int, const QString&)),
                editor_window,
                SLOT (handle_update_breakpoint_marker_request (bool,
                                                               const QString&,
-                                                              int)));
+                                                              int,
+							      const QString&)));
 #endif
 
       octave_link::post_event (this, &main_window::resize_command_window_callback);
@@ -1558,10 +1561,13 @@
                SLOT (handle_delete_debugger_pointer_request (const QString&, int)));
 
       connect (_octave_qt_link,
-               SIGNAL (update_breakpoint_marker_signal (bool, const QString&, int)),
+               SIGNAL (update_breakpoint_marker_signal (bool, const QString&,
+	                                                int, const QString&)),
                this,
-               SLOT (handle_update_breakpoint_marker_request (bool, const QString&,
-                                                              int)));
+               SLOT (handle_update_breakpoint_marker_request (bool,
+	                                                      const QString&,
+                                                              int,
+							      const QString&)));
 
       connect (_octave_qt_link,
                SIGNAL (show_doc_signal (const QString &)),