Mercurial > hg > octave-lyh
changeset 16672:fd43631f09c2
Fix Qt error messages w/o QScintilla-dev installed (Bug #38878)
* libgui/src/main-window.cc
(main_window::construct): #ifdef HAVE_QSCINTILLA around connects for editor_window debug operations.
(main_window::construct_octave_qt_link): #ifdef HAVE_QSCINTILLA block around connects for editor_window edit_file_signal.
(main_window::construct_file_menu): #ifdef HAVE_QSCINTILLA block around connects for editor_window request_open_file.
(main_window::construct_new_menu): #ifdef HAVE_QSCINTILLA block around connects for editor_window request_new_XXXX slots.
(main_window::construct_window_menu): #ifdef HAVE_QSCINTILLA block around connects for editor_window focus slot.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 12 May 2013 16:46:56 -0400 |
parents | 784c765225ba |
children | 092d0a685546 |
files | libgui/src/main-window.cc |
diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/main-window.cc +++ b/libgui/src/main-window.cc @@ -832,6 +832,7 @@ construct_octave_qt_link (); +#ifdef HAVE_QSCINTILLA connect (this, SIGNAL (insert_debugger_pointer_signal (const QString&, int)), editor_window, @@ -846,6 +847,7 @@ SIGNAL (update_breakpoint_marker_signal (bool, const QString&, int)), editor_window, SLOT (handle_update_breakpoint_marker_request (bool, const QString&, int))); +#endif QDir curr_dir; set_current_working_directory (curr_dir.absolutePath ()); @@ -902,10 +904,12 @@ connect (_octave_qt_link, SIGNAL (exit_debugger_signal ()), this, SLOT (handle_exit_debugger ())); +#ifdef HAVE_QSCINTILLA connect (_octave_qt_link, SIGNAL (edit_file_signal (const QString&)), editor_window, SLOT (handle_edit_file_request (const QString&))); +#endif connect (_octave_qt_link, SIGNAL (insert_debugger_pointer_signal (const QString&, int)), @@ -986,8 +990,10 @@ connect (preferences_action, SIGNAL (triggered ()), this, SLOT (process_settings_dialog_request ())); +#ifdef HAVE_QSCINTILLA connect (_open_action, SIGNAL (triggered ()), editor_window, SLOT (request_open_file ())); +#endif connect (load_workspace_action, SIGNAL (triggered ()), this, SLOT (handle_load_workspace_request ())); @@ -1014,11 +1020,13 @@ QAction *new_figure_action = new_menu->addAction (tr ("Figure")); new_figure_action->setEnabled (true); +#ifdef HAVE_QSCINTILLA connect (_new_script_action, SIGNAL (triggered ()), editor_window, SLOT (request_new_script ())); connect (new_function_action, SIGNAL (triggered ()), editor_window, SLOT (request_new_function ())); +#endif connect (new_figure_action, SIGNAL (triggered ()), this, SLOT (handle_new_figure_request ())); @@ -1253,8 +1261,10 @@ connect (file_browser_action, SIGNAL (triggered ()), file_browser_window, SLOT (focus ())); +#ifdef HAVE_QSCINTILLA connect (editor_action, SIGNAL (triggered ()), editor_window, SLOT (focus ())); +#endif connect (documentation_action, SIGNAL (triggered ()), doc_browser_window, SLOT (focus ()));